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 33574A10DA for ; Fri, 2 Aug 2019 11:34:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D0041C243; Fri, 2 Aug 2019 11:34:10 +0200 (CEST) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 5C3AC1C243 for ; Fri, 2 Aug 2019 11:34:09 +0200 (CEST) Received: by mail-pf1-f193.google.com with SMTP id i189so35745846pfg.10 for ; Fri, 02 Aug 2019 02:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=vzhFeqxwneAJSnNR5P1wsmG/tHFhTo0Tzlm/Jp6xTMo=; b=sG1UiSx8Y8mNOb7MySj35SOyb4/tnvuaoJD3TCjcxZQB1DrtyFWfK3Q/yhnhykcpsT P0vvaYZStTJG2DzX94ILIStIaRAPcdfUARQ7I8ESx4eClx0KMkCHeBZ1yaS8CwBStx5k 8v+bkc5Ka0Wr1hOXlbjiXqLrqTocem7LMD1PH3fNmr4hkSpNqph/kZ9puJ9zE3JCvs/r DLch5/sQS/QAtVXQihMZ9W3udiaxMKOI+7igOoT2i70Xj4vtd0WbIQPlgKAGV0ejoAfG cE0qByy6gA2QfWVqu4rqCQw00jnbhkfvU5g/iA4rC0Ne2DFT2ytLn06RadGYJERMiUf5 Y6gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vzhFeqxwneAJSnNR5P1wsmG/tHFhTo0Tzlm/Jp6xTMo=; b=H5DBxstMFxJHTC/4WLiJR38UCQQcDKX0/LMYl0iiSot9fdT9zBzhFO41xp+0P9pj6N FUteCaCTPkNpLG1z80Fa5WqUwNJXzOBptijqHnnz6UQEhyKbzr1MwytKq8hX30QEkkz4 nRzjlqrw7fmkn4EGa8gHHiFAmpeONcXPlOuYLI0M+dMz60WaXMm15RCNaNt+/byeR8le aCPu+Dns778VxTnpP80Vz1YYaJZ7PqibVvp7kpL5WAJEEJivUoMJnHE7/JGg82eYOEbq gPMH4d475cM9IOaQQwTIkros8cZScPJEwPuj4Qd9rl9rOF5QyOhRbRBEBnlywExicqYW quYg== X-Gm-Message-State: APjAAAUfMN50UvTm6hawCl7IQo7SKFeeRnBYGz+az7uiHlQ/Q209x9g3 5q99VQTmIoB/mVlOemQbAsOiOeow X-Google-Smtp-Source: APXvYqwYvax/cEiFpx3Kh7ksPrTAn5i9CKZcMePb3u+W44QHv4cv/xBO6tPI6NYLH7OY6d34L6t8QQ== X-Received: by 2002:a62:1d11:: with SMTP id d17mr59240608pfd.249.1564738448513; Fri, 02 Aug 2019 02:34:08 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c8c2:de00:9c1a:eba9:3129:63d2]) by smtp.gmail.com with ESMTPSA id n10sm1458509pgv.67.2019.08.02.02.34.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 02:34:08 -0700 (PDT) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Fri, 2 Aug 2019 18:33:55 +0900 Message-Id: <20190802093358.13696-4-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190802093358.13696-1-yasufum.o@gmail.com> References: <20190802093358.13696-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 3/6] spp_vf: remove no meaning int variables X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" In main(), there are many no meaning variables for receiveing results of functions such as `ret_do` or `ret_parse` or so and each of which is used only one time for checking. It is enough by using `int ret` defined at the head of the function. Signed-off-by: Yasufumi Ogawa --- src/vf/spp_vf.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c index e10ae71..b2f2af4 100644 --- a/src/vf/spp_vf.c +++ b/src/vf/spp_vf.c @@ -211,17 +211,16 @@ main(int argc, char *argv[]) int ret; char ctl_ip[IPADDR_LEN] = { 0 }; int ctl_port; - int ret_cmd_init; unsigned int master_lcore; unsigned int lcore_id; #ifdef SPP_DEMONIZE /* Daemonize process */ - int ret_daemon = daemon(0, 0); - if (unlikely(ret_daemon != 0)) { + ret = daemon(0, 0); + if (unlikely(ret != 0)) { RTE_LOG(ERR, APP, "daemonize is failed. (ret = %d)\n", - ret_daemon); - return ret_daemon; + ret); + return ret; } #endif @@ -248,8 +247,8 @@ main(int argc, char *argv[]) */ while (1) { /* Parse spp_vf specific parameters */ - int ret_parse = parse_app_args(argc, argv); - if (unlikely(ret_parse != SPPWK_RET_OK)) + ret = parse_app_args(argc, argv); + if (unlikely(ret != SPPWK_RET_OK)) break; if (sppwk_set_mng_data(&g_iface_info, g_component_info, @@ -261,12 +260,12 @@ main(int argc, char *argv[]) break; } - int ret_mng = init_mng_data(); - if (unlikely(ret_mng != SPPWK_RET_OK)) + ret = init_mng_data(); + if (unlikely(ret != SPPWK_RET_OK)) break; - int ret_classifier_mac_init = init_cls_mng_info(); - if (unlikely(ret_classifier_mac_init != SPPWK_RET_OK)) + ret = init_cls_mng_info(); + if (unlikely(ret != SPPWK_RET_OK)) break; init_forwarder(); @@ -275,8 +274,8 @@ main(int argc, char *argv[]) /* Setup connection for accepting commands from controller */ get_spp_ctl_ip(ctl_ip); ctl_port = get_spp_ctl_port(); - ret_cmd_init = sppwk_cmd_runner_conn(ctl_ip, ctl_port); - if (unlikely(ret_cmd_init != SPPWK_RET_OK)) + ret = sppwk_cmd_runner_conn(ctl_ip, ctl_port); + if (unlikely(ret != SPPWK_RET_OK)) break; #ifdef SPP_RINGLATENCYSTATS_ENABLE @@ -291,10 +290,10 @@ main(int argc, char *argv[]) if (port_type == RING) nof_rings++; } - int ret_ringlatency = spp_ringlatencystats_init( + ret = spp_ringlatencystats_init( SPP_RING_LATENCY_STATS_SAMPLING_INTERVAL, nof_rings); - if (unlikely(ret_ringlatency != SPPWK_RET_OK)) + if (unlikely(ret != SPPWK_RET_OK)) break; #endif /* SPP_RINGLATENCYSTATS_ENABLE */ @@ -305,8 +304,8 @@ main(int argc, char *argv[]) /* Set the status of main thread to idle */ g_core_info[master_lcore].status = SPPWK_LCORE_IDLING; - int ret_wait = check_core_status_wait(SPPWK_LCORE_IDLING); - if (unlikely(ret_wait != SPPWK_RET_OK)) + ret = check_core_status_wait(SPPWK_LCORE_IDLING); + if (unlikely(ret != SPPWK_RET_OK)) break; /* Start forwarding */ @@ -318,7 +317,6 @@ main(int argc, char *argv[]) backup_mng_info(&g_backup_info); /* Enter loop for accepting commands */ - int ret_do = SPPWK_RET_OK; #ifndef USE_UT_SPP_VF while (likely(g_core_info[master_lcore].status != SPPWK_LCORE_REQ_STOP)) { @@ -326,8 +324,8 @@ main(int argc, char *argv[]) { #endif /* Receive command */ - ret_do = sppwk_run_cmd(); - if (unlikely(ret_do != SPPWK_RET_OK)) + ret = sppwk_run_cmd(); + if (unlikely(ret != SPPWK_RET_OK)) break; /* @@ -340,7 +338,7 @@ main(int argc, char *argv[]) #endif /* SPP_RINGLATENCYSTATS_ENABLE */ } - if (unlikely(ret_do != SPPWK_RET_OK)) { + if (unlikely(ret != SPPWK_RET_OK)) { set_all_core_status(SPPWK_LCORE_REQ_STOP); break; } @@ -351,8 +349,8 @@ main(int argc, char *argv[]) /* Finalize to exit */ g_core_info[master_lcore].status = SPPWK_LCORE_STOPPED; - int ret_core_end = check_core_status_wait(SPPWK_LCORE_STOPPED); - if (unlikely(ret_core_end != SPPWK_RET_OK)) + ret = check_core_status_wait(SPPWK_LCORE_STOPPED); + if (unlikely(ret != SPPWK_RET_OK)) RTE_LOG(ERR, APP, "Failed to terminate master thread.\n"); /* -- 2.17.1