From 3ebf58548cc505b39caae3b780e9ab930c2b0e07 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Fri, 3 Aug 2018 11:14:46 +0200 Subject: [PATCH] Drop the CALLS_FREE_PTR_PROPERTY() macro Replace it by g_free() as it does the same thing. --- src/calls-ofono-call.c | 6 +++--- src/calls-ofono-origin.c | 2 +- src/util.h | 8 +------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/calls-ofono-call.c b/src/calls-ofono-call.c index abbde92..d70ecc5 100644 --- a/src/calls-ofono-call.c +++ b/src/calls-ofono-call.c @@ -303,9 +303,9 @@ finalize (GObject *object) GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT); CallsOfonoCall *self = CALLS_OFONO_CALL (object); - CALLS_FREE_PTR_PROPERTY (self->disconnect_reason); - CALLS_FREE_PTR_PROPERTY (self->name); - CALLS_FREE_PTR_PROPERTY (self->number); + g_free (self->disconnect_reason); + g_free (self->name); + g_free (self->number); parent_class->finalize (object); } diff --git a/src/calls-ofono-origin.c b/src/calls-ofono-origin.c index a1ae7f1..3b63d92 100644 --- a/src/calls-ofono-origin.c +++ b/src/calls-ofono-origin.c @@ -506,7 +506,7 @@ finalize (GObject *object) { g_string_free (self->tone_queue, TRUE); } - CALLS_FREE_PTR_PROPERTY (self->name); + g_free (self->name); parent_class->finalize (object); } diff --git a/src/util.h b/src/util.h index 98870ee..5cfbff6 100644 --- a/src/util.h +++ b/src/util.h @@ -80,14 +80,8 @@ G_BEGIN_DECLS g_object_ref (G_OBJECT (obj_ptr)); -#define CALLS_FREE_PTR_PROPERTY(ptr) \ - if (ptr) \ - { \ - g_free (ptr); \ - } \ - #define CALLS_SET_PTR_PROPERTY(ptr,new_value) \ - CALLS_FREE_PTR_PROPERTY (ptr) \ + g_free (ptr); \ ptr = new_value;