settings/trivial: rename nm_keyfile_loaded_uuid_*() API to nm_keyfile_nmmeta_*()
The file got a wider scope to contain generic meta data about profiles. Rename the internal API to reflect that (and be consistend with the naming of the files).
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
nms_keyfile_loaded_uuid_is_filename (const char *filename,
|
nms_keyfile_nmmeta_check_filename (const char *filename,
|
||||||
guint *out_uuid_len)
|
guint *out_uuid_len)
|
||||||
{
|
{
|
||||||
const char *uuid;
|
const char *uuid;
|
||||||
@@ -71,7 +71,7 @@ nms_keyfile_loaded_uuid_is_filename (const char *filename,
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
nms_keyfile_loaded_uuid_filename (const char *dirname,
|
nms_keyfile_nmmeta_filename (const char *dirname,
|
||||||
const char *uuid,
|
const char *uuid,
|
||||||
gboolean temporary)
|
gboolean temporary)
|
||||||
{
|
{
|
||||||
@@ -101,7 +101,7 @@ nms_keyfile_loaded_uuid_filename (const char *dirname,
|
|||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
nms_keyfile_loaded_uuid_read (const char *dirname,
|
nms_keyfile_nmmeta_read (const char *dirname,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
char **out_full_filename,
|
char **out_full_filename,
|
||||||
char **out_uuid,
|
char **out_uuid,
|
||||||
@@ -116,7 +116,7 @@ nms_keyfile_loaded_uuid_read (const char *dirname,
|
|||||||
nm_assert (dirname && dirname[0] == '/');
|
nm_assert (dirname && dirname[0] == '/');
|
||||||
nm_assert (filename && filename[0] && !strchr (filename, '/'));
|
nm_assert (filename && filename[0] && !strchr (filename, '/'));
|
||||||
|
|
||||||
uuid = nms_keyfile_loaded_uuid_is_filename (filename, &uuid_len);
|
uuid = nms_keyfile_nmmeta_check_filename (filename, &uuid_len);
|
||||||
if (!uuid)
|
if (!uuid)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
@@ -139,7 +139,7 @@ nms_keyfile_loaded_uuid_read (const char *dirname,
|
|||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
nms_keyfile_loaded_uuid_read_from_file (const char *full_filename,
|
nms_keyfile_nmmeta_read_from_file (const char *full_filename,
|
||||||
char **out_dirname,
|
char **out_dirname,
|
||||||
char **out_filename,
|
char **out_filename,
|
||||||
char **out_uuid,
|
char **out_uuid,
|
||||||
@@ -153,7 +153,7 @@ nms_keyfile_loaded_uuid_read_from_file (const char *full_filename,
|
|||||||
filename = g_path_get_basename (full_filename);
|
filename = g_path_get_basename (full_filename);
|
||||||
dirname = g_path_get_dirname (full_filename);
|
dirname = g_path_get_dirname (full_filename);
|
||||||
|
|
||||||
if (!nms_keyfile_loaded_uuid_read (dirname,
|
if (!nms_keyfile_nmmeta_read (dirname,
|
||||||
filename,
|
filename,
|
||||||
NULL,
|
NULL,
|
||||||
out_uuid,
|
out_uuid,
|
||||||
@@ -167,7 +167,7 @@ nms_keyfile_loaded_uuid_read_from_file (const char *full_filename,
|
|||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
nms_keyfile_loaded_uuid_write (const char *dirname,
|
nms_keyfile_nmmeta_write (const char *dirname,
|
||||||
const char *uuid,
|
const char *uuid,
|
||||||
const char *loaded_path,
|
const char *loaded_path,
|
||||||
gboolean allow_relative,
|
gboolean allow_relative,
|
||||||
@@ -181,7 +181,7 @@ nms_keyfile_loaded_uuid_write (const char *dirname,
|
|||||||
&& !strchr (uuid, '/'));
|
&& !strchr (uuid, '/'));
|
||||||
nm_assert (!loaded_path || loaded_path[0] == '/');
|
nm_assert (!loaded_path || loaded_path[0] == '/');
|
||||||
|
|
||||||
full_filename_tmp = nms_keyfile_loaded_uuid_filename (dirname, uuid, TRUE);
|
full_filename_tmp = nms_keyfile_nmmeta_filename (dirname, uuid, TRUE);
|
||||||
|
|
||||||
nm_assert (g_str_has_suffix (full_filename_tmp, "~"));
|
nm_assert (g_str_has_suffix (full_filename_tmp, "~"));
|
||||||
nm_assert (nm_utils_file_is_in_path (full_filename_tmp, dirname));
|
nm_assert (nm_utils_file_is_in_path (full_filename_tmp, dirname));
|
||||||
|
@@ -37,27 +37,27 @@ const char *nms_keyfile_utils_get_path (void);
|
|||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
const char *nms_keyfile_loaded_uuid_is_filename (const char *filename,
|
const char *nms_keyfile_nmmeta_check_filename (const char *filename,
|
||||||
guint *out_uuid_len);
|
guint *out_uuid_len);
|
||||||
|
|
||||||
char *nms_keyfile_loaded_uuid_filename (const char *dirname,
|
char *nms_keyfile_nmmeta_filename (const char *dirname,
|
||||||
const char *uuid,
|
const char *uuid,
|
||||||
gboolean temporary);
|
gboolean temporary);
|
||||||
|
|
||||||
gboolean nms_keyfile_loaded_uuid_read (const char *dirname,
|
gboolean nms_keyfile_nmmeta_read (const char *dirname,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
char **out_full_filename,
|
char **out_full_filename,
|
||||||
char **out_uuid,
|
char **out_uuid,
|
||||||
char **out_loaded_path,
|
char **out_loaded_path,
|
||||||
struct stat *out_st);
|
struct stat *out_st);
|
||||||
|
|
||||||
gboolean nms_keyfile_loaded_uuid_read_from_file (const char *full_filename,
|
gboolean nms_keyfile_nmmeta_read_from_file (const char *full_filename,
|
||||||
char **out_dirname,
|
char **out_dirname,
|
||||||
char **out_filename,
|
char **out_filename,
|
||||||
char **out_uuid,
|
char **out_uuid,
|
||||||
char **out_loaded_path);
|
char **out_loaded_path);
|
||||||
|
|
||||||
gboolean nms_keyfile_loaded_uuid_write (const char *dirname,
|
gboolean nms_keyfile_nmmeta_write (const char *dirname,
|
||||||
const char *uuid,
|
const char *uuid,
|
||||||
const char *loaded_path,
|
const char *loaded_path,
|
||||||
gboolean allow_relative,
|
gboolean allow_relative,
|
||||||
|
@@ -2507,7 +2507,7 @@ test_nm_keyfile_plugin_utils_escape_filename (void)
|
|||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_assert_keyfile_loaded_uuid (const char *dirname,
|
_assert_keyfile_nmmeta (const char *dirname,
|
||||||
const char *uuid,
|
const char *uuid,
|
||||||
const char *loaded_path,
|
const char *loaded_path,
|
||||||
gboolean allow_relative,
|
gboolean allow_relative,
|
||||||
@@ -2533,12 +2533,12 @@ _assert_keyfile_loaded_uuid (const char *dirname,
|
|||||||
|
|
||||||
filename = g_path_get_basename (exp_full_filename);
|
filename = g_path_get_basename (exp_full_filename);
|
||||||
|
|
||||||
full_filename = nms_keyfile_loaded_uuid_filename (dirname, uuid, FALSE);
|
full_filename = nms_keyfile_nmmeta_filename (dirname, uuid, FALSE);
|
||||||
g_assert_cmpstr (full_filename, ==, full_filename);
|
g_assert_cmpstr (full_filename, ==, full_filename);
|
||||||
nm_clear_g_free (&full_filename);
|
nm_clear_g_free (&full_filename);
|
||||||
|
|
||||||
|
|
||||||
g_assert (nms_keyfile_loaded_uuid_write (dirname, uuid, loaded_path, allow_relative, &full_filename));
|
g_assert (nms_keyfile_nmmeta_write (dirname, uuid, loaded_path, allow_relative, &full_filename));
|
||||||
g_assert_cmpstr (full_filename, ==, exp_full_filename);
|
g_assert_cmpstr (full_filename, ==, exp_full_filename);
|
||||||
nm_clear_g_free (&full_filename);
|
nm_clear_g_free (&full_filename);
|
||||||
|
|
||||||
@@ -2550,7 +2550,7 @@ _assert_keyfile_loaded_uuid (const char *dirname,
|
|||||||
g_assert_cmpstr (symlink_target, ==, exp_symlink_target);
|
g_assert_cmpstr (symlink_target, ==, exp_symlink_target);
|
||||||
|
|
||||||
|
|
||||||
success = nms_keyfile_loaded_uuid_read (dirname, filename, &full_filename, &uuid2, &loaded_path2, NULL);
|
success = nms_keyfile_nmmeta_read (dirname, filename, &full_filename, &uuid2, &loaded_path2, NULL);
|
||||||
g_assert_cmpint (!!exp_uuid, ==, success);
|
g_assert_cmpint (!!exp_uuid, ==, success);
|
||||||
if (success)
|
if (success)
|
||||||
g_assert_cmpstr (full_filename, ==, exp_full_filename);
|
g_assert_cmpstr (full_filename, ==, exp_full_filename);
|
||||||
@@ -2561,7 +2561,7 @@ _assert_keyfile_loaded_uuid (const char *dirname,
|
|||||||
g_assert_cmpstr (loaded_path2, ==, exp_loaded_path);
|
g_assert_cmpstr (loaded_path2, ==, exp_loaded_path);
|
||||||
|
|
||||||
|
|
||||||
success = nms_keyfile_loaded_uuid_read_from_file (exp_full_filename, &dirname3, &filename3, &uuid3, &loaded_path3);
|
success = nms_keyfile_nmmeta_read_from_file (exp_full_filename, &dirname3, &filename3, &uuid3, &loaded_path3);
|
||||||
g_assert_cmpint (!!exp_uuid, ==, success);
|
g_assert_cmpint (!!exp_uuid, ==, success);
|
||||||
if (success) {
|
if (success) {
|
||||||
g_assert_cmpstr (dirname3, ==, dirname);
|
g_assert_cmpstr (dirname3, ==, dirname);
|
||||||
@@ -2575,7 +2575,7 @@ _assert_keyfile_loaded_uuid (const char *dirname,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_loaded_uuid (void)
|
test_nmmeta (void)
|
||||||
{
|
{
|
||||||
const char *uuid = "3c03fd17-ddc3-4100-a954-88b6fafff959";
|
const char *uuid = "3c03fd17-ddc3-4100-a954-88b6fafff959";
|
||||||
gs_free char *filename = g_strdup_printf ("%s%s",
|
gs_free char *filename = g_strdup_printf ("%s%s",
|
||||||
@@ -2591,17 +2591,17 @@ test_loaded_uuid (void)
|
|||||||
TEST_SCRATCH_DIR,
|
TEST_SCRATCH_DIR,
|
||||||
filename2);
|
filename2);
|
||||||
|
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, NULL, FALSE, full_filename, NULL, NULL, NULL);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, NULL, FALSE, full_filename, NULL, NULL, NULL);
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, NULL, TRUE, full_filename, NULL, NULL, NULL);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, NULL, TRUE, full_filename, NULL, NULL, NULL);
|
||||||
|
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path0, FALSE, full_filename, uuid, loaded_path0, loaded_path0);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path0, FALSE, full_filename, uuid, loaded_path0, loaded_path0);
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path0, TRUE, full_filename, uuid, loaded_path0, loaded_path0);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path0, TRUE, full_filename, uuid, loaded_path0, loaded_path0);
|
||||||
|
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path1, FALSE, full_filename, uuid, loaded_path1, loaded_path1);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path1, FALSE, full_filename, uuid, loaded_path1, loaded_path1);
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path1, TRUE, full_filename, uuid, loaded_path1, loaded_path1);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path1, TRUE, full_filename, uuid, loaded_path1, loaded_path1);
|
||||||
|
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path2, FALSE, full_filename, uuid, loaded_path2, loaded_path2);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path2, FALSE, full_filename, uuid, loaded_path2, loaded_path2);
|
||||||
_assert_keyfile_loaded_uuid (TEST_SCRATCH_DIR, uuid, loaded_path2, TRUE, full_filename, uuid, filename2, loaded_path2);
|
_assert_keyfile_nmmeta (TEST_SCRATCH_DIR, uuid, loaded_path2, TRUE, full_filename, uuid, filename2, loaded_path2);
|
||||||
|
|
||||||
(void) unlink (full_filename);
|
(void) unlink (full_filename);
|
||||||
}
|
}
|
||||||
@@ -2695,7 +2695,7 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
g_test_add_func ("/keyfile/test_nm_keyfile_plugin_utils_escape_filename", test_nm_keyfile_plugin_utils_escape_filename);
|
g_test_add_func ("/keyfile/test_nm_keyfile_plugin_utils_escape_filename", test_nm_keyfile_plugin_utils_escape_filename);
|
||||||
|
|
||||||
g_test_add_func ("/keyfile/test_loaded_uuid", test_loaded_uuid);
|
g_test_add_func ("/keyfile/test_nmmeta", test_nmmeta);
|
||||||
|
|
||||||
return g_test_run ();
|
return g_test_run ();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user