From patchwork Mon Mar 18 11:18:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 138450 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E603943CE3; Mon, 18 Mar 2024 12:21:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC40440A75; Mon, 18 Mar 2024 12:21:05 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id DE3BE40A6D for ; Mon, 18 Mar 2024 12:21:00 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4TysmN3GnyzwPgs; Mon, 18 Mar 2024 19:18:28 +0800 (CST) Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10]) by mail.maildlp.com (Postfix) with ESMTPS id 045FF140259; Mon, 18 Mar 2024 19:20:59 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 18 Mar 2024 19:20:58 +0800 From: Chengwen Feng To: , CC: Subject: [PATCH v4 2/6] argparse: remove dead code Date: Mon, 18 Mar 2024 11:18:34 +0000 Message-ID: <20240318111838.16991-3-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240318111838.16991-1-fengchengwen@huawei.com> References: <20240220131502.47510-1-fengchengwen@huawei.com> <20240318111838.16991-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500024.china.huawei.com (7.185.36.10) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The judgement "obj->callback == NULL" is dead code which can't be reached, because verify_arg_saver() already make sure obj->callback must not be NULL when arg->val_saver is NULL. Signed-off-by: Chengwen Feng --- app/test/test_argparse.c | 7 ------- lib/argparse/rte_argparse.c | 6 ------ 2 files changed, 13 deletions(-) diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c index df11a129ba..c98bcee56d 100644 --- a/app/test/test_argparse.c +++ b/app/test/test_argparse.c @@ -288,13 +288,6 @@ test_argparse_invalid_arg_flags(void) ret = rte_argparse_parse(obj, default_argc, default_argv); TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!"); - obj = test_argparse_init_obj(); - obj->args[0].val_saver = NULL; - obj->args[0].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_SUPPORT_MULTI; - obj->callback = NULL; - ret = rte_argparse_parse(obj, default_argc, default_argv); - TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!"); - return 0; } diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c index 48738cd07b..6e890cdc0d 100644 --- a/lib/argparse/rte_argparse.c +++ b/lib/argparse/rte_argparse.c @@ -195,12 +195,6 @@ verify_arg_flags(const struct rte_argparse *obj, uint32_t index) return -EINVAL; } - if (obj->callback == NULL) { - ARGPARSE_LOG(ERR, "argument %s should use callback to parse, but callback is NULL!", - arg->name_long); - return -EINVAL; - } - return 0; }