From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 56368385114C for ; Thu, 20 Oct 2022 13:42:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 56368385114C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x329.google.com with SMTP id cb2-20020a056830618200b00661b6e5dcd8so11420282otb.8 for ; Thu, 20 Oct 2022 06:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=gxCEnro/elGoPBohAvHqWmU05difKy6LtPWaVt0PX6Q=; b=YoVpDeGNnMQi+GaMlbdhSdalIaliMdvl34rF/A6jszzFt1gZnikWOQTbhCnJoFSPml tkJ+24JGt1OSDeI7nP8cXIas207u0ua30IYSGX2DuO0JUqjluSjhVQYArcIr4oAbo7n6 PYvPMgh5jo082pBWgMIXmxUuC7d3KSlZ9zQ/MERtR2Ic/j4WIqydLRXZ8tKCXLnEgDef 75qtQV5ytdLahTnzyU3Nxi6EFljJ0DJKgTkg8DKRbZZhLWQrpL12NXDcg+qJoBO7GNHe 6Vvesd6vM0GClYVQdsCNJ2paIM6XU+w0oLpfmgUaNkJ45KxTuLTX7tuncVos2wtp4H91 lzgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gxCEnro/elGoPBohAvHqWmU05difKy6LtPWaVt0PX6Q=; b=zwSJet92JS9ce36/41WCOPQGAMX1W+lIPTBLwwJmzN74y5l7Azl1FlFUAKa+jKPlNB y2na2bYcJHNuxON6+sCoLIvzyOLSzE7l2v7I+EnrAjtNxTSL2RHOqb3QTjMFPO8tGEEj xgT5LFSnPh42jccPwFV+Fbf3HLj2BjXNWN22Wv9YqTGC43i6+S1cqtSKBZaLt4dMJEJs Rd55B5IDG6ZiwohCGAbn6Di2Jg0J6O43SrZ8aIOGRVnZJzbp13+W/9/27iysHQiEMuxY T1RzR3B1gm99Q39sMtzgMXdBXwbgqiDNhVRfJ3nUZQ23eoN9rl74nGbUVDCKbLB6RJ/o PxhA== X-Gm-Message-State: ACrzQf0CyrXIeBvR1VNnFRg3Lq8Y5httR5QTiBP4lU9s89+IdGPBeibr Gkw9+W1uOXXU2ceOAcJDvfrbNw== X-Google-Smtp-Source: AMsMyM5oqz5jBuL2WIyPODYYDIbFugMirK5X+eojfh+JLY+coLy5TwGOryPnxE+t9/N9U6WkLS8mTw== X-Received: by 2002:a9d:729e:0:b0:661:9724:7c65 with SMTP id t30-20020a9d729e000000b0066197247c65mr7232245otj.320.1666273343494; Thu, 20 Oct 2022 06:42:23 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:7d19:dd57:1ff9:1f14:a9d5? ([2804:1b3:a7c3:7d19:dd57:1ff9:1f14:a9d5]) by smtp.gmail.com with ESMTPSA id x7-20020a9d6287000000b00661a1a48079sm8061698otk.7.2022.10.20.06.42.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Oct 2022 06:42:22 -0700 (PDT) Message-ID: Date: Thu, 20 Oct 2022 10:42:20 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.3.3 Subject: Re: [PATCH] nis: Fix nis_print_directory Content-Language: en-US To: Arjun Shankar Cc: libc-alpha@sourceware.org References: <20220926165324.4005972-1-adhemerval.zanella@linaro.org> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 19/10/22 09:19, Arjun Shankar wrote: > Hi Adhemerval, > >> Remove implicit conversion from enumeration type 'zotypes' to different >> type 'nstype'. >> >> Checked on x86_64-linux-gnu. > > Overall, the patch looks good to me and with the patch in place, glibc > builds cleanly with -Wenum-conversion. One question below; but even > without that change, I'm okay with this patch. It fixes a bug and is > an improvement. > > Reviewed-by: Arjun Shankar Thanks. > >> --- >> nis/nis_print.c | 59 +++++++++++++++++++++++-------------------------- >> 1 file changed, 28 insertions(+), 31 deletions(-) >> >> diff --git a/nis/nis_print.c b/nis/nis_print.c >> index d0efd98e86..2708c29ef0 100644 >> --- a/nis/nis_print.c >> +++ b/nis/nis_print.c >> @@ -52,6 +52,32 @@ nis_nstype2str (const nstype type) >> } >> } >> >> +static const char * >> +nis_objtype (const zotypes type) >> +{ >> + switch (type) >> + { >> + case NIS_BOGUS_OBJ: >> + return _("BOGUS OBJECT"); >> + case NIS_NO_OBJ: >> + return _("NO OBJECT"); >> + case NIS_DIRECTORY_OBJ: >> + return _("DIRECTORY"); >> + case NIS_GROUP_OBJ: >> + return _("GROUP"); >> + case NIS_TABLE_OBJ: >> + return _("TABLE"); >> + case NIS_ENTRY_OBJ: >> + return _("ENTRY"); >> + case NIS_LINK_OBJ: >> + return _("LINK"); >> + case NIS_PRIVATE_OBJ: >> + return _("PRIVATE\n"); >> + default: >> + return _("(Unknown object"); >> + } >> +} >> + >> static void >> print_ttl (const uint32_t ttl) >> { > > New function to return strings corresponding to zotype. Translating > these strings makes sense. I'm wondering if they should be in > title-case instead of all-caps? Looks like "Table", "Directory" etc. > are being printed elsewhere as part of longer translatable strings > already. I don't have a strong opinion, but it does make sense to be consistent here. > >> @@ -103,36 +129,7 @@ print_flags (const unsigned int flags) >> static void >> nis_print_objtype (enum zotypes type) >> { >> - switch (type) >> - { >> - case NIS_BOGUS_OBJ: >> - fputs (_("BOGUS OBJECT\n"), stdout); >> - break; >> - case NIS_NO_OBJ: >> - fputs (_("NO OBJECT\n"), stdout); >> - break; >> - case NIS_DIRECTORY_OBJ: >> - fputs (_("DIRECTORY\n"), stdout); >> - break; >> - case NIS_GROUP_OBJ: >> - fputs (_("GROUP\n"), stdout); >> - break; >> - case NIS_TABLE_OBJ: >> - fputs (_("TABLE\n"), stdout); >> - break; >> - case NIS_ENTRY_OBJ: >> - fputs (_("ENTRY\n"), stdout); >> - break; >> - case NIS_LINK_OBJ: >> - fputs (_("LINK\n"), stdout); >> - break; >> - case NIS_PRIVATE_OBJ: >> - fputs (_("PRIVATE\n"), stdout); >> - break; >> - default: >> - fputs (_("(Unknown object)\n"), stdout); >> - break; >> - } >> + printf ("%s\n", nis_objtype (type)); >> } >> >> void > > OK. Get the string from the new function instead of duplicating the > switch statement. > >> @@ -236,7 +233,7 @@ nis_print_directory (const directory_obj *dir) >> for (i = 0; i < dir->do_armask.do_armask_len; i++) >> { >> nis_print_rights (ptr->oa_rights); >> - printf (_("\tType : %s\n"), nis_nstype2str (ptr->oa_otype)); >> + printf (_("\tType : %s\n"), nis_objtype (ptr->oa_otype)); >> fputs (_("\tAccess rights: "), stdout); >> nis_print_rights (ptr->oa_rights); >> fputs ("\n", stdout); > > OK. This was quite wrong earlier, printing strings corresponding to > the wrong enum. Fixed now. > >> -- >> 2.34.1 >> >