From 4d9b61c085f37ec87f3f480c88a3c2037516174b Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 25 Nov 2015 12:07:54 +0000 Subject: [PATCH] cache1d: Save the filenames of GRP and SSI files that are opened. git-svn-id: https://svn.eduke32.com/eduke32@5441 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/cache1d.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/build/src/cache1d.c b/polymer/eduke32/build/src/cache1d.c index 1808f00c7..205f05aaf 100644 --- a/polymer/eduke32/build/src/cache1d.c +++ b/polymer/eduke32/build/src/cache1d.c @@ -693,6 +693,7 @@ static intptr_t groupfil[MAXGROUPFILES] = {-1,-1,-1,-1,-1,-1,-1,-1}; static int32_t groupfilpos[MAXGROUPFILES]; static uint8_t groupfilgrp[MAXGROUPFILES]; static char *gfilelist[MAXGROUPFILES]; +static char *groupname[MAXGROUPFILES]; static int32_t *gfileoffs[MAXGROUPFILES]; static int32_t groupcrc[MAXGROUPFILES]; @@ -802,6 +803,7 @@ int32_t initgroupfile(const char *filename) } gfileoffs[numgroupfiles][gnumfiles[numgroupfiles]] = j; initgroupfile_crc32(numgroupfiles); + groupname[numgroupfiles] = Xstrdup(filename); numgroupfiles++; return 0; } @@ -906,6 +908,7 @@ int32_t initgroupfile(const char *filename) } gfileoffs[numgroupfiles][gnumfiles[numgroupfiles]] = j; initgroupfile_crc32(numgroupfiles); + groupname[numgroupfiles] = Xstrdup(filename); numgroupfiles++; return 0; } @@ -921,8 +924,10 @@ void uninitgroupfile(void) for (i=numgroupfiles-1; i>=0; i--) if (groupfil[i] != -1) { - Bfree(gfilelist[i]); - Bfree(gfileoffs[i]); + DO_FREE_AND_NULL(gfilelist[i]); + DO_FREE_AND_NULL(gfileoffs[i]); + DO_FREE_AND_NULL(groupname[i]); + Bclose(groupfil[i]); groupfil[i] = -1; }