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

[Daniel P. Berrange]

On Tue, Nov 08, 2011 at 08:50:41PM -0500, Laine Stump wrote:
> 
> "make check" fails to build after applying this patch:
> 
>   CC     sockettest.o
> sockettest.c:28:27: fatal error: virsocketaddr.h: No such file or directory
> compilation terminated.


> >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>
> >
> 
> Here's the problem. util/network.[ch] split into multiple files in
> patch 13/33, but you've accidentally changed the name of the
> #include here in 09/33:
> 
> 
> >-#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"
> 
> Same problem here:
> 
> >-#include "network.h"
> >+#include "virsocketaddr.h"
> >  #include "gnutls_1_0_compat.h"
> >
> >
> 
> ACK with those two #include lines changed back to network.h

Yes, I squashed a later patch into this one and squashed too much !


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|