diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-06 14:51:02 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-09 22:37:41 +0000 |
| commit | 3eb92605f13ad489c5f8bbccf4463f6951f3c03c (patch) | |
| tree | 6035851d43b0e73655cfe21fa45807c7ec69613c | |
| parent | bdaff032dd15ebe90236c4c23baf9dcf294496cd (diff) | |
Fix newlines in Com_Error, patch by Zack Middleton (#5023)
| -rw-r--r-- | src/client/cl_curl.c | 6 | ||||
| -rw-r--r-- | src/qcommon/cmd.c | 2 | ||||
| -rw-r--r-- | src/qcommon/cvar.c | 4 | ||||
| -rw-r--r-- | src/qcommon/files.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/client/cl_curl.c b/src/client/cl_curl.c index 3a59f19e..63958e38 100644 --- a/src/client/cl_curl.c +++ b/src/client/cl_curl.c @@ -252,13 +252,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); @@ -285,7 +285,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/src/qcommon/cmd.c b/src/qcommon/cmd.c index 8ea761e8..afd10279 100644 --- a/src/qcommon/cmd.c +++ b/src/qcommon/cmd.c @@ -725,7 +725,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/src/qcommon/cvar.c b/src/qcommon/cvar.c index 8db30e6a..b5a6a281 100644 --- a/src/qcommon/cvar.c +++ b/src/qcommon/cvar.c @@ -636,10 +636,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/src/qcommon/files.c b/src/qcommon/files.c index 41510fec..76cc6075 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -519,7 +519,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 ); } } @@ -1425,7 +1425,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; } |