From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 3655F385085F; Thu, 20 Oct 2022 14:10:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3655F385085F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666275002; bh=mo2dcZ6JxpGaJvfH3IFCY6PbAAEKB4CDBHbe+AdihHk=; h=From:To:Subject:Date:From; b=GY4a10GjV2XUzmEJOgiF1w7bk2zlnEkgN4kOQ/ohVjq+DkPVZrwXAo3HyRXbb8bEA wcjEl/MbkjISkuukGb2xfcQ+J65GOyWFS2uvmO4XQhoW6HvKPiut5X5cF7AJS8T/QH 8Ulgb27tpH3XMzhHV625MXYn0gpfQ+24nVzStfxQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] nis: Fix nis_print_directory X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 9b5e138f2bbd032da858a4ad5bb51ed99d6f89b6 X-Git-Newrev: 0ff92021c045ee53b91bd42fa3fbbb923a6ffb17 Message-Id: <20221020141002.3655F385085F@sourceware.org> Date: Thu, 20 Oct 2022 14:10:02 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0ff92021c045ee53b91bd42fa3fbbb923a6ffb17 commit 0ff92021c045ee53b91bd42fa3fbbb923a6ffb17 Author: Adhemerval Zanella Netto Date: Mon Sep 26 13:53:24 2022 -0300 nis: Fix nis_print_directory Remove implicit conversion from enumeration type 'zotypes' to different type 'nstype'. Checked on x86_64-linux-gnu. Reviewed-by: Arjun Shankar Diff: --- 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) { @@ -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 @@ -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);