Mercurial > hg > dmlib
changeset 1019:8cf8a8035438
Rename some variables.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 01 Mar 2015 05:26:11 +0200 |
| parents | 782a2a3a3707 |
| children | 021e76f94dcb |
| files | tools/packed.c |
| diffstat | 1 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/packed.c Sun Mar 01 04:56:00 2015 +0200 +++ b/tools/packed.c Sun Mar 01 05:26:11 2015 +0200 @@ -462,8 +462,8 @@ */ BOOL dm_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) @@ -471,65 +471,65 @@ // 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++; } } @@ -538,7 +538,7 @@ { if (*pattern == *str) { - didMatch = TRUE; + matched = TRUE; if (*pattern) pattern++; if (*str) @@ -546,24 +546,24 @@ } 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 (didMatch && !isEnd); + } while (matched && !end); - return didMatch; + return matched; }