diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-07-23 15:46:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-07-25 22:02:00 +0200 |
| commit | c7e2fe7da6899b09e24791e8a82c6de4e623e2b3 (patch) | |
| tree | 2e24f5403943692c9dd5d9512cbf442a7f85074e | |
| parent | e32d80ea29ecbdef29f0ca6eb0b232d389bc3170 (diff) | |
| download | NetworkManager-c7e2fe7da6899b09e24791e8a82c6de4e623e2b3.tar.gz | |
settings/trivial: rename NMS_KEYFILE_FILETYPE_NMLOADED to NMS_KEYFILE_FILETYPE_NMMETA
This name is better suited for the file with extension ".nmmeta".
| -rw-r--r-- | src/settings/plugins/keyfile/nms-keyfile-utils.c | 6 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/nms-keyfile-utils.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c index 0d03132793..e9d5351573 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-utils.c +++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c @@ -122,7 +122,7 @@ nms_keyfile_nmmeta_read (const char *dirname, full_filename = g_build_filename (dirname, filename, NULL); - if (!nms_keyfile_utils_check_file_permissions (NMS_KEYFILE_FILETYPE_NMLOADED, + if (!nms_keyfile_utils_check_file_permissions (NMS_KEYFILE_FILETYPE_NMMETA, full_filename, out_st, NULL)) @@ -242,7 +242,7 @@ nms_keyfile_utils_check_file_permissions_stat (NMSKeyfileFiletype filetype, "file is not a regular file"); return FALSE; } - } else if (filetype == NMS_KEYFILE_FILETYPE_NMLOADED) { + } else if (filetype == NMS_KEYFILE_FILETYPE_NMMETA) { if (!S_ISLNK (st->st_mode)) { g_set_error_literal (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "file is not a slink"); @@ -289,7 +289,7 @@ nms_keyfile_utils_check_file_permissions (NMSKeyfileFiletype filetype, "cannot access file: %s", nm_strerror_native (errsv)); return FALSE; } - } else if (filetype == NMS_KEYFILE_FILETYPE_NMLOADED) { + } else if (filetype == NMS_KEYFILE_FILETYPE_NMMETA) { if (lstat (filename, &st) != 0) { errsv = errno; g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h index 1f5280f727..4f4ad54091 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-utils.h +++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h @@ -24,7 +24,7 @@ typedef enum { NMS_KEYFILE_FILETYPE_KEYFILE, - NMS_KEYFILE_FILETYPE_NMLOADED, + NMS_KEYFILE_FILETYPE_NMMETA, } NMSKeyfileFiletype; typedef enum { |