From 698a9c51ecf08a162f808943accb780e93e535ba Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Mon, 6 Jun 2011 14:51:02 +0000
Subject: [PATCH] Fix newlines in Com_Error, patch by Zack Middleton (#5023)

---
 code/client/cl_curl.c | 6 +++---
 code/qcommon/cmd.c    | 2 +-
 code/qcommon/cvar.c   | 4 ++--
 code/qcommon/files.c  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c
index 170e97b9..16a73b66 100644
--- a/code/client/cl_curl.c
+++ b/code/client/cl_curl.c
@@ -251,13 +251,13 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 	clc.downloadCURL = qcurl_easy_init();
 	if(!clc.downloadCURL) {
 		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: qcurl_easy_init() "
-			"failed\n");
+			"failed");
 		return;
 	}
 	clc.download = FS_SV_FOpenFileWrite(clc.downloadTempName);
 	if(!clc.download) {
 		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: failed to open "
-			"%s for writing\n", clc.downloadTempName);
+			"%s for writing", clc.downloadTempName);
 		return;
 	}
 	qcurl_easy_setopt(clc.downloadCURL, CURLOPT_WRITEDATA, clc.download);
@@ -284,7 +284,7 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
 		qcurl_easy_cleanup(clc.downloadCURL);
 		clc.downloadCURL = NULL;
 		Com_Error(ERR_DROP, "CL_cURL_BeginDownload: qcurl_multi_init() "
-			"failed\n");
+			"failed");
 		return;
 	}
 	qcurl_multi_add_handle(clc.downloadCURLM, clc.downloadCURL);
diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
index 15c2d891..6f7c36f0 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -686,7 +686,7 @@ void Cmd_RemoveCommandSafe( const char *cmd_name )
 	if( cmd->function )
 	{
 		Com_Error( ERR_DROP, "Restricted source tried to remove "
-			"system command \"%s\"\n", cmd_name );
+			"system command \"%s\"", cmd_name );
 		return;
 	}
 
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index fa4c00ce..2c3f1f4f 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -635,10 +635,10 @@ void Cvar_SetSafe( const char *var_name, const char *value )
 	{
 		if( value )
 			Com_Error( ERR_DROP, "Restricted source tried to set "
-				"\"%s\" to \"%s\"\n", var_name, value );
+				"\"%s\" to \"%s\"", var_name, value );
 		else
 			Com_Error( ERR_DROP, "Restricted source tried to "
-				"modify \"%s\"\n", var_name );
+				"modify \"%s\"", var_name );
 		return;
 	}
 	Cvar_Set( var_name, value );
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index 6ccba98f..53e4256d 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -541,7 +541,7 @@ static void FS_CheckFilenameIsNotExecutable( const char *filename,
 	if( !Q_stricmp( COM_GetExtension( filename ), DLL_EXT ) )
 	{
 		Com_Error( ERR_FATAL, "%s: Not allowed to manipulate '%s' due "
-			"to %s extension\n", function, filename, DLL_EXT );
+			"to %s extension", function, filename, DLL_EXT );
 	}
 }
 
@@ -1454,7 +1454,7 @@ int FS_Seek( fileHandle_t f, long offset, int origin ) {
 
 		if( offset < 0 || origin == FS_SEEK_END ) {
 			Com_Error( ERR_FATAL, "Negative offsets and FS_SEEK_END not implemented "
-					"for FS_Seek on pk3 file contents\n" );
+					"for FS_Seek on pk3 file contents" );
 			return -1;
 		}