diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-10-19 15:27:11 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-23 10:37:33 +0200 |
| commit | e93d8cdb74d1bcd6d23ba33b4a1601b0e6dd8b99 (patch) | |
| tree | c374b5834fbc65604cbcab603da459622d1efd07 | |
| parent | c4a9f44affd71a7e2fc7824029adde45351062b4 (diff) | |
| download | NetworkManager-e93d8cdb74d1bcd6d23ba33b4a1601b0e6dd8b99.tar.gz | |
keyfile: drop with_extension argument from _internal_write_connection()
For non-test code, we always passed TRUE.
For test code, setting with_extension is fine too, so drop the
argument.
| -rw-r--r-- | src/settings/plugins/keyfile/nms-keyfile-writer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c index 23a6a77c27..bbce43d1b1 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c @@ -173,7 +173,6 @@ static gboolean _internal_write_connection (NMConnection *connection, const char *keyfile_dir, const char *profile_dir, - gboolean with_extension, uid_t owner_uid, pid_t owner_grp, const char *existing_path, @@ -230,7 +229,7 @@ _internal_write_connection (NMConnection *connection, if (existing_path != NULL && !rename) { path = g_strdup (existing_path); } else { - char *filename_escaped = nm_keyfile_utils_create_filename (id, with_extension); + char *filename_escaped = nm_keyfile_utils_create_filename (id, TRUE); path = g_build_filename (keyfile_dir, filename_escaped, NULL); g_free (filename_escaped); @@ -256,7 +255,7 @@ _internal_write_connection (NMConnection *connection, else filename = g_strdup_printf ("%s-%s-%u", id, nm_connection_get_uuid (connection), i); - filename_escaped = nm_keyfile_utils_create_filename (filename, with_extension); + filename_escaped = nm_keyfile_utils_create_filename (filename, TRUE); g_free (path); path = g_strdup_printf ("%s/%s", keyfile_dir, filename_escaped); @@ -361,7 +360,6 @@ nms_keyfile_writer_connection (NMConnection *connection, return _internal_write_connection (connection, keyfile_dir, nms_keyfile_utils_get_path (), - TRUE, 0, 0, existing_path, @@ -385,7 +383,6 @@ nms_keyfile_writer_test_connection (NMConnection *connection, return _internal_write_connection (connection, keyfile_dir, keyfile_dir, - FALSE, owner_uid, owner_grp, NULL, |