From patchwork Tue Aug 14 11:24:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 957445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41qVcY6dyLz9sBW; Tue, 14 Aug 2018 21:24:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fpXRJ-0007mF-1s; Tue, 14 Aug 2018 11:24:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fpXRH-0007kZ-5M for fwts-devel@lists.ubuntu.com; Tue, 14 Aug 2018 11:24:39 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fpXRG-0001yO-Rf; Tue, 14 Aug 2018 11:24:38 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 07/13] lib: fwts_ipmi: make fwts_ipmi_msg_id static, make some code style changes Date: Tue, 14 Aug 2018 12:24:29 +0100 Message-Id: <20180814112435.22166-8-colin.king@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180814112435.22166-1-colin.king@canonical.com> References: <20180814112435.22166-1-colin.king@canonical.com> MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King Variable fwts_ipmi_msg_id does not need to be in global scope so make it static. Make some fwts coding style changes and remove some empty lines. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/src/fwts_ipmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c index a4c8a511..36acf6ee 100644 --- a/src/lib/src/fwts_ipmi.c +++ b/src/lib/src/fwts_ipmi.c @@ -27,10 +27,11 @@ #include "fwts.h" -unsigned int fwts_ipmi_msg_id = 1; +static unsigned int fwts_ipmi_msg_id = 1; static const char *fwts_ipmi_devnode = "/dev/ipmi0"; -bool fwts_ipmi_present(int fwts_ipmi_flags) { +bool fwts_ipmi_present(int fwts_ipmi_flags) +{ return !access(fwts_ipmi_devnode, fwts_ipmi_flags); } @@ -49,7 +50,6 @@ int fwts_ipmi_exec_query( return FWTS_ERROR; fwts_send_rc = ioctl(fd, IPMICTL_SEND_COMMAND, (char *)fwts_ipmi_req); - if (fwts_send_rc != 0) { (void)close(fd); return FWTS_ERROR; @@ -69,7 +69,6 @@ int fwts_ipmi_exec_query( fwts_ipmi_recv.addr = (unsigned char *)&fwts_ipmi_addr; fwts_ipmi_recv.addr_len = sizeof (fwts_ipmi_addr); fwts_recv_rc = ioctl(fd, IPMICTL_RECEIVE_MSG_TRUNC, &fwts_ipmi_recv); - if (fwts_recv_rc != 0) { (void)close(fd); return FWTS_ERROR;