File c9ebdf9b-rename-virNetDevClearIPv4Address.patch of Package libvirt.11695

From c9ebdf9b7f8a1224cf15562959ebeb233fb33c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 6 Aug 2014 14:18:31 +0200
Subject: [PATCH 06/17] Renamed virNetDevClearIPv4Address to
 virNetDevClearIPAddress

Make clear that virNetDevClearIPv4Address can also handle IPv6
addresses by changing the name
---
 src/libvirt_private.syms |  2 +-
 src/util/virnetdev.c     | 14 +++++++-------
 src/util/virnetdev.h     |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: libvirt-1.2.5/src/libvirt_private.syms
===================================================================
--- libvirt-1.2.5.orig/src/libvirt_private.syms
+++ libvirt-1.2.5/src/libvirt_private.syms
@@ -1537,7 +1537,7 @@ virMacAddrSetRaw;
 
 # util/virnetdev.h
 virNetDevAddRoute;
-virNetDevClearIPv4Address;
+virNetDevClearIPAddress;
 virNetDevExists;
 virNetDevGetIndex;
 virNetDevGetIPv4Address;
Index: libvirt-1.2.5/src/util/virnetdev.c
===================================================================
--- libvirt-1.2.5.orig/src/util/virnetdev.c
+++ libvirt-1.2.5/src/util/virnetdev.c
@@ -1016,7 +1016,7 @@ virNetDevAddRoute(const char *ifname,
 }
 
 /**
- * virNetDevClearIPv4Address:
+ * virNetDevClearIPAddress:
  * @ifname: the interface name
  * @addr: the IP address (IPv4 or IPv6)
  * @prefix: number of 1 bits in the netmask
@@ -1025,9 +1025,9 @@ virNetDevAddRoute(const char *ifname,
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
 {
     int ret = -1;
     struct nl_msg *nlmsg = NULL;
@@ -1139,9 +1139,9 @@ virNetDevAddRoute(const char *ifname,
     return ret;
 }
 
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
 {
     virCommandPtr cmd = NULL;
     char *addrstr;
Index: libvirt-1.2.5/src/util/virnetdev.h
===================================================================
--- libvirt-1.2.5.orig/src/util/virnetdev.h
+++ libvirt-1.2.5/src/util/virnetdev.h
@@ -61,9 +61,9 @@ int virNetDevAddRoute(const char *ifname
                       unsigned int metric)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_RETURN_CHECK;
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 int virNetDevGetIPv4Address(const char *ifname, virSocketAddrPtr addr)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;