From 4af71715be47d4a4c8b7c61c29baafe82630e0b0 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 12 Dec 2012 16:43:54 +0000 Subject: [PATCH] Rename dnsmasq.{c,h} to virdnsmasq.{c,h} --- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/network/bridge_driver.c | 2 +- src/network/bridge_driver.h | 2 +- src/util/{dnsmasq.c => virdnsmasq.c} | 4 +++- src/util/{dnsmasq.h => virdnsmasq.h} | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) rename src/util/{dnsmasq.c => virdnsmasq.c} (99%) rename src/util/{dnsmasq.h => virdnsmasq.h} (98%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 6dcda84b29..6081c261bf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -138,7 +138,6 @@ src/storage/storage_driver.c src/test/test_driver.c src/uml/uml_conf.c src/uml/uml_driver.c -src/util/dnsmasq.c src/util/event_poll.c src/util/hooks.c src/util/hostusb.c @@ -159,6 +158,7 @@ src/util/vircgroup.c src/util/vircommand.c src/util/virconf.c src/util/virdbus.c +src/util/virdnsmasq.c src/util/virfile.c src/util/virhash.c src/util/virinitctl.c diff --git a/src/Makefile.am b/src/Makefile.am index c27388301f..efb23c1fc8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,7 +58,6 @@ UTIL_SOURCES = \ util/hooks.c util/hooks.h \ util/iptables.c util/iptables.h \ util/ebtables.c util/ebtables.h \ - util/dnsmasq.c util/dnsmasq.h \ util/json.c util/json.h \ util/logging.c util/logging.h \ util/memory.c util/memory.h \ @@ -84,6 +83,7 @@ UTIL_SOURCES = \ util/virbuffer.c util/virbuffer.h \ util/vircommand.c util/vircommand.h \ util/virconf.c util/virconf.h \ + util/virdnsmasq.c util/virdnsmasq.h \ util/virfile.c util/virfile.h \ util/virnodesuspend.c util/virnodesuspend.h \ util/virobject.c util/virobject.h \ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 84098de2b7..7bb6b2a983 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -58,7 +58,7 @@ #include "uuid.h" #include "iptables.h" #include "logging.h" -#include "dnsmasq.h" +#include "virdnsmasq.h" #include "configmake.h" #include "virnetdev.h" #include "pci.h" diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index fea27e0cc5..4bf64eafb1 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -31,7 +31,7 @@ # include "network_conf.h" # include "domain_conf.h" # include "vircommand.h" -# include "dnsmasq.h" +# include "virdnsmasq.h" int networkRegister(void); diff --git a/src/util/dnsmasq.c b/src/util/virdnsmasq.c similarity index 99% rename from src/util/dnsmasq.c rename to src/util/virdnsmasq.c index 18be2ffb6d..1c930602df 100644 --- a/src/util/dnsmasq.c +++ b/src/util/virdnsmasq.c @@ -1,4 +1,6 @@ /* + * virdnsmasq.c: Helper APIs for managing dnsmasq + * * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH * @@ -40,7 +42,7 @@ #include "internal.h" #include "datatypes.h" #include "virbitmap.h" -#include "dnsmasq.h" +#include "virdnsmasq.h" #include "util.h" #include "vircommand.h" #include "memory.h" diff --git a/src/util/dnsmasq.h b/src/util/virdnsmasq.h similarity index 98% rename from src/util/dnsmasq.h rename to src/util/virdnsmasq.h index b83bc96c9e..a97d3e6019 100644 --- a/src/util/dnsmasq.h +++ b/src/util/virdnsmasq.h @@ -1,4 +1,6 @@ /* + * virdnsmasq.h: Helper APIs for managing dnsmasq + * * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH *