summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ernberg <john.ernberg@actia.se>2016-04-26 06:19:38 +0000
committerDenis Kenzior <denkenz@gmail.com>2016-04-26 08:05:00 -0500
commit65132868c872a43db6561ba911b96f6e88bc4a38 (patch)
tree4a1c7d2a0a7db6ca298f0acf3698e909ddd42911
parent6ad3e839d1d4f03c7f842f7a2211d3bfdf1b284a (diff)
downloadofono-65132868c872a43db6561ba911b96f6e88bc4a38.tar.gz
stk: clean up undefined function pointer casts
-rw-r--r--src/stk.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/stk.c b/src/stk.c
index 01c95b53..373f6966 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -2315,8 +2315,7 @@ static gboolean handle_command_refresh(const struct stk_command *cmd,
break;
}
- g_slist_foreach(file_list, (GFunc) g_free, NULL);
- g_slist_free(file_list);
+ g_slist_free_full(file_list, g_free);
return FALSE;
}
@@ -3163,8 +3162,7 @@ static void stk_unregister(struct ofono_atom *atom)
stk->main_menu = NULL;
}
- g_queue_foreach(stk->envelope_q, (GFunc) g_free, NULL);
- g_queue_free(stk->envelope_q);
+ g_queue_free_full(stk->envelope_q, g_free);
ofono_modem_remove_interface(modem, OFONO_STK_INTERFACE);
g_dbus_unregister_interface(conn, path, OFONO_STK_INTERFACE);