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

svn-id: r46107

4 files changed, 0 insertions, 24 deletions

diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp
index 0d1d005b9e..6fc2894925 100644
--- a/backends/fs/ds/ds-fs.cpp
+++ b/backends/fs/ds/ds-fs.cpp
@@ -769,10 +769,4 @@ void std_clearerr(FILE* handle) {
 //	consolePrintf("clearerr ");
 }
 
-void std_fprintf(FILE* handle, const char* fmt, ...) {
-	//FIXME: not implemented properly
-	consolePrintf("%s", fmt);
-}
-
-
 } // namespace DS
diff --git a/backends/fs/stdiostream.cpp b/backends/fs/stdiostream.cpp
index a33d79b08a..b18403a18b 100644
--- a/backends/fs/stdiostream.cpp
+++ b/backends/fs/stdiostream.cpp
@@ -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)
diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp
index b0c3ce68e4..047992b13d 100644
--- a/backends/platform/ps2/fileio.cpp
+++ b/backends/platform/ps2/fileio.cpp
@@ -508,22 +508,6 @@ int ps2_fputs(const char *s, FILE *stream) {
 		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;
diff --git a/backends/platform/ps2/fileio.h b/backends/platform/ps2/fileio.h
index e3b1a98db9..ce470cebd1 100644
--- a/backends/platform/ps2/fileio.h
+++ b/backends/platform/ps2/fileio.h
@@ -97,7 +97,6 @@ char *ps2_fgets(char *buf, int n, FILE *stream);
 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);