Mercurial > hg > dmlib

comparison dmres.c @ 124:d5cfd29c87c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some conditional compilation directives.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 04 Oct 2012 05:37:26 +0300
parents e9de22e5a6d5
children 112eb95f2fba
comparison
equal deleted inserted replaced
123:6f7356f3b91c 124:d5cfd29c87c4
5 * (C) Copyright 2003-2012 Tecnic Software productions (TNSP) 5 * (C) Copyright 2003-2012 Tecnic Software productions (TNSP)
6 */ 6 */
7 #include "dmres.h" 7 #include "dmres.h"
8 #include <time.h> 8 #include <time.h>
9 9
10 #if !defined(DMRES_PACKFS) && !defined(DMRES_STDIO) 10 #if !defined(DM_USE_PACKFS) && !defined(DM_USE_STDIO)
11 #error At least one of DMRES_PACKFS, DMRES_STDIO must be defined. 11 #error At least one of DM_USE_PACKFS, DM_USE_STDIO must be defined.
12 #endif 12 #endif
13 13
14 #define DMRES_LOCK(x) dmMutexLock(dfResourcesMutex) 14 #define DMRES_LOCK(x) dmMutexLock(dfResourcesMutex)
15 #define DMRES_UNLOCK(x) dmMutexUnlock(dfResourcesMutex) 15 #define DMRES_UNLOCK(x) dmMutexUnlock(dfResourcesMutex)
16 16
22 static char * dfResPath = NULL; 22 static char * dfResPath = NULL;
23 DMResource * dfResources = NULL; 23 DMResource * dfResources = NULL;
24 DMMutex * dfResourcesMutex = NULL; 24 DMMutex * dfResourcesMutex = NULL;
25 25
26 26
27 #ifdef DMRES_PACKFS 27 #ifdef DM_USE_PACKFS
28 static DMPackFile *dfResPackFile = NULL; 28 static DMPackFile *dfResPackFile = NULL;
29 static char * dfResPackFilename = NULL; 29 static char * dfResPackFilename = NULL;
30 #endif 30 #endif
31 31
32 32
137 137
138 return found; 138 return found;
139 } 139 }
140 140
141 141
142 #ifdef DMRES_STDIO 142 #ifdef DM_USE_STDIO
143 /* Basic stdio file routines 143 /* Basic stdio file routines
144 */ 144 */
145 static int dm_stdio_fopen(DMResource *handle) 145 static int dm_stdio_fopen(DMResource *handle)
146 { 146 {
147 char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename); 147 char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename);
315 315
316 316
317 /* 317 /*
318 * PACK file routines 318 * PACK file routines
319 */ 319 */
320 #ifdef DMRES_PACKFS 320 #ifdef DM_USE_PACKFS
321 static int dm_pack_preload(DMResource *handle) 321 static int dm_pack_preload(DMResource *handle)
322 { 322 {
323 DMPackEntry *node; 323 DMPackEntry *node;
324 int res = DMERR_OK, cres, cdataLeft; 324 int res = DMERR_OK, cres, cdataLeft;
325 z_stream cstream; 325 z_stream cstream;
538 static void dmf_init_fops(DMResource *handle) 538 static void dmf_init_fops(DMResource *handle)
539 { 539 {
540 // Check fops 540 // Check fops
541 if (handle->fops == NULL) 541 if (handle->fops == NULL)
542 { 542 {
543 #ifdef DMRES_PACKFS 543 #ifdef DM_USE_PACKFS
544 if (dfResFlags & DRF_USE_PACK) 544 if (dfResFlags & DRF_USE_PACK)
545 handle->fops = &dfPackFileOps; 545 handle->fops = &dfPackFileOps;
546 #ifdef DMRES_STDIO 546 #ifdef DM_USE_STDIO
547 else 547 else
548 handle->fops = &dfStdioFileOps; 548 handle->fops = &dfStdioFileOps;
549 #else 549 #else
550 handle->fops = &dfPackFileOps; 550 handle->fops = &dfPackFileOps;
551 #endif 551 #endif
616 DMResource *handle; 616 DMResource *handle;
617 617
618 // Check master directory for resource 618 // Check master directory for resource
619 if ((handle = dmres_find(filename)) == NULL) 619 if ((handle = dmres_find(filename)) == NULL)
620 { 620 {
621 #ifdef DMRES_STDIO 621 #ifdef DM_USE_STDIO
622 // Hmm.. does not exist? Fall back to a stdio file 622 // Hmm.. does not exist? Fall back to a stdio file
623 handle = dmres_new(filename, 0, 0); 623 handle = dmres_new(filename, 0, 0);
624 if (handle == NULL) 624 if (handle == NULL)
625 return NULL; 625 return NULL;
626 626
677 677
678 return handle; 678 return handle;
679 } 679 }
680 680
681 681
682 #ifdef DMRES_STDIO 682 #ifdef DM_USE_STDIO
683 DMResource * dmf_create_stdio(const char *filename, const char *mode) 683 DMResource * dmf_create_stdio(const char *filename, const char *mode)
684 { 684 {
685 DMResource *handle = dmres_new(filename, 0, 0); 685 DMResource *handle = dmres_new(filename, 0, 0);
686 if (handle == NULL) 686 if (handle == NULL)
687 return NULL; 687 return NULL;
919 dfResourcesMutex = dmCreateMutex(); 919 dfResourcesMutex = dmCreateMutex();
920 920
921 921
922 if (flags & DRF_USE_PACK) 922 if (flags & DRF_USE_PACK)
923 { 923 {
924 #ifdef DMRES_PACKFS 924 #ifdef DM_USE_PACKFS
925 int ret; 925 int ret;
926 DMPackEntry *node; 926 DMPackEntry *node;
927 927
928 dfResPackFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK); 928 dfResPackFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK);
929 929
992 992
993 if (!dfResInitialized) 993 if (!dfResInitialized)
994 return; 994 return;
995 995
996 // Shutdown possible subsystems 996 // Shutdown possible subsystems
997 #ifdef DMRES_PACKFS 997 #ifdef DM_USE_PACKFS
998 if (dfResFlags & DRF_USE_PACK) 998 if (dfResFlags & DRF_USE_PACK)
999 { 999 {
1000 int res = dm_pack_close(dfResPackFile); 1000 int res = dm_pack_close(dfResPackFile);
1001 if (res != DMERR_OK) 1001 if (res != DMERR_OK)
1002 { 1002 {