[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 19/25] smbios: use g_free directly on NULL pointers
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 19/25] smbios: use g_free directly on NULL pointers |
Date: |
Tue, 10 Jun 2014 20:08:37 +0400 |
From: Paolo Bonzini <address@hidden>
No need to wrap it with an if.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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 b3bedde..e3fa1b2 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -745,11 +745,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)
{
@@ -758,7 +753,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) {
@@ -767,7 +762,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.7.10.4
- [Qemu-trivial] [PULL 00/25] Trivial patches for 2014-06-10, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 02/25] net: cadence_gem: Add Tx descriptor fetch printf, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 06/25] slirp: Remove unused zero_ethaddr[] variable, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 05/25] qtest: fix hex2nib for capital characters, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 04/25] net: cadence_gem: Remove &desc[0] usages, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 10/25] hw/dma/xilinx_axidma: Remove unused stream_halted() function, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 19/25] smbios: use g_free directly on NULL pointers,
Michael Tokarev <=
- [Qemu-trivial] [PULL 22/25] libcacard: Clean up dead stores before g_free(), Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 21/25] libcacard: Drop superfluous conditionals around g_free(), Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 23/25] migration: Plug memory leak in migrate-set-cache-size command, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 17/25] apb: Fix compiler warnings (large constants), Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 14/25] hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem(), Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 24/25] hw: vmware_vga: don't return cursorx when the driver asks for cursory register, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 12/25] hw/isa/pc87312: Remove unused function is_parallel_epp(), Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 01/25] net: cadence_gem: Fix Tx descriptor update, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 03/25] net: cadence_gem: Comment spelling sweep, Michael Tokarev, 2014/06/10
- [Qemu-trivial] [PULL 18/25] vdi: remove double conversion, Michael Tokarev, 2014/06/10