teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove newlines from Com_Error message format strings, patch by DevHC

This commit is contained in:
Thilo Schulz 2011-05-12 14:02:48 +00:00
parent 59271903a2
commit c95bd0a684
20 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/botlib/l_precomp.c
View File

@ -271,7 +271,7 @@ token_t *PC_CopyToken(token_t *token)
#ifdef BSPC
Error("out of token space\n");
#else
Com_Error(ERR_FATAL, "out of token space\n");
Com_Error(ERR_FATAL, "out of token space");
#endif
return NULL;
} //end if

6
code/client/cl_avi.c
View File

@ -82,7 +82,7 @@ SafeFS_Write
static ID_INLINE void SafeFS_Write( const void *buffer, int len, fileHandle_t f )
{
if( FS_Write( buffer, len, f ) < len )
Com_Error( ERR_DROP, "Failed to write avi file\n" );
Com_Error( ERR_DROP, "Failed to write avi file" );
}
/*
@ -142,7 +142,7 @@ static ID_INLINE void START_CHUNK( const char *s )
{
if( afd.chunkStackTop == MAX_RIFF_CHUNKS )
{
Com_Error( ERR_DROP, "ERROR: Top of chunkstack breached\n" );
Com_Error( ERR_DROP, "ERROR: Top of chunkstack breached" );
}
afd.chunkStack[ afd.chunkStackTop ] = bufIndex;
@ -162,7 +162,7 @@ static ID_INLINE void END_CHUNK( void )
if( afd.chunkStackTop <= 0 )
{
Com_Error( ERR_DROP, "ERROR: Bottom of chunkstack breached\n" );
Com_Error( ERR_DROP, "ERROR: Bottom of chunkstack breached" );
}
afd.chunkStackTop--;

2
code/client/cl_cgame.c
View File

@ -300,7 +300,7 @@ rescan:
if ( argc >= 2 )
Com_Error( ERR_SERVERDISCONNECT, "Server disconnected - %s", Cmd_Argv( 1 ) );
else
Com_Error( ERR_SERVERDISCONNECT, "Server disconnected\n" );
Com_Error( ERR_SERVERDISCONNECT, "Server disconnected" );
}
if ( !strcmp( cmd, "bcs0" ) ) {

6
code/client/cl_parse.c
View File

@ -265,7 +265,7 @@ void CL_ParseSnapshot( msg_t *msg ) {
if(len > sizeof(newSnap.areamask))
{
Com_Error (ERR_DROP,"CL_ParseSnapshot: Invalid size %d for areamask.", len);
Com_Error (ERR_DROP,"CL_ParseSnapshot: Invalid size %d for areamask", len);
return;
}
@ -580,7 +580,7 @@ void CL_ParseDownload ( msg_t *msg ) {
size = MSG_ReadShort ( msg );
if (size < 0 || size > sizeof(data))
{
Com_Error(ERR_DROP, "CL_ParseDownload: Invalid size %d for download chunk.", size);
Com_Error(ERR_DROP, "CL_ParseDownload: Invalid size %d for download chunk", size);
return;
}
@ -885,7 +885,7 @@ void CL_ParseServerMessage( msg_t *msg ) {
// other commands
switch ( cmd ) {
default:
Com_Error (ERR_DROP,"CL_ParseServerMessage: Illegible server message\n");
Com_Error (ERR_DROP,"CL_ParseServerMessage: Illegible server message");
break;
case svc_nop:
break;

4
code/client/snd_dma.c
View File

@ -259,10 +259,10 @@ static sfx_t *S_FindName( const char *name ) {
sfx_t *sfx;
if (!name) {
Com_Error (ERR_FATAL, "S_FindName: NULL\n");
Com_Error (ERR_FATAL, "S_FindName: NULL");
}
if (!name[0]) {
Com_Error (ERR_FATAL, "S_FindName: empty name\n");
Com_Error (ERR_FATAL, "S_FindName: empty name");
}
if (strlen(name) >= MAX_QPATH) {

2
code/client/snd_main.c
View File

@ -509,7 +509,7 @@ void S_Init( void )
if( started ) {
if( !S_ValidSoundInterface( &si ) ) {
Com_Error( ERR_FATAL, "Sound interface invalid." );
Com_Error( ERR_FATAL, "Sound interface invalid" );
}
S_SoundInfo( );

2
code/client/snd_openal.c
View File

@ -227,7 +227,7 @@ S_AL_BufferUseDefault
static void S_AL_BufferUseDefault(sfxHandle_t sfx)
{
if(sfx == default_sfx)
Com_Error(ERR_FATAL, "Can't load default sound effect %s\n", knownSfx[sfx].filename);
Com_Error(ERR_FATAL, "Can't load default sound effect %s", knownSfx[sfx].filename);
Com_Printf( S_COLOR_YELLOW "WARNING: Using default sound for %s\n", knownSfx[sfx].filename);
knownSfx[sfx].isDefault = qtrue;

8
code/qcommon/common.c
View File

@ -1054,12 +1054,12 @@ void Z_CheckHeap( void ) {
break; // all blocks have been hit
}
if ( (byte *)block + block->size != (byte *)block->next)
Com_Error( ERR_FATAL, "Z_CheckHeap: block size does not touch the next block\n" );
Com_Error( ERR_FATAL, "Z_CheckHeap: block size does not touch the next block" );
if ( block->next->prev != block) {
Com_Error( ERR_FATAL, "Z_CheckHeap: next block doesn't have proper back link\n" );
Com_Error( ERR_FATAL, "Z_CheckHeap: next block doesn't have proper back link" );
}
if ( !block->tag && !block->next->tag ) {
Com_Error( ERR_FATAL, "Z_CheckHeap: two consecutive free blocks\n" );
Com_Error( ERR_FATAL, "Z_CheckHeap: two consecutive free blocks" );
}
}
}
@ -1870,7 +1870,7 @@ void Hunk_Trash( void ) {
return;
#ifdef _DEBUG
Com_Error(ERR_DROP, "hunk trashed\n");
Com_Error(ERR_DROP, "hunk trashed");
return;
#endif

54
code/qcommon/files.c
View File

@ -517,7 +517,7 @@ qboolean FS_CreatePath (char *OSPath) {
// create the directory
*ofs = 0;
if (!Sys_Mkdir (path)) {
Com_Error( ERR_FATAL, "FS_CreatePath: failed to create path \"%s\"\n",
Com_Error( ERR_FATAL, "FS_CreatePath: failed to create path \"%s\"",
path );
}
*ofs = PATH_SEP;
@ -630,7 +630,7 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
fileHandle_t f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
ospath = FS_BuildOSPath( fs_homepath->string, filename, "" );
@ -674,7 +674,7 @@ int FS_SV_FOpenFileRead( const char *filename, fileHandle_t *fp ) {
fileHandle_t f = 0;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
f = FS_HandleForFile();
@ -739,7 +739,7 @@ void FS_SV_Rename( const char *from, const char *to ) {
char *from_ospath, *to_ospath;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
// don't let sound stutter
@ -771,7 +771,7 @@ void FS_Rename( const char *from, const char *to ) {
char *from_ospath, *to_ospath;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
// don't let sound stutter
@ -801,7 +801,7 @@ on files returned by FS_FOpenFile...
*/
void FS_FCloseFile( fileHandle_t f ) {
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if (fsh[f].zipFile == qtrue) {
@ -831,7 +831,7 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
fileHandle_t f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
f = FS_HandleForFile();
@ -874,7 +874,7 @@ fileHandle_t FS_FOpenFileAppend( const char *filename ) {
fileHandle_t f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
f = FS_HandleForFile();
@ -917,7 +917,7 @@ fileHandle_t FS_FCreateOpenPipeFile( const char *filename ) {
fileHandle_t f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
f = FS_HandleForFile();
@ -1065,7 +1065,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
hash = 0;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( file == NULL ) {
@ -1104,7 +1104,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
}
if ( !filename ) {
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed\n" );
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed" );
}
// qpaths are not supposed to have a leading slash
@ -1267,7 +1267,7 @@ char *FS_FindDll( const char *filename ) {
directory_t *dir;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
for ( search = fs_searchpaths ; search ; search = search->next ) {
@ -1297,7 +1297,7 @@ Properly handles partial reads
*/
int FS_Read2( void *buffer, int len, fileHandle_t f ) {
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !f ) {
@ -1321,7 +1321,7 @@ int FS_Read( void *buffer, int len, fileHandle_t f ) {
int tries;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !f ) {
@ -1375,7 +1375,7 @@ int FS_Write( const void *buffer, int len, fileHandle_t h ) {
FILE *f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !h ) {
@ -1436,7 +1436,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
int _origin;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
return -1;
}
@ -1474,7 +1474,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
break;
default:
Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
return -1;
break;
}
@ -1493,7 +1493,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
break;
default:
_origin = SEEK_CUR;
Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
break;
}
@ -1517,11 +1517,11 @@ int FS_FileIsInPAK(const char *filename, int *pChecksum ) {
long hash = 0;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !filename ) {
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed\n" );
Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename' parameter passed" );
}
// qpaths are not supposed to have a leading slash
@ -1585,11 +1585,11 @@ int FS_ReadFile( const char *qpath, void **buffer ) {
int len;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !qpath || !qpath[0] ) {
Com_Error( ERR_FATAL, "FS_ReadFile with empty name\n" );
Com_Error( ERR_FATAL, "FS_ReadFile with empty name" );
}
buf = NULL; // quiet compiler warning
@ -1694,7 +1694,7 @@ FS_FreeFile
*/
void FS_FreeFile( void *buffer ) {
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !buffer ) {
Com_Error( ERR_FATAL, "FS_FreeFile( NULL )" );
@ -1720,7 +1720,7 @@ void FS_WriteFile( const char *qpath, const void *buffer, int size ) {
fileHandle_t f;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !qpath || !buffer ) {
@ -1977,7 +1977,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, char *filt
char zpath[MAX_ZPATH];
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !path ) {
@ -2108,7 +2108,7 @@ void FS_FreeFileList( char **list ) {
int i;
if ( !fs_searchpaths ) {
Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
}
if ( !list ) {
@ -3660,7 +3660,7 @@ void FS_Restart( int checksumFeed ) {
lastValidBase[0] = '\0';
lastValidGame[0] = '\0';
FS_Restart(checksumFeed);
Com_Error( ERR_DROP, "Invalid game folder\n" );
Com_Error( ERR_DROP, "Invalid game folder" );
return;
}
Com_Error( ERR_FATAL, "Couldn't load default.cfg" );

4
code/qcommon/huffman.c
View File

@ -273,7 +273,7 @@ int Huff_Receive (node_t *node, int *ch, byte *fin) {
}
if (!node) {
return 0;
// Com_Error(ERR_DROP, "Illegal tree!\n");
// Com_Error(ERR_DROP, "Illegal tree!");
}
return (*ch = node->symbol);
}
@ -291,7 +291,7 @@ void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
if (!node) {
*ch = 0;
return;
// Com_Error(ERR_DROP, "Illegal tree!\n");
// Com_Error(ERR_DROP, "Illegal tree!");
}
*ch = node->symbol;
*offset = bloc;

4
code/qcommon/msg.c
View File

@ -155,7 +155,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
msg->cursize += 4;
msg->bit += 32;
} else {
Com_Error(ERR_DROP, "can't read %d bits\n", bits);
Com_Error(ERR_DROP, "can't read %d bits", bits);
}
} else {
// fp = fopen("c:\\netchan.bin", "a");
@ -213,7 +213,7 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
msg->readcount += 4;
msg->bit += 32;
} else {
Com_Error(ERR_DROP, "can't read %d bits\n", bits);
Com_Error(ERR_DROP, "can't read %d bits", bits);
}
} else {
nbits = 0;

2
code/qcommon/vm.c
View File

@ -502,7 +502,7 @@ vm_t *VM_Restart( vm_t *vm ) {
Com_Printf( "VM_Restart()\n" );
if( !( header = VM_LoadQVM( vm, qfalse ) ) ) {
Com_Error( ERR_DROP, "VM_Restart failed.\n" );
Com_Error( ERR_DROP, "VM_Restart failed" );
return NULL;
}

4
code/qcommon/vm_powerpc.c
View File

@ -1,4 +1,4 @@
/*
50/*
===========================================================================
Copyright (C) 2008 Przemyslaw Iskra <sparky@pld-linux.org>
@ -47,7 +47,7 @@ static clock_t time_total_vm = 0;
/* exit() won't be called but use it because it is marked with noreturn */
#define DIE( reason ) \
do { \
Com_Error(ERR_DROP, "vm_powerpc compiler error: " reason "\n"); \
Com_Error(ERR_DROP, "vm_powerpc compiler error: " reason); \
exit(1); \
} while(0)

2
code/qcommon/vm_sparc.c
View File

@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/* exit() won't be called but use it because it is marked with noreturn */
#define DIE( reason ) \
do { \
Com_Error(ERR_DROP, "vm_sparc compiler error: " reason "\n"); \
Com_Error(ERR_DROP, "vm_sparc compiler error: " reason); \
exit(1); \
} while(0)

2
code/sdl/sdl_input.c
View File

@ -1026,7 +1026,7 @@ void IN_Init( void )
if( !SDL_WasInit( SDL_INIT_VIDEO ) )
{
Com_Error( ERR_FATAL, "IN_Init called before SDL_Init( SDL_INIT_VIDEO )\n" );
Com_Error( ERR_FATAL, "IN_Init called before SDL_Init( SDL_INIT_VIDEO )" );
return;
}

2
code/server/sv_bot.c
View File

@ -304,7 +304,7 @@ BotImport_HunkAlloc
*/
static void *BotImport_HunkAlloc( int size ) {
if( Hunk_CheckMark() ) {
Com_Error( ERR_DROP, "SV_Bot_HunkAlloc: Alloc with marks already set\n" );
Com_Error( ERR_DROP, "SV_Bot_HunkAlloc: Alloc with marks already set" );
}
return Hunk_Alloc( size, h_high );
}

2
code/server/sv_client.c
View File

@ -459,7 +459,7 @@ void SV_DirectConnect( netadr_t from ) {
newcl = &svs.clients[sv_maxclients->integer - 1];
}
else {
Com_Error( ERR_FATAL, "server is full on local connect\n" );
Com_Error( ERR_FATAL, "server is full on local connect" );
return;
}
}

8
code/server/sv_init.c
View File

@ -108,7 +108,7 @@ void SV_SetConfigstring (int index, const char *val) {
client_t *client;
if ( index < 0 || index >= MAX_CONFIGSTRINGS ) {
Com_Error (ERR_DROP, "SV_SetConfigstring: bad index %i\n", index);
Com_Error (ERR_DROP, "SV_SetConfigstring: bad index %i", index);
}
if ( !val ) {
@ -156,7 +156,7 @@ void SV_GetConfigstring( int index, char *buffer, int bufferSize ) {
Com_Error( ERR_DROP, "SV_GetConfigstring: bufferSize == %i", bufferSize );
}
if ( index < 0 || index >= MAX_CONFIGSTRINGS ) {
Com_Error (ERR_DROP, "SV_GetConfigstring: bad index %i\n", index);
Com_Error (ERR_DROP, "SV_GetConfigstring: bad index %i", index);
}
if ( !sv.configstrings[index] ) {
buffer[0] = 0;
@ -175,7 +175,7 @@ SV_SetUserinfo
*/
void SV_SetUserinfo( int index, const char *val ) {
if ( index < 0 || index >= sv_maxclients->integer ) {
Com_Error (ERR_DROP, "SV_SetUserinfo: bad index %i\n", index);
Com_Error (ERR_DROP, "SV_SetUserinfo: bad index %i", index);
}
if ( !val ) {
@ -199,7 +199,7 @@ void SV_GetUserinfo( int index, char *buffer, int bufferSize ) {
Com_Error( ERR_DROP, "SV_GetUserinfo: bufferSize == %i", bufferSize );
}
if ( index < 0 || index >= sv_maxclients->integer ) {
Com_Error (ERR_DROP, "SV_GetUserinfo: bad index %i\n", index);
Com_Error (ERR_DROP, "SV_GetUserinfo: bad index %i", index);
}
Q_strncpyz( buffer, svs.clients[ index ].userinfo, bufferSize );
}

2
code/server/sv_net_chan.c
View File

@ -139,7 +139,7 @@ void SV_Netchan_TransmitNextFragment( client_t *client ) {
{
// make sure the netchan queue has been properly initialized (you never know)
if ((!client->netchan_end_queue) && (client->state >= CS_CONNECTED)) {
Com_Error(ERR_DROP, "netchan queue is not properly initialized in SV_Netchan_TransmitNextFragment\n");
Com_Error(ERR_DROP, "netchan queue is not properly initialized in SV_Netchan_TransmitNextFragment");
}
// the last fragment was transmitted, check wether we have queued messages
if (client->netchan_start_queue) {

2
code/server/sv_snapshot.c
View File

@ -350,7 +350,7 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
// entities can be flagged to be sent to a given mask of clients
if ( ent->r.svFlags & SVF_CLIENTMASK ) {
if (frame->ps.clientNum >= 32)
Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum >= 32\n" );
Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum >= 32" );
if (~ent->r.singleClient & (1 << frame->ps.clientNum))
continue;
}