From patchwork Wed Aug 15 09:04:13 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: 957817 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 41r3S15KCyz9s9N; Wed, 15 Aug 2018 19:04:17 +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 1fpriw-0004vX-9u; Wed, 15 Aug 2018 09:04:14 +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 1fpriv-0004vR-Ml for fwts-devel@lists.ubuntu.com; Wed, 15 Aug 2018 09:04:13 +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 1fpriv-0002iP-DC; Wed, 15 Aug 2018 09:04:13 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_clog.c: replace space identations with tab Date: Wed, 15 Aug 2018 10:04:13 +0100 Message-Id: <20180815090413.19800-1-colin.king@canonical.com> X-Mailer: git-send-email 2.17.1 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 Keep to fwts coding standard by using tab indentations Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu Acked-by: Ivan Hu --- src/lib/src/fwts_clog.c | 96 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/src/lib/src/fwts_clog.c b/src/lib/src/fwts_clog.c index a8b04413..af634b58 100644 --- a/src/lib/src/fwts_clog.c +++ b/src/lib/src/fwts_clog.c @@ -1,4 +1,4 @@ - /* +/* * Copyright (C) 2010-2018 Canonical * Copyright (C) 2018 9elements Cyber Security * @@ -33,7 +33,7 @@ /* * match unique strings in the coreboot log -*/ + */ #define UNIQUE_CLOG_LABEL "Clog" /* @@ -46,24 +46,24 @@ */ void fwts_clog_free(fwts_list *clog) { - fwts_log_free(clog); + fwts_log_free(clog); } bool fwts_clog_available(fwts_framework *fw) { - bool coreboot_tag = false; - char *vendor = fwts_get("/sys/class/dmi/id/bios_vendor"); + bool coreboot_tag = false; + char *vendor = fwts_get("/sys/class/dmi/id/bios_vendor"); - if (vendor) { - if (strstr(vendor, COREBOOT_BIOS_VENDOR)) - coreboot_tag = true; - free(vendor); - } + if (vendor) { + if (strstr(vendor, COREBOOT_BIOS_VENDOR)) + coreboot_tag = true; + free(vendor); + } - if (fw->clog || coreboot_tag) - return true; + if (fw->clog || coreboot_tag) + return true; - return false; + return false; } /* @@ -71,57 +71,59 @@ bool fwts_clog_available(fwts_framework *fw) */ fwts_list *fwts_clog_read(fwts_framework *fw) { - fwts_list *list; + fwts_list *list; - if (fw->clog && (list = fwts_file_open_and_read(fw->clog))) - return list; - if ((list = fwts_file_open_and_read(GOOGLE_MEMCONSOLE_COREBOOT_PATH)) != NULL) - return list; - if ((list = fwts_coreboot_cbmem_log()) != NULL) - return list; + if (fw->clog && (list = fwts_file_open_and_read(fw->clog))) + return list; + if ((list = fwts_file_open_and_read(GOOGLE_MEMCONSOLE_COREBOOT_PATH)) != NULL) + return list; + if ((list = fwts_coreboot_cbmem_log()) != NULL) + return list; - return NULL; + return NULL; } int fwts_clog_scan(fwts_framework *fw, - fwts_list *clog, - fwts_clog_scan_func scan_func, - fwts_clog_progress_func progress_func, - void *private, - int *match) + fwts_list *clog, + fwts_clog_scan_func scan_func, + fwts_clog_progress_func progress_func, + void *private, + int *match) { - return fwts_log_scan(fw, clog, scan_func, progress_func, private, match, false); + return fwts_log_scan(fw, clog, scan_func, progress_func, private, match, false); } void fwts_clog_scan_patterns(fwts_framework *fw, - char *line, - int repeated, - char *prevline, - void *private, - int *errors) + char *line, + int repeated, + char *prevline, + void *private, + int *errors) { - static char *advice = - "This is a bug picked up by coreboot, but as yet, the " - "firmware test suite has no diagnostic advice for this particular problem."; - fwts_log_scan_patterns(fw, line, repeated, prevline, private, errors, "coreboot", advice); + static char *advice = + "This is a bug picked up by coreboot, but as yet, the " + "firmware test suite has no diagnostic advice for this particular problem."; + fwts_log_scan_patterns(fw, line, repeated, prevline, private, errors, "coreboot", advice); } static int fwts_clog_check(fwts_framework *fw, - const char *table, - fwts_clog_progress_func progress, - fwts_list *clog, - int *errors) + const char *table, + fwts_clog_progress_func progress, + fwts_list *clog, + int *errors) { - char json_data_path[PATH_MAX]; + char json_data_path[PATH_MAX]; - snprintf(json_data_path, sizeof(json_data_path), "%s/%s", fw->json_data_path, CLOG_DATA_JSON_FILE); + snprintf(json_data_path, sizeof(json_data_path), "%s/%s", fw->json_data_path, CLOG_DATA_JSON_FILE); - return fwts_log_check(fw, table, fwts_clog_scan_patterns, progress, clog, errors, json_data_path, UNIQUE_CLOG_LABEL, true); + return fwts_log_check(fw, table, fwts_clog_scan_patterns, progress, clog, errors, json_data_path, UNIQUE_CLOG_LABEL, true); } -int fwts_clog_firmware_check(fwts_framework *fw, fwts_clog_progress_func progress, - fwts_list *clog, int *errors) +int fwts_clog_firmware_check( + fwts_framework *fw, + fwts_clog_progress_func progress, + fwts_list *clog, int *errors) { - return fwts_clog_check(fw, "firmware_error_warning_patterns", - progress, clog, errors); + return fwts_clog_check(fw, "firmware_error_warning_patterns", + progress, clog, errors); }