[gnome-desktop] gnome-language: Use g_autofree



commit 6271db6bbda01805cbec6fed44e481ca7a11dd79
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Aug 13 15:11:27 2018 +1200

    gnome-language: Use g_autofree
    
    Replace some g_free calls with g_autofree. Most of the rest of the g_frees were
    removed in 389a3761

 libgnome-desktop/gnome-languages.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/libgnome-desktop/gnome-languages.c b/libgnome-desktop/gnome-languages.c
index 7f95bb43..80cc3ae8 100644
--- a/libgnome-desktop/gnome-languages.c
+++ b/libgnome-desktop/gnome-languages.c
@@ -130,8 +130,6 @@ gnome_parse_locale (const char *locale,
         static GRegex *re = NULL;
         GMatchInfo *match_info;
         gboolean    res;
-        gchar      *normalized_codeset = NULL;
-        gchar      *normalized_name = NULL;
         gboolean    retval;
 
         match_info = NULL;
@@ -200,6 +198,9 @@ gnome_parse_locale (const char *locale,
         }
 
         if (codesetp != NULL && *codesetp != NULL) {
+                g_autofree gchar *normalized_codeset = NULL;
+                g_autofree gchar *normalized_name = NULL;
+
                 normalized_codeset = normalize_codeset (*codesetp);
                 normalized_name = construct_language_name (language_codep ? *language_codep : NULL,
                                                            country_codep ? *country_codep : NULL,
@@ -208,11 +209,8 @@ gnome_parse_locale (const char *locale,
 
                 if (language_name_is_valid (normalized_name)) {
                         g_free (*codesetp);
-                        *codesetp = normalized_codeset;
-                } else {
-                        g_free (normalized_codeset);
+                        *codesetp = g_steal_pointer (&normalized_codeset);
                 }
-                g_free (normalized_name);
         }
 
  out:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]