[Scummvm-cvs-logs] SF.net SVN: scummvm:[42433] scummvm/trunk

[sunmax at users.sourceforge.net]

Revision: 42433
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42433&view=rev
Author:   sunmax
Date:     2009-07-13 00:55:30 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Reverted my previous change (fprintf vs fputs),
and properly implemented fputs for stderr case
on PS2 ;-)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ps2/fileio.cpp
    scummvm/trunk/common/util.cpp

Modified: scummvm/trunk/backends/platform/ps2/fileio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-07-12 23:54:46 UTC (rev 42432)
+++ scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-07-13 00:55:30 UTC (rev 42433)
@@ -507,6 +507,13 @@
 
 int ps2_fputs(const char *s, FILE *stream) {
 	int len = strlen(s);
+
+	if (stream == stderr || stream == stdout) {
+		printf("%s", s);
+		sioprintf("%s", s);
+		return len;
+	}
+
 	if (ps2_fwrite(s, 1, len, stream) == (size_t)len)
 		return len;
 	else

Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp	2009-07-12 23:54:46 UTC (rev 42432)
+++ scummvm/trunk/common/util.cpp	2009-07-13 00:55:30 UTC (rev 42433)
@@ -477,11 +477,7 @@
 
 
 	// Print the error message to stderr
-#ifndef __PLAYSTATION2__
 	fputs(buf_output, stderr);
-#else
-	fprintf(stderr, "%s", buf_output);
-#endif
 
 	// Unless this error -originated- within the debugger itself, we
 	// now invoke the debugger, if available / supported.


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