From patchwork Mon Sep 25 20:00:05 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: 114183 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2993222qgf; Mon, 25 Sep 2017 13:01:28 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAy5n1+cvPkX/4b+fwsiCWI+UuUt4BVFyBxyOZKeo/H/lWzH4T76oVVV+fRqFdYJzN/LCz7 X-Received: by 10.107.195.132 with SMTP id t126mr10658615iof.147.1506369687953; Mon, 25 Sep 2017 13:01:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506369687; cv=none; d=google.com; s=arc-20160816; b=xvlYgG+i2C1R1qNAYwrKDPAtZIZatyExng92lqrpLBk/tY/I2RTebnzbN4Tkb/kYee QtMZW4xeW59on7w9/qXCcFAlEMydwuLfncoQlcJYv8Y8JpdbsKZIw4Ybh2WpbLYd+LiL Xk/1zfbebcLRACiRRfPK9yLbjiIIjDAlyhxAsINAJUOgSrpjvxgrj+Bz8WEu2sD5+Di7 KSPq7MaZmh8e0A+6DDvlwVBhpuYJrn8qOhZpB/iPlRYCexYdnY0g8HWO5O8HBYBmlWM7 EP6f98kWA7g4jfjO0Rx5/H8EG6N4WzAjo0Ft6Lt8/H8JXaxtIdb342/gAmw+1TcI0wf2 09zg== 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=TfnTaFuJP1CMbAXbptFErc8DOutVWXDiNek6VofzEdM=; b=PHuMLBD3bZXjtpdZXuCLrXybqFupZDZ+9tNq56h4l4L4bde3jKAkXUdsCNrgCSoWWL pM0DMdO7H3hiphI5aYb3Xp/CX0lFyOgZ0tNP46p1lUnhWb7KkxM9qr1zdmkFQEX5WGmN EwlhtzuQ54cKw2iJzW2Ay4KbwUOMN5suyCTpj+g/Zhm+LJ8WBwmylkji8MoD7ZfdP3uk MTemoQrI7JEWGEWIbaywKOrjyvsCaWg6gPq+mdgW8/8YIMCXnHtnsfe/Ue7G9xdPoBWP i9GGcgJ1Pkhyi0dds9M8uI2WA0IAS0FEaQ2qWQ00oQKmkXQs8XvDTLjMzt749L6Fa0V2 TYjw== 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 u201si239065ita.13.2017.09.25.13.01.27; Mon, 25 Sep 2017 13:01:27 -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 7DE5A60C40; Mon, 25 Sep 2017 20:01:27 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 9D52660A79; Mon, 25 Sep 2017 20:00:52 +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 D5DAE609D5; Mon, 25 Sep 2017 20:00:47 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id A7E95608B6 for ; Mon, 25 Sep 2017 20:00:22 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward102o.mail.yandex.net (Yandex) with ESMTP id DABE25A041A5 for ; Mon, 25 Sep 2017 23:00:20 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ygDaTsMRwl-0EdWVZHr; Mon, 25 Sep 2017 23:00:14 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rfYvK95PBd-0EiaKpbt; Mon, 25 Sep 2017 23:00:14 +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: Mon, 25 Sep 2017 23:00:05 +0300 Message-Id: <1506369605-26802-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506369605-26802-1-git-send-email-odpbot@yandex.ru> References: <1506369605-26802-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 192 Subject: [lng-odp] [PATCH v1 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: c2ed3f71a8d61449c5e35ce201f020a74a8ea244 ** Merge commit sha: 6ccb9f950b361c8df33bdd1808ca808bc5f2ea93 **/ 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 */