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

[anotherguest at users.sourceforge.net]

Revision: 54372
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54372&view=rev
Author:   anotherguest
Date:     2010-11-19 12:49:33 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
SYMBIAN : Remove Symbian FatalError implementation (not really used anymore for any current symbian phone)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/backends/platform/symbian/src/portdefs.h
    scummvm/trunk/common/textconsole.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2010-11-19 12:47:52 UTC (rev 54371)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2010-11-19 12:49:33 UTC (rev 54372)
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError()
 #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
 #include <bautils.h>
 
@@ -53,19 +52,6 @@
 ////////// extern "C" ///////////////////////////////////////////////////
 namespace Symbian {
 
-// Show a simple Symbian Info win with Msg & exit
-void FatalError(const char *msg) {
-	TPtrC8 msgPtr((const TUint8 *)msg);
-	TBuf<512> msg16Bit;
-	msg16Bit.Copy(msgPtr);
-#ifdef S60
-#else
-	CEikonEnv::Static()->InfoWinL(_L("ScummVM Fatal Error"), msg16Bit);
-#endif
-	if (g_system)
-		g_system->quit();
-}
-
 // make this easily available everywhere
 char* GetExecutablePath() {
 	return CSDLApp::GetExecutablePathCStr();

Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h	2010-11-19 12:47:52 UTC (rev 54371)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h	2010-11-19 12:49:33 UTC (rev 54372)
@@ -44,17 +44,6 @@
 // hack in some tricks to work around not having these fcns for Symbian
 // and we _really_ don't wanna link with any other windows LIBC library!
 #if defined(__GCC32__)
-
-	FIXME: If the following macros are ever used, then this will lead
-	to serious errors, e.g. an almost guaranteed buffer overflow
-	in Common::String::format(). Do *NOT* re-#define vsnprintf to
-	vsprintf, it will lead to disaster!
-	This shouldn't be necessary anyway, since we have
-	backends/platform/symbian/src/vsnprintf.h
-
-	#define snprintf(buf,len,args...)	sprintf(buf,args)
-	#define vsnprintf(buf,len,format,valist)	vsprintf(buf,format,valist)
-
 	// taken from public domain http://www.opensource.apple.com/darwinsource/WWDC2004/gcc_legacy-939/gcc/floatlib.c
 	#define SIGNBIT		0x80000000
 	#define HIDDEN		(1 << 23)
@@ -144,7 +133,6 @@
 
 // we cannot include SymbianOS.h everywhere, but this works too (functions code is in SymbianOS.cpp)
 namespace Symbian {
-extern void FatalError(const char *msg);
 extern char* GetExecutablePath();
 }
 #endif

Modified: scummvm/trunk/common/textconsole.cpp
===================================================================
--- scummvm/trunk/common/textconsole.cpp	2010-11-19 12:47:52 UTC (rev 54371)
+++ scummvm/trunk/common/textconsole.cpp	2010-11-19 12:49:33 UTC (rev 54372)
@@ -95,10 +95,6 @@
 	if (Common::s_errorHandler)
 		(*Common::s_errorHandler)(buf_output);
 
-#ifdef __SYMBIAN32__
-	Symbian::FatalError(buf_output);
-#endif
-
 	if (g_system)
 		g_system->fatalError();
 


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