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.
This commit is contained in:
Daniel Mack 2015-06-15 13:50:43 +02:00
parent f430b07b72
commit 12c2884c55
7 changed files with 12 additions and 12 deletions

2
.gitignore vendored
View file

@ -193,7 +193,7 @@
/test-fdset
/test-fileio
/test-fstab-util
/test-fw-util
/test-firewall-util
/test-hashmap
/test-hostname
/test-icmp6-rs

View file

@ -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)

View file

@ -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"

View file

@ -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"

View file

@ -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);

View file

@ -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))}