提交 4f7c65da 编写于 作者: J Ján Tomko

tools: use g_steal_pointer instead of VIR_STEAL_PTR

Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 72a1bb8e
......@@ -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;
}
......
......@@ -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;
}
......@@ -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++)
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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++)
......
......@@ -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;
}
......
......@@ -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;
}
......@@ -62,7 +62,7 @@ virshSnapshotNameCompleter(vshControl *ctl,
goto cleanup;
}
VIR_STEAL_PTR(ret, tmp);
ret = g_steal_pointer(&tmp);
cleanup:
virshDomainFree(dom);
......
......@@ -62,7 +62,7 @@ virshStorageVolNameCompleter(vshControl *ctl,
goto cleanup;
}
VIR_STEAL_PTR(ret, tmp);
ret = g_steal_pointer(&tmp);
cleanup:
virStoragePoolFree(pool);
......
......@@ -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) {
......
......@@ -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);
......
......@@ -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++;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册