]> xenbits.xensource.com Git - libvirt.git/commitdiff
virsh: getSignalNumber: use g_autofree
authorJán Tomko <jtomko@redhat.com>
Fri, 18 Oct 2019 21:32:12 +0000 (23:32 +0200)
committerJán Tomko <jtomko@redhat.com>
Sun, 20 Oct 2019 12:37:16 +0000 (14:37 +0200)
Mark the 'str' variable as g_autofree and avoid the need for
a separate cleanup label.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
tools/virsh-domain.c

index d74a671167a0be25a668196a3d88b51dc3f72b6d..44eb8a5d32fdb3fcf2723fa07833bd9076e5330b 100644 (file)
@@ -8806,27 +8806,21 @@ static int getSignalNumber(vshControl *ctl, const char *signame)
 {
     size_t i;
     int signum;
-    char *str = vshStrdup(ctl, signame);
+    g_autofree char *str = vshStrdup(ctl, signame);
     char *p = str;
 
     for (i = 0; signame[i]; i++)
         p[i] = c_tolower(signame[i]);
 
     if (virStrToLong_i(p, NULL, 10, &signum) >= 0)
-        goto cleanup;
+        return signum;
 
     if (STRPREFIX(p, "sig_"))
         p += 4;
     else if (STRPREFIX(p, "sig"))
         p += 3;
 
-    if ((signum = virDomainProcessSignalTypeFromString(p)) >= 0)
-        goto cleanup;
-
-    signum = -1;
- cleanup:
-    VIR_FREE(str);
-    return signum;
+    return virDomainProcessSignalTypeFromString(p);
 }
 
 static bool