diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | src/network/networkd-address.c | 2 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 2 | ||||
| -rw-r--r-- | src/shared/firewall-util.c (renamed from src/shared/fw-util.c) | 2 | ||||
| -rw-r--r-- | src/shared/firewall-util.h (renamed from src/shared/fw-util.h) | 0 | ||||
| -rw-r--r-- | src/test/test-firewall-util.c (renamed from src/test/test-fw-util.c) | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 9d93347d6b..1e704a872b 100644 --- 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 a0327fdf54..e32a469300 100644 --- 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 944da3f5b8..172ca43a7d 100644 --- 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 2fc5f2f595..c87956bb01 100644 --- 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 index 6b3599d90d..effc6e8e70 100644 --- 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 index 93152e3978..93152e3978 100644 --- a/src/shared/fw-util.h +++ b/src/shared/firewall-util.h diff --git a/src/test/test-fw-util.c b/src/test/test-firewall-util.c index ab891aa0c4..d636e427c4 100644 --- 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))} |