Rename iface(G|S)etMacaddr to iface(G|S)etMacAddress for consistency

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index da7e1862cca14382ad205991c2852cade30177f6..afe9835ca636191554971e885adddda97610fbd4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -499,7 +499,7 @@ ifaceCheck;
 ifaceCtrl;
 ifaceGetFlags;
 ifaceGetIndex;
-ifaceGetMacaddr;
+ifaceGetMacAddress;
 ifaceGetNthParent;
 ifaceGetVlanID;
 ifaceIsUp;
@@ -508,7 +508,7 @@ ifaceMacvtapLinkAdd;
 ifaceMacvtapLinkDump;
 ifaceReplaceMacAddress;
 ifaceRestoreMacAddress;
-ifaceSetMacaddr;
+ifaceSetMacAddress;
 
 
 # interface_conf.h

diff --git a/src/util/interface.c b/src/util/interface.c
index a5ab271994af1ba8c118b6a40f64308f675136ad..d51ceec3930c696ce02aeb9ad39632428d1a4db8 100644 (file)
--- a/src/util/interface.c
+++ b/src/util/interface.c
@@ -397,7 +397,7 @@ ifaceGetVlanID(const char *vlanifname ATTRIBUTE_UNUSED,
 #endif /* __linux__ */
 
 /**
- * ifaceGetMacaddr:
+ * ifaceGetMacAddress:
  * @ifname: interface name to set MTU for
  * @macaddr: MAC address (VIR_MAC_BUFLEN in size)
  *
@@ -407,8 +407,8 @@ ifaceGetVlanID(const char *vlanifname ATTRIBUTE_UNUSED,
  */
 #ifdef __linux__
 int
-ifaceGetMacaddr(const char *ifname,
-                unsigned char *macaddr)
+ifaceGetMacAddress(const char *ifname,
+                   unsigned char *macaddr)
 {
     struct ifreq ifr;
     int fd;
@@ -435,8 +435,8 @@ ifaceGetMacaddr(const char *ifname,
 #else
 
 int
-ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED,
-                unsigned char *macaddr ATTRIBUTE_UNUSED)
+ifaceGetMacAddress(const char *ifname ATTRIBUTE_UNUSED,
+                   unsigned char *macaddr ATTRIBUTE_UNUSED)
 {
     return ENOSYS;
 }
@@ -444,7 +444,7 @@ ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED,
 #endif /* __linux__ */
 
 /**
- * ifaceSetMacaddr:
+ * ifaceSetMacAddress:
  * @ifname: interface name to set MTU for
  * @macaddr: MAC address (VIR_MAC_BUFLEN in size)
  *
@@ -455,8 +455,8 @@ ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED,
  */
 #ifdef __linux__
 int
-ifaceSetMacaddr(const char *ifname,
-                const unsigned char *macaddr)
+ifaceSetMacAddress(const char *ifname,
+                   const unsigned char *macaddr)
 {
     struct ifreq ifr;
     int fd;
@@ -484,8 +484,8 @@ ifaceSetMacaddr(const char *ifname,
 #else
 
 int
-ifaceSetMacaddr(const char *ifname ATTRIBUTE_UNUSED,
-                const unsigned char *macaddr ATTRIBUTE_UNUSED)
+ifaceSetMacAddress(const char *ifname ATTRIBUTE_UNUSED,
+                   const unsigned char *macaddr ATTRIBUTE_UNUSED)
 {
     return ENOSYS;
 }
@@ -1027,7 +1027,7 @@ ifaceReplaceMacAddress(const unsigned char *macaddress,
     unsigned char oldmac[6];
     int rc;
 
-    rc = ifaceGetMacaddr(linkdev, oldmac);
+    rc = ifaceGetMacAddress(linkdev, oldmac);
 
     if (rc) {
         virReportSystemError(rc,
@@ -1054,7 +1054,7 @@ ifaceReplaceMacAddress(const unsigned char *macaddress,
         }
     }
 
-    rc = ifaceSetMacaddr(linkdev, macaddress);
+    rc = ifaceSetMacAddress(linkdev, macaddress);
     if (rc) {
         virReportSystemError(rc,
                              _("Setting MAC address on  '%s' to "
@@ -1104,7 +1104,7 @@ ifaceRestoreMacAddress(const char *linkdev,
     }
 
     /*reset mac and remove file-ignore results*/
-    rc = ifaceSetMacaddr(linkdev, oldmac);
+    rc = ifaceSetMacAddress(linkdev, oldmac);
     if (rc) {
         virReportSystemError(rc,
                              _("Setting MAC address on  '%s' to "

diff --git a/src/util/interface.h b/src/util/interface.h
index 663fabb669d00c913f13fb171a522c4f7b791ce0..5cbf5c182b0d1339916c13563564ad788445d3c4 100644 (file)
--- a/src/util/interface.h
+++ b/src/util/interface.h
@@ -45,9 +45,9 @@ int ifaceGetIndex(bool reportError, const char *ifname, int *ifindex);
 
 int ifaceGetVlanID(const char *vlanifname, int *vlanid);
 
-int ifaceSetMacaddr(const char *ifname, const unsigned char *macaddr);
+int ifaceSetMacAddress(const char *ifname, const unsigned char *macaddr);
 
-int ifaceGetMacaddr(const char *ifname, unsigned char *macaddr);
+int ifaceGetMacAddress(const char *ifname, unsigned char *macaddr);
 
 int ifaceMacvtapLinkAdd(const char *type,
                         const unsigned char *macaddress, int macaddrsize,