core/logging: return static string from nm_logging_level_to_string()

Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 85b972e9b8603f95954575e5e1646190ac198b4c)

3 files changed, 5 insertions, 7 deletions

diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
index 1a406625ce..f6853d7b92 100644
--- a/src/logging/nm-logging.c
+++ b/src/logging/nm-logging.c
@@ -263,10 +263,10 @@ nm_logging_setup (const char  *level,
 	return TRUE;
 }
 
-char *
+const char *
 nm_logging_level_to_string (void)
 {
-	return g_strdup (level_names[log_level]);
+	return level_names[log_level];
 }
 
 const char *
diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h
index 3eef7eb0c3..fdc64de43a 100644
--- a/src/logging/nm-logging.h
+++ b/src/logging/nm-logging.h
@@ -114,7 +114,7 @@ void _nm_log (const char *loc,
               const char *fmt,
               ...) __attribute__((__format__ (__printf__, 5, 6)));
 
-char *nm_logging_level_to_string (void);
+const char *nm_logging_level_to_string (void);
 char *nm_logging_domains_to_string (void);
 gboolean nm_logging_enabled (guint32 level, guint64 domain);
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index de958e4618..328deb0b7e 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4042,12 +4042,10 @@ impl_manager_set_logging (NMManager *manager,
 	}
 
 	if (nm_logging_setup (level, domains, NULL, &error)) {
-		char *new_level = nm_logging_level_to_string ();
 		char *new_domains = nm_logging_domains_to_string ();
 
 		nm_log_info (LOGD_CORE, "logging: level '%s' domains '%s'",
-		             new_level, new_domains);
-		g_free (new_level);
+		             nm_logging_level_to_string (), new_domains);
 		g_free (new_domains);
 	}
 
@@ -4064,7 +4062,7 @@ impl_manager_get_logging (NMManager *manager,
                           char **level,
                           char **domains)
 {
-	*level = nm_logging_level_to_string ();
+	*level = g_strdup (nm_logging_level_to_string ());
 	*domains = nm_logging_domains_to_string ();
 }