From patchwork Fri Aug 30 16:18:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 34359 Received: (qmail 55512 invoked by alias); 30 Aug 2019 16:18:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 55503 invoked by uid 89); 30 Aug 2019 16:18:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=HCc:U*carlos, H*f:sk:ba96560, H*i:sk:ba96560 X-HELO: mx1.redhat.com From: Florian Weimer To: Szabolcs Nagy Cc: Carlos O'Donell , nd , Martin Sebor , Steve Ellcey , "libc-alpha\@sourceware.org" , "msebor\@redhat.com" Subject: Re: ToT glibc build problem with ToT GCC References: <486309d08583ed1c27a001d946205850b421f7ad.camel@marvell.com> <53b36206-3f07-432b-9d0f-02520debe4b8@gmail.com> <2e5c0137-4109-e7ce-8d1d-9c268e086f81@gmail.com> <87ef126bvu.fsf@oldenburg2.str.redhat.com> Date: Fri, 30 Aug 2019 18:18:03 +0200 In-Reply-To: (Szabolcs Nagy's message of "Fri, 30 Aug 2019 14:14:42 +0000") Message-ID: <87mufq4og4.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 * Szabolcs Nagy: > On 30/08/2019 14:06, Florian Weimer wrote: >> * Carlos O'Donell: >> >>> Is there a viable solution for a static allocation of a structure >>> that ends in a VLA? >> >> Sure, use an initializer. Not sure if this breaks anything. The test >> suite is clean. >> >> (GNU C obviously didn't support that when the code was written.) > > i didn't know an initializer would be enough. > >> >> - replace[0].nbytes = 1; >> - replace[0].bytes[0] = '?'; >> - replace[0].bytes[1] = '\0'; >> - ctype->mboutdigits[cnt] = &replace[0]; >> + static const struct charseq replace = >> + { >> + .nbytes = 1, >> + .bytes = { '\0' }, >> + }; >> + ctype->mboutdigits[cnt] = (struct charseq *) &replace; >> } > > is it ok to change {'?','\0'} to {'\0'} ? Ah, my mistake. It should be "?", I suppose. Thanks, Florian localedef: Use initializer for flexible array member [BZ #24950] 2019-08-30 Florian Weimer [BZ #24950] * locale/programs/charmap.h (struct charseq): Turn bytes into a flexible array member. * locale/programs/ld-ctype.c (ctype_finish): Use initializer for replace. diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h index 870a9e9577..70db330d29 100644 --- a/locale/programs/charmap.h +++ b/locale/programs/charmap.h @@ -60,7 +60,7 @@ struct charseq const char *name; uint32_t ucs4; int nbytes; - unsigned char bytes[0]; + unsigned char bytes[]; }; diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index cfc9c43fd5..9123f64a56 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); for (cnt = 0; cnt < 10; ++cnt) if (ctype->mboutdigits[cnt] == NULL) { - static struct charseq replace[2]; - if (!warned) { record_error (0, 0, _("\ @@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); warned = 1; } - replace[0].nbytes = 1; - replace[0].bytes[0] = '?'; - replace[0].bytes[1] = '\0'; - ctype->mboutdigits[cnt] = &replace[0]; + static const struct charseq replace = + { + .nbytes = 1, + .bytes = "?", + }; + ctype->mboutdigits[cnt] = (struct charseq *) &replace; } warned = 0;