diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-09-11 16:02:17 -0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-16 05:19:15 -0500 |
| commit | b0694b9e98ee64cb25490de0921ce307f3872749 (patch) | |
| tree | 5fe07b4da5c6f4cc7b34c864a0aa455b2facf076 /ChangeLog | |
| parent | f80af76648ed97a76745fad6caa3315a79cb1c7c (diff) | |
| download | glibc-b0694b9e98ee64cb25490de0921ce307f3872749.tar.gz glibc-b0694b9e98ee64cb25490de0921ce307f3872749.tar.xz glibc-b0694b9e98ee64cb25490de0921ce307f3872749.zip | |
Move findidx nested functions to top-level.
Needed in order to backport strxfrm_l security fix cleanly. (cherry picked from commit 8c0ab919f63dc03a420751172602a52d2bea59a8) Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index e416cd0e62..dbf7e86950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2015-02-16 Kostya Serebryany <konstantin.s.serebryany@gmail.com> + Roland McGrath <roland@hack.frob.com> + + * locale/weight.h: Add include guard. + (findidx): Make static rather than auto; take new parameters + TABLE, INDIRECT, and EXTRA instead of getting them as outer locals. + * locale/weightwc.h: Likewise. + * posix/fnmatch_loop.c + (FCT): Change type of EXTRA from int32_t to wint_t. + Don't include either header inside the function. + Call FINDIDX rather than findidx, and pass new arguments. + #undef FINDIDX at the end of the file. + * posix/fnmatch.c [_LIBC]: #include <locale/weight.h> and define + FINDIDX before including fnmatch_loop.c for the non-wide version. + [_LIBC] [HANDLE_MULTIBYTE]: #define findidx to findidxwc around + #include <locale/weightwc.h>, and define FINDIDX to findidxwc + for the wide version. + * posix/regcomp.c [_LIBC]: #include <locale/weight.h>. + (build_equiv_class) [_LIBC]: Don't #include it inside the function. + Pass new arguments to findidx. + * posix/regexec.c [RE_ENABLE_I18N] [_LIBC]: #include <locale/weight.h>. + [RE_ENABLE_I18N] (check_node_accept_bytes) [_LIBC]: + Don't #include it inside the function. Pass new arguments to findidx. + * posix/regex_internal.h + [!NOT_IN_libc] [_LIBC]: #include <locale/weight.h>. + (re_string_elem_size_at): Don't #include it inside the function. + Pass new arguments to findidx. + * string/strcoll_l.c: #include WEIGHT_H at top level. + (get_next_seq): Don't #include it inside the function. + Pass new arguments to findidx. + (get_next_seq_nocache): Likewise. + * string/strxfrm_l.c: #include WEIGHT_H at top level. + (STRXFRM): Don't #include it inside the function. + Pass new arguments to findidx. + 2014-12-16 Florian Weimer <fweimer@redhat.com> [BZ #17630] |