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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Nov 23 23:29:39 CET 2009


Revision: 46107
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46107&view=rev
Author:   fingolfin
Date:     2009-11-23 22:29:39 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
PS2 & NDS: Remove ps2_fprintf and some useless typedefs and #defines; use fputs instead of fprintf

Modified Paths:
--------------
    scummvm/trunk/backends/fs/ds/ds-fs.cpp
    scummvm/trunk/backends/fs/stdiostream.cpp
    scummvm/trunk/backends/platform/ps2/fileio.cpp
    scummvm/trunk/backends/platform/ps2/fileio.h
    scummvm/trunk/common/debug.cpp
    scummvm/trunk/common/util.cpp

Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp	2009-11-23 22:29:39 UTC (rev 46107)
@@ -769,10 +769,4 @@
 //	consolePrintf("clearerr ");
 }
 
-void std_fprintf(FILE* handle, const char* fmt, ...) {
-	//FIXME: not implemented properly
-	consolePrintf("%s", fmt);
-}
-
-
 } // namespace DS

Modified: scummvm/trunk/backends/fs/stdiostream.cpp
===================================================================
--- scummvm/trunk/backends/fs/stdiostream.cpp	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/backends/fs/stdiostream.cpp	2009-11-23 22:29:39 UTC (rev 46107)
@@ -39,7 +39,6 @@
 	#define fread(a, b, c, d)	ps2_fread(a, b, c, d)
 	#define fwrite(a, b, c, d)	ps2_fwrite(a, b, c, d)
 
-	#define fprintf				ps2_fprintf  // used in common/util.cpp
 	#define fflush(a)			ps2_fflush(a)  // used in common/util.cpp
 	#define ferror(a)			ps2_ferror(a)
 	#define clearerr(a)			ps2_clearerr(a)

Modified: scummvm/trunk/backends/platform/ps2/fileio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-11-23 22:29:39 UTC (rev 46107)
@@ -508,22 +508,6 @@
 		return EOF;
 }
 
-int ps2_fprintf(FILE *pOut, const char *zFormat, ...) {
-	va_list ap;
-	char resStr[2048];
-
-	va_start(ap,zFormat);
-	int res = vsnprintf(resStr, 2048, zFormat, ap);
-	va_end(ap);
-	if ((pOut == stderr) || (pOut == stdout)) {
-		printf("%s", resStr);
-		sioprintf("%s", resStr);
-	} else
-		res = ps2_fwrite(resStr, 1, res, pOut);
-
-	return res;
-}
-
 int ps2_fflush(FILE *stream) {
 	// printf("fflush not implemented\n");
 	return 0;

Modified: scummvm/trunk/backends/platform/ps2/fileio.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.h	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/backends/platform/ps2/fileio.h	2009-11-23 22:29:39 UTC (rev 46107)
@@ -97,7 +97,6 @@
 size_t ps2_fwrite(const void *buf, size_t r, size_t n, FILE *stream);
 int ps2_fputc(int c, FILE *stream);
 int ps2_fputs(const char *s, FILE *stream);
-int ps2_fprintf(FILE *pOut, const char *zFormat, ...);
 
 int ps2_ferror(FILE *stream);
 void ps2_clearerr(FILE *stream);

Modified: scummvm/trunk/common/debug.cpp
===================================================================
--- scummvm/trunk/common/debug.cpp	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/common/debug.cpp	2009-11-23 22:29:39 UTC (rev 46107)
@@ -33,11 +33,8 @@
 
 #ifdef __PLAYSTATION2__
 	// for those replaced fopen/fread/etc functions
-	typedef unsigned long	uint64;
-	typedef signed long	int64;
 	#include "backends/platform/ps2/fileio.h"
 
-	#define fprintf				ps2_fprintf
 	#define fputs(str, file)	ps2_fputs(str, file)
 	#define fflush(a)			ps2_fflush(a)
 #endif
@@ -45,12 +42,8 @@
 #ifdef __DS__
 	#include "backends/fs/ds/ds-fs.h"
 
-	void	std_fprintf(FILE* handle, const char* fmt, ...);
-	void	std_fflush(FILE* handle);
-
-	#define fprintf(file, fmt, ...)				do { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); } while(0)
-	#define fputs(str, file)					DS::std_fwrite(str, strlen(str), 1, file)
-	#define fflush(file)						DS::std_fflush(file)
+	#define fputs(str, file)	DS::std_fwrite(str, strlen(str), 1, file)
+	#define fflush(file)		DS::std_fflush(file)
 #endif
 
 

Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp	2009-11-23 22:29:02 UTC (rev 46106)
+++ scummvm/trunk/common/util.cpp	2009-11-23 22:29:39 UTC (rev 46107)
@@ -37,24 +37,15 @@
 
 #ifdef __PLAYSTATION2__
 	// for those replaced fopen/fread/etc functions
-	typedef unsigned long	uint64;
-	typedef signed long	int64;
 	#include "backends/platform/ps2/fileio.h"
 
-	#define fprintf				ps2_fprintf
 	#define fputs(str, file)	ps2_fputs(str, file)
-	#define fflush(a)			ps2_fflush(a)
 #endif
 
 #ifdef __DS__
 	#include "backends/fs/ds/ds-fs.h"
 
-	void	std_fprintf(FILE* handle, const char* fmt, ...);
-	void	std_fflush(FILE* handle);
-
-	#define fprintf(file, fmt, ...)				do { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); } while(0)
-	#define fputs(str, file)					DS::std_fwrite(str, strlen(str), 1, file)
-	#define fflush(file)						DS::std_fflush(file)
+	#define fputs(str, file)	DS::std_fwrite(str, strlen(str), 1, file)
 #endif
 
 
@@ -444,7 +435,9 @@
 	va_end(va);
 
 #if !defined (__SYMBIAN32__)
-	fprintf(stderr, "WARNING: %s!\n", buf);
+	fputs("WARNING: ", stderr);
+	fputs(buf, stderr);
+	fputs("!\n", stderr);
 #endif
 
 #if defined( USE_WINDBG )


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