[libvirt] [PATCH 6/9] tools: use g_steal_pointer instead of VIR_STEAL_PTR

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tools/virsh-completer-domain.c | 12 ++++++------ tools/virsh-completer-host.c | 4 ++-- tools/virsh-completer-interface.c | 2 +- tools/virsh-completer-network.c | 4 ++-- tools/virsh-completer-nodedev.c | 4 ++-- tools/virsh-completer-nwfilter.c | 4 ++-- tools/virsh-completer-pool.c | 4 ++-- tools/virsh-completer-secret.c | 4 ++-- tools/virsh-completer-snapshot.c | 2 +- tools/virsh-completer-volume.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh-snapshot.c | 2 +- tools/vsh.c | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 16c209ab36..bb06f468d7 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -66,7 +66,7 @@ virshDomainNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < ndomains; i++) @@ -122,7 +122,7 @@ virshDomainInterfaceCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } @@ -162,7 +162,7 @@ virshDomainDiskTargetCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } @@ -186,7 +186,7 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } @@ -249,7 +249,7 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } @@ -292,7 +292,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index ce43818be3..42e59a6656 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -100,7 +100,7 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } @@ -143,6 +143,6 @@ virshCellnoCompleter(vshControl *ctl, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-interface.c index 24a69d30b9..6fae0f6584 100644 --- a/tools/virsh-completer-interface.c +++ b/tools/virsh-completer-interface.c @@ -57,7 +57,7 @@ virshInterfaceNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < nifaces; i++) diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c index 404260b20c..a3d8b71d19 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -59,7 +59,7 @@ virshNetworkNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < nnets; i++) @@ -88,7 +88,7 @@ virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: return ret; diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodedev.c index 9bd1d20945..899c199902 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -57,7 +57,7 @@ virshNodeDeviceNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < ndevs; i++) @@ -86,7 +86,7 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfilter.c index 5a86602101..5029becf09 100644 --- a/tools/virsh-completer-nwfilter.c +++ b/tools/virsh-completer-nwfilter.c @@ -55,7 +55,7 @@ virshNWFilterNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < nnwfilters; i++) @@ -95,7 +95,7 @@ virshNWFilterBindingNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < nbindings; i++) diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index e646d07e65..ceb73eed06 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -60,7 +60,7 @@ virshStoragePoolNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < npools; i++) @@ -89,7 +89,7 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index 38403f275a..a533ac178f 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -57,7 +57,7 @@ virshSecretUUIDCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: for (i = 0; i < nsecrets; i++) @@ -86,6 +86,6 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); return ret; } diff --git a/tools/virsh-completer-snapshot.c b/tools/virsh-completer-snapshot.c index cad56e2fba..14bd7bc6e4 100644 --- a/tools/virsh-completer-snapshot.c +++ b/tools/virsh-completer-snapshot.c @@ -62,7 +62,7 @@ virshSnapshotNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: virshDomainFree(dom); diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index 2df0077d7a..f14570f23d 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -62,7 +62,7 @@ virshStorageVolNameCompleter(vshControl *ctl, goto cleanup; } - VIR_STEAL_PTR(ret, tmp); + ret = g_steal_pointer(&tmp); cleanup: virStoragePoolFree(pool); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f46d30341d..3ba8451470 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8441,7 +8441,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(desc); - VIR_STEAL_PTR(desc, desc_edited); + desc = g_steal_pointer(&desc_edited); } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index b5e5c234cc..eae19ecd27 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1380,7 +1380,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virshSnapSorter); snaplist->nsnaps -= deleted; - VIR_STEAL_PTR(ret, snaplist); + ret = g_steal_pointer(&snaplist); cleanup: virshSnapshotListFree(snaplist); diff --git a/tools/vsh.c b/tools/vsh.c index a9b2a84122..ee675a63cc 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2796,7 +2796,7 @@ vshCompleterFilter(char ***list, continue; } - VIR_STEAL_PTR(newList[newList_len], (*list)[i]); + newList[newList_len] = g_steal_pointer(&(*list)[i]); newList_len++; } -- 2.19.2