External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 19:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvz: Use virStringSplitCount instead of strtok_r

Browse Source 
When parsing the barrier:limit values, use virStringSplitCount in order
to split the pair and make the approriate checks to get the data.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-02-19 13:35:24 -05:00
parent b2ce5b027c
commit fe0063685a
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/openvz/openvz_conf.c
View File

@ -133,35 +133,25 @@ openvzParseBarrierLimit(const char* value,
unsigned long long *barrier,
unsigned long long *limit)
{
char *token;
char *saveptr = NULL;
char *str;
char **tmp = NULL;
size_t ntmp = 0;
int ret = -1;
if (VIR_STRDUP(str, value) < 0)
if (!(tmp = virStringSplitCount(value, ":", 0, &ntmp)))
goto error;
token = strtok_r(str, ":", &saveptr);
if (token == NULL) {
if (ntmp != 2)
goto error;
} else {
if (barrier != NULL) {
if (virStrToLong_ull(token, NULL, 10, barrier))
goto error;
}
}
token = strtok_r(NULL, ":", &saveptr);
if (token == NULL) {
if (barrier && virStrToLong_ull(tmp[0], NULL, 10, barrier) < 0)
goto error;
} else {
if (limit != NULL) {
if (virStrToLong_ull(token, NULL, 10, limit))
goto error;
}
}
if (limit && virStrToLong_ull(tmp[1], NULL, 10, limit) < 0)
goto error;
ret = 0;
error:
VIR_FREE(str);
virStringFreeListCount(tmp, ntmp);
return ret;
}