X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=filematch.c;h=e06439614c2174927168128adf5b1fcbe8fa268d;hp=95d0e650245a137f889d3fc72ea517dc12efb6b7;hb=0dfd3a30839fefb7c1d817618354350f4efd1131;hpb=3fba31505b873b637e5d96e48a1bb6ad9b2bef41 diff --git a/filematch.c b/filematch.c index 95d0e650..e0643961 100644 --- a/filematch.c +++ b/filematch.c @@ -5,9 +5,9 @@ #include #endif -#include "quakedef.h" +#include "darkplaces.h" -// LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such... +// LadyHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such... int matchpattern(const char *in, const char *pattern, int caseinsensitive) { @@ -16,7 +16,7 @@ int matchpattern(const char *in, const char *pattern, int caseinsensitive) // wildcard_least_one: if true * matches 1 or more characters // if false * matches 0 or more characters -int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one) +int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qbool wildcard_least_one) { int c1, c2; while (*pattern) @@ -122,7 +122,7 @@ static int stringlistsort_cmp(const void *a, const void *b) return strcasecmp(*(const char **)a, *(const char **)b); } -void stringlistsort(stringlist_t *list, qboolean uniq) +void stringlistsort(stringlist_t *list, qbool uniq) { int i, j; if(list->numstrings < 1) @@ -164,8 +164,7 @@ static void adddirentry(stringlist_t *list, const char *path, const char *name) #ifdef WIN32 void listdirectory(stringlist_t *list, const char *basepath, const char *path) { - int i; - char pattern[4096], *c; + char pattern[4096]; WIN32_FIND_DATA n_file; HANDLE hFile; strlcpy (pattern, basepath, sizeof(pattern));