aboutsummaryrefslogtreecommitdiff
path: root/nis/nis_print.c
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-09-26 13:53:24 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-10-20 10:54:27 -0300
commit0ff92021c045ee53b91bd42fa3fbbb923a6ffb17 (patch)
treeb264136ef2b983b675f12edcda7c816c14547608 /nis/nis_print.c
parent9b5e138f2bbd032da858a4ad5bb51ed99d6f89b6 (diff)
downloadglibc-0ff92021c045ee53b91bd42fa3fbbb923a6ffb17.zip
glibc-0ff92021c045ee53b91bd42fa3fbbb923a6ffb17.tar.gz
glibc-0ff92021c045ee53b91bd42fa3fbbb923a6ffb17.tar.bz2
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 <arjun@redhat.com>
Diffstat (limited to 'nis/nis_print.c')
-rw-r--r--nis/nis_print.c59
1 files changed, 28 insertions, 31 deletions
diff --git a/nis/nis_print.c b/nis/nis_print.c
index d0efd98..2708c29 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);