NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/openvz: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-03-07 09:33:31 +01:00
parent 6c1bde6a94
commit d9e4d5cb7c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openvz/openvz_conf.c
View File

@ -232,10 +232,8 @@ openvzReadNetworkConf(virDomainDefPtr def,
if (VIR_STRDUP(net->data.ethernet.ipaddr, token) < 0) if (VIR_STRDUP(net->data.ethernet.ipaddr, token) < 0)
goto error; goto error;
if (VIR_REALLOC_N(def->nets, def->nnets + 1) < 0) if (VIR_APPEND_ELEMENT_COPY(def->nets, def->nnets, net) < 0)
goto error; goto error;
def->nets[def->nnets++] = net;
net = NULL;
token = strtok_r(NULL, " ", &saveptr); token = strtok_r(NULL, " ", &saveptr);
} }
@ -326,10 +324,8 @@ openvzReadNetworkConf(virDomainDefPtr def,
p = ++next; p = ++next;
} while (p < token + strlen(token)); } while (p < token + strlen(token));
if (VIR_REALLOC_N(def->nets, def->nnets + 1) < 0) if (VIR_APPEND_ELEMENT_COPY(def->nets, def->nnets, net) < 0)
goto error; goto error;
def->nets[def->nnets++] = net;
net = NULL;
token = strtok_r(NULL, ";", &saveptr); token = strtok_r(NULL, ";", &saveptr);
} }
@ -450,10 +446,8 @@ openvzReadFSConf(virDomainDefPtr def,
} }
} }
if (VIR_REALLOC_N(def->fss, def->nfss + 1) < 0) if (VIR_APPEND_ELEMENT(def->fss, def->nfss, fs) < 0)
goto error; goto error;
def->fss[def->nfss++] = fs;
fs = NULL;
VIR_FREE(temp); VIR_FREE(temp);