summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-07-17 15:09:53 +0200
committerThomas Haller <thaller@redhat.com>2018-07-17 15:09:53 +0200
commit31a0881f3c52412b9275aec4d390e92ade2be1f3 (patch)
treeed6901ed57f921053b176f0daedcc3f2891109f0
parente512cec770b680f066934f6de7ee8053c4446ac7 (diff)
downloadNetworkManager-31a0881f3c52412b9275aec4d390e92ade2be1f3.tar.gz
keyfile: use gs_unref_keyfile in nms_keyfile_reader_from_file()
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-reader.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/settings/plugins/keyfile/nms-keyfile-reader.c
index cb4b837950..71578686cb 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.c
@@ -115,7 +115,7 @@ nms_keyfile_reader_from_keyfile (GKeyFile *key_file,
NMConnection *
nms_keyfile_reader_from_file (const char *filename, GError **error)
{
- GKeyFile *key_file;
+ gs_unref_keyfile GKeyFile *key_file = NULL;
struct stat statbuf;
NMConnection *connection = NULL;
GError *verify_error = NULL;
@@ -144,11 +144,11 @@ nms_keyfile_reader_from_file (const char *filename, GError **error)
key_file = g_key_file_new ();
if (!g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, error))
- goto out;
+ return NULL;
connection = nms_keyfile_reader_from_keyfile (key_file, filename, TRUE, error);
if (!connection)
- goto out;
+ return NULL;
/* Normalize and verify the connection */
if (!nm_connection_normalize (connection, NULL, NULL, &verify_error)) {
@@ -160,8 +160,6 @@ nms_keyfile_reader_from_file (const char *filename, GError **error)
connection = NULL;
}
-out:
- g_key_file_free (key_file);
return connection;
}