summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-09-13 18:41:26 +0200
committerThomas Haller <thaller@redhat.com>2017-09-18 20:14:09 +0200
commitb1029c6198ae809bbdab23f36dbe2873ee313330 (patch)
tree7b509067abe14c5ffaf536aa0cc63d6232f745f7
parentdaa4604c124f946b52d1f442bad3d231e46a7bba (diff)
downloadNetworkManager-b1029c6198ae809bbdab23f36dbe2873ee313330.tar.gz
ifcfg-rh/trivial: rename function that are only for testing
We have similar functions, like _nmtst_ip4_config_del_route(). Rename testing functions to have "_nmtst_" prefix for consistency.
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.c4
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.h4
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index 0206f35861..d939d0ee6b 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -645,7 +645,7 @@ svFileGetName (const shvarFile *s)
}
void
-svFileSetName_test_only (shvarFile *s, const char *fileName)
+_nmtst_svFileSetName (shvarFile *s, const char *fileName)
{
/* changing the file name is not supported for regular
* operation. Only allowed to use in tests, othewise,
@@ -655,7 +655,7 @@ svFileSetName_test_only (shvarFile *s, const char *fileName)
}
void
-svFileSetModified_test_only (shvarFile *s)
+_nmtst_svFileSetModified (shvarFile *s)
{
/* marking a file as modified is only for testing. */
s->modified = TRUE;
diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
index 34f952e4ef..8fbc14808e 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.h
+++ b/src/settings/plugins/ifcfg-rh/shvar.h
@@ -35,8 +35,8 @@ typedef struct _shvarFile shvarFile;
const char *svFileGetName (const shvarFile *s);
-void svFileSetName_test_only (shvarFile *s, const char *fileName);
-void svFileSetModified_test_only (shvarFile *s);
+void _nmtst_svFileSetName (shvarFile *s, const char *fileName);
+void _nmtst_svFileSetModified (shvarFile *s);
/* Create the file <name>, return a shvarFile (never fails) */
shvarFile *svCreateFile (const char *name);
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 1a70af5cec..3d3b672c6a 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -9156,8 +9156,8 @@ test_write_unknown (gconstpointer test_data)
sv = _svOpenFile (testfile);
- svFileSetName_test_only (sv, filename_tmp_1);
- svFileSetModified_test_only (sv);
+ _nmtst_svFileSetName (sv, filename_tmp_1);
+ _nmtst_svFileSetModified (sv);
if (g_str_has_suffix (testfile, "ifcfg-test-write-unknown-4")) {
_svGetValue_check (sv, "NAME", "l4x");