From patchwork Wed Mar 6 18:49:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 225575 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 CA0752C0399 for ; Thu, 7 Mar 2013 05:49:14 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UDJOq-00023o-Vt; Wed, 06 Mar 2013 18:49:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UDJOl-00023Y-NX for fwts-devel@lists.ubuntu.com; Wed, 06 Mar 2013 18:49:07 +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 1UDJOl-0000e3-KL for fwts-devel@lists.ubuntu.com; Wed, 06 Mar 2013 18:49:07 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: fwts_log_*: fix a few smatch errors Date: Wed, 6 Mar 2013 18:49:07 +0000 Message-Id: <1362595747-2847-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 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 Minor re-working to fix up some smatch errors in fwts_log_*.c, for example: fwts_log_xml.c:142 fwts_log_section_begin_xml() error: testing array offset 'xml_stack_index' after use. Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu --- src/lib/src/fwts_log_html.c | 7 +++---- src/lib/src/fwts_log_json.c | 8 ++++---- src/lib/src/fwts_log_xml.c | 7 +++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/lib/src/fwts_log_html.c b/src/lib/src/fwts_log_html.c index 4b907c5..89557d4 100644 --- a/src/lib/src/fwts_log_html.c +++ b/src/lib/src/fwts_log_html.c @@ -376,8 +376,6 @@ static void fwts_log_newline_html(fwts_log_file *log_file) static void fwts_log_section_begin_html(fwts_log_file *log_file, const char *name) { - html_stack[html_stack_index].name = name; - if (!strcmp(name, "summary")) { fwts_log_html(log_file, "Summary\n"); } else if (!strcmp(name, "heading")) { @@ -390,9 +388,10 @@ static void fwts_log_section_begin_html(fwts_log_file *log_file, const char *nam fflush(log_file->fp); - if (html_stack_index < MAX_HTML_STACK) + if (html_stack_index < MAX_HTML_STACK) { + html_stack[html_stack_index].name = name; html_stack_index++; - else { + } else { fprintf(stderr, "html log stack overflow pushing section %s.\n", name); exit(EXIT_FAILURE); } diff --git a/src/lib/src/fwts_log_json.c b/src/lib/src/fwts_log_json.c index f83abc5..bf28c0c 100644 --- a/src/lib/src/fwts_log_json.c +++ b/src/lib/src/fwts_log_json.c @@ -178,16 +178,16 @@ static void fwts_log_section_begin_json(fwts_log_file *log_file, const char *nam */ json_object_object_add(json_obj, name, json_log); - json_stack[json_stack_index].obj = json_obj; - json_stack[json_stack_index].log = json_log; if (json_stack_index > 0) if (json_object_array_add(json_stack[json_stack_index-1].log, json_obj) != 0) fwts_log_out_of_memory_json(); - if (json_stack_index < MAX_JSON_STACK) + if (json_stack_index < MAX_JSON_STACK) { + json_stack[json_stack_index].obj = json_obj; + json_stack[json_stack_index].log = json_log; json_stack_index++; - else { + } else { fprintf(stderr, "json log stack overflow pushing section %s.\n", name); exit(EXIT_FAILURE); } diff --git a/src/lib/src/fwts_log_xml.c b/src/lib/src/fwts_log_xml.c index b737357..393dfbe 100644 --- a/src/lib/src/fwts_log_xml.c +++ b/src/lib/src/fwts_log_xml.c @@ -134,14 +134,13 @@ static void fwts_log_newline_xml(fwts_log_file *log_file) static void fwts_log_section_begin_xml(fwts_log_file *log_file, const char *name) { - xml_stack[xml_stack_index].name = name; - fprintf(log_file->fp, "%*s<%s>\n", xml_stack_index * XML_INDENT, "", name); fflush(log_file->fp); - if (xml_stack_index < MAX_XML_STACK) + if (xml_stack_index < MAX_XML_STACK) { + xml_stack[xml_stack_index].name = name; xml_stack_index++; - else { + } else { fprintf(stderr, "xml log stack overflow pushing section %s.\n", name); exit(EXIT_FAILURE); }