Re: [PATCH] un-nest findidx()

[Konstantin Serebryany <konstantin dot s dot serebryany at gmail dot com>]

2.20 has been released.
Can we now proceed with this patch?
(I've double-checked, it still applies, builds and validates)

Thanks,

--kcc

On Fri, Jul 25, 2014 at 6:12 AM, Konstantin Serebryany
<konstantin.s.serebryany@gmail.com> wrote:
> On Fri, Jul 25, 2014 at 3:48 PM, Will Newton <will.newton@linaro.org> wrote:
>> On 25 July 2014 11:05, Konstantin Serebryany
>> <konstantin.s.serebryany@gmail.com> wrote:
>>> Any other comments?
>>
>> The comments on the include guards are a little odd,
> You mean the ChangeLog entry?
>
> Should it be like this?
> 2014-07-25  Kostya Serebryany  <konstantin.s.serebryany@gmail.com>
>
>         * locale/weight.h (_WEIGHT_H_): add include guard.
>         (findidx): un-nest, make it static inline, add parameters.
>         * locale/weightwc.h (_WEIGHTWC_H_): add include guard.
>         (findidx): rename to findidxwc, un-nest, make it static inline,
>         add parameters.
>         * posix/fnmatch_loop.c: include weightwc.h or weight.h depending on
>         WIDE_CHAR_VERSION. Define FINDIDX as findidxwc or findidx.
>         (FCT): change type of 'extra' to wint_t; do not include weight.h,
>         un-nest calls to findidx.
>         * posix/regcomp.c: include weight.h.
>         (build_equiv_class): don't include weight.h, un-nest findidx.
>         * posix/regex_internal.h: include weight.h
>         (re_string_elem_size_at): don't include weight.h, un-nest findidx.
>         * posix/regexec.c: include weight.h.
>         (check_node_accept_bytes): don't include weight.h, un-nest findidx.
>         * string/strcoll_l.c: define FINDIDX, include WEIGHT_H.
>         (get_next_seq): don't include WEIGHT_H, un-nest findidx.
>         (get_next_seq_nocache): don't include WEIGHT_H, un-nest findidx.
>         * string/strxfrm_l.c: define FINDIDX, include WEIGHT_H.
>         (STRXFRM): don't include WEIGHT_H, un-nest findidx.
>         * wcsmbs/wcscoll_l.c: define FINDIDX.
>         * wcsmbs/wcsxfrm_l.c: define FINDIDX.
>
>
>
>> usually the name
>> of the define is used rather than the filename. Besides that minor nit
>> the code looks ok to me and also passes make check. I don't think it
>> is something we would want to take at this stage in the freeze
>> however.
>
> Ok, let me ping this thread after the freeze is over. Thanks!
>
> --kcc
>
>
>>
>>> On Thu, Jul 3, 2014 at 5:01 PM, Konstantin Serebryany
>>> <konstantin.s.serebryany@gmail.com> wrote:
>>>> On Thu, Jul 3, 2014 at 4:26 PM, Andreas Schwab <schwab@suse.de> wrote:
>>>>> Konstantin Serebryany <konstantin.s.serebryany@gmail.com> writes:
>>>>>
>>>>>> On Thu, Jul 3, 2014 at 4:06 PM, Andreas Schwab <schwab@suse.de> wrote:
>>>>>>> Konstantin Serebryany <konstantin.s.serebryany@gmail.com> writes:
>>>>>>>
>>>>>>>>         (FCT): change type of 'extra' to wint_t;
>>>>>>>
>>>>>>> Why do you need this change?
>>>>>> To avoid warnings about different types of argument and parameter
>>>>>
>>>>> But why do you have that conflict in the first place?  You must use the
>>>>> type of the object in the end.
>>>>
>>>> There are multiple uses of findidxwc. Some were using int32_t* for
>>>> 'extra', some where using wint_t*
>>>> (e.g. see USTRING_TYPE in wcsmbs/wcscoll.c).
>>>> When un-nesting findidxwc we have to chose just one type. I chose
>>>> wint_t because otherwise the change would have been larger.
>>>>
>>>> --kcc
>>>>
>>>>>
>>>>> Andreas.
>>>>>
>>>>> --
>>>>> Andreas Schwab, SUSE Labs, schwab@suse.de
>>>>> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
>>>>> "And now for something completely different."
>>
>>
>>
>> --
>> Will Newton
>> Toolchain Working Group, Linaro