Rename iptables.{c,h} to viriptables.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc595b177911a8e048e2439bbb42b3a97339e485..7d16d444e8ba35c54926d4ab3987f9fb2fb08720 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/iptables.c
 src/util/json.c
 src/util/pci.c
 src/util/processinfo.c
@@ -161,6 +160,7 @@ src/util/virfile.c
 src/util/virhash.c
 src/util/virhook.c
 src/util/virinitctl.c
+src/util/viriptables.c
 src/util/virkeyfile.c
 src/util/virlockspace.c
 src/util/virnetdev.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 322998705e93ce3223708722c7470c51cbec9351..d8f20f0042ac975c0749f256024fa1ca0c2d9fe0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =                                                 \
-               util/iptables.c util/iptables.h                 \
                util/json.c util/json.h                         \
                util/logging.c util/logging.h                   \
                util/memory.c util/memory.h                     \
@@ -85,6 +84,7 @@ UTIL_SOURCES =                                                        \
                util/virfile.c util/virfile.h                   \
                util/virhook.c util/virhook.h                   \
                util/virnodesuspend.c util/virnodesuspend.h     \
+               util/viriptables.c util/viriptables.h           \
                util/virobject.c util/virobject.h               \
                util/virpidfile.c util/virpidfile.h             \
                util/virprocess.c util/virprocess.h             \

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 7bb6b2a98388842028749c2dbf15e0b60ada8638..fdac7120550bc409a3bf1a5746163a81ecd2756b 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -56,7 +56,7 @@
 #include "vircommand.h"
 #include "memory.h"
 #include "uuid.h"
-#include "iptables.h"
+#include "viriptables.h"
 #include "logging.h"
 #include "virdnsmasq.h"
 #include "configmake.h"

diff --git a/src/util/iptables.c b/src/util/viriptables.c
similarity index 99%
rename from src/util/iptables.c
rename to src/util/viriptables.c
index 25253ff2e2fe2c540c42f02df77ed48d485df871..941dd46891dccc874a3a4da48868a7c8c11ed753 100644 (file)
--- a/src/util/iptables.c
+++ b/src/util/viriptables.c
@@ -1,4 +1,6 @@
 /*
+ * viriptables.c: helper APIs for managing iptables
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -38,7 +40,7 @@
 #endif
 
 #include "internal.h"
-#include "iptables.h"
+#include "viriptables.h"
 #include "vircommand.h"
 #include "memory.h"
 #include "virterror_internal.h"

diff --git a/src/util/iptables.h b/src/util/viriptables.h
similarity index 99%
rename from src/util/iptables.h
rename to src/util/viriptables.h
index e54f8b1a43996b517cb34a306eacda0342861277..d7fa7311aaac8ef9e6dbd2228bf2e7310c07b5d6 100644 (file)
--- a/src/util/iptables.h
+++ b/src/util/viriptables.h
@@ -1,4 +1,6 @@
 /*
+ * viriptables.h: helper APIs for managing iptables
+ *
  * Copyright (C) 2007, 2008 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or