Mercurial > hg > th-libs
changeset 175:3d0a1f87e393
Rename some variables.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 01 Mar 2015 05:35:15 +0200 |
| parents | 7d5707438333 |
| children | 791eaeb4f412 |
| files | th_string.c |
| diffstat | 1 files changed, 51 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/th_string.c Sun Mar 01 05:34:48 2015 +0200 +++ b/th_string.c Sun Mar 01 05:35:15 2015 +0200 @@ -338,8 +338,8 @@ */ BOOL th_strmatch(const char *str, const char *pattern) { - BOOL didMatch = TRUE, isAnyMode = FALSE, isEnd = FALSE; - const char *tmpPattern = NULL; + BOOL matched = TRUE, any = FALSE, end = FALSE; + const char *tmp = NULL; // Check given pattern and string if (str == NULL || pattern == NULL) @@ -347,65 +347,66 @@ // Start comparision do { - didMatch = FALSE; + matched = FALSE; switch (*pattern) { case '?': // Any single character matches if (*str) { - didMatch = TRUE; + matched = TRUE; pattern++; str++; } break; case '*': - didMatch = TRUE; + matched = TRUE; pattern++; if (!*pattern) - isEnd = TRUE; - isAnyMode = TRUE; - tmpPattern = pattern; + end = TRUE; + any = TRUE; + tmp = pattern; break; case 0: - if (isAnyMode) + if (any) { if (*str) str++; else - isEnd = TRUE; + end = TRUE; } else { if (*str) { - if (tmpPattern) + if (tmp) { - isAnyMode = TRUE; - pattern = tmpPattern; + any = TRUE; + pattern = tmp; } else - didMatch = FALSE; + matched = FALSE; } else - isEnd = TRUE; + end = TRUE; } break; + default: - if (isAnyMode) + if (any) { if (*pattern == *str) { - isAnyMode = FALSE; - didMatch = TRUE; + any = FALSE; + matched = TRUE; } else { if (*str) { - didMatch = TRUE; + matched = TRUE; str++; } } @@ -414,7 +415,7 @@ { if (*pattern == *str) { - didMatch = TRUE; + matched = TRUE; if (*pattern) pattern++; if (*str) @@ -422,24 +423,23 @@ } else { - if (tmpPattern) + if (tmp) { - didMatch = TRUE; - isAnyMode = TRUE; - pattern = tmpPattern; + matched = TRUE; + any = TRUE; + pattern = tmp; } } } if (!*str && !*pattern) - isEnd = TRUE; + end = TRUE; break; } // switch + } while (matched && !end); - } while (didMatch && !isEnd); - - return didMatch; + return matched; } @@ -447,8 +447,8 @@ */ BOOL th_strcasematch(const char *str, const char *pattern) { - BOOL didMatch = TRUE, isAnyMode = FALSE, isEnd = FALSE; - const char *tmpPattern = NULL; + BOOL matched = TRUE, any = FALSE, end = FALSE; + const char *tmp = NULL; // Check given pattern and string if (str == NULL || pattern == NULL) @@ -465,55 +465,55 @@ str++; } else - didMatch = FALSE; + matched = FALSE; break; case '*': pattern++; if (!*pattern || *pattern == '?') - isEnd = TRUE; - isAnyMode = TRUE; - tmpPattern = pattern; + end = TRUE; + any = TRUE; + tmp = pattern; break; case 0: - if (isAnyMode) + if (any) { if (*str) str++; else - isEnd = TRUE; + end = TRUE; } else { if (*str) { - if (tmpPattern) + if (tmp) { - isAnyMode = TRUE; - pattern = tmpPattern; + any = TRUE; + pattern = tmp; } else - didMatch = FALSE; + matched = FALSE; } else - isEnd = TRUE; + end = TRUE; } break; default: - if (isAnyMode) + if (any) { if (th_tolower(*pattern) == th_tolower(*str)) { - isAnyMode = FALSE; + any = FALSE; } else { if (*str) str++; else - didMatch = FALSE; + matched = FALSE; } } else @@ -527,26 +527,25 @@ } else { - if (tmpPattern) + if (tmp) { - isAnyMode = TRUE; - pattern = tmpPattern; + any = TRUE; + pattern = tmp; } else - didMatch = FALSE; + matched = FALSE; } } if (!*str && !*pattern) - isEnd = TRUE; + end = TRUE; break; } // switch + } while (matched && !end); - } while (didMatch && !isEnd); - - return didMatch; + return matched; }