Mercurial > hg > dmlib
diff tools/packed.c @ 2586:9807ae37ad69
Require stdbool.h, we require C11 now.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 08 Dec 2022 15:59:22 +0200 |
parents | c64806412be0 |
children |
line wrap: on
line diff
--- a/tools/packed.c Thu Dec 08 15:56:36 2022 +0200 +++ b/tools/packed.c Thu Dec 08 15:59:22 2022 +0200 @@ -95,7 +95,7 @@ } -BOOL argHandleOpt(const int optN, char *optArg, char *currArg) +bool argHandleOpt(const int optN, char *optArg, char *currArg) { switch (optN) { @@ -118,7 +118,7 @@ if (optCompressLevel < 0 || optCompressLevel > 9) { dmErrorMsg("Invalid compression level argument '%s', must be 0 .. 9.\n", optArg); - return FALSE; + return false; } break; @@ -131,20 +131,20 @@ { dmErrorMsg("Maximum number of exclusion patterns (%d) exceeded!\n", SET_MAX_FILES); - return FALSE; + return false; } break; default: dmErrorMsg("Unimplemented option argument '%s'.\n", currArg); - return FALSE; + return false; } - return TRUE; + return true; } -BOOL argHandleNonOpt(char *arg) +bool argHandleNonOpt(char *arg) { if (optCommand == CMD_NONE) { @@ -162,7 +162,7 @@ if (optCommand == CMD_NONE) { dmErrorMsg("Invalid command '%s'.\n", arg); - return FALSE; + return false; } } else @@ -179,9 +179,9 @@ { dmErrorMsg("Maximum number of input files (%d) exceeded!\n", SET_MAX_FILES); - return FALSE; + return false; } - return TRUE; + return true; } @@ -287,7 +287,7 @@ DMPackEntry rentry, *pentry; FILE *inFile = NULL; int ret = DMERR_OK; - BOOL zinit = FALSE; + bool zinit = false; z_stream zstr; *ppEntry = NULL; @@ -334,7 +334,7 @@ ret = DMERR_COMPRESSION; goto out; } - zinit = TRUE; + zinit = true; zret = Z_OK; while (!feof(inFile) && zret == Z_OK) @@ -407,14 +407,14 @@ } -int dmPackExtractFile(DMPackFile *pack, DMPackEntry * entry, const BOOL decompress) +int dmPackExtractFile(DMPackFile *pack, DMPackEntry * entry, const bool decompress) { z_stream zstr; FILE *outFile = NULL; Uint8 *inBuffer = NULL, *outBuffer = NULL; size_t remaining; int zret, ret = DMERR_OK; - BOOL zinit = FALSE; + bool zinit = false; if (pack == NULL) return DMERR_NULLPTR; @@ -448,7 +448,7 @@ ret = DMERR_COMPRESSION; goto out; } - zinit = TRUE; + zinit = true; } remaining = entry->csize; @@ -512,36 +512,36 @@ * wildcards ? and *. "?" matches any character and "*" matches * any number of characters. */ -BOOL dmStrMatch(const char *str, const char *pattern) +bool dmStrMatch(const char *str, const char *pattern) { - BOOL matched = TRUE, any = FALSE, end = FALSE; + bool matched = true, any = false, end = false; const char *tmp = NULL; // Check given pattern and string if (str == NULL || pattern == NULL) - return FALSE; + return false; // Start comparision do { - matched = FALSE; + matched = false; switch (*pattern) { case '?': // Any single character matches if (*str) { - matched = TRUE; + matched = true; pattern++; str++; } break; case '*': - matched = TRUE; + matched = true; pattern++; if (!*pattern) - end = TRUE; - any = TRUE; + end = true; + any = true; tmp = pattern; break; @@ -551,7 +551,7 @@ if (*str) str++; else - end = TRUE; + end = true; } else { @@ -559,14 +559,14 @@ { if (tmp) { - any = TRUE; + any = true; pattern = tmp; } else - matched = FALSE; + matched = false; } else - end = TRUE; + end = true; } break; default: @@ -574,14 +574,14 @@ { if (*pattern == *str) { - any = FALSE; - matched = TRUE; + any = false; + matched = true; } else { if (*str) { - matched = TRUE; + matched = true; str++; } } @@ -590,7 +590,7 @@ { if (*pattern == *str) { - matched = TRUE; + matched = true; if (*pattern) pattern++; if (*str) @@ -600,15 +600,15 @@ { if (tmp) { - matched = TRUE; - any = TRUE; + matched = true; + any = true; pattern = tmp; } } } if (!*str && !*pattern) - end = TRUE; + end = true; break; } // switch @@ -619,14 +619,14 @@ } -BOOL dmMatchList(char **list, const size_t nlist, const char *str) +bool dmMatchList(char **list, const size_t nlist, const char *str) { for (size_t i = 0; i < nlist; i++) { if (dmStrMatch(str, list[i])) - return TRUE; + return true; } - return FALSE; + return false; } @@ -672,7 +672,7 @@ case CMD_ADD: dmMsg(1, "Opening existing PACK\n"); - res = dmPackOpen(optPackFilename, &pack, FALSE); + res = dmPackOpen(optPackFilename, &pack, false); break; } @@ -710,7 +710,7 @@ case CMD_LIST: // List files in PACK - if ((res = dmPackOpen(optPackFilename, &pack, TRUE)) != DMERR_OK) + if ((res = dmPackOpen(optPackFilename, &pack, true)) != DMERR_OK) { dmErrorMsg("Could not open PACK file: %s\n", dmErrorStr(res)); @@ -734,14 +734,14 @@ // Print all the matching entries for (entry = pack->entries; entry != NULL; entry = entry->next) { - BOOL match; + bool match; if (nsrcFilenames > 0) // Check for matches in specified filenames/patterns match = dmMatchList(srcFilenames, nsrcFilenames, entry->filename); else // No filenames specified, everything shown - match = TRUE; + match = true; if (match && !dmMatchList(excFilenames, nexcFilenames, entry->filename)) { @@ -772,7 +772,7 @@ case CMD_EXTRACT: // Extract files from PACK - if ((res = dmPackOpen(optPackFilename, &pack, TRUE)) != DMERR_OK) + if ((res = dmPackOpen(optPackFilename, &pack, true)) != DMERR_OK) { dmErrorMsg("Could not open PACK file: %s\n", dmErrorStr(res)); @@ -781,7 +781,7 @@ for (entry = pack->entries; entry != NULL; entry = entry->next) { - BOOL match; + bool match; // Check for matches if (nsrcFilenames > 0)