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.129.124]) by sourceware.org (Postfix) with ESMTPS id 7DBAF3858D39 for ; Wed, 19 Oct 2022 12:19:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7DBAF3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666181971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eeagcNSaqVqD3QGfxF2liwvlnK5yMeezyZRllUuTDAY=; b=FW9cHV8pKy/u+6Qjv4T+gJL0x/dnFDZgBO9rdX0LKWzs6hZVt9tHUVqEDcbjpu2lTukFjz WzxKk0Y3eKzuurkC6mKzlOehyDFbVxrsx7bZmQgafELTp8qHgzAlMPPUJx3X/nC/p3gE9k YjfpU5hlAQnrS9mEOypXVUFKz60owNo= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-671-s1MfWXtOOaesgj8PBoaoKQ-1; Wed, 19 Oct 2022 08:19:30 -0400 X-MC-Unique: s1MfWXtOOaesgj8PBoaoKQ-1 Received: by mail-pj1-f70.google.com with SMTP id o11-20020a17090aac0b00b0020625062cbaso13496470pjq.2 for ; Wed, 19 Oct 2022 05:19:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eeagcNSaqVqD3QGfxF2liwvlnK5yMeezyZRllUuTDAY=; b=aFI1hFOcV4hnaANl+siK8fzomiyKNja7HaOa+ki1rXwGsrFmugkq/7gW7G6tgVCst/ yxhONcZzYcBY40gHDkjs2gbzrKBtxcw6kdDYt5rlrI1QAc+JhKEsLUVRXlrExRGXS8/U SouCxq9pzi6d2dz7Lq7y4hK7yRP2U82NZv0dImmEEgktIIH0GGShYJVz1oBKMa4PMGcU vRUpP7Bt1tE6hKHWeVyFYzdeFUHGbt4eOfdC5RQFZzMOyMdWJ0M2UJueVmlL+IU8fLcc oxksydpN4nQBqNAzX/kDUB4weTC9qLs0FJ7PVYLRtC1GUcrb9+s1cgRtI0nIFUeZW3UL 7YDw== X-Gm-Message-State: ACrzQf1PMfAk6LkxTOdIujqOANNVBzKCnBqHSXw10era+ylpsXHjsfsa tx/25I7MJ6TWeQNLaYtOHp/2A18bosb8OUI165uZbbIPlD52cTjlcXnr8sumX5Kzj+zxmIF1+mn 1CRgKCvWBnefI6ImR9sUQesuuC5DbmyIBuwE3 X-Received: by 2002:a17:903:124e:b0:178:6946:a2ba with SMTP id u14-20020a170903124e00b001786946a2bamr8056488plh.89.1666181969334; Wed, 19 Oct 2022 05:19:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xVBVXaKsb+Omqb31ODYVTeCTTDykvYTiiKgwgrxjZIxenGoQMmosQcy8FTHYHSp4LM7jQ6q0NpkoAQgtYd/A= X-Received: by 2002:a17:903:124e:b0:178:6946:a2ba with SMTP id u14-20020a170903124e00b001786946a2bamr8056404plh.89.1666181968021; Wed, 19 Oct 2022 05:19:28 -0700 (PDT) MIME-Version: 1.0 References: <20220926165324.4005972-1-adhemerval.zanella@linaro.org> In-Reply-To: <20220926165324.4005972-1-adhemerval.zanella@linaro.org> From: Arjun Shankar Date: Wed, 19 Oct 2022 14:19:16 +0200 Message-ID: Subject: Re: [PATCH] nis: Fix nis_print_directory To: Adhemerval Zanella Cc: libc-alpha@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: 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 > --- > 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. > @@ -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 >