External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change 'interface' to 'iface' in virNetworkDHCPLease

Browse Source 
Variables/fields named 'interface' clash with system
header symbols on some platforms.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-06-24 13:23:59 +01:00
parent 1a065caa79
commit 6512c8b456
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/remote.c
View File

@ -6223,7 +6223,7 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea
lease_dst->type = lease_src->type; lease_dst->type = lease_src->type;
lease_dst->prefix = lease_src->prefix; lease_dst->prefix = lease_src->prefix;
if (VIR_STRDUP(lease_dst->interface, lease_src->interface) < 0 || if (VIR_STRDUP(lease_dst->iface, lease_src->iface) < 0 ||
VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0 || VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0 ||
VIR_STRDUP(*mac_tmp, lease_src->mac) < 0 || VIR_STRDUP(*mac_tmp, lease_src->mac) < 0 ||
VIR_STRDUP(*iaid_tmp, lease_src->iaid) < 0 || VIR_STRDUP(*iaid_tmp, lease_src->iaid) < 0 ||
@ -6248,7 +6248,7 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea
VIR_FREE(hostname_tmp); VIR_FREE(hostname_tmp);
VIR_FREE(clientid_tmp); VIR_FREE(clientid_tmp);
VIR_FREE(lease_dst->ipaddr); VIR_FREE(lease_dst->ipaddr);
VIR_FREE(lease_dst->interface); VIR_FREE(lease_dst->iface);
return -1; return -1;
} }

2
include/libvirt/libvirt.h.in
View File

@ -5174,7 +5174,7 @@ typedef enum {
typedef struct _virNetworkDHCPLease virNetworkDHCPLease; typedef struct _virNetworkDHCPLease virNetworkDHCPLease;
typedef virNetworkDHCPLease *virNetworkDHCPLeasePtr; typedef virNetworkDHCPLease *virNetworkDHCPLeasePtr;
struct _virNetworkDHCPLease { struct _virNetworkDHCPLease {
char *interface; /* Network interface name */ char *iface; /* Network interface name */
long long expirytime; /* Seconds since epoch */ long long expirytime; /* Seconds since epoch */
int type; /* virIPAddrType */ int type; /* virIPAddrType */
char *mac; /* MAC address */ char *mac; /* MAC address */

2
src/libvirt.c
View File

@ -21176,7 +21176,7 @@ virNetworkDHCPLeaseFree(virNetworkDHCPLeasePtr lease)
{ {
if (!lease) if (!lease)
return; return;
VIR_FREE(lease->interface); VIR_FREE(lease->iface);
VIR_FREE(lease->mac); VIR_FREE(lease->mac);
VIR_FREE(lease->iaid); VIR_FREE(lease->iaid);
VIR_FREE(lease->ipaddr); VIR_FREE(lease->ipaddr);

2
src/network/bridge_driver.c
View File

@ -3490,7 +3490,7 @@ networkGetDHCPLeasesHelper(virNetworkObjPtr obj,
if ((VIR_STRDUP(lease->mac, mac_tmp) < 0) || if ((VIR_STRDUP(lease->mac, mac_tmp) < 0) ||
(VIR_STRDUP(lease->ipaddr, ip_tmp) < 0) || (VIR_STRDUP(lease->ipaddr, ip_tmp) < 0) ||
(VIR_STRDUP(lease->interface, obj->def->bridge) < 0)) (VIR_STRDUP(lease->iface, obj->def->bridge) < 0))
goto error; goto error;
/* Fields that can be NULL */ /* Fields that can be NULL */

2
src/remote/remote_driver.c
View File

@ -7557,7 +7557,7 @@ remoteSerializeDHCPLease(virNetworkDHCPLeasePtr lease_dst, remote_network_dhcp_l
lease_dst->type = lease_src->type; lease_dst->type = lease_src->type;
lease_dst->prefix = lease_src->prefix; lease_dst->prefix = lease_src->prefix;
if (VIR_STRDUP(lease_dst->interface, lease_src->interface) < 0) if (VIR_STRDUP(lease_dst->iface, lease_src->iface) < 0)
goto error; goto error;
if (VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0) if (VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0)

2
src/remote/remote_protocol.x
View File

@ -3022,7 +3022,7 @@ struct remote_node_get_free_pages_ret {
}; };
struct remote_network_dhcp_lease { struct remote_network_dhcp_lease {
remote_nonnull_string interface; remote_nonnull_string iface;
hyper expirytime; hyper expirytime;
int type; int type;
remote_string mac; remote_string mac;

2
src/remote_protocol-structs
View File

@ -2486,7 +2486,7 @@ struct remote_node_get_free_pages_ret {
} counts; } counts;
}; };
struct remote_network_dhcp_lease { struct remote_network_dhcp_lease {
remote_nonnull_string interface; remote_nonnull_string iface;
int64_t expirytime; int64_t expirytime;
int type; int type;
remote_string mac; remote_string mac;