firewall: rename fw-util.[ch] → firewall-util.[ch]

The names fw-util.[ch] are too ambiguous, better rename the files to
firewall-util.[ch]. Also rename the test accordingly.

diff --git a/.gitignore b/.gitignore
index 9d93347d6b8e6ac30bb8d7046473393a5ffdb4ad..1e704a872bbc75faf3e1d7bbbe6cd3444c736721 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -193,7 +193,7 @@
 /test-fdset
 /test-fileio
 /test-fstab-util
-/test-fw-util
+/test-firewall-util
 /test-hashmap
 /test-hostname
 /test-icmp6-rs

diff --git a/Makefile.am b/Makefile.am
index a0327fdf54d2416c2e12021e3d3422e273699748..e32a469300c5bad6f3afe0e4bab0b3e4c18348c5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1032,8 +1032,8 @@ noinst_LTLIBRARIES += \
        libfirewall.la
 
 libfirewall_la_SOURCES = \
-       src/shared/fw-util.h \
-       src/shared/fw-util.c
+       src/shared/firewall-util.h \
+       src/shared/firewall-util.c
 
 libfirewall_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1358,7 +1358,7 @@ manual_tests += \
 
 if HAVE_LIBIPTC
 manual_tests += \
-       test-fw-util
+       test-firewall-util
 endif
 
 if HAVE_KMOD
@@ -1846,14 +1846,14 @@ test_btrfs_LDADD = \
        libshared.la
 
 if HAVE_LIBIPTC
-test_fw_util_SOURCES = \
-       src/test/test-fw-util.c
+test_firewall_util_SOURCES = \
+       src/test/test-firewall-util.c
 
-test_fw_util_CFLAGS = \
+test_firewall_util_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBIPTC_CFLAGS)
 
-test_fw_util_LDADD = \
+test_firewall_util_LDADD = \
        libfirewall.la \
        libshared.la \
        $(LIBIPTC_LIBS)

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 944da3f5b8490fd821bff806786fd3bbeb677ebe..172ca43a7db54a0ad0ea64833a49ca19addb4bf4 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -24,7 +24,7 @@
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"
-#include "fw-util.h"
+#include "firewall-util.h"
 #include "networkd.h"
 #include "networkd-link.h"
 

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2fc5f2f595373b7924cc516bbaf582dca060bf6e..c87956bb0163986c1b0331c93e082bbd34e93cf1 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -90,7 +90,7 @@
 #include "machine-image.h"
 #include "list.h"
 #include "in-addr-util.h"
-#include "fw-util.h"
+#include "firewall-util.h"
 #include "local-addresses.h"
 #include "formats-util.h"
 #include "process-util.h"

diff --git a/src/shared/fw-util.c b/src/shared/firewall-util.c
similarity index 99%
rename from src/shared/fw-util.c
rename to src/shared/firewall-util.c
index 6b3599d90d56edec4bf5eb9cdfbbc314f22dc9fe..effc6e8e703b2451a1937a89eaf48cd39a647056 100644 (file)
--- a/src/shared/fw-util.c
+++ b/src/shared/firewall-util.c
@@ -28,7 +28,7 @@
 #include <libiptc/libiptc.h>
 
 #include "util.h"
-#include "fw-util.h"
+#include "firewall-util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 

diff --git a/src/shared/fw-util.h b/src/shared/firewall-util.h
similarity index 100%
rename from src/shared/fw-util.h
rename to src/shared/firewall-util.h

diff --git a/src/test/test-fw-util.c b/src/test/test-firewall-util.c
similarity index 98%
rename from src/test/test-fw-util.c
rename to src/test/test-firewall-util.c
index ab891aa0c448918efcff5c684f55b0a6575bce7e..d636e427c4d381423131417875d3e5ad4e9f32fa 100644 (file)
--- a/src/test/test-fw-util.c
+++ b/src/test/test-firewall-util.c
@@ -20,7 +20,7 @@
 ***/
 
 #include "log.h"
-#include "fw-util.h"
+#include "firewall-util.h"
 
 #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))}