From 5ad7885e7060997506a65299e34232bd4556b9da Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 27 Apr 2014 08:33:05 +0000 Subject: [PATCH] comment out COM_DefaultExtension git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@905 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Misc/homedir_0.patch | 12 ++++++------ Quake/common.c | 2 ++ Quake/common.h | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Misc/homedir_0.patch b/Misc/homedir_0.patch index 35c6d204..55f2bc27 100644 --- a/Misc/homedir_0.patch +++ b/Misc/homedir_0.patch @@ -1,11 +1,11 @@ support for user directories, based on uhexen2 and tyrquake: -** against quakespasm svn revision 904. +** against quakespasm svn revision 905. ** on-the-fly game directory switching not supported yet. ** minimally tested, needs more work. Index: Quake/sys_sdl_unix.c =================================================================== ---- Quake/sys_sdl_unix.c (revision 904) +--- Quake/sys_sdl_unix.c (revision 905) +++ Quake/sys_sdl_unix.c (working copy) @@ -20,6 +20,8 @@ @@ -73,9 +73,9 @@ Index: Quake/sys_sdl_unix.c void Sys_mkdir (const char *path) Index: Quake/common.c =================================================================== ---- Quake/common.c (revision 904) +--- Quake/common.c (revision 905) +++ Quake/common.c (working copy) -@@ -1917,6 +1917,7 @@ static void COM_AddGameDirectory (const +@@ -1919,6 +1919,7 @@ static void COM_AddGameDirectory (const searchpath_t *search; pack_t *pak, *qspak; char pakfile[MAX_OSPATH]; @@ -83,7 +83,7 @@ Index: Quake/common.c q_strlcpy (com_gamedir, va("%s/%s", base, dir), sizeof(com_gamedir)); -@@ -1925,6 +1926,7 @@ static void COM_AddGameDirectory (const +@@ -1927,6 +1928,7 @@ static void COM_AddGameDirectory (const path_id = com_searchpaths->path_id << 1; else path_id = 1U; @@ -91,7 +91,7 @@ Index: Quake/common.c // add the directory to the search path search = (searchpath_t *) Z_Malloc(sizeof(searchpath_t)); search->path_id = path_id; -@@ -1961,6 +1963,14 @@ static void COM_AddGameDirectory (const +@@ -1963,6 +1965,14 @@ static void COM_AddGameDirectory (const } if (!pak) break; } diff --git a/Quake/common.c b/Quake/common.c index 2a7ed8c7..71aa3fa3 100644 --- a/Quake/common.c +++ b/Quake/common.c @@ -1056,6 +1056,7 @@ if path doesn't have a .EXT, append extension (extension should include the leading ".") ================== */ +#if 0 /* can be dangerous */ void COM_DefaultExtension (char *path, const char *extension, size_t len) { char *src; @@ -1072,6 +1073,7 @@ void COM_DefaultExtension (char *path, const char *extension, size_t len) q_strlcat(path, extension, len); } +#endif /* ================== diff --git a/Quake/common.h b/Quake/common.h index 35464bfb..97c89554 100644 --- a/Quake/common.h +++ b/Quake/common.h @@ -180,7 +180,9 @@ const char *COM_SkipPath (const char *pathname); void COM_StripExtension (const char *in, char *out, size_t outsize); void COM_FileBase (const char *in, char *out, size_t outsize); void COM_AddExtension (char *path, const char *extension, size_t len); +#if 0 /* COM_DefaultExtension can be dangerous */ void COM_DefaultExtension (char *path, const char *extension, size_t len); +#endif const char *COM_FileGetExtension (const char *in); /* doesn't return NULL */ void COM_ExtractExtension (const char *in, char *out, size_t outsize); void COM_CreatePath (char *path);