[Scummvm-cvs-logs] scummvm master -> 96aed4d0577995709bcdf04d286f04979dc8e277

[fingolfin]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4f159dba90 PS2: Simplify OSystem_PS2::logMessage
c5532153c3 PS2: Remove dead code
8d77d8cf1c DS: Remove dead code
96aed4d057 PS2: Add missing semicolon


Commit: 4f159dba905cc1c623c99b2adf4d9df18c669dac
    https://github.com/scummvm/scummvm/commit/4f159dba905cc1c623c99b2adf4d9df18c669dac
Author: Max Horn (max at quendi.de)
Date: 2011-06-06T07:47:20-07:00

Commit Message:
PS2: Simplify OSystem_PS2::logMessage

Changed paths:
    backends/platform/ps2/systemps2.cpp



diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 9336468..1085f3d 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -984,13 +984,6 @@ Common::String OSystem_PS2::getDefaultConfigFileName() {
 }
 
 void OSystem_PS2::logMessage(LogMessageType::Type type, const char *message) {
-	FILE *output = 0;
-
-	if (type == LogMessageType::kInfo || type == LogMessageType::kDebug)
-		output = stdout;
-	else
-		output = stderr;
-
-	ps2_fputs(message, output);
-	ps2_fflush(output);
+	printf("%s", message);
+	sioprintf("%s", message);
 }


Commit: c5532153c344e0aa369e888eabad5cfe1e569673
    https://github.com/scummvm/scummvm/commit/c5532153c344e0aa369e888eabad5cfe1e569673
Author: Max Horn (max at quendi.de)
Date: 2011-06-06T07:50:26-07:00

Commit Message:
PS2: Remove dead code

Changed paths:
    backends/platform/ps2/fileio.cpp
    backends/platform/ps2/fileio.h



diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp
index 038cccd..ef01f3a 100644
--- a/backends/platform/ps2/fileio.cpp
+++ b/backends/platform/ps2/fileio.cpp
@@ -535,23 +535,3 @@ size_t ps2_fwrite(const void *buf, size_t r, size_t n, FILE *stream) {
 	assert(r != 0);
 	return ((Ps2File*)stream)->write(buf, r * n) / r;
 }
-
-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
-		return EOF;
-}
-
-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 3fdee5f..afa2ca1 100644
--- a/backends/platform/ps2/fileio.h
+++ b/backends/platform/ps2/fileio.h
@@ -115,10 +115,8 @@ public:
 // TODO: Get rid of the following, instead use PS2FileStream directly.
 FILE *ps2_fopen(const char *fname, const char *mode);
 int ps2_fclose(FILE *stream);
-int ps2_fflush(FILE *stream);
 
 size_t ps2_fread(void *buf, size_t r, size_t n, FILE *stream);
 size_t ps2_fwrite(const void *buf, size_t r, size_t n, FILE *stream);
-int ps2_fputs(const char *s, FILE *stream);
 
 #endif // __PS2FILE_IO__


Commit: 8d77d8cf1c4de7d9589f3f14492bdc26464ac0f9
    https://github.com/scummvm/scummvm/commit/8d77d8cf1c4de7d9589f3f14492bdc26464ac0f9
Author: Max Horn (max at quendi.de)
Date: 2011-06-06T07:55:18-07:00

Commit Message:
DS: Remove dead code

Changed paths:
    backends/fs/ds/ds-fs.cpp



diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp
index a038889..e3f282d 100644
--- a/backends/fs/ds/ds-fs.cpp
+++ b/backends/fs/ds/ds-fs.cpp
@@ -602,35 +602,11 @@ size_t std_fread(void *ptr, size_t size, size_t numItems, FILE *handle) {
 }
 
 size_t std_fwrite(const void *ptr, size_t size, size_t numItems, FILE *handle) {
-	if ((handle == stdin))
-		return 0;
-
-	if ((handle == stderr) || (handle == stdout)) {
-#ifndef DISABLE_TEXT_CONSOLE
-		nocashMessage((char *)ptr);
-//		consolePrintf((char *)ptr);
-#endif
-		return size;
-	}
-
 	//consolePrintf("fwrite size=%d\n", size * numItems);
 
 	if (DS::isGBAMPAvailable()) {
 		FAT_fwrite(ptr, size, numItems, (FAT_FILE *) handle);
 		return numItems;
-
-		int length = size * numItems;
-		int pos = 0;
-
-		while (pos < length) {
-			int amount = length > 512? 512: length;
-
-			FAT_fwrite(((char *) (ptr)) + pos, 1, amount, (FAT_FILE *) handle);
-			length -= amount;
-			pos += amount;
-		}
-
-		return numItems;
 	}
 
 	return 0;


Commit: 96aed4d0577995709bcdf04d286f04979dc8e277
    https://github.com/scummvm/scummvm/commit/96aed4d0577995709bcdf04d286f04979dc8e277
Author: Max Horn (max at quendi.de)
Date: 2011-06-06T08:01:11-07:00

Commit Message:
PS2: Add missing semicolon

Changed paths:
    backends/platform/ps2/systemps2.cpp



diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 1085f3d..728a67f 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -980,7 +980,7 @@ void OSystem_PS2::makeConfigPath() {
 }
 
 Common::String OSystem_PS2::getDefaultConfigFileName() {
-	return _configFile
+	return _configFile;
 }
 
 void OSystem_PS2::logMessage(LogMessageType::Type type, const char *message) {