From patchwork Tue Sep 26 01:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114209 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3244187qgf; Mon, 25 Sep 2017 18:01:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAWXY+6RZdmB0Dq5LcdjddNDQRMba39kwFvzfJI2euVsNNEczWoex8fbOinVEjP0F1HtcmI X-Received: by 10.36.10.8 with SMTP id 8mr3495304itw.112.1506387718211; Mon, 25 Sep 2017 18:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506387718; cv=none; d=google.com; s=arc-20160816; b=bqhKJnn94NMs0J7fmxNEnSVWCeousAmr1h5QHkBij2t7h4BFd3nMGO1MArLjOjIVHh ZusupJqUMiOZunY4ltkit+qTQYmhSG9lEAel3kKKHZuPZMncYkUf6YyNqLhzlxDPPKWq QW3EjbHyNsO8v+rD+a+0VF1rrSnbbQtTIcZ3ia6A4MIhh+SbnE/YPY4VrZV4odcA7bJ0 1AgZbG0RK4NZm+xs6iofJq5f6BxySOK9XjJyNPu432TlE3wBtaNGYxpqZvK2fQOS8Xb2 2TIRHdKTOrlrCeTmdLm8AcpTwjzefuQB5FfUl7v+3rWU2PV1ITl6qMcqIC3eaKS025uC rHrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=PAfnvo7/8qlEGtNmhDiToxYuvwVPIrfcDFiFtlOO+VE=; b=MZlbtjB5fvTRlOXP3nShMIOmv3Q05ulO3k/TqVyyipVTk9XvuF7eFzWvar+/BSu2Kg xxKMH8Aek4hyPiLr1k6mfcmLkutox0ynVKRYKsFPLui6IDuo7f0AJKwtrXDOaGvyG2mY R43OcMI4ucdIRvOtnurnWbf1r28f1vxFDNGru1pTcPg5FYz0D4cPIbFNIPKIfIfZ+B2Z lLxHm3zkTfsL8k6yxAP+mz3MDtqC+19j8x03GShm+dCLVXBy8p7i5PGgi53WMN+rDfQr GZ3/TqrNYmci7gbeW9xXrmZG+kwmVrH3SrDHa97WLP92CnRnImjj50BSbxhga+B2vIZo lARw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 8si705188ita.114.2017.09.25.18.01.57; Mon, 25 Sep 2017 18:01:58 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 33E8960BEF; Tue, 26 Sep 2017 01:01:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3B7F560C95; Tue, 26 Sep 2017 01:01:05 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E9EB260BE8; Tue, 26 Sep 2017 01:01:00 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 82278607E6 for ; Tue, 26 Sep 2017 01:00:29 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 8D43318039E1 for ; Tue, 26 Sep 2017 04:00:28 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0ctCxx6KZO-0MQaroYD; Tue, 26 Sep 2017 04:00:22 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id PpMuZ1JNWm-0LLORlXv; Tue, 26 Sep 2017 04:00:21 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 26 Sep 2017 04:00:12 +0300 Message-Id: <1506387612-31906-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506387612-31906-1-git-send-email-odpbot@yandex.ru> References: <1506387612-31906-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 192 Subject: [lng-odp] [PATCH v2 1/1] linux-gen: _fdserver return code cleanup X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov somewhere we have return (-1) somewhere -1, let's make it common. Signed-off-by: Maxim Uvarov --- /** Email created from pull request 192 (muvarov:master_fdserverclup) ** https://github.com/Linaro/odp/pull/192 ** Patch: https://github.com/Linaro/odp/pull/192.patch ** Base sha: 886e54149d3ee64e56c422a0d3dd7c536e2b4b7d ** Merge commit sha: 6f71bd8c14468855f15664298afe94875ebea820 **/ platform/linux-generic/_fdserver.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index d15ddbec6..60bb91393 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -160,7 +160,7 @@ static int send_fdserver_msg(int sock, int command, res = sendmsg(sock, &socket_message, 0); if (res < 0) { ODP_ERR("send_fdserver_msg: %s\n", strerror(errno)); - return(-1); + return -1; } return 0; @@ -206,7 +206,7 @@ static int recv_fdserver_msg(int sock, int *command, /* receive the message */ if (recvmsg(sock, &socket_message, MSG_CMSG_CLOEXEC) < 0) { ODP_ERR("recv_fdserver_msg: %s\n", strerror(errno)); - return(-1); + return -1; } *command = msg.command; @@ -251,7 +251,7 @@ static int get_socket(void) s_sock = socket(AF_UNIX, SOCK_STREAM, 0); if (s_sock == -1) { ODP_ERR("cannot connect to server: %s\n", strerror(errno)); - return(-1); + return -1; } remote.sun_family = AF_UNIX; @@ -260,7 +260,7 @@ static int get_socket(void) if (connect(s_sock, (struct sockaddr *)&remote, len) == -1) { ODP_ERR("cannot connect to server: %s\n", strerror(errno)); close(s_sock); - return(-1); + return -1; } return s_sock; @@ -286,7 +286,7 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key, s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_REGISTER_REQ, context, key, @@ -332,7 +332,7 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_DEREGISTER_REQ, context, key, -1); @@ -375,7 +375,7 @@ int _odp_fdserver_lookup_fd(fd_server_context_e context, uint64_t key) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_LOOKUP_REQ, context, key, -1); @@ -418,7 +418,7 @@ static int stop_server(void) s_sock = get_socket(); if (s_sock < 0) { odp_spinlock_unlock(client_lock); - return(-1); + return -1; } res = send_fdserver_msg(s_sock, FD_SERVERSTOP_REQ, 0, 0, -1); @@ -604,7 +604,7 @@ int _odp_fdserver_init_global(void) sock = socket(AF_UNIX, SOCK_STREAM, 0); if (sock == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); - return(-1); + return -1; } /* remove previous named socket if it already exists: */ @@ -617,14 +617,14 @@ int _odp_fdserver_init_global(void) if (res == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); close(sock); - return(-1); + return -1; } /* listen for incoming conections: */ if (listen(sock, FDSERVER_BACKLOG) == -1) { ODP_ERR("_odp_fdserver_init_global: %s\n", strerror(errno)); close(sock); - return(-1); + return -1; } /* fork a server process: */ @@ -632,7 +632,7 @@ int _odp_fdserver_init_global(void) if (server_pid == -1) { ODP_ERR("Could not fork!\n"); close(sock); - return(-1); + return -1; } if (server_pid == 0) { /*child */