From patchwork Tue May 19 11:37:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 135261 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29EE34BB1C26 for ; Tue, 19 May 2026 11:38:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29EE34BB1C26 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Z3UmlMCj; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EVxfgePN; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Z3UmlMCj; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EVxfgePN X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id EF7204BB24E5 for ; Tue, 19 May 2026 11:37:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF7204BB24E5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF7204BB24E5 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779190669; cv=none; b=ei1DAkeSd2VPKm44W0cWoeATJjj5zrBfb8j8F/YyaqEJw44YEhTkbeiuMgl3Hq+AMoxh6rrEJW6sCuf/+O5rOfYRhDYk6BJfT2tua7/Lb7+ZQHXBf6SNB2pbv61GykJ0saJJvZr4/tZjYZclbO/4HJN0jwl2N+likMSytRYCNSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779190669; c=relaxed/simple; bh=Kj252CIDIhglTNc3auyCxfzj6ZrZhnqfOfa2Y7mrJeM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=CYQ2WXtfasrIPIkg4DsfB8txLB79kqq+NsB7M38qka+BXbS5rnX3VAses59mP8TiVkXPdkBgvkdnhamPPDuZZVL10+jqeoaocaiUjI869BECh3JDump00zIJWykx1Clh1GNbQlWqWR+5Wb7IHEf9Lo33lVYoSTRKjqqaUoZjOC0= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Z3UmlMCj; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EVxfgePN; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Z3UmlMCj; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EVxfgePN DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF7204BB24E5 Received: from hawking.suse.de (unknown [IPv6:2a07:de40:a101:3:92b1:1cff:fe69:ddc]) by smtp-out1.suse.de (Postfix) with ESMTP id 4D2FA6ACC2 for ; Tue, 19 May 2026 11:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779190667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Kt/vzL0de0yq9lULbhiyG6xpnkBme3XIfVGSHVL9oHI=; b=Z3UmlMCjFXxk9Y1L3YNacRGj2SKZ280MZHfOov7oQ0FDlT0pIbJSXqyKWYlgSaDRuX4rW3 umueiMU2OFg7zlBQwWeRa7zGGrOAWOdaBISGYKSXwW94Z4ircEg2Y7UAPwjfflZNhLIHGP iwUfj1cF9Gsm6V1++I5xcblONgEwYew= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779190667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Kt/vzL0de0yq9lULbhiyG6xpnkBme3XIfVGSHVL9oHI=; b=EVxfgePNLMc7MI9uzqoWfJ/WHDhiHRyDvrngIYg/ztX+yeAvmezIqb/Xre+kVE/0lL9sft vCQrdimsWo42iODw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Z3UmlMCj; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=EVxfgePN DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779190667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Kt/vzL0de0yq9lULbhiyG6xpnkBme3XIfVGSHVL9oHI=; b=Z3UmlMCjFXxk9Y1L3YNacRGj2SKZ280MZHfOov7oQ0FDlT0pIbJSXqyKWYlgSaDRuX4rW3 umueiMU2OFg7zlBQwWeRa7zGGrOAWOdaBISGYKSXwW94Z4ircEg2Y7UAPwjfflZNhLIHGP iwUfj1cF9Gsm6V1++I5xcblONgEwYew= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779190667; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Kt/vzL0de0yq9lULbhiyG6xpnkBme3XIfVGSHVL9oHI=; b=EVxfgePNLMc7MI9uzqoWfJ/WHDhiHRyDvrngIYg/ztX+yeAvmezIqb/Xre+kVE/0lL9sft vCQrdimsWo42iODw== Received: by hawking.suse.de (Postfix, from userid 17005) id 3C0974A05A4; Tue, 19 May 2026 13:37:47 +0200 (CEST) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] nss_files: use booleans in parser macro calls In-Reply-To: (Andreas Schwab's message of "Tue, 19 May 2026 13:23:08 +0200") References: Date: Tue, 19 May 2026 13:37:47 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spamd-Result: default: False [15.29 / 50.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM_LONG(3.50)[1.000]; BAYES_HAM(-3.00)[99.99%]; NEURAL_SPAM_SHORT(3.00)[1.000]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.suse.de]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.suse.de]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MX_GOOD(-0.01)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:a101:3:92b1:1cff:fe69:ddc:from]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[hawking.suse.de:helo, suse.de:dkim, suse.de:email, suse.de:mid] X-Spamd-Bar: +++++++++++++++ X-Rspamd-Queue-Id: 4D2FA6ACC2 X-Spam-Score: 15.29 X-Rspamd-Action: add header X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam: Yes X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org The swallow argument in the INT_FIELD and STRING_FIELD macros is used as a boolean, change all callers to use false and true instead of 0 and 1. --- nss/nss_files/files-ethers.c | 6 +++--- nss/nss_files/files-hosts.c | 4 ++-- nss/nss_files/files-network.c | 4 ++-- nss/nss_files/files-parse.c | 1 + nss/nss_files/files-proto.c | 4 ++-- nss/nss_files/files-rpc.c | 4 ++-- nss/nss_files/files-service.c | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/nss/nss_files/files-ethers.c b/nss/nss_files/files-ethers.c index a689b1a5b4..bdbb64d699 100644 --- a/nss/nss_files/files-ethers.c +++ b/nss/nss_files/files-ethers.c @@ -36,16 +36,16 @@ LINE_PARSER unsigned int number; if (cnt < 5) - INT_FIELD (number, ISCOLON , 0, 16, (unsigned int)) + INT_FIELD (number, ISCOLON , false, 16, (unsigned int)) else - INT_FIELD (number, isspace, 1, 16, (unsigned int)) + INT_FIELD (number, isspace, true, 16, (unsigned int)) if (number > 0xff) return 0; result->e_addr.ether_addr_octet[cnt] = number; } }; - STRING_FIELD (result->e_name, isspace, 1); + STRING_FIELD (result->e_name, isspace, true); ) diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index bfbffa3b54..8d7c90945a 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -53,7 +53,7 @@ LINE_PARSER { char *addr; - STRING_FIELD (addr, isspace, 1); + STRING_FIELD (addr, isspace, true); /* Parse address. */ if (__inet_pton (af == AF_UNSPEC ? AF_INET : af, addr, entdata->host_addr) @@ -96,7 +96,7 @@ LINE_PARSER entdata->h_addr_ptrs[1] = NULL; result->h_addr_list = entdata->h_addr_ptrs; - STRING_FIELD (result->h_name, isspace, 1); + STRING_FIELD (result->h_name, isspace, true); }) #define EXTRA_ARGS_VALUE , AF_INET, 0 diff --git a/nss/nss_files/files-network.c b/nss/nss_files/files-network.c index 86cab9e4e9..b5d6f536f9 100644 --- a/nss/nss_files/files-network.c +++ b/nss/nss_files/files-network.c @@ -38,9 +38,9 @@ LINE_PARSER char *cp; int n = 1; - STRING_FIELD (result->n_name, isspace, 1); + STRING_FIELD (result->n_name, isspace, true); - STRING_FIELD (addr, isspace, 1); + STRING_FIELD (addr, isspace, true); /* 'inet_network' does not add zeroes at the end if the network number does not contain four byte values. We shift result ourselves if necessary. */ diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 016b0965e4..f9fcb64c01 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/nss/nss_files/files-proto.c b/nss/nss_files/files-proto.c index 59dc134fe6..398ba85519 100644 --- a/nss/nss_files/files-proto.c +++ b/nss/nss_files/files-proto.c @@ -29,8 +29,8 @@ struct protoent_data {}; #include "files-parse.c" LINE_PARSER ("#", - STRING_FIELD (result->p_name, isspace, 1); - INT_FIELD (result->p_proto, isspace, 1, 10,); + STRING_FIELD (result->p_name, isspace, true); + INT_FIELD (result->p_proto, isspace, true, 10,); ) #include GENERIC diff --git a/nss/nss_files/files-rpc.c b/nss/nss_files/files-rpc.c index 76056c04e8..f159f04686 100644 --- a/nss/nss_files/files-rpc.c +++ b/nss/nss_files/files-rpc.c @@ -29,8 +29,8 @@ struct rpcent_data {}; #include "files-parse.c" LINE_PARSER ("#", - STRING_FIELD (result->r_name, isspace, 1); - INT_FIELD (result->r_number, isspace, 1, 10,); + STRING_FIELD (result->r_name, isspace, true); + INT_FIELD (result->r_number, isspace, true, 10,); ) #include GENERIC diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 2ba48b798d..ba141438c4 100644 --- a/nss/nss_files/files-service.c +++ b/nss/nss_files/files-service.c @@ -31,9 +31,9 @@ struct servent_data {}; #define ISSLASH(c) ((c) == '/') LINE_PARSER ("#", - STRING_FIELD (result->s_name, isspace, 1); - INT_FIELD (result->s_port, ISSLASH, 0, 10, htons); - STRING_FIELD (result->s_proto, isspace, 1); + STRING_FIELD (result->s_name, isspace, true); + INT_FIELD (result->s_port, ISSLASH, false, 10, htons); + STRING_FIELD (result->s_proto, isspace, true); ) #include GENERIC