From patchwork Wed May 16 13:20:21 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: 159640 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 80458B6FAC for ; Wed, 16 May 2012 23:20:39 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUe9e-0003EH-6J for incoming@patchwork.ozlabs.org; Wed, 16 May 2012 13:20:38 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SUe9c-0003Da-2G for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:20:36 +0000 Received: from cpc19-craw6-2-0-cust5.croy.cable.virginmedia.com ([77.102.228.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SUe9b-0007VS-SI for fwts-devel@lists.ubuntu.com; Wed, 16 May 2012 13:20:36 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 4/8] lib: fwts_log: tidy up white spaces and strncmps Date: Wed, 16 May 2012 14:20:21 +0100 Message-Id: <1337174425-21531-5-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1337174425-21531-1-git-send-email-colin.king@canonical.com> References: <1337174425-21531-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: Alex Hung Acked-by: Keng-Yu Lin --- src/lib/src/fwts_log.c | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/lib/src/fwts_log.c b/src/lib/src/fwts_log.c index a142f58..fabfcf5 100644 --- a/src/lib/src/fwts_log.c +++ b/src/lib/src/fwts_log.c @@ -142,7 +142,7 @@ void fwts_log_print_fields(void) { fwts_log_field field = 1; char *str; - + printf("Available fields: "); for (field=1; ; field <<= 1) { str = fwts_log_field_to_str(field); @@ -211,7 +211,7 @@ void fwts_log_filter_unset_field(const fwts_log_field filter) * clears a bit. */ void fwts_log_set_field_filter(const char *str) -{ +{ char *token; char *saveptr; fwts_log_field field; @@ -238,7 +238,7 @@ void fwts_log_set_field_filter(const char *str) */ void fwts_log_set_format(const char *str) { - strncpy(fwts_log_format, str, sizeof(fwts_log_format)-1); + strncpy(fwts_log_format, str, sizeof(fwts_log_format)-1); fwts_log_format[sizeof(fwts_log_format)-1]='\0'; } @@ -259,36 +259,36 @@ static int fwts_log_header(fwts_log *log, char *buffer, const int len, const fwt for (ptr = fwts_log_format; *ptr; ) { if (*ptr == '%') { ptr++; - if (strncmp(ptr,"line",4)==0) { - n += snprintf(buffer+n, len-n, + if (!strncmp(ptr, "line", 4)) { + n += snprintf(buffer + n, len - n, "%5.5d", log->line_number); - ptr+=4; + ptr += 4; } - if (strncmp(ptr,"date",4)==0) { - n += snprintf(buffer+n, len-n, - "%2.2d/%2.2d/%-2.2d", + if (!strncmp(ptr, "date", 4)) { + n += snprintf(buffer + n, len - n, + "%2.2d/%2.2d/%-2.2d", tm.tm_mday, tm.tm_mon + 1, (tm.tm_year+1900) % 100); - ptr+=4; + ptr += 4; } - if (strncmp(ptr,"time",4)==0) { - n += snprintf(buffer+n, len-n, - "%2.2d:%2.2d:%2.2d", + if (!strncmp(ptr, "time", 4)) { + n += snprintf(buffer + n, len - n, + "%2.2d:%2.2d:%2.2d", tm.tm_hour, tm.tm_min, tm.tm_sec); - ptr+=4; + ptr += 4; } - if (strncmp(ptr,"field",5)==0) { - n += snprintf(buffer+n, len-n, "%s", + if (!strncmp(ptr, "field", 5)) { + n += snprintf(buffer + n, len - n, "%s", fwts_log_field_to_str(field)); - ptr+=5; + ptr += 5; } - if (strncmp(ptr,"level",5)==0) { - n += snprintf(buffer+n, len-n, "%1.1s", + if (!strncmp(ptr, "level", 5)) { + n += snprintf(buffer + n, len - n, "%1.1s", fwts_log_level_to_str(level)); - ptr+=5; + ptr += 5; } - if (strncmp(ptr,"owner",5)==0 && log->owner) { - n += snprintf(buffer+n, len-n, "%-15.15s", log->owner); - ptr+=5; + if (!strncmp(ptr,"owner", 5) && log->owner) { + n += snprintf(buffer + n, len - n, "%-15.15s", log->owner); + ptr += 5; } } else { @@ -365,7 +365,7 @@ int fwts_log_vprintf(fwts_log *log, const fwts_log_field field, const fwts_log_l len += strlen(text) + 1; } fwts_text_list_free(lines); - + return len; } @@ -446,7 +446,7 @@ fwts_log *fwts_log_open(const char *owner, const char *name, const char *mode) newlog->magic = LOG_MAGIC; if (owner) { - if ((newlog->owner = calloc(1, strlen(owner)+1)) == NULL) { + if ((newlog->owner = calloc(1, strlen(owner)+1)) == NULL) { free(newlog); return NULL; }