Mercurial > hg > th-libs

changeset 593:1a33088e7fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some internal preprocessor macros.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 13 Jan 2020 11:41:06 +0200
parents 4fd6ee473d1b
children 31720ede4b50
files th_string.c th_strmatch.c
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/th_string.c	Mon Jan 13 11:40:42 2020 +0200
+++ b/th_string.c	Mon Jan 13 11:41:06 2020 +0200
@@ -541,15 +541,15 @@
  * wildcards ? and *. "?" matches any character and "*" matches
  * any number of characters.
  */
-#define TH_STRMATCH_FUNC th_strmatch
-#define TH_STRMATCH_COLLATE(px) (px)
+#define TH_STRGLOB_FUNC th_strmatch
+#define TH_STRGLOB_COLLATE(px) (px)
 #include "th_strmatch.c"
 
 
 /* Compare a string to a pattern. Case-INSENSITIVE version.
  */
-#define TH_STRMATCH_FUNC th_strcasematch
-#define TH_STRMATCH_COLLATE(px) th_tolower(px)
+#define TH_STRGLOB_FUNC th_strcasematch
+#define TH_STRGLOB_COLLATE(px) th_tolower(px)
 #include "th_strmatch.c"
 
 
--- a/th_strmatch.c	Mon Jan 13 11:40:42 2020 +0200
+++ b/th_strmatch.c	Mon Jan 13 11:41:06 2020 +0200
@@ -6,7 +6,7 @@
  * Please read file 'COPYING' for information on license and distribution.
  */
 
-BOOL TH_STRMATCH_FUNC (const char *haystack, const char *pattern)
+BOOL TH_STRGLOB_FUNC (const char *haystack, const char *pattern)
 {
     BOOL matched = TRUE, any = FALSE, end = FALSE;
     const char *tmp = NULL;
@@ -64,7 +64,7 @@
     default:
         if (any)
         {
-            if (TH_STRMATCH_COLLATE(*pattern) == TH_STRMATCH_COLLATE(*haystack))
+            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
             {
                 any = FALSE;
             }
@@ -76,7 +76,7 @@
         }
         else
         {
-            if (TH_STRMATCH_COLLATE(*pattern) == TH_STRMATCH_COLLATE(*haystack))
+            if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
             {
                 if (*pattern)
                     pattern++;
@@ -103,6 +103,6 @@
 }
 
 
-#undef TH_STRMATCH_FUNC
-#undef TH_STRMATCH_COLLATE
+#undef TH_STRGLOB_FUNC
+#undef TH_STRGLOB_COLLATE