yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 05:10:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

A comparision "array != NULL" is always true

Browse source
This commit is contained in:
Yamagi Burmeister 2014-08-03 11:10:22 +02:00
parent f6a48b44bf
commit 0ac4fdccfc
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/common/filesystem.c
View file

@ -1906,29 +1906,27 @@ FS_ListFiles2(char *findname, int *numfiles,
} }
} }
} }
else if (search->path != NULL)
if (musthave & SFF_INPACK)
{ {
if (musthave & SFF_INPACK) continue;
}
Com_sprintf(path, sizeof(path), "%s/%s", search->path, findname);
tmplist = FS_ListFiles(path, &tmpnfiles, musthave, canthave);
if (tmplist != NULL)
{
tmpnfiles--;
nfiles += tmpnfiles;
list = realloc(list, nfiles * sizeof(char *));
for (i = 0, j = nfiles - tmpnfiles; i < tmpnfiles; i++, j++)
{ {
continue; list[j] = strdup(tmplist[i] + strlen(search->path) + 1);
} }
Com_sprintf(path, sizeof(path), "%s/%s", search->path, findname); FS_FreeList(tmplist, tmpnfiles + 1);
tmplist = FS_ListFiles(path, &tmpnfiles, musthave, canthave);
if (tmplist != NULL)
{
tmpnfiles--;
nfiles += tmpnfiles;
list = realloc(list, nfiles * sizeof(char *));
for (i = 0, j = nfiles - tmpnfiles; i < tmpnfiles; i++, j++)
{
list[j] = strdup(tmplist[i] + strlen(search->path) + 1);
}
FS_FreeList(tmplist, tmpnfiles + 1);
}
} }
} }