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

[marcus_c at users.sourceforge.net]

Revision: 39591
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39591&view=rev
Author:   marcus_c
Date:     2009-03-21 16:07:46 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
argv should not be modified; make it plenty const.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/dc/dcmain.cpp
    scummvm/trunk/base/commandLine.cpp
    scummvm/trunk/base/commandLine.h
    scummvm/trunk/base/main.cpp
    scummvm/trunk/base/main.h

Modified: scummvm/trunk/backends/platform/dc/dcmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/dcmain.cpp	2009-03-21 15:47:45 UTC (rev 39590)
+++ scummvm/trunk/backends/platform/dc/dcmain.cpp	2009-03-21 16:07:46 UTC (rev 39591)
@@ -217,7 +217,7 @@
 
 int main()
 {
-  static char *argv[] = { "scummvm", NULL, };
+  static const char *argv[] = { "scummvm", NULL, };
   static int argc = 1;
 
   g_system = &osys_dc;

Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp	2009-03-21 15:47:45 UTC (rev 39590)
+++ scummvm/trunk/base/commandLine.cpp	2009-03-21 16:07:46 UTC (rev 39591)
@@ -281,7 +281,7 @@
 	}
 
 
-Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
+Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv) {
 	const char *s, *s2;
 
 	// argv[0] contains the name of the executable.
@@ -710,7 +710,7 @@
 #else // DISABLE_COMMAND_LINE
 
 
-Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
+Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv) {
 	return Common::String();
 }
 

Modified: scummvm/trunk/base/commandLine.h
===================================================================
--- scummvm/trunk/base/commandLine.h	2009-03-21 15:47:45 UTC (rev 39590)
+++ scummvm/trunk/base/commandLine.h	2009-03-21 16:07:46 UTC (rev 39591)
@@ -32,7 +32,7 @@
 namespace Base {
 
 void registerDefaults();
-Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
+Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv);
 bool processSettings(Common::String &command, Common::StringMap &settings);
 
 } // End of namespace Base

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2009-03-21 15:47:45 UTC (rev 39590)
+++ scummvm/trunk/base/main.cpp	2009-03-21 16:07:46 UTC (rev 39591)
@@ -235,7 +235,7 @@
 }
 
 
-extern "C" int scummvm_main(int argc, char *argv[]) {
+extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	Common::String specialDebug;
 	Common::String command;
 

Modified: scummvm/trunk/base/main.h
===================================================================
--- scummvm/trunk/base/main.h	2009-03-21 15:47:45 UTC (rev 39590)
+++ scummvm/trunk/base/main.h	2009-03-21 16:07:46 UTC (rev 39591)
@@ -31,6 +31,6 @@
 //
 // The scummvm main entry point, to be invoked by ports
 //
-extern "C" int scummvm_main(int argc, char *argv[]);
+extern "C" int scummvm_main(int argc, const char * const argv[]);
 
 #endif


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