NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-09-03 20:53:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

tools: use g_strdup instead of VIR_STRDUP

Browse Source 
Replace all occurrences of
  if (VIR_STRDUP(a, b) < 0)
     /* effectively dead code */
with:
  a = g_strdup(b);

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko
2019-10-21 12:51:59 +02:00
parent 29b1e859e3
commit 506d313fa1
15 changed files with 46 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/virsh-completer-network.c
+6 -8
View File
@@ -55,8 +55,7 @@ virshNetworkNameCompleter(vshControl *ctl,
for (i = 0; i < nnets; i++) {
const char *name = virNetworkGetName(nets[i]);
if (VIR_STRDUP(tmp[i], name) < 0)
goto cleanup;
tmp[i] = g_strdup(name);
}
ret = g_steal_pointer(&tmp);
@@ -83,10 +82,8 @@ virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_UNUSED,
if (VIR_ALLOC_N(tmp, VIR_NETWORK_EVENT_ID_LAST + 1) < 0)
goto cleanup;
for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++) {
if (VIR_STRDUP(tmp[i], virshNetworkEventCallbacks[i].name) < 0)
goto cleanup;
}
for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++)
tmp[i] = g_strdup(virshNetworkEventCallbacks[i].name);
ret = g_steal_pointer(&tmp);
@@ -124,10 +121,11 @@ virshNetworkPortUUIDCompleter(vshControl *ctl,
for (i = 0; i < nports; i++) {
char uuid[VIR_UUID_STRING_BUFLEN];
if (virNetworkPortGetUUIDString(ports[i], uuid) < 0 ||
VIR_STRDUP(ret[i], uuid) < 0)
if (virNetworkPortGetUUIDString(ports[i], uuid) < 0)
goto error;
ret[i] = g_strdup(uuid);
virNetworkPortFree(ports[i]);
}
VIR_FREE(ports);