fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-05 15:00:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan/ofono: use gs_unref_variant instead of g_variant_unref

Browse source
This commit is contained in:
Bhushan Shah 2021-03-05 20:17:00 +05:30 • committed by Thomas Haller
parent e4941696be
commit 0daea018c6
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/devices/wwan/nm-modem-ofono.c
View file

@ -316,10 +316,9 @@ handle_sim_property(GDBusProxy *proxy, const char *property, GVariant *v, gpoint
static void
sim_property_changed(GDBusProxy *proxy, const char *property, GVariant *v, gpointer user_data)
{
GVariant *v_child = g_variant_get_child_value(v, 0);
gs_unref_variant GVariant *v_child = g_variant_get_child_value(v, 0);
handle_sim_property(proxy, property, v_child, user_data);
g_variant_unref(v_child);
}
static void
@ -330,7 +329,7 @@ sim_get_properties_done(GObject *source, GAsyncResult *result, gpointer user_dat
gs_free_error GError *error = NULL;
gs_unref_variant GVariant *v_properties = NULL;
gs_unref_variant GVariant *v_dict = NULL;
GVariant * v;
gs_unref_variant GVariant *v = NULL;
GVariantIter i;
const char * property;
@ -370,9 +369,8 @@ sim_get_properties_done(GObject *source, GAsyncResult *result, gpointer user_dat
*/
g_variant_iter_init(&i, v_dict);
while (g_variant_iter_next(&i, "{&sv}", &property, &v)) {
while (g_variant_iter_loop(&i, "{&sv}", &property, &v)) {
handle_sim_property(NULL, property, v, self);
g_variant_unref(v);
}
}
@ -477,10 +475,9 @@ handle_connman_property(GDBusProxy *proxy, const char *property, GVariant *v, gp
static void
connman_property_changed(GDBusProxy *proxy, const char *property, GVariant *v, gpointer user_data)
{
GVariant *v_child = g_variant_get_child_value(v, 0);
gs_unref_variant GVariant *v_child = g_variant_get_child_value(v, 0);
handle_connman_property(proxy, property, v_child, user_data);
g_variant_unref(v_child);
}
static void
@ -491,7 +488,7 @@ connman_get_properties_done(GObject *source, GAsyncResult *result, gpointer user
gs_free_error GError *error = NULL;
gs_unref_variant GVariant *v_properties = NULL;
gs_unref_variant GVariant *v_dict = NULL;
GVariant * v;
gs_unref_variant GVariant *v = NULL;
GVariantIter i;
const char * property;
@ -523,9 +520,8 @@ connman_get_properties_done(GObject *source, GAsyncResult *result, gpointer user
*/
g_variant_iter_init(&i, v_dict);
while (g_variant_iter_next(&i, "{&sv}", &property, &v)) {
while (g_variant_iter_loop(&i, "{&sv}", &property, &v)) {
handle_connman_property(NULL, property, v, self);
g_variant_unref(v);
}
}
@ -700,9 +696,8 @@ modem_get_properties_done(GObject *source, GAsyncResult *result, gpointer user_d
*/
g_variant_iter_init(&i, v_dict);
while (g_variant_iter_next(&i, "{&sv}", &property, &v)) {
while (g_variant_iter_loop(&i, "{&sv}", &property, &v)) {
handle_modem_property(NULL, property, v, self);
g_variant_unref(v);
}
}
@ -898,8 +893,8 @@ out:
static void
context_property_changed(GDBusProxy *proxy, const char *property, GVariant *v, gpointer user_data)
{
NMModemOfono *self = NM_MODEM_OFONO(user_data);
gs_unref_variant GVariant * v_dict = NULL;
NMModemOfono * self = NM_MODEM_OFONO(user_data);
gs_unref_variant GVariant *v_dict = NULL;
_LOGD("PropertyChanged: %s", property);