X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.c;h=e180f13d4ce077518f88b6e45e12fa0c7e096dc6;hp=093d0ac9ad3a7cec37d5bd7d803d6d9efaf3e164;hb=49efc53510842f29eccbc160e1aa56c17e575468;hpb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84

diff --git a/fs.c b/fs.c
index 093d0ac9..e180f13d 100644
--- a/fs.c
+++ b/fs.c
@@ -317,11 +317,7 @@ Unload the Zlib DLL
 */
 void PK3_CloseLibrary (void)
 {
-	if (!zlib_dll)
-		return;
-
-	Sys_UnloadLibrary (zlib_dll);
-	zlib_dll = NULL;
+	Sys_UnloadLibrary (&zlib_dll);
 }
 
 
@@ -335,7 +331,6 @@ Try to load the Zlib DLL
 qboolean PK3_OpenLibrary (void)
 {
 	const char* dllname;
-	const dllfunction_t *func;
 
 	// Already loaded?
 	if (zlib_dll)
@@ -347,27 +342,14 @@ qboolean PK3_OpenLibrary (void)
 	dllname = "libz.so";
 #endif
 
-	// Initializations
-	for (func = zlibfuncs; func && func->name != NULL; func++)
-		*func->funcvariable = NULL;
-
 	// Load the DLL
-	if (! (zlib_dll = Sys_LoadLibrary (dllname)))
+	if (! Sys_LoadLibrary (dllname, &zlib_dll, zlibfuncs))
 	{
-		Con_Printf("Can't find %s. Compressed files support disabled\n", dllname);
+		Con_Printf ("Compressed files support disabled\n");
 		return false;
 	}
 
-	// Get the function adresses
-	for (func = zlibfuncs; func && func->name != NULL; func++)
-		if (!(*func->funcvariable = (void *) Sys_GetProcAddress (zlib_dll, func->name)))
-		{
-			Con_Printf("missing function \"%s\" - broken Zlib library!\n", func->name);
-			PK3_CloseLibrary ();
-			return false;
-		}
-
-	Con_Printf("%s loaded. Compressed files support enabled\n", dllname);
+	Con_Printf ("Compressed files support enabled\n");
 	return true;
 }
 
@@ -1918,7 +1900,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
 	if (separator < colon)
 		separator = colon;
 	basepathlength = separator - pattern;
-	basepath = Z_Malloc(basepathlength + 1);
+	basepath = Mem_Alloc (tempmempool, basepathlength + 1);
 	if (basepathlength)
 		memcpy(basepath, pattern, basepathlength);
 	basepath[basepathlength] = 0;
@@ -2022,7 +2004,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
 			stringlistfree(liststart);
 	}
 
-	Z_Free(basepath);
+	Mem_Free(basepath);
 	return search;
 }