From patchwork Tue Oct 16 19:20:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 191856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E19C62C00A6 for ; Wed, 17 Oct 2012 06:20:53 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOChA-0002Wd-85; Tue, 16 Oct 2012 19:20:52 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOCh8-0002VW-CB for fwts-devel@lists.ubuntu.com; Tue, 16 Oct 2012 19:20:50 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TOCh8-0005lB-9H for fwts-devel@lists.ubuntu.com; Tue, 16 Oct 2012 19:20:50 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 02/11] lib: fwts_acpi_method: constify funcs and static tables Date: Tue, 16 Oct 2012 20:20:39 +0100 Message-Id: <1350415248-16965-3-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350415248-16965-1-git-send-email-colin.king@canonical.com> References: <1350415248-16965-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/lib/include/fwts_acpi_method.h | 6 +++--- src/lib/src/fwts_acpi_method.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/lib/include/fwts_acpi_method.h b/src/lib/include/fwts_acpi_method.h index acaf8db..0313ceb 100644 --- a/src/lib/include/fwts_acpi_method.h +++ b/src/lib/include/fwts_acpi_method.h @@ -27,10 +27,10 @@ int fwts_method_init(fwts_framework *fw); int fwts_method_deinit(fwts_framework *fw); -char *fwts_method_exists(char *name); +char *fwts_method_exists(const char *name); fwts_list *fwts_method_get_names(void); -void fwts_method_dump_object(fwts_framework *fw, ACPI_OBJECT *obj); -void fwts_method_evaluate_report_error(fwts_framework *fw, char *name, ACPI_STATUS status); +void fwts_method_dump_object(fwts_framework *fw, const ACPI_OBJECT *obj); +void fwts_method_evaluate_report_error(fwts_framework *fw, const char *name, const ACPI_STATUS status); ACPI_STATUS fwts_method_evaluate(fwts_framework *fw, char *name, ACPI_OBJECT_LIST *arg_list, ACPI_BUFFER *buf); #endif diff --git a/src/lib/src/fwts_acpi_method.c b/src/lib/src/fwts_acpi_method.c index 7974545..d9d9883 100644 --- a/src/lib/src/fwts_acpi_method.c +++ b/src/lib/src/fwts_acpi_method.c @@ -28,13 +28,13 @@ #include "fwts_acpi_method.h" typedef struct { - ACPI_STATUS status; + const ACPI_STATUS status; const fwts_log_level level; const char *error_type; const char *error_text; } acpi_eval_error; -static acpi_eval_error errors[] = { +static const acpi_eval_error errors[] = { /* ACPI_STATUS fwts_log_level error_type error_text */ { AE_ERROR, LOG_LEVEL_HIGH, "AEError", "Environment error" }, { AE_NO_ACPI_TABLES, LOG_LEVEL_HIGH, "AENoACPITables", "NO ACPI tables" }, @@ -160,7 +160,7 @@ fwts_list *fwts_method_get_names(void) * fwts_method_exists() * return first matching name */ -char *fwts_method_exists(char *name) +char *fwts_method_exists(const char *name) { size_t name_len = strlen(name); fwts_list_link *item; @@ -180,7 +180,11 @@ char *fwts_method_exists(char *name) * fwts_method_dump_object() * dump out an object, minimal form */ -static void fwts_method_dump_object_recursive(fwts_framework *fw, ACPI_OBJECT *obj, int depth, int index) +static void fwts_method_dump_object_recursive( + fwts_framework *fw, + const ACPI_OBJECT *obj, + const int depth, + const int index) { uint32_t i; char index_buf[5]; @@ -222,7 +226,7 @@ static void fwts_method_dump_object_recursive(fwts_framework *fw, ACPI_OBJECT *o * fwts_method_dump_object() * dump out an object, minimal form */ -void fwts_method_dump_object(fwts_framework *fw, ACPI_OBJECT *obj) +void fwts_method_dump_object(fwts_framework *fw, const ACPI_OBJECT *obj) { fwts_method_dump_object_recursive(fw, obj, 1, -1); } @@ -231,7 +235,10 @@ void fwts_method_dump_object(fwts_framework *fw, ACPI_OBJECT *obj) * fwts_method_evaluate_report_error() * report any errors found during object evaluation */ -void fwts_method_evaluate_report_error(fwts_framework *fw, char *name, ACPI_STATUS status) +void fwts_method_evaluate_report_error( + fwts_framework *fw, + const char *name, + const ACPI_STATUS status) { int i;