colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings/trivial: rename NMS_KEYFILE_FILETYPE_NMLOADED to NMS_KEYFILE_FILETYPE_NMMETA

Browse Source 
This name is better suited for the file with extension ".nmmeta".
This commit is contained in:
Thomas Haller
2019-07-23 15:46:49 +02:00
parent e32d80ea29
commit c7e2fe7da6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings/plugins/keyfile/nms-keyfile-utils.c
View File

@@ -122,7 +122,7 @@ nms_keyfile_nmmeta_read (const char *dirname,
full_filename = g_build_filename (dirname, filename, NULL); 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, full_filename,
out_st, out_st,
NULL)) NULL))
@@ -242,7 +242,7 @@ nms_keyfile_utils_check_file_permissions_stat (NMSKeyfileFiletype filetype,
"file is not a regular file"); "file is not a regular file");
return FALSE; return FALSE;
} }
} else if (filetype == NMS_KEYFILE_FILETYPE_NMLOADED) { } else if (filetype == NMS_KEYFILE_FILETYPE_NMMETA) {
if (!S_ISLNK (st->st_mode)) { if (!S_ISLNK (st->st_mode)) {
g_set_error_literal (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, g_set_error_literal (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"file is not a slink"); "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)); "cannot access file: %s", nm_strerror_native (errsv));
return FALSE; return FALSE;
} }
} else if (filetype == NMS_KEYFILE_FILETYPE_NMLOADED) { } else if (filetype == NMS_KEYFILE_FILETYPE_NMMETA) {
if (lstat (filename, &st) != 0) { if (lstat (filename, &st) != 0) {
errsv = errno; errsv = errno;
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,

2
src/settings/plugins/keyfile/nms-keyfile-utils.h
View File

@@ -24,7 +24,7 @@
typedef enum { typedef enum {
NMS_KEYFILE_FILETYPE_KEYFILE, NMS_KEYFILE_FILETYPE_KEYFILE,
NMS_KEYFILE_FILETYPE_NMLOADED, NMS_KEYFILE_FILETYPE_NMMETA,
} NMSKeyfileFiletype; } NMSKeyfileFiletype;
typedef enum { typedef enum {