adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of the last warnings (on GCC 3.4 at least)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1827 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-06-17 15:03:11 +00:00
parent 6acdba48b7
commit 2107534a53
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/memory/w_memlib.c
+27 -7
View File
@@ -45,7 +45,11 @@ int leak_size = -1;
#endif #endif
static Mutex _MemoryLock; static Mutex _MemoryLock;
#define MAX_EXTENTS 100000 //#define MAX_EXTENTS 100000
#define MAX_EXTENTS (MEM_HANDLE) 32766
// Changed to 32766 to get rid of warnings that an expression
// 'h <= MAX_EXTENTS' is always true due to limited range of
// MEM_HANDLE.
/* Keep track of memory allocations. */ /* Keep track of memory allocations. */
@@ -110,6 +114,7 @@ static void Message(char *fmt, ...)
#endif #endif
} }
#if 0
/*****************************************************************************/ /*****************************************************************************/
/*FUNCTION /*FUNCTION
** **
@@ -176,6 +181,7 @@ static int MessageWithRetry(char *fmt, ...)
#endif #endif
return FALSE; return FALSE;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
/*FUNCTION /*FUNCTION
@@ -302,8 +308,13 @@ mem_allocate (MEM_SIZE coreSize, MEM_FLAGS flags, MEM_PRIORITY priority,
memset (node->memory, 0, node->size); memset (node->memory, 0, node->size);
#ifdef LEAK_DEBUG #ifdef LEAK_DEBUG
if (leak_debug) if (leak_debug)
fprintf (stderr, "alloc %d: %08x, %lu\n", (int) node->handle, {
(int) node->memory, node->size); fprintf (stderr, "alloc %d: %p, %lu\n", (int) node->handle,
(void *) node->memory, node->size);
// Prefered form:
//fprintf (stderr, "alloc %d: %#8" PRIxPTR ", %lu\n",
// (int) node->handle, (intptr_t) node->memory, node->size);
}
if (node->handle == leak_idx && node->size == leak_size) if (node->handle == leak_idx && node->size == leak_size)
node = node; node = node;
if (node->size == leak_size) if (node->size == leak_size)
@@ -434,9 +445,13 @@ mem_uninit(void)
{ {
if (extents[i].handle != -1) if (extents[i].handle != -1)
{ {
fprintf (stderr, "LEAK: unreleased extent %d: %08x, %lu\n", fprintf (stderr, "LEAK: unreleased extent %d: %p, %lu\n",
extents[i].handle, (unsigned int) extents[i].memory, extents[i].handle, (void *) extents[i].memory,
extents[i].size); extents[i].size);
// Prefered form:
//fprintf (stderr, "LEAK: unreleased extent %d: %#8" PRIxPTR
// ", %lu\n", extents[i].handle,
// (intptr_t) extents[i].memory, extents[i].size);
fflush (stderr); fflush (stderr);
extents[i].handle = -1; extents[i].handle = -1;
if (extents[i].memory) if (extents[i].memory)
@@ -493,8 +508,13 @@ mem_release(MEM_HANDLE h)
{ {
#ifdef LEAK_DEBUG #ifdef LEAK_DEBUG
if (leak_debug) if (leak_debug)
fprintf (stderr, "free %d: %08x\n", {
extents[h].handle, (unsigned int) extents[h].memory); fprintf (stderr, "free %d: %p\n",
extents[h].handle, (void *) extents[h].memory);
// Prefered form:
//fprintf (stderr, "free %d: %#8" PRIxPTR "\n",
// extents[h].handle, (intptr_t) extents[h].memory);
}
#endif #endif
if (extents[h].memory) if (extents[h].memory)
{ {