From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 1E99F3858CDA; Tue, 4 Oct 2022 12:55:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E99F3858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664888143; bh=2/Ek/SlB0F6wTQfTd1gQhbVNSuv57ZlE7C8TMFBhzP8=; h=From:To:Subject:Date:From; b=QM+yUuw58QldM+JzYlqYF4k9JB0ruzj0q8tdo2bZfkYgWcS/95i3QKJVdQ8KfAZEE TH+nt2dhm/SKr8E3oOSt6kl6VrErg7NyVqK7vmrMKUlulTUhJXkLSd6JFZIcxWE5Na NLlwb5of0gaybjEEYCPhajED/4Be7b1Z0fYRvF7w= 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/azanella/clang] nis: Fix nis_print_directory X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: c92ee6e05a05234e94a8eb2e35dd04f56d6db350 X-Git-Newrev: 7866bdadcfccc23eb8cceea244b73d3378d81991 Message-Id: <20221004125543.1E99F3858CDA@sourceware.org> Date: Tue, 4 Oct 2022 12:55:43 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7866bdadcfccc23eb8cceea244b73d3378d81991 commit 7866bdadcfccc23eb8cceea244b73d3378d81991 Author: Adhemerval Zanella Date: Thu Mar 10 17:10:39 2022 -0300 nis: Fix nis_print_directory Remove implicit conversion from enumeration type 'zotypes' to different type 'nstype'. Checked on x86_64-linux-gnu. 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);