From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 87E873858D39 for ; Thu, 23 Sep 2021 10:07:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 87E873858D39 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-SkDs1sEgOwaCB1_-suxV3A-1; Thu, 23 Sep 2021 06:07:32 -0400 X-MC-Unique: SkDs1sEgOwaCB1_-suxV3A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D43EDF8A0; Thu, 23 Sep 2021 10:07:31 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EFB619724; Thu, 23 Sep 2021 10:07:30 +0000 (UTC) From: Florian Weimer To: Andreas Schwab Cc: Florian Weimer via Libc-alpha Subject: Re: [PATCH 2/2] vfprintf: Unify argument handling in process_arg References: <1a90d7bf325cd6606bcb083ffc5cd528eefad219.1632294469.git.fweimer@redhat.com> <87y27owv7l.fsf@igel.home> Date: Thu, 23 Sep 2021 12:07:28 +0200 In-Reply-To: <87y27owv7l.fsf@igel.home> (Andreas Schwab's message of "Wed, 22 Sep 2021 16:17:34 +0200") Message-ID: <87tuibsizj.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2021 10:07:35 -0000 * Andreas Schwab: > On Sep 22 2021, Florian Weimer via Libc-alpha wrote: > >> Instead of checking a pointer argument for NULL, use helper macros >> defined differently in the non-positional and positional cases. >> This avoids frequent conditional checks and a GCC 12 warning >> about comparing pointers against NULL which cannot be NULL. > > Ok. > >> @@ -1545,8 +1474,28 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap, unsigned int mode_flags) >> /* Process current format. */ >> while (1) >> { >> - process_arg (((struct printf_spec *) NULL)); >> - process_string_arg (((struct printf_spec *) NULL)); >> +#define PROCESS_ARG_INT() va_arg (ap, int) >> +#define PROCESS_ARG_LONG_INT() va_arg (ap, long int) >> +#define PROCESS_ARG_LONG_LONG_INT() va_arg (ap, long long int) >> +#define PROCESS_ARG_POINTER() va_arg (ap, void *) >> +#define PROCESS_ARG_STRING() va_arg (ap, const char *) >> +#define PROCESS_ARG_UNSIGNED_INT() va_arg (ap, unsigned int) >> +#define PROCESS_ARG_UNSIGNED_LONG_INT() va_arg (ap, unsigned long int) >> +#define PROCESS_ARG_UNSIGNED_LONG_LONG_INT() va_arg (ap, unsigned long long int) >> +#define PROCESS_ARG_WCHAR_T() va_arg (ap, wchar_t) >> +#define PROCESS_ARG_WSTRING() va_arg (ap, const wchar_t *) > > I think it would be nicer to spell these macros in lower case. Fair enough, I've renamed the macros to lower case before pushing. Thanks, Florian