From patchwork Mon Sep 26 16:53:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 58049 X-Patchwork-Delegate: arjun.is@lostca.se Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 23A813857368 for ; Mon, 26 Sep 2022 16:53:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23A813857368 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664211230; bh=h1Svc7ZACh+YXAiRD2loTcm/+UROWeCYX3r4kHcIBJc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=HGUnAMQGw4o1HVh6X3FePKBE/yUu2CnTcL3lumJeSe7+RD4L5WVvyPD5eQIUmt4NL dp+suSEVGkuU18ps6iud5wjVh48amidlAUiNamXjrzRWYIFJ3oDJxQxhsYXXbL7lfH m6/UGB8Qs9LFPKvOtUMqgESqLcf8izpeSZgCiAvQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by sourceware.org (Postfix) with ESMTPS id 604CB3857378 for ; Mon, 26 Sep 2022 16:53:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 604CB3857378 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-127dca21a7dso9976233fac.12 for ; Mon, 26 Sep 2022 09:53:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=h1Svc7ZACh+YXAiRD2loTcm/+UROWeCYX3r4kHcIBJc=; b=fPLeL+so7syyr0yhC18st+5B8n36Dk9kAs8m1I3rGhgQt0PTD43gG2m3SUNC467Oni FzhsRP80cwueHG0RxXPwrxyiCWuHmZJ5tAsP61ZxuTrzniulcCi49ULarAgu3inDKw/7 gHPEzIpLGPd4Mh1jZ+WNDNe+EKqwrNSwtxRamA81mDtYBTN1MIx2hcHJJt38juM9zUG+ lh9NKpV9m4lLL5jPc74CvVvb25BgWRSX2dNDJ1oR3ftBtxSH9LNSTSt0fyZKH0jikp2T xNrW25OUyMDmam86HE5s+rG/lTYnATTFqmdlPiPJD1QrycWfXVZnvEmq0z9vjFN7IY8D leog== X-Gm-Message-State: ACrzQf2MOlVfYKbiD0KFVUaNkm/oo/TWWDpx9r0BvhhKJpVoe/SY6I0Y LxegOcnkCdTXW8Iyu91yVQDi7/a5dfsHm5VM X-Google-Smtp-Source: AMsMyM5TM/G5zg9WwTnUCfoquOth3h+CDScwSbxw5A3KbwNBM8ZdNUltJZpy/DvaAtZFMCWxgHAgng== X-Received: by 2002:a05:6870:f69f:b0:130:4f0:2a9c with SMTP id el31-20020a056870f69f00b0013004f02a9cmr9391223oab.118.1664211207561; Mon, 26 Sep 2022 09:53:27 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c2:3736:a46a:a08:50aa:35ca]) by smtp.gmail.com with ESMTPSA id f22-20020a056870211600b0012752d3212fsm387633oae.53.2022.09.26.09.53.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 09:53:27 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] nis: Fix nis_print_directory Date: Mon, 26 Sep 2022 13:53:24 -0300 Message-Id: <20220926165324.4005972-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Remove implicit conversion from enumeration type 'zotypes' to different type 'nstype'. Checked on x86_64-linux-gnu. 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) { @@ -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);