From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsDcR-00069c-Ed for qemu-devel@nongnu.org; Wed, 04 Jun 2014 12:01:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsDcE-0000IJ-KH for qemu-devel@nongnu.org; Wed, 04 Jun 2014 12:00:50 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 4 Jun 2014 18:00:28 +0200 Message-Id: <1401897628-13422-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org No need to wrap it with an if. Signed-off-by: Paolo Bonzini --- hw/i386/smbios.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 7660718..ab89420 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -740,11 +740,6 @@ void smbios_set_cpuid(uint32_t version, uint32_t features) field = value; \ } -#define G_FREE_UNLESS_NULL(ptr) \ - if (ptr != NULL) { \ - g_free(ptr); \ - } - void smbios_set_defaults(const char *manufacturer, const char *product, const char *version, bool legacy_mode) { @@ -753,7 +748,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product, /* drop unwanted version of command-line file blob(s) */ if (smbios_legacy) { - G_FREE_UNLESS_NULL(smbios_tables); + g_free(smbios_tables); /* in legacy mode, also complain if fields were given for types > 1 */ if (find_next_bit(have_fields_bitmap, SMBIOS_MAX_TYPE+1, 2) < SMBIOS_MAX_TYPE+1) { @@ -762,7 +757,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product, exit(1); } } else { - G_FREE_UNLESS_NULL(smbios_entries); + g_free(smbios_entries); } SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer); -- 1.8.3.1