[Scummvm-cvs-logs] SF.net SVN: scummvm:[38694] scummvm/trunk/engines/sci/engine

joostp at users.sourceforge.net joostp at users.sourceforge.net
Sat Feb 21 13:58:10 CET 2009


Revision: 38694
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38694&view=rev
Author:   joostp
Date:     2009-02-21 12:58:09 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
error() calls don't need \n, as it is already appended in error() itself

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp
    scummvm/trunk/engines/sci/engine/sys_strings.cpp

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-21 12:43:37 UTC (rev 38693)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-21 12:58:09 UTC (rev 38694)
@@ -186,12 +186,12 @@
 
 static FILE *getFileFromHandle(EngineState *s, int handle) {
 	if (handle == 0) {
-		error("Attempt to use file handle 0\n");
+		error("Attempt to use file handle 0");
 		return 0;
 	}
 
 	if ((handle >= s->file_handles_nr) || (s->file_handles[handle] == NULL)) {
-		error("Attempt to use invalid/unused file handle %d\n", handle);
+		error("Attempt to use invalid/unused file handle %d", handle);
 		return 0;
 	}
 	
@@ -901,7 +901,7 @@
 		break;
 	}
 	default :
-		error("Unknown FileIO() sub-command: %d\n", func_nr);
+		error("Unknown FileIO() sub-command: %d", func_nr);
 	}
 
 	return s->r_acc;

Modified: scummvm/trunk/engines/sci/engine/sys_strings.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/sys_strings.cpp	2009-02-21 12:43:37 UTC (rev 38693)
+++ scummvm/trunk/engines/sci/engine/sys_strings.cpp	2009-02-21 12:58:09 UTC (rev 38694)
@@ -33,12 +33,12 @@
 	sys_string_t *str = strings->strings + index;
 
 	if (index < 0 || index >= SYS_STRINGS_MAX) {
-		error("[SYSSTR] Error: Attempt to acquire string #%d\n", index);
+		error("[SYSSTR] Error: Attempt to acquire string #%d", index);
 		BREAKPOINT();
 	}
 
 	if (str->name && (strcmp(name, str->name) || (str->max_size != max_len))) {
-		error("[SYSSTR] Error: Attempt to re-acquire existing string #%d; was '%s', tried to claim as '%s'\n", index, str->name, name);
+		error("[SYSSTR] Error: Attempt to re-acquire existing string #%d; was '%s', tried to claim as '%s'", index, str->name, name);
 		BREAKPOINT();
 	}
 
@@ -52,7 +52,7 @@
 	sys_string_t *str = strings->strings + index;
 
 	if (index < 0 || index >= SYS_STRINGS_MAX || !str->name) {
-		error("[SYSSTR] Error: Attempt to write to invalid/unused string #%d\n", index);
+		error("[SYSSTR] Error: Attempt to write to invalid/unused string #%d", index);
 		BREAKPOINT();
 		return 1;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list