ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix newlines in Com_Error, patch by Zack Middleton (#5023)

This commit is contained in:
Thilo Schulz 2011-06-06 14:51:02 +00:00
parent 71b8fe477d
commit 698a9c51ec
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/client/cl_curl.c
View File

@ -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);

2
code/qcommon/cmd.c
View File

@ -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;
}

4
code/qcommon/cvar.c
View File

@ -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 );

4
code/qcommon/files.c
View File

@ -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;
}