From patchwork Wed Jul 29 13:55:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 501727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id BE4D914030E; Wed, 29 Jul 2015 23:55:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZKRpe-0002pb-UB; Wed, 29 Jul 2015 13:55:42 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZKRpZ-0002pG-Kq for fwts-devel@lists.ubuntu.com; Wed, 29 Jul 2015 13:55:37 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ZKRpZ-0000z0-GX for fwts-devel@lists.ubuntu.com; Wed, 29 Jul 2015 13:55:37 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fix build error on non-Intel platforms Date: Wed, 29 Jul 2015 14:55:13 +0100 Message-Id: <1438178113-5228-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.4.6 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Fix for build error: fwts_dump.c: In function 'fwts_dump_info': fwts_dump.c:259:7: error: unused variable 'root_priv' [-Werror=unused-variable] cc1: all warnings being treated as errors Fixes: 6e9c327a42017de ("lib: Allow reading ACPI dump file by non-root user") Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Alex Hung --- src/lib/src/fwts_dump.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/src/fwts_dump.c b/src/lib/src/fwts_dump.c index 97c6555..dab4558 100644 --- a/src/lib/src/fwts_dump.c +++ b/src/lib/src/fwts_dump.c @@ -256,7 +256,6 @@ static int dump_cpuinfo(void) int fwts_dump_info(fwts_framework *fw) { char path[PATH_MAX+1]; - bool root_priv = (fwts_check_root_euid(fw, false) == FWTS_OK); if (getcwd(path, PATH_MAX) == NULL) strcpy(path, "./"); @@ -277,7 +276,7 @@ int fwts_dump_info(fwts_framework *fw) printf("Dumping dmesg to dmesg.log\n"); #ifdef FWTS_ARCH_INTEL - if (root_priv) { + if (fwts_check_root_euid(fw, false) == FWTS_OK) { if (dump_dmidecode(fw) != FWTS_OK) fprintf(stderr, "Failed to dump output from dmidecode.\n"); else