* [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers
@ 2014-06-04 16:00 Paolo Bonzini
2014-06-05 15:40 ` Benoît Canet
2014-06-08 13:16 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-06-04 16:00 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial
No need to wrap it with an if.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers
2014-06-04 16:00 [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers Paolo Bonzini
@ 2014-06-05 15:40 ` Benoît Canet
2014-06-08 13:16 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Benoît Canet @ 2014-06-05 15:40 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-trivial, qemu-devel
The Wednesday 04 Jun 2014 à 18:00:28 (+0200), Paolo Bonzini wrote :
> No need to wrap it with an if.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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
>
>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] smbios: use g_free directly on NULL pointers
2014-06-04 16:00 [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers Paolo Bonzini
2014-06-05 15:40 ` Benoît Canet
@ 2014-06-08 13:16 ` Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2014-06-08 13:16 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: qemu-trivial
Applied to -trivial, thank you!
/mjt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-08 13:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-04 16:00 [Qemu-devel] [PATCH] smbios: use g_free directly on NULL pointers Paolo Bonzini
2014-06-05 15:40 ` Benoît Canet
2014-06-08 13:16 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).