Mercurial > hg > th-libs

changeset 615:b87395754c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 17 Jan 2020 00:01:55 +0200
parents afcaf5e38f56
children 594f197f7005
files th_strglob.c
diffstat 1 files changed, 29 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/th_strglob.c	Thu Jan 16 18:45:41 2020 +0200
+++ b/th_strglob.c	Fri Jan 17 00:01:55 2020 +0200
@@ -62,40 +62,42 @@
         break;
 
     default:
-        if (any)
         {
-            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
+            BOOL equals = TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack);
+            if (any)
             {
-                any = FALSE;
+                if (equals)
+                {
+                    any = FALSE;
+                }
+                else
+                if (*haystack)
+                    haystack++;
+                else
+                    matched = FALSE;
             }
             else
-            if (*haystack)
-                haystack++;
-            else
-                matched = FALSE;
-        }
-        else
-        {
-            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
             {
-                if (*pattern)
-                    pattern++;
-                if (*haystack)
-                    haystack++;
+                if (equals)
+                {
+                    if (*pattern)
+                        pattern++;
+                    if (*haystack)
+                        haystack++;
+                }
+                else
+                if (tmp)
+                {
+                    any = TRUE;
+                    pattern = tmp;
+                }
+                else
+                    matched = FALSE;
             }
-            else
-            if (tmp)
-            {
-                any = TRUE;
-                pattern = tmp;
-            }
-            else
-                matched = FALSE;
+
+            if (!*haystack && !*pattern)
+                end = TRUE;
         }
-
-        if (!*haystack && !*pattern)
-            end = TRUE;
-
         break;
     }