diff options
| author | Jouni Malinen <j@w1.fi> | 2010-01-03 01:01:56 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2010-01-03 01:01:56 +0200 |
| commit | 2f1a90188c922750e4439eef7b0c99327b966b9f (patch) | |
| tree | 04ae0b203b134d72de9926d08d4d9ab070d71e27 /wpa_supplicant/dbus/dbus_new.c | |
| parent | e90bd80cf5545601c91b237e378f3e9854bf6dcf (diff) | |
| download | external_wpa_supplicant_8_ti-2f1a90188c922750e4439eef7b0c99327b966b9f.zip external_wpa_supplicant_8_ti-2f1a90188c922750e4439eef7b0c99327b966b9f.tar.gz external_wpa_supplicant_8_ti-2f1a90188c922750e4439eef7b0c99327b966b9f.tar.bz2 | |
dbus: Use free_dbus_object_desc() consistently to free object descriptor
Diffstat (limited to 'wpa_supplicant/dbus/dbus_new.c')
| -rw-r--r-- | wpa_supplicant/dbus/dbus_new.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 3216d3d..2b2a24c 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -1018,7 +1018,7 @@ int wpas_dbus_register_network(struct wpa_supplicant *wpa_s, { struct wpas_dbus_priv *ctrl_iface; struct wpa_dbus_object_desc *obj_desc; - struct network_handler_args *arg = NULL; + struct network_handler_args *arg; char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX]; /* Do nothing if the control interface is not turned on */ @@ -1065,8 +1065,7 @@ int wpas_dbus_register_network(struct wpa_supplicant *wpa_s, return 0; err: - os_free(obj_desc); - os_free(arg); + free_dbus_object_desc(obj_desc); return -1; } @@ -1228,7 +1227,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, struct wpas_dbus_priv *ctrl_iface; struct wpa_dbus_object_desc *obj_desc; char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX]; - struct bss_handler_args *arg = NULL; + struct bss_handler_args *arg; /* Do nothing if the control interface is not turned on */ if (wpa_s == NULL || wpa_s->global == NULL) @@ -1276,8 +1275,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, return 0; err: - os_free(obj_desc); - os_free(arg); + free_dbus_object_desc(obj_desc); return -1; } @@ -1548,7 +1546,7 @@ int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s) err: os_free(wpa_s->dbus_new_path); wpa_s->dbus_new_path = NULL; - os_free(obj_desc); + free_dbus_object_desc(obj_desc); return -1; } |