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

virjsontest: use VIR_AUTOPTR for virJSONValues

Browse Source 
Remove all explicit usage of virJSONValueFree.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2019-04-02 16:14:13 +02:00
parent 20783bbcfd
commit 675460cad5
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/virjsontest.c
View File

@ -20,7 +20,7 @@ static int
testJSONFromString(const void *data) testJSONFromString(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
virJSONValuePtr json; VIR_AUTOPTR(virJSONValue) json = NULL;
const char *expectstr = info->expect ? info->expect : info->doc; const char *expectstr = info->expect ? info->expect : info->doc;
char *formatted = NULL; char *formatted = NULL;
int ret = -1; int ret = -1;
@ -59,7 +59,6 @@ testJSONFromString(const void *data)
cleanup: cleanup:
VIR_FREE(formatted); VIR_FREE(formatted);
virJSONValueFree(json);
return ret; return ret;
} }
@ -68,8 +67,8 @@ static int
testJSONAddRemove(const void *data) testJSONAddRemove(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
virJSONValuePtr json = NULL; VIR_AUTOPTR(virJSONValue) json = NULL;
virJSONValuePtr name = NULL; VIR_AUTOPTR(virJSONValue) name = NULL;
VIR_AUTOFREE(char *) infile = NULL; VIR_AUTOFREE(char *) infile = NULL;
VIR_AUTOFREE(char *) indata = NULL; VIR_AUTOFREE(char *) indata = NULL;
VIR_AUTOFREE(char *) outfile = NULL; VIR_AUTOFREE(char *) outfile = NULL;
@ -135,8 +134,6 @@ testJSONAddRemove(const void *data)
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(json);
virJSONValueFree(name);
return ret; return ret;
} }
@ -145,7 +142,7 @@ static int
testJSONLookup(const void *data) testJSONLookup(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
virJSONValuePtr json; VIR_AUTOPTR(virJSONValue) json = NULL;
virJSONValuePtr value = NULL; virJSONValuePtr value = NULL;
char *result = NULL; char *result = NULL;
int rc; int rc;
@ -243,7 +240,6 @@ testJSONLookup(const void *data)
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(json);
VIR_FREE(result); VIR_FREE(result);
return ret; return ret;
} }
@ -253,8 +249,8 @@ static int
testJSONCopy(const void *data) testJSONCopy(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
virJSONValuePtr json = NULL; VIR_AUTOPTR(virJSONValue) json = NULL;
virJSONValuePtr jsonCopy = NULL; VIR_AUTOPTR(virJSONValue) jsonCopy = NULL;
char *result = NULL; char *result = NULL;
char *resultCopy = NULL; char *resultCopy = NULL;
int ret = -1; int ret = -1;
@ -314,8 +310,6 @@ testJSONCopy(const void *data)
cleanup: cleanup:
VIR_FREE(result); VIR_FREE(result);
VIR_FREE(resultCopy); VIR_FREE(resultCopy);
virJSONValueFree(json);
virJSONValueFree(jsonCopy);
return ret; return ret;
} }
@ -324,8 +318,8 @@ static int
testJSONDeflatten(const void *data) testJSONDeflatten(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
virJSONValuePtr injson = NULL; VIR_AUTOPTR(virJSONValue) injson = NULL;
virJSONValuePtr deflattened = NULL; VIR_AUTOPTR(virJSONValue) deflattened = NULL;
char *infile = NULL; char *infile = NULL;
char *indata = NULL; char *indata = NULL;
char *outfile = NULL; char *outfile = NULL;
@ -365,8 +359,6 @@ testJSONDeflatten(const void *data)
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(injson);
virJSONValueFree(deflattened);
VIR_FREE(infile); VIR_FREE(infile);
VIR_FREE(indata); VIR_FREE(indata);
VIR_FREE(outfile); VIR_FREE(outfile);
@ -379,9 +371,9 @@ testJSONDeflatten(const void *data)
static int static int
testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED) testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED)
{ {
virJSONValuePtr json = NULL; VIR_AUTOPTR(virJSONValue) json = NULL;
virJSONValuePtr nestjson = NULL; VIR_AUTOPTR(virJSONValue) nestjson = NULL;
virJSONValuePtr parsejson = NULL; VIR_AUTOPTR(virJSONValue) parsejson = NULL;
char *neststr = NULL; char *neststr = NULL;
char *result = NULL; char *result = NULL;
const char *parsednestedstr; const char *parsednestedstr;
@ -430,9 +422,6 @@ testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED)
cleanup: cleanup:
VIR_FREE(neststr); VIR_FREE(neststr);
VIR_FREE(result); VIR_FREE(result);
virJSONValueFree(json);
virJSONValueFree(nestjson);
virJSONValueFree(parsejson);
return ret; return ret;
} }
@ -440,10 +429,10 @@ testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED)
static int static int
testJSONObjectFormatSteal(const void *opaque ATTRIBUTE_UNUSED) testJSONObjectFormatSteal(const void *opaque ATTRIBUTE_UNUSED)
{ {
virJSONValuePtr a1 = NULL; VIR_AUTOPTR(virJSONValue) a1 = NULL;
virJSONValuePtr a2 = NULL; VIR_AUTOPTR(virJSONValue) a2 = NULL;
virJSONValuePtr t1 = NULL; VIR_AUTOPTR(virJSONValue) t1 = NULL;
virJSONValuePtr t2 = NULL; VIR_AUTOPTR(virJSONValue) t2 = NULL;
int ret = -1; int ret = -1;
if (!(a1 = virJSONValueNewString("test")) || if (!(a1 = virJSONValueNewString("test")) ||
@ -474,10 +463,6 @@ testJSONObjectFormatSteal(const void *opaque ATTRIBUTE_UNUSED)
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(a1);
virJSONValueFree(a2);
virJSONValueFree(t1);
virJSONValueFree(t2);
return ret; return ret;
} }