[quake3-commits] r2005 - in trunk/code: client qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-06 10:51:02 -0400 (Mon, 06 Jun 2011)
New Revision: 2005

Modified:
   trunk/code/client/cl_curl.c
   trunk/code/qcommon/cmd.c
   trunk/code/qcommon/cvar.c
   trunk/code/qcommon/files.c
Log:
Fix newlines in Com_Error, patch by Zack Middleton (#5023)


Modified: trunk/code/client/cl_curl.c
===================================================================
--- trunk/code/client/cl_curl.c	2011-06-06 14:29:45 UTC (rev 2004)
+++ trunk/code/client/cl_curl.c	2011-06-06 14:51:02 UTC (rev 2005)
@@ -251,13 +251,13 @@
 	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 @@
 		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);

Modified: trunk/code/qcommon/cmd.c
===================================================================
--- trunk/code/qcommon/cmd.c	2011-06-06 14:29:45 UTC (rev 2004)
+++ trunk/code/qcommon/cmd.c	2011-06-06 14:51:02 UTC (rev 2005)
@@ -686,7 +686,7 @@
 	if( cmd->function )
 	{
 		Com_Error( ERR_DROP, "Restricted source tried to remove "
-			"system command \"%s\"\n", cmd_name );
+			"system command \"%s\"", cmd_name );
 		return;
 	}
 

Modified: trunk/code/qcommon/cvar.c
===================================================================
--- trunk/code/qcommon/cvar.c	2011-06-06 14:29:45 UTC (rev 2004)
+++ trunk/code/qcommon/cvar.c	2011-06-06 14:51:02 UTC (rev 2005)
@@ -635,10 +635,10 @@
 	{
 		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 );

Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2011-06-06 14:29:45 UTC (rev 2004)
+++ trunk/code/qcommon/files.c	2011-06-06 14:51:02 UTC (rev 2005)
@@ -541,7 +541,7 @@
 	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 @@
 
 		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;
 		}