From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 8 Apr 2016 09:07:16 +0000 (+0200)
Subject: netdev: Use the correct pointer type for virSocketAddrFormat()
X-Git-Tag: v1.3.4-rc1~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4572997aca7c5467bcee8afc5b945352ce56a66f;p=thirdparty%2Flibvirt.git

netdev: Use the correct pointer type for virSocketAddrFormat()

virSocketAddrFormat() wants a single pointer, not a double pointer.

Fixes the following compilation error on FreeBSD:

  util/virnetdev.c:1448:72: error: incompatible pointer types passing
   'virSocketAddr **' to parameter of type 'const virSocketAddr *';
   remove & [-Werror,-Wincompatible-pointer-types]
      if (VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(&peer)))
                                                                         ^~~~~
  ./util/virsocketaddr.h:92:48: note: passing argument to parameter 'addr' here
  char *virSocketAddrFormat(const virSocketAddr *addr);
                                                 ^
---

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 6e32ebbf6c..712c3bcc32 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -1445,7 +1445,7 @@ int virNetDevSetIPAddress(const char *ifname,
     if (!(addrstr = virSocketAddrFormat(addr)))
         goto cleanup;
 
-    if (VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(&peer)))
+    if (VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(peer)))
         goto cleanup;
 
     /* format up a broadcast address if this is IPv4 */