diff options
Diffstat (limited to 'libmm-glib')
| -rw-r--r-- | libmm-glib/mm-location-gps-nmea.c | 10 | ||||
| -rw-r--r-- | libmm-glib/mm-location-gps-raw.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libmm-glib/mm-location-gps-nmea.c b/libmm-glib/mm-location-gps-nmea.c index d23bc146..b2ef6951 100644 --- a/libmm-glib/mm-location-gps-nmea.c +++ b/libmm-glib/mm-location-gps-nmea.c @@ -54,9 +54,7 @@ static gboolean check_append_or_replace (MMLocationGpsNmea *self, const gchar *trace) { - /* By default, replace */ - gboolean append_or_replace = FALSE; - GMatchInfo *match_info = NULL; + g_autoptr(GMatchInfo) match_info = NULL; if (G_UNLIKELY (!self->priv->sequence_regex)) self->priv->sequence_regex = g_regex_new ("\\$..(?:ALM|GSV|RTE|SFI),(\\d),(\\d).*", @@ -69,11 +67,11 @@ check_append_or_replace (MMLocationGpsNmea *self, /* If we don't have the first element of a sequence, append */ if (mm_get_uint_from_match_info (match_info, 2, &index) && index != 1) - append_or_replace = TRUE; + return TRUE; } - g_match_info_free (match_info); - return append_or_replace; + /* By default, replace */ + return FALSE; } static gboolean diff --git a/libmm-glib/mm-location-gps-raw.c b/libmm-glib/mm-location-gps-raw.c index fddc5629..d776d1ca 100644 --- a/libmm-glib/mm-location-gps-raw.c +++ b/libmm-glib/mm-location-gps-raw.c @@ -190,7 +190,7 @@ gboolean mm_location_gps_raw_add_trace (MMLocationGpsRaw *self, const gchar *trace) { - GMatchInfo *match_info = NULL; + g_autoptr(GMatchInfo) match_info = NULL; /* Current implementation works only with $GPGGA and $GNGGA traces */ do { @@ -268,8 +268,6 @@ mm_location_gps_raw_add_trace (MMLocationGpsRaw *self, mm_get_double_from_match_info (match_info, 9, &self->priv->altitude); } - g_match_info_free (match_info); - return TRUE; } |