Re: [libvirt] [PATCH 09/33] Santize naming of socket address APIs

From: "Daniel P. Berrange"<berrange(a)redhat.com> The socket address APIs in src/util/network.h either take the form virSocketAddrXXX, virSocketXXX or virSocketXXXAddr. Sanitize this so everything is virSocketAddrXXXX, and ensure that the virSocketAddr parameter is always the first one. * src/util/network.c, src/util/network.h: Santize socket address API naming * src/conf/domain_conf.c, src/conf/network_conf.c, src/conf/nwfilter_conf.c, src/network/bridge_driver.c, src/nwfilter/nwfilter_ebiptables_driver.c, src/nwfilter/nwfilter_learnipaddr.c, src/qemu/qemu_command.c, src/rpc/virnetsocket.c, src/util/dnsmasq.c, src/util/iptables.c, src/util/virnetdev.c, src/vbox/vbox_tmpl.c: Update for API renaming --- src/conf/domain_conf.c | 12 ++-- src/conf/network_conf.c | 66 ++++++++++---------- src/conf/nwfilter_conf.c | 16 ++--- src/libvirt_private.syms | 18 +++--- src/network/bridge_driver.c | 42 +++++++------- src/nwfilter/nwfilter_ebiptables_driver.c | 4 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_command.c | 4 +- src/rpc/virnetsocket.c | 6 +- src/util/dnsmasq.c | 4 +- src/util/iptables.c | 20 +++--- src/util/network.c | 93 ++++++++++++++--------------- src/util/network.h | 46 +++++++------- src/util/virnetdev.c | 8 +- src/vbox/vbox_tmpl.c | 10 ++-- tests/sockettest.c | 20 +++--- tests/virnetsockettest.c | 1 + tests/virnettlscontexttest.c | 6 +- 18 files changed, 188 insertions(+), 190 deletions(-)

diff --git a/tests/sockettest.c b/tests/sockettest.c index b9e37ab..bcc2800 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -25,7 +25,7 @@ #include<stdlib.h> #include<string.h>

-#include "network.h" +#include "virsocketaddr.h" #include "testutils.h" #include "logging.h" #include "memory.h"

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index ece611a..51f75b4 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -33,7 +33,7 @@ #include "logging.h" #include "virfile.h" #include "command.h"

-#include "network.h" +#include "virsocketaddr.h" #include "gnutls_1_0_compat.h"