From patchwork Sun Jun 16 12:02:18 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: 251678 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 AAAF12C008A for ; Sun, 16 Jun 2013 22:02:28 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UoBf6-00078e-Tc; Sun, 16 Jun 2013 12:02:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UoBf1-00078W-Lf for fwts-devel@lists.ubuntu.com; Sun, 16 Jun 2013 12:02:19 +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 1UoBf1-00039k-H3 for fwts-devel@lists.ubuntu.com; Sun, 16 Jun 2013 12:02:19 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib, acpi, hotkey: remove redundant null checks before free() Date: Sun, 16 Jun 2013 13:02:18 +0100 Message-Id: <1371384138-3061-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.3.1 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 Since free() on a null is a no-op, the null checks before free() are redundant and a waste of code. So remove the null checks. Cleans up a bunch of smatch warnings too. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/crsdump/crsdump.c | 4 +--- src/acpi/method/method.c | 3 +-- src/acpi/pcc/pcc.c | 4 +--- src/acpi/wmi/wmi.c | 4 +--- src/hotkey/hotkey/hotkey.c | 6 ++---- src/lib/src/fwts_framework.c | 3 +-- src/lib/src/fwts_klog.c | 3 +-- src/lib/src/fwts_log.c | 10 +++------- 8 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/acpi/crsdump/crsdump.c b/src/acpi/crsdump/crsdump.c index d6dd6df..94fbf0c 100644 --- a/src/acpi/crsdump/crsdump.c +++ b/src/acpi/crsdump/crsdump.c @@ -869,9 +869,7 @@ static int crsdump_test1(fwts_framework *fw) else crsdump_small_resource_items(fw, name, data, obj->Buffer.Length); } - - if (buf.Length && buf.Pointer) - free(buf.Pointer); + free(buf.Pointer); } } return FWTS_OK; diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index 906ebc0..6afa864 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -439,8 +439,7 @@ static void method_evaluate_found_method( check_func(fw, name, &buf, obj, private); } } - if (buf.Length && buf.Pointer) - free(buf.Pointer); + free(buf.Pointer); fwts_acpica_sem_count_get(&sem_acquired, &sem_released); if (sem_acquired != sem_released) { diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c index 36eb654..4e4dd8a 100644 --- a/src/acpi/pcc/pcc.c +++ b/src/acpi/pcc/pcc.c @@ -433,9 +433,7 @@ static int pcc_test1(fwts_framework *fw) if (ACPI_FAILURE(ret) == AE_OK) { pcc_check_buffer(fw, pcc_name, &buf); count++; - - if (buf.Length && buf.Pointer) - free(buf.Pointer); + free(buf.Pointer); } } } diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c index 2425be1..510e9d0 100644 --- a/src/acpi/wmi/wmi.c +++ b/src/acpi/wmi/wmi.c @@ -380,9 +380,7 @@ static int wmi_test1(fwts_framework *fw) (uint8_t*)obj->Buffer.Pointer); wdg_found = true; } - - if (buf.Length && buf.Pointer) - free(buf.Pointer); + free(buf.Pointer); } } diff --git a/src/hotkey/hotkey/hotkey.c b/src/hotkey/hotkey/hotkey.c index 381f029..70fcc78 100644 --- a/src/hotkey/hotkey/hotkey.c +++ b/src/hotkey/hotkey/hotkey.c @@ -231,10 +231,8 @@ static int hotkey_deinit(fwts_framework *fw) FWTS_UNUSED(fw); fwts_keymap_free(hotkeys); - if (hotkey_dev) - free(hotkey_dev); - if (hotkey_keymap) - free(hotkey_keymap); + free(hotkey_dev); + free(hotkey_keymap); return FWTS_OK; } diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index ff1e3b3..8042cf9 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -788,8 +788,7 @@ static void fwts_framework_strdup(char **ptr, const char *str) if (ptr == NULL) return; - if (*ptr) - free(*ptr); + free(*ptr); *ptr = strdup(str); } diff --git a/src/lib/src/fwts_klog.c b/src/lib/src/fwts_klog.c index cd247e2..0472136 100644 --- a/src/lib/src/fwts_klog.c +++ b/src/lib/src/fwts_klog.c @@ -469,8 +469,7 @@ static void fwts_klog_regex_find_callback(fwts_framework *fw, char *line, int re return; rc = pcre_exec(re, extra, line, strlen(line), 0, 0, vector, 1); - if (extra) - free(extra); + free(extra); pcre_free(re); if (rc == 0) (*match)++; diff --git a/src/lib/src/fwts_log.c b/src/lib/src/fwts_log.c index b4a36ec..d8b7cc9 100644 --- a/src/lib/src/fwts_log.c +++ b/src/lib/src/fwts_log.c @@ -482,8 +482,7 @@ int fwts_log_set_owner(fwts_log *log, const char *owner) if (log && (log->magic == LOG_MAGIC)) { char *newowner = strdup(owner); if (newowner) { - if (log->owner) - free(log->owner); + free(log->owner); log->owner = newowner; return FWTS_OK; } @@ -580,8 +579,7 @@ char *fwts_log_get_filenames(const char *filename, const fwts_log_type type) fwts_log_type mask = 1 << i; if (type & mask) { if ((tmp = fwts_log_filename(filename, mask)) == NULL) { - if (filenames) - free(filenames); + free(filenames); return NULL; } @@ -726,9 +724,7 @@ int fwts_log_close(fwts_log *log) /* ..and free log files */ fwts_list_free_items(&log->log_files, free); - if (log->owner) - free(log->owner); - + free(log->owner); free(log); } return FWTS_OK;