diff options
Diffstat (limited to 'src/qcommon')
-rw-r--r-- | src/qcommon/common.c | 8 | ||||
-rw-r--r-- | src/qcommon/files.c | 54 | ||||
-rw-r--r-- | src/qcommon/huffman.c | 4 | ||||
-rw-r--r-- | src/qcommon/msg.c | 4 | ||||
-rw-r--r-- | src/qcommon/vm.c | 2 | ||||
-rw-r--r-- | src/qcommon/vm_powerpc.c | 4 | ||||
-rw-r--r-- | src/qcommon/vm_sparc.c | 2 |
7 files changed, 39 insertions, 39 deletions
diff --git a/src/qcommon/common.c b/src/qcommon/common.c index 761fe726..069eb922 100644 --- a/src/qcommon/common.c +++ b/src/qcommon/common.c @@ -1053,12 +1053,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" ); } } } @@ -1869,7 +1869,7 @@ void Hunk_Trash( void ) { return; #ifdef _DEBUG - Com_Error(ERR_DROP, "hunk trashed\n"); + Com_Error(ERR_DROP, "hunk trashed"); return; #endif diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 129daeca..62edf997 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -495,7 +495,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; @@ -608,7 +608,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, "" ); @@ -652,7 +652,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(); @@ -717,7 +717,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 @@ -749,7 +749,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 @@ -779,7 +779,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) { @@ -809,7 +809,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(); @@ -852,7 +852,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(); @@ -895,7 +895,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(); @@ -1043,7 +1043,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 ) { @@ -1082,7 +1082,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 @@ -1238,7 +1238,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 ) { @@ -1268,7 +1268,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 ) { @@ -1292,7 +1292,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 ) { @@ -1346,7 +1346,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 ) { @@ -1407,7 +1407,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; } @@ -1445,7 +1445,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; } @@ -1464,7 +1464,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; } @@ -1488,11 +1488,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 @@ -1556,11 +1556,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 @@ -1665,7 +1665,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 )" ); @@ -1691,7 +1691,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 ) { @@ -1948,7 +1948,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 ) { @@ -2079,7 +2079,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 ) { @@ -3376,7 +3376,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" ); diff --git a/src/qcommon/huffman.c b/src/qcommon/huffman.c index 8ef702af..f230c96a 100644 --- a/src/qcommon/huffman.c +++ b/src/qcommon/huffman.c @@ -274,7 +274,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); } @@ -292,7 +292,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; diff --git a/src/qcommon/msg.c b/src/qcommon/msg.c index 05a7aa9f..d20803b4 100644 --- a/src/qcommon/msg.c +++ b/src/qcommon/msg.c @@ -156,7 +156,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"); @@ -214,7 +214,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; diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c index 225119fb..37db8b02 100644 --- a/src/qcommon/vm.c +++ b/src/qcommon/vm.c @@ -503,7 +503,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; } diff --git a/src/qcommon/vm_powerpc.c b/src/qcommon/vm_powerpc.c index 831e5672..47c6c1de 100644 --- a/src/qcommon/vm_powerpc.c +++ b/src/qcommon/vm_powerpc.c @@ -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) diff --git a/src/qcommon/vm_sparc.c b/src/qcommon/vm_sparc.c index 370ee200..e707dc23 100644 --- a/src/qcommon/vm_sparc.c +++ b/src/qcommon/vm_sparc.c @@ -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) |