From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F309BA04B5; Thu, 29 Oct 2020 13:57:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7C382CDF2; Thu, 29 Oct 2020 13:54:26 +0100 (CET) Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by dpdk.org (Postfix) with ESMTP id 6B3F5CDCA for ; Thu, 29 Oct 2020 13:54:23 +0100 (CET) Received: by mail-ej1-f66.google.com with SMTP id t25so3596987ejd.13 for ; Thu, 29 Oct 2020 05:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xiMR9VpKeYjtjDyP5wuQiRXfxn2eKnHb8aC3kMCbhz4=; b=G7ih8+IR5VhHeHaNlAMjIXYwuZVbX2qiqkGk4XOWWkmOZBND9IcWjza8Hv0sHdHrIf nCO4Pcdxg/mi1fkVJAihiLRkyMh88mRxwlijCILUquWsYEOWtwZog+ug331prmXsQT46 FuP1otDZy+eXKwRUbT79IRk1EMvY12HLpM1SlUVYcCpfR24QIkjrirPlFHqHblwzaA08 zlrL2jrbWEgjjnRk7ksG5Zk+yUzM66ua7rX4r6g/bcsZJnZHEqMywlYK4YwNlX0GQZ3O 8e7/Ea9VK5QK9HBAKYrmem2dbTMcds79DRGtPWkZ3UHhMpFZ5DJYmNQnTSU2Ez64C+5g cyIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xiMR9VpKeYjtjDyP5wuQiRXfxn2eKnHb8aC3kMCbhz4=; b=Msc3Vw4wXX0Mo7Q6PSwHOgH0FhG03tmdIi0/Fnr3g6SdvABljACD6Zpdq/Pq90MrCK yA/rAaCVyKZ6BBMSBG6CyxpaA3Oa29KkKjrxjaUjhkI7x43EZFbtjb6eE4FiUCplCGzf ASTqSPHh7ta5BA0b0Pn/oZ67+K+tgFa0l5qmcEqGvnC+H6SbBqmxmVX54WlqCBiuBf6a Q7Y38ydRyvADgWlHx26cMTgBjtGGqeus3wevjYXvi8xdqIR2VjSyEhICHVYb0WWcu9NV zGA2A2Ta44IOvwpsY4H1ch9ewUHilbcWmO3wtumHtARY6+hpAadTTklchIRsOpIgKVXe SI9g== X-Gm-Message-State: AOAM532oq+D+b0XPYefD+CuJd3n0BTzu28ak5GHzHh69RE1whhfuO4lt PLlQT+ABZ0qQ9YDOIKdFwyvdNw== X-Google-Smtp-Source: ABdhPJwAmU2nhZ8/3Ug4h61SS8uUx6GoNNpwpl9arydhESp+UBRo8rqQ6Y/qIdoxnnjLppgWGqaHYQ== X-Received: by 2002:a17:906:3a1a:: with SMTP id z26mr3758164eje.519.1603976062135; Thu, 29 Oct 2020 05:54:22 -0700 (PDT) Received: from localhost.localdomain ([39.33.228.207]) by smtp.gmail.com with ESMTPSA id q19sm1487951ejz.90.2020.10.29.05.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 05:54:21 -0700 (PDT) From: Ibtisam Tariq To: marko.kovacevic@intel.com, konstantin.ananyev@intel.com, reshma.pattan@intel.com, john.mcnamara@intel.com, cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, chenbo.xia@intel.com, maxime.coquelin@redhat.com, xiaoyun.li@intel.com Cc: dev@dpdk.org, Ibtisam Tariq , roy.fan.zhang@intel.com Date: Thu, 29 Oct 2020 12:53:38 +0000 Message-Id: <20201029125339.30916-7-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201029125339.30916-1-ibtisam.tariq@emumba.com> References: <20201029125339.30916-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH 7/8] examples/vhost_crypto: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Instead of using getopt_long return value, strcmp was used to compare the input parameters with the struct option array. This patch get rid of all those strcmp by directly binding each longopt with an int enum. Bugzilla ID: 238 Fixes: f5188211c7 ("examples/vhost_crypto: add sample application") Cc: roy.fan.zhang@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- examples/vhost_crypto/main.c | 78 ++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index 11ad49159..c68b409b3 100644 --- a/examples/vhost_crypto/main.c +++ b/examples/vhost_crypto/main.c @@ -62,10 +62,16 @@ struct vhost_crypto_options { uint32_t guest_polling; } options; +enum { #define CONFIG_KEYWORD "config" + CONFIG_KEYWORD_NUM = 256, #define SOCKET_FILE_KEYWORD "socket-file" + SOCKET_FILE_KEYWORD_NUM, #define ZERO_COPY_KEYWORD "zero-copy" + ZERO_COPY_KEYWORD_NUM, #define POLLING_KEYWORD "guest-polling" + POLLING_KEYWORD_NUM, +}; #define NB_SOCKET_FIELDS (2) @@ -210,10 +216,14 @@ vhost_crypto_parse_args(int argc, char **argv) char **argvopt; int option_index; struct option lgopts[] = { - {SOCKET_FILE_KEYWORD, required_argument, 0, 0}, - {CONFIG_KEYWORD, required_argument, 0, 0}, - {ZERO_COPY_KEYWORD, no_argument, 0, 0}, - {POLLING_KEYWORD, no_argument, 0, 0}, + {SOCKET_FILE_KEYWORD, required_argument, + NULL, SOCKET_FILE_KEYWORD_NUM}, + {CONFIG_KEYWORD, required_argument, + NULL, CONFIG_KEYWORD_NUM}, + {ZERO_COPY_KEYWORD, no_argument, + NULL, ZERO_COPY_KEYWORD_NUM}, + {POLLING_KEYWORD, no_argument, + NULL, POLLING_KEYWORD_NUM}, {NULL, 0, 0, 0} }; @@ -222,36 +232,46 @@ vhost_crypto_parse_args(int argc, char **argv) while ((opt = getopt_long(argc, argvopt, "s:", lgopts, &option_index)) != EOF) { + if (opt == '?') { + vhost_crypto_usage(prgname); + return -1; + } + switch (opt) { - case 0: - if (strcmp(lgopts[option_index].name, - SOCKET_FILE_KEYWORD) == 0) { - ret = parse_socket_arg(optarg); - if (ret < 0) { - vhost_crypto_usage(prgname); - return ret; - } - } else if (strcmp(lgopts[option_index].name, - CONFIG_KEYWORD) == 0) { - ret = parse_config(optarg); - if (ret < 0) { - vhost_crypto_usage(prgname); - return ret; - } - } else if (strcmp(lgopts[option_index].name, - ZERO_COPY_KEYWORD) == 0) { - options.zero_copy = - RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE; - } else if (strcmp(lgopts[option_index].name, - POLLING_KEYWORD) == 0) { - options.guest_polling = 1; - } else { + case SOCKET_FILE_KEYWORD_NUM: + { + ret = parse_socket_arg(optarg); + if (ret < 0) { vhost_crypto_usage(prgname); - return -EINVAL; + return ret; } break; + } + case CONFIG_KEYWORD_NUM: + { + ret = parse_config(optarg); + if (ret < 0) { + vhost_crypto_usage(prgname); + return ret; + } + break; + } + case ZERO_COPY_KEYWORD_NUM: + { + options.zero_copy = + RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE; + break; + } + case POLLING_KEYWORD_NUM: + { + options.guest_polling = 1; + break; + } default: - return -1; + { + vhost_crypto_usage(prgname); + return -EINVAL; + } } } -- 2.17.1