mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

smbios: use g_free directly on NULL pointers

Browse Source 
No need to wrap it with an if.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Paolo Bonzini 2014-06-04 18:00:28 +02:00 committed by Michael Tokarev
parent 6998b6c11b
commit a10678b08e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/i386/smbios.c
View File

@ -745,11 +745,6 @@ void smbios_set_cpuid(uint32_t version, uint32_t features)
field = value; \ field = value; \
} }
#define G_FREE_UNLESS_NULL(ptr) \
if (ptr != NULL) { \
g_free(ptr); \
}
void smbios_set_defaults(const char *manufacturer, const char *product, void smbios_set_defaults(const char *manufacturer, const char *product,
const char *version, bool legacy_mode) 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) */ /* drop unwanted version of command-line file blob(s) */
if (smbios_legacy) { 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 */ /* in legacy mode, also complain if fields were given for types > 1 */
if (find_next_bit(have_fields_bitmap, if (find_next_bit(have_fields_bitmap,
SMBIOS_MAX_TYPE+1, 2) < SMBIOS_MAX_TYPE+1) { 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); exit(1);
} }
} else { } else {
G_FREE_UNLESS_NULL(smbios_entries); g_free(smbios_entries);
} }
SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer); SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer);