From d33090b7eefd35908c428ff27581d6c41fe41a14 Mon Sep 17 00:00:00 2001 From: Lance Date: Mon, 30 May 2011 04:44:04 +0000 Subject: [PATCH] My bad usage of Con_SafePrintf, replaced with normal Con_Printf so dedicated server can build git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3802 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/common.c | 2 +- engine/common/fs_stdio.c | 2 +- engine/common/gl_q2bsp.c | 2 +- engine/common/translate.c | 2 +- engine/server/sv_rankin.c | 6 +++--- engine/server/sv_sys_unix.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/common/common.c b/engine/common/common.c index 38124475a..e880e7856 100644 --- a/engine/common/common.c +++ b/engine/common/common.c @@ -3035,7 +3035,7 @@ void COM_InitArgv (int argc, const char **argv) //not allowed to tprint result = fread(buffer, 1, len, f); // do something with result if (result != len) - Con_SafePrintf("COM_InitArgv() fread: Filename: %s, expected %i, result was %i (%i)\n",va("%s_p.txt", argv[0]),len,result,errno); + Con_Printf("COM_InitArgv() fread: Filename: %s, expected %i, result was %i (%i)\n",va("%s_p.txt", argv[0]),len,result,errno); buffer[len] = '\0'; diff --git a/engine/common/fs_stdio.c b/engine/common/fs_stdio.c index 184febab1..de585d28e 100644 --- a/engine/common/fs_stdio.c +++ b/engine/common/fs_stdio.c @@ -224,7 +224,7 @@ static void FSSTDIO_ReadFile(void *handle, flocation_t *loc, char *buffer) result = fread(buffer, 1, loc->len, f); // do soemthing with result if (result != loc->len) - Con_SafePrintf("FSSTDIO_ReadFile() fread: Filename: %s, expected %i, result was %i (%i)\n",loc->rawname,loc->len,result,errno); + Con_Printf("FSSTDIO_ReadFile() fread: Filename: %s, expected %i, result was %i (%i)\n",loc->rawname,loc->len,result,errno); fclose(f); } diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c index 708fd521d..323132692 100644 --- a/engine/common/gl_q2bsp.c +++ b/engine/common/gl_q2bsp.c @@ -5666,7 +5666,7 @@ void CM_ReadPortalState (FILE *f) result = fread (portalopen, 1, sizeof(portalopen), f); // do something with result if (result != sizeof(portalopen)) - Con_SafePrintf("CM_ReadPortalState() fread: expected %i, result was %i (%i)\n",sizeof(portalopen),result,errno); + Con_Printf("CM_ReadPortalState() fread: expected %i, result was %i (%i)\n",sizeof(portalopen),result,errno); FloodAreaConnections (); } diff --git a/engine/common/translate.c b/engine/common/translate.c index de1c9927f..6a27c76c2 100644 --- a/engine/common/translate.c +++ b/engine/common/translate.c @@ -585,7 +585,7 @@ void TL_LoadLanguage (char *name, char *shortname, int num) //this is one of the result = fread(buffer, 1, size, f); // do something with result if (result != size) - Con_SafePrintf("TL_LoadLanguage() fread: Filename: %s, expected %i, result was %i (%i)\n",va("%s.trl", shortname),size,result,errno); + Con_Printf("TL_LoadLanguage() fread: Filename: %s, expected %i, result was %i (%i)\n",va("%s.trl", shortname),size,result,errno); fclose(f); diff --git a/engine/server/sv_rankin.c b/engine/server/sv_rankin.c index eddede6ad..fbd51b625 100644 --- a/engine/server/sv_rankin.c +++ b/engine/server/sv_rankin.c @@ -43,7 +43,7 @@ void inline READ_PLAYERSTATS(int x, rankstats_t *os) result = fread(os, sizeof(rankstats_t), 1, rankfile); if (result != sizeof(rankstats_t)) - Con_SafePrintf("READ_PLAYERSTATS() fread: expected %i, result was %i (%i)\n",sizeof(rankstats_t),result,errno); + Con_Printf("READ_PLAYERSTATS() fread: expected %i, result was %i (%i)\n",sizeof(rankstats_t),result,errno); os->kills = swaplong(os->kills); os->deaths = swaplong(os->deaths); @@ -85,7 +85,7 @@ void inline READ_PLAYERHEADER(int x, rankheader_t *oh) result = fread(oh, sizeof(rankheader_t), 1, rankfile); if (result != sizeof(rankheader_t)) - Con_SafePrintf("READ_PLAYERHEADER() fread: expected %i, result was %i (%i)\n",sizeof(rankheader_t),result,errno); + Con_Printf("READ_PLAYERHEADER() fread: expected %i, result was %i (%i)\n",sizeof(rankheader_t),result,errno); oh->prev = swaplong(oh->prev); //score is held for convineance. oh->next = swaplong(oh->next); @@ -164,7 +164,7 @@ qboolean Rank_OpenRankings(void) result = fread(&rankfileheader, sizeof(rankfileheader_t), 1, rankfile); if (result != sizeof(rankfileheader_t)) - Con_SafePrintf("Rank_OpenRankings() fread: expected %i, result was %i (%i)\n",sizeof(rankfileheader_t),result,errno); + Con_Printf("Rank_OpenRankings() fread: expected %i, result was %i (%i)\n",sizeof(rankfileheader_t),result,errno); rankfileheader.version = swaplong(rankfileheader.version); rankfileheader.usedslots = swaplong(rankfileheader.usedslots); diff --git a/engine/server/sv_sys_unix.c b/engine/server/sv_sys_unix.c index 12b68b428..7d59d66e8 100644 --- a/engine/server/sv_sys_unix.c +++ b/engine/server/sv_sys_unix.c @@ -119,7 +119,7 @@ int Sys_DebugLog(char *file, char *fmt, ...) result = write(fd, data, strlen(data)); // do something with the result if (result != strlen(data)) - Con_SafePrintf("Sys_DebugLog() write: Filename: %s, expected %i, result was %i (%i)\n",file,strlen(data),result,errno); + Con_Printf("Sys_DebugLog() write: Filename: %s, expected %i, result was %i (%i)\n",file,strlen(data),result,errno); close(fd); return 0;