mirror of git://git.sysmocom.de/ofono
ussd: Use g_slist_free_full
This commit is contained in:
parent
c9be86ce1a
commit
1326026c6d
10
src/ussd.c
10
src/ussd.c
|
@ -102,8 +102,10 @@ static struct ssc_entry *ssc_entry_create(const char *sc, void *cb, void *data,
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ssc_entry_destroy(struct ssc_entry *ca)
|
static void ssc_entry_destroy(gpointer pointer)
|
||||||
{
|
{
|
||||||
|
struct ssc_entry *ca = pointer;
|
||||||
|
|
||||||
if (ca->destroy)
|
if (ca->destroy)
|
||||||
ca->destroy(ca->user);
|
ca->destroy(ca->user);
|
||||||
|
|
||||||
|
@ -790,12 +792,10 @@ static void ussd_unregister(struct ofono_atom *atom)
|
||||||
struct ofono_modem *modem = __ofono_atom_get_modem(atom);
|
struct ofono_modem *modem = __ofono_atom_get_modem(atom);
|
||||||
const char *path = __ofono_atom_get_path(atom);
|
const char *path = __ofono_atom_get_path(atom);
|
||||||
|
|
||||||
g_slist_foreach(ussd->ss_control_list, (GFunc) ssc_entry_destroy, NULL);
|
g_slist_free_full(ussd->ss_control_list, ssc_entry_destroy);
|
||||||
g_slist_free(ussd->ss_control_list);
|
|
||||||
ussd->ss_control_list = NULL;
|
ussd->ss_control_list = NULL;
|
||||||
|
|
||||||
g_slist_foreach(ussd->ss_passwd_list, (GFunc) ssc_entry_destroy, NULL);
|
g_slist_free_full(ussd->ss_passwd_list, ssc_entry_destroy);
|
||||||
g_slist_free(ussd->ss_passwd_list);
|
|
||||||
ussd->ss_passwd_list = NULL;
|
ussd->ss_passwd_list = NULL;
|
||||||
|
|
||||||
ofono_modem_remove_interface(modem,
|
ofono_modem_remove_interface(modem,
|
||||||
|
|
Loading…
Reference in New Issue