# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1455527339 -7200
# Node ID cd97e7517e218627ffd0e469574da7281bd794e8
# Parent  55d99dc7c35c52e58b760010bd06cc72a36e9c3d
Simplify error handling logic.

diff -r 55d99dc7c35c -r cd97e7517e21 sidinfo.c
--- a/sidinfo.c	Mon Feb 15 11:08:21 2016 +0200
+++ b/sidinfo.c	Mon Feb 15 11:08:59 2016 +0200
@@ -256,6 +256,7 @@
     PSFStackItem item;
     const char *start = NULL;
     int mode = 0;
+    BOOL rval = TRUE;
 
     siClearStack(stack);
 
@@ -291,17 +292,16 @@
                 {
                     char *field = th_strndup_trim(start, fmt - start, TH_TRIM_BOTH);
                     int ret = argMatchPSFieldError(field);
+                    th_free(field);
                     if (ret >= 0)
                     {
                         item.cmd = ret;
                         item.str = NULL;
                         if (!siStackAddItem(stack, &item))
-                        {
-                            th_free(field);
                             return FALSE;
-                        }
                     }
-                    th_free(field);
+                    else
+                        rval = FALSE;
                 }
                 mode = 0;
             }
@@ -326,7 +326,7 @@
             break;
     }
 
-    return TRUE;
+    return rval;
 }