From c6d43a9ba93e079153f298cf8ec978e4cb1f0a38 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Thu, 12 May 2011 14:02:48 +0000 Subject: Remove newlines from Com_Error message format strings, patch by DevHC --- src/server/sv_client.c | 2 +- src/server/sv_init.c | 8 ++++---- src/server/sv_net_chan.c | 2 +- src/server/sv_snapshot.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server') diff --git a/src/server/sv_client.c b/src/server/sv_client.c index 124c0a74..36c5e711 100644 --- a/src/server/sv_client.c +++ b/src/server/sv_client.c @@ -265,7 +265,7 @@ void SV_DirectConnect( netadr_t from ) { if ( !newcl ) { if ( NET_IsLocalAddress( from ) ) { - Com_Error( ERR_FATAL, "server is full on local connect\n" ); + Com_Error( ERR_FATAL, "server is full on local connect" ); return; } else { diff --git a/src/server/sv_init.c b/src/server/sv_init.c index e84ff0f4..a723f68c 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -116,7 +116,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 ) { @@ -164,7 +164,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].s ) { buffer[0] = 0; @@ -206,7 +206,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 ) { @@ -230,7 +230,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 ); } diff --git a/src/server/sv_net_chan.c b/src/server/sv_net_chan.c index 1adba16d..33d04b3f 100644 --- a/src/server/sv_net_chan.c +++ b/src/server/sv_net_chan.c @@ -140,7 +140,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) { diff --git a/src/server/sv_snapshot.c b/src/server/sv_snapshot.c index a7d0f17b..10820d07 100644 --- a/src/server/sv_snapshot.c +++ b/src/server/sv_snapshot.c @@ -351,7 +351,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; } -- cgit