External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthias Bolte 2011-06-24 22:39:15 +02:00
parent a800d66b72
commit d95f673ad2
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libvirt_private.syms
View File

@ -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

26
src/util/interface.c
View File

@ -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 "

4
src/util/interface.h
View File

@ -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,