comparison th_strglob.c @ 615:b87395754c8d

Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 17 Jan 2020 00:01:55 +0200
parents 5ec903f366b5
children 4ca6a3b30fe8
comparison
equal deleted inserted replaced
614:afcaf5e38f56 615:b87395754c8d
60 else 60 else
61 end = TRUE; 61 end = TRUE;
62 break; 62 break;
63 63
64 default: 64 default:
65 if (any)
66 { 65 {
67 if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack)) 66 BOOL equals = TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack);
67 if (any)
68 { 68 {
69 any = FALSE; 69 if (equals)
70 {
71 any = FALSE;
72 }
73 else
74 if (*haystack)
75 haystack++;
76 else
77 matched = FALSE;
70 } 78 }
71 else 79 else
72 if (*haystack) 80 {
73 haystack++; 81 if (equals)
74 else 82 {
75 matched = FALSE; 83 if (*pattern)
84 pattern++;
85 if (*haystack)
86 haystack++;
87 }
88 else
89 if (tmp)
90 {
91 any = TRUE;
92 pattern = tmp;
93 }
94 else
95 matched = FALSE;
96 }
97
98 if (!*haystack && !*pattern)
99 end = TRUE;
76 } 100 }
77 else
78 {
79 if (TH_STRGLOB_COLLATE(*pattern) == TH_STRGLOB_COLLATE(*haystack))
80 {
81 if (*pattern)
82 pattern++;
83 if (*haystack)
84 haystack++;
85 }
86 else
87 if (tmp)
88 {
89 any = TRUE;
90 pattern = tmp;
91 }
92 else
93 matched = FALSE;
94 }
95
96 if (!*haystack && !*pattern)
97 end = TRUE;
98
99 break; 101 break;
100 } 102 }
101 103
102 return matched; 104 return matched;
103 } 105 }