colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmm-glib,location: build_locations() doesn't own the dictionary

Browse Source 
Rework the build_locations() method so that it doesn't take ownership
of the input dictionary. This allows us reusing this method with
dictionaries for which ownership cannot be transferred.
This commit is contained in:
Aleksander Morgado
2021-06-24 10:44:50 +02:00
parent e1fbc1ccb7
commit 4e4cb6d66a
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libmm-glib/mm-modem-location.c
View File

@@ -566,25 +566,24 @@ mm_modem_location_set_gps_refresh_rate_sync (MMModemLocation *self,
/*****************************************************************************/ /*****************************************************************************/
static gboolean static gboolean
build_locations (GVariant *dictionary, build_locations (GVariant *dictionary,
MMLocation3gpp **location_3gpp, MMLocation3gpp **location_3gpp,
MMLocationGpsNmea **location_gps_nmea, MMLocationGpsNmea **location_gps_nmea,
MMLocationGpsRaw **location_gps_raw, MMLocationGpsRaw **location_gps_raw,
MMLocationCdmaBs **location_cdma_bs, MMLocationCdmaBs **location_cdma_bs,
GError **error) GError **error)
{ {
GError *inner_error = NULL; GError *inner_error = NULL;
GVariant *value; GVariant *value;
guint source; guint source;
GVariantIter iter; GVariantIter iter;
if (!dictionary) if (!dictionary)
/* No location provided. Not actually an error. */ /* No location provided. Not actually an error. */
return TRUE; return TRUE;
g_variant_iter_init (&iter, dictionary); g_variant_iter_init (&iter, dictionary);
while (!inner_error && while (!inner_error && g_variant_iter_next (&iter, "{uv}", &source, &value)) {
g_variant_iter_next (&iter, "{uv}", &source, &value)) {
switch (source) { switch (source) {
case MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI: case MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI:
if (location_3gpp) if (location_3gpp)
@@ -606,16 +605,12 @@ build_locations (GVariant *dictionary,
g_warn_if_reached (); g_warn_if_reached ();
break; break;
} }
g_variant_unref (value); g_variant_unref (value);
} }
g_variant_unref (dictionary);
if (inner_error) { if (inner_error) {
g_propagate_error (error, inner_error); g_propagate_error (error, inner_error);
g_prefix_error (error, g_prefix_error (error, "Couldn't build locations result: ");
"Couldn't build locations result: ");
return FALSE; return FALSE;
} }
@@ -656,7 +651,7 @@ mm_modem_location_get_full_finish (MMModemLocation *self,
MMLocationCdmaBs **location_cdma_bs, MMLocationCdmaBs **location_cdma_bs,
GError **error) GError **error)
{ {
GVariant *dictionary = NULL; g_autoptr(GVariant) dictionary = NULL;
g_return_val_if_fail (MM_IS_MODEM_LOCATION (self), FALSE); g_return_val_if_fail (MM_IS_MODEM_LOCATION (self), FALSE);
@@ -736,7 +731,7 @@ mm_modem_location_get_full_sync (MMModemLocation *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GVariant *dictionary = NULL; g_autoptr(GVariant) dictionary = NULL;
g_return_val_if_fail (MM_IS_MODEM_LOCATION (self), FALSE); g_return_val_if_fail (MM_IS_MODEM_LOCATION (self), FALSE);