External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 02:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing 'const' annotations for internal domain conf helpers

Browse Source 
The virDomainNetGetActualBridgeName and virDomainNetGetActualDirectDev
methods both return strings that point to data in the virDomainDefPtr
struct, and should therefore not be freed. The return values should
thus be 'const char *' not 'char *'.

* src/conf/domain_conf.c, src/conf/domain_conf.h: Mark const
* src/network/bridge_driver.c: Update to use a const char *
This commit is contained in:
Daniel P. Berrange 2011-11-10 11:18:57 +00:00
parent 0c1587e10b
commit 914d1b7403
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -13064,7 +13064,7 @@ virDomainNetGetActualType(virDomainNetDefPtr iface)
return iface->data.network.actual->type; return iface->data.network.actual->type;
} }
char * const char *
virDomainNetGetActualBridgeName(virDomainNetDefPtr iface) virDomainNetGetActualBridgeName(virDomainNetDefPtr iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_BRIDGE) if (iface->type == VIR_DOMAIN_NET_TYPE_BRIDGE)
@ -13076,7 +13076,7 @@ virDomainNetGetActualBridgeName(virDomainNetDefPtr iface)
return iface->data.network.actual->data.bridge.brname; return iface->data.network.actual->data.bridge.brname;
} }
char * const char *
virDomainNetGetActualDirectDev(virDomainNetDefPtr iface) virDomainNetGetActualDirectDev(virDomainNetDefPtr iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT) if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT)

4
src/conf/domain_conf.h
View File

@ -1794,8 +1794,8 @@ int virDomainGraphicsListenSetNetwork(virDomainGraphicsDefPtr def,
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
int virDomainNetGetActualType(virDomainNetDefPtr iface); int virDomainNetGetActualType(virDomainNetDefPtr iface);
char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface); const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface);
char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface); const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface);
int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface); int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface);
virNetDevVPortProfilePtr virNetDevVPortProfilePtr
virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface);

12
src/network/bridge_driver.c
View File

@ -2899,7 +2899,7 @@ networkNotifyActualDevice(virDomainNetDefPtr iface)
struct network_driver *driver = driverState; struct network_driver *driver = driverState;
virNetworkObjPtr network; virNetworkObjPtr network;
virNetworkDefPtr netdef; virNetworkDefPtr netdef;
char *actualDev; const char *actualDev;
int ret = -1; int ret = -1;
if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
@ -2925,8 +2925,8 @@ networkNotifyActualDevice(virDomainNetDefPtr iface)
if (!actualDev) { if (!actualDev) {
networkReportError(VIR_ERR_INTERNAL_ERROR, networkReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("the interface uses a direct mode, but has no source dev")); "%s", _("the interface uses a direct mode, but has no source dev"));
goto cleanup; goto cleanup;
} }
netdef = network->def; netdef = network->def;
if (netdef->nForwardIfs == 0) { if (netdef->nForwardIfs == 0) {
@ -2999,7 +2999,7 @@ networkReleaseActualDevice(virDomainNetDefPtr iface)
struct network_driver *driver = driverState; struct network_driver *driver = driverState;
virNetworkObjPtr network = NULL; virNetworkObjPtr network = NULL;
virNetworkDefPtr netdef; virNetworkDefPtr netdef;
char *actualDev; const char *actualDev;
int ret = -1; int ret = -1;
if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
@ -3026,8 +3026,8 @@ networkReleaseActualDevice(virDomainNetDefPtr iface)
if (!actualDev) { if (!actualDev) {
networkReportError(VIR_ERR_INTERNAL_ERROR, networkReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("the interface uses a direct mode, but has no source dev")); "%s", _("the interface uses a direct mode, but has no source dev"));
goto cleanup; goto cleanup;
} }
netdef = network->def; netdef = network->def;
if (netdef->nForwardIfs == 0) { if (netdef->nForwardIfs == 0) {