From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by dpdk.org (Postfix) with ESMTP id 02857B3B0 for ; Mon, 22 Sep 2014 10:32:10 +0200 (CEST) Received: by mail-wi0-f175.google.com with SMTP id r20so2432249wiv.8 for ; Mon, 22 Sep 2014 01:38:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jLjRIry/x2iiajWLuQ5VjEtEbGtLlQaXpAVor/XAeUM=; b=AC8hivujtHQpmA/oHcYkSZuXtq9ddAQtqr02Gy0GQZSiUCC/y1xKr+xf89AgvETuuk g7QQKx7ke8oRC/7EAKo6ZQVXplPq0YuFkDgZsn7CXaUt2hX7rZWqdGlps5zyCtDJSapx 54FcletL8aTcX8+JXcD3o2llNjsyTJp3JJDNyNn1LZTYHPa/kAICE1eAFDY6xVJOwIhO TSX9fxzR86WUmeb0uE3RbBj6inURygN9F87BBpiJZDeYdMoTw2OwSua3aDS1fOa8vOuB MutUbBNMVM4M5LpWLU7v00SUOYn8UQsmAAH2Zyounv1StFsBqajpvpSUsaT4cPwB2Cj0 +8JA== X-Gm-Message-State: ALoCoQlwv9QH8YBjjPjj56YOMMb8dofqjftRaCca3RW2WDsdDyyea4AnxyhPG5LHFdvU8wg5ml6s X-Received: by 10.180.91.133 with SMTP id ce5mr13576216wib.62.1411375093093; Mon, 22 Sep 2014 01:38:13 -0700 (PDT) Received: from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id js2sm11522334wjc.9.2014.09.22.01.38.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Sep 2014 01:38:12 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Mon, 22 Sep 2014 10:37:58 +0200 Message-Id: <1411375081-27986-5-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1411375081-27986-1-git-send-email-david.marchand@6wind.com> References: <1411375081-27986-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH 4/7] eal: fix checkpatch issues before moving code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2014 08:32:10 -0000 Signed-off-by: David Marchand --- lib/librte_eal/bsdapp/eal/eal.c | 21 +++++++------------ lib/librte_eal/linuxapp/eal/eal.c | 42 +++++++++++++------------------------ 2 files changed, 21 insertions(+), 42 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 8599a35..81d1a65 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -613,30 +613,23 @@ eal_parse_args(int argc, char **argv) case 0: if (!strcmp(lgopts[option_index].name, OPT_NO_HUGE)) { internal_config.no_hugetlbfs = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { internal_config.no_pci = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_HPET)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_HPET)) { internal_config.no_hpet = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_VMWARE_TSC_MAP)) { + } else if (!strcmp(lgopts[option_index].name, OPT_VMWARE_TSC_MAP)) { internal_config.vmware_tsc_map = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { internal_config.no_shconf = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { + } else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { internal_config.process_type = eal_parse_proc_type(optarg); - } - else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) { + } else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) { if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, optarg) < 0) { eal_usage(prgname); return -1; } - } - else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { + } else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { if (eal_parse_syslog(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" OPT_SYSLOG "\n"); diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 655c454..3393550 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -839,8 +839,7 @@ eal_parse_args(int argc, char **argv) case 0: if (!strcmp(lgopts[option_index].name, OPT_NO_HUGE)) { internal_config.no_hugetlbfs = 1; - } - if (!strcmp(lgopts[option_index].name, OPT_XEN_DOM0)) { + } else if (!strcmp(lgopts[option_index].name, OPT_XEN_DOM0)) { #ifdef RTE_LIBRTE_XEN_DOM0 internal_config.xen_dom0_support = 1; #else @@ -849,44 +848,34 @@ eal_parse_args(int argc, char **argv) " RTE_LIBRTE_XEN_DOM0=y\n"); return -1; #endif - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { internal_config.no_pci = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_HPET)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_HPET)) { internal_config.no_hpet = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_VMWARE_TSC_MAP)) { + } else if (!strcmp(lgopts[option_index].name, OPT_VMWARE_TSC_MAP)) { internal_config.vmware_tsc_map = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { + } else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { internal_config.no_shconf = 1; - } - else if (!strcmp(lgopts[option_index].name, OPT_HUGE_DIR)) { + } else if (!strcmp(lgopts[option_index].name, OPT_HUGE_DIR)) { internal_config.hugepage_dir = optarg; - } - else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { + } else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { internal_config.process_type = eal_parse_proc_type(optarg); - } - else if (!strcmp(lgopts[option_index].name, OPT_FILE_PREFIX)) { + } else if (!strcmp(lgopts[option_index].name, OPT_FILE_PREFIX)) { internal_config.hugefile_prefix = optarg; - } - else if (!strcmp(lgopts[option_index].name, OPT_SOCKET_MEM)) { + } else if (!strcmp(lgopts[option_index].name, OPT_SOCKET_MEM)) { if (eal_parse_socket_mem(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" OPT_SOCKET_MEM "\n"); eal_usage(prgname); return -1; } - } - else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) { + } else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) { if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, optarg) < 0) { eal_usage(prgname); return -1; } - } - else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { + } else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { if (eal_parse_syslog(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" OPT_SYSLOG "\n"); @@ -905,24 +894,21 @@ eal_parse_args(int argc, char **argv) return -1; } internal_config.log_level = log; - } - else if (!strcmp(lgopts[option_index].name, OPT_BASE_VIRTADDR)) { + } else if (!strcmp(lgopts[option_index].name, OPT_BASE_VIRTADDR)) { if (eal_parse_base_virtaddr(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameter for --" OPT_BASE_VIRTADDR "\n"); eal_usage(prgname); return -1; } - } - else if (!strcmp(lgopts[option_index].name, OPT_VFIO_INTR)) { + } else if (!strcmp(lgopts[option_index].name, OPT_VFIO_INTR)) { if (eal_parse_vfio_intr(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" OPT_VFIO_INTR "\n"); eal_usage(prgname); return -1; } - } - else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) { + } else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) { internal_config.create_uio_dev = 1; } else { RTE_LOG(ERR, EAL, "Option %s is not supported " -- 1.7.10.4