From 47cdbac47d78fa0663bc0d648301dea14ba1fb5a Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 12 Dec 2012 17:42:44 +0000
Subject: [PATCH] Rename iptables.{c,h} to viriptables.{c,h}

---
 po/POTFILES.in                         | 2 +-
 src/Makefile.am                        | 2 +-
 src/network/bridge_driver.c            | 2 +-
 src/util/{iptables.c => viriptables.c} | 4 +++-
 src/util/{iptables.h => viriptables.h} | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename src/util/{iptables.c => viriptables.c} (99%)
 rename src/util/{iptables.h => viriptables.h} (99%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc595b1779..7d16d444e8 100644
--- 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 322998705e..d8f20f0042 100644
--- 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 7bb6b2a983..fdac712055 100644
--- 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 25253ff2e2..941dd46891 100644
--- 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 e54f8b1a43..d7fa7311aa 100644
--- 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
-- 
GitLab