diff options
author | Thomas Haller <thaller@redhat.com> | 2016-10-07 11:44:48 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-10-11 11:37:46 +0200 |
commit | 254f892c9c6c5b52c9cf5cd4784f8545c9f4c913 (patch) | |
tree | df7017188cfcfe50cfe8d552bb7469321e3ad370 | |
parent | d18e71f35a0a6f5112432869534ab16892109064 (diff) | |
download | NetworkManager-254f892c9c6c5b52c9cf5cd4784f8545c9f4c913.tar.gz |
ifcfg-rh: rename files
-rw-r--r-- | po/POTFILES.in | 2 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/Makefile.am | 22 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h (renamed from src/settings/plugins/ifcfg-rh/common.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c (renamed from src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c) | 14 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h (renamed from src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c (renamed from src/settings/plugins/ifcfg-rh/plugin.c) | 12 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h (renamed from src/settings/plugins/ifcfg-rh/plugin.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c (renamed from src/settings/plugins/ifcfg-rh/reader.c) | 6 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h (renamed from src/settings/plugins/ifcfg-rh/reader.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c (renamed from src/settings/plugins/ifcfg-rh/utils.c) | 4 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h (renamed from src/settings/plugins/ifcfg-rh/utils.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c (renamed from src/settings/plugins/ifcfg-rh/writer.c) | 8 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h (renamed from src/settings/plugins/ifcfg-rh/writer.h) | 0 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/tests/Makefile.am | 8 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c | 4 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 8 |
16 files changed, 44 insertions, 44 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index e51cfc5a56..9606e77b41 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -173,4 +173,4 @@ src/nm-iface-helper.c src/nm-logging.c src/nm-manager.c src/settings/plugins/ibft/nms-ibft-plugin.c -src/settings/plugins/ifcfg-rh/reader.c +src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index 2792d68c62..ec8114ac13 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -31,13 +31,13 @@ noinst_LTLIBRARIES += libifcfg-rh-io.la libifcfg_rh_io_la_SOURCES = \ shvar.c \ shvar.h \ - reader.c \ - reader.h \ - writer.c \ - writer.h \ - common.h \ - utils.c \ - utils.h + nms-ifcfg-rh-reader.c \ + nms-ifcfg-rh-reader.h \ + nms-ifcfg-rh-writer.c \ + nms-ifcfg-rh-writer.h \ + nms-ifcfg-rh-common.h \ + nms-ifcfg-rh-utils.c \ + nms-ifcfg-rh-utils.h AM_CPPFLAGS = \ -I$(top_srcdir)/src/ \ @@ -55,10 +55,10 @@ AM_CPPFLAGS = \ -DSBINDIR=\"$(sbindir)\" libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ - plugin.c \ - plugin.h \ - nm-ifcfg-connection.c \ - nm-ifcfg-connection.h + nms-ifcfg-rh-plugin.c \ + nms-ifcfg-rh-plugin.h \ + nms-ifcfg-rh-connection.c \ + nms-ifcfg-rh-connection.h libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version libnm_settings_plugin_ifcfg_rh_la_LIBADD = libifcfg-rh-io.la libnmdbus-ifcfg-rh.la diff --git a/src/settings/plugins/ifcfg-rh/common.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h index d850ac4e75..d850ac4e75 100644 --- a/src/settings/plugins/ifcfg-rh/common.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c index 09c585a9da..e4afbc2dab 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c @@ -20,7 +20,7 @@ #include "nm-default.h" -#include "nm-ifcfg-connection.h" +#include "nms-ifcfg-rh-connection.h" #include <string.h> #include <sys/inotify.h> @@ -36,13 +36,13 @@ #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" #include "nm-platform.h" - -#include "common.h" -#include "nm-config.h" -#include "reader.h" -#include "writer.h" #include "nm-inotify-helper.h" -#include "utils.h" +#include "nm-config.h" + +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-reader.h" +#include "nms-ifcfg-rh-writer.h" +#include "nms-ifcfg-rh-utils.h" /*****************************************************************************/ diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h index c706d2a20a..c706d2a20a 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 77bd32499f..7532da75e6 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -23,7 +23,7 @@ #include "nm-default.h" -#include "plugin.h" +#include "nms-ifcfg-rh-plugin.h" #include <string.h> #include <unistd.h> @@ -39,12 +39,12 @@ #include "NetworkManagerUtils.h" #include "nm-exported-object.h" -#include "nm-ifcfg-connection.h" +#include "nms-ifcfg-rh-connection.h" +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-reader.h" +#include "nms-ifcfg-rh-writer.h" +#include "nms-ifcfg-rh-utils.h" #include "shvar.h" -#include "common.h" -#include "reader.h" -#include "writer.h" -#include "utils.h" #include "nmdbus-ifcfg-rh.h" diff --git a/src/settings/plugins/ifcfg-rh/plugin.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h index d815cc5160..d815cc5160 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index c46a454633..3f4556179f 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -20,7 +20,7 @@ #include "nm-default.h" -#include "reader.h" +#include "nms-ifcfg-rh-reader.h" #include <stdlib.h> #include <string.h> @@ -56,9 +56,9 @@ #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "common.h" +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-utils.h" #include "shvar.h" -#include "utils.h" /*****************************************************************************/ diff --git a/src/settings/plugins/ifcfg-rh/reader.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h index 35464474f2..35464474f2 100644 --- a/src/settings/plugins/ifcfg-rh/reader.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index b9d52b7f4c..9cb44b19c6 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -20,7 +20,7 @@ #include "nm-default.h" -#include "utils.h" +#include "nms-ifcfg-rh-utils.h" #include <stdlib.h> #include <string.h> @@ -28,7 +28,7 @@ #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "common.h" +#include "nms-ifcfg-rh-common.h" /* * utils_single_quote_string diff --git a/src/settings/plugins/ifcfg-rh/utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index c105487ac5..c105487ac5 100644 --- a/src/settings/plugins/ifcfg-rh/utils.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 8dc4cbe2af..590ab03308 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -20,7 +20,7 @@ #include "nm-default.h" -#include "writer.h" +#include "nms-ifcfg-rh-writer.h" #include <string.h> #include <sys/types.h> @@ -47,10 +47,10 @@ #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "common.h" +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-reader.h" +#include "nms-ifcfg-rh-utils.h" #include "shvar.h" -#include "reader.h" -#include "utils.h" /*****************************************************************************/ diff --git a/src/settings/plugins/ifcfg-rh/writer.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h index 97a9f25252..97a9f25252 100644 --- a/src/settings/plugins/ifcfg-rh/writer.h +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index 134191c5d4..434c56ce98 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -32,17 +32,17 @@ noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils test_ifcfg_rh_SOURCES = \ test-ifcfg-rh.c \ - ../reader.c \ + ../nms-ifcfg-rh-reader.c \ ../shvar.c \ - ../utils.c \ - ../writer.c + ../nms-ifcfg-rh-utils.c \ + ../nms-ifcfg-rh-writer.c test_ifcfg_rh_LDADD = \ $(top_builddir)/src/libNetworkManager.la test_ifcfg_rh_utils_SOURCES = \ test-ifcfg-rh-utils.c \ - ../utils.c \ + ../nms-ifcfg-rh-utils.c \ ../shvar.c test_ifcfg_rh_utils_LDADD = \ diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c index d2a348bb8b..65a75f0b85 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c @@ -25,8 +25,8 @@ #include <unistd.h> #include <string.h> -#include "common.h" -#include "utils.h" +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-utils.h" #include "nm-test-utils-core.h" 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 b71f732d15..2869f48387 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -50,10 +50,10 @@ #include "NetworkManagerUtils.h" -#include "common.h" -#include "reader.h" -#include "writer.h" -#include "utils.h" +#include "nms-ifcfg-rh-common.h" +#include "nms-ifcfg-rh-reader.h" +#include "nms-ifcfg-rh-writer.h" +#include "nms-ifcfg-rh-utils.h" #include "nm-test-utils-core.h" |