External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

util: virmacmap: Use g_autofree for virJSONValue

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-05 11:14:09 +01:00
parent a2e23f24b5
commit a2e64fc6af
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virmacmap.c
View File

@ -130,7 +130,7 @@ virMacMapLoadFile(virMacMapPtr mgr,
const char *file) const char *file)
{ {
g_autofree char *map_str = NULL; g_autofree char *map_str = NULL;
virJSONValuePtr map = NULL; g_autoptr(virJSONValue) map = NULL;
int map_str_len = 0; int map_str_len = 0;
size_t i; size_t i;
int ret = -1; int ret = -1;
@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr,
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(map);
return ret; return ret;
} }
@ -199,14 +198,12 @@ virMACMapHashDumper(void *payload,
const char *name, const char *name,
void *data) void *data)
{ {
virJSONValuePtr obj = virJSONValueNewObject(); g_autoptr(virJSONValue) obj = virJSONValueNewObject();
virJSONValuePtr arr = NULL; g_autoptr(virJSONValue) arr = virJSONValueNewArray();
const char **macs = payload; const char **macs = payload;
size_t i; size_t i;
int ret = -1; int ret = -1;
arr = virJSONValueNewArray();
for (i = 0; macs[i]; i++) { for (i = 0; macs[i]; i++) {
virJSONValuePtr m = virJSONValueNewString(macs[i]); virJSONValuePtr m = virJSONValueNewString(macs[i]);
@ -228,8 +225,6 @@ virMACMapHashDumper(void *payload,
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(obj);
virJSONValueFree(arr);
return ret; return ret;
} }
@ -238,11 +233,9 @@ static int
virMacMapDumpStrLocked(virMacMapPtr mgr, virMacMapDumpStrLocked(virMacMapPtr mgr,
char **str) char **str)
{ {
virJSONValuePtr arr; g_autoptr(virJSONValue) arr = virJSONValueNewArray();
int ret = -1; int ret = -1;
arr = virJSONValueNewArray();
if (virHashForEachSorted(mgr->macs, virMACMapHashDumper, arr) < 0) if (virHashForEachSorted(mgr->macs, virMACMapHashDumper, arr) < 0)
goto cleanup; goto cleanup;
@ -251,7 +244,6 @@ virMacMapDumpStrLocked(virMacMapPtr mgr,
ret = 0; ret = 0;
cleanup: cleanup:
virJSONValueFree(arr);
return ret; return ret;
} }