External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to VIR_STRDUP and VIR_STRNDUP in src/uml/*

Browse Source
This commit is contained in:
Michal Privoznik 2013-05-03 14:49:48 +02:00
parent 296d319f05
commit 4a22990dfd
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uml/uml_conf.c
View File

@ -114,8 +114,8 @@ umlConnectTapDevice(virConnectPtr conn,
STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) ||
strchr(net->ifname, '%')) {
VIR_FREE(net->ifname);
if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d")))
goto no_memory;
if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0)
goto error;
/* avoid exposing vnet%d in getXMLDesc or error outputs */
template_ifname = true;
}
@ -141,8 +141,6 @@ umlConnectTapDevice(virConnectPtr conn,
return 0;
no_memory:
virReportOOMError();
error:
return -1;
}
@ -463,8 +461,8 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
if (vm->def->os.cmdline) {
char *args, *next_arg;
char *cmdline;
if ((cmdline = strdup(vm->def->os.cmdline)) == NULL)
goto no_memory;
if (VIR_STRDUP(cmdline, vm->def->os.cmdline) < 0)
goto error;
args = cmdline;
while (*args == ' ')

10
src/uml/uml_driver.c
View File

@ -248,8 +248,7 @@ requery:
if (res && STRPREFIX(res, "pts:")) {
VIR_FREE(def->source.data.file.path);
if ((def->source.data.file.path = strdup(res + 4)) == NULL) {
virReportOOMError();
if (VIR_STRDUP(def->source.data.file.path, res + 4) < 0) {
VIR_FREE(res);
VIR_FREE(cmd);
return -1;
@ -491,8 +490,8 @@ umlStateInitialize(bool privileged,
"%s/log/libvirt/uml", LOCALSTATEDIR) == -1)
goto out_of_memory;
if ((base = strdup(SYSCONFDIR "/libvirt")) == NULL)
goto out_of_memory;
if (VIR_STRDUP(base, SYSCONFDIR "/libvirt") < 0)
goto error;
if (virAsprintf(&uml_driver->monitorDir,
"%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1)
@ -1672,8 +1671,7 @@ static char *umlDomainGetOSType(virDomainPtr dom) {
goto cleanup;
}
if (!(type = strdup(vm->def->os.type)))
virReportOOMError();
ignore_value(VIR_STRDUP(type, vm->def->os.type));
cleanup:
if (vm)