[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Sun Dec 5 15:25:02 CET 2004


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6258

Modified Files:
	config-manager.cpp 
Log Message:
cleanup

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- config-manager.cpp	28 Sep 2004 12:10:48 -0000	1.23
+++ config-manager.cpp	5 Dec 2004 23:24:43 -0000	1.24
@@ -26,9 +26,6 @@
 
 #if defined(UNIX)
 #include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
 #ifdef MACOSX
 #define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"
 #else
@@ -38,6 +35,10 @@
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 256
+#endif
+
 #define MAXLINELEN 256
 
 static char *ltrim(char *t) {
@@ -67,20 +68,18 @@
 
 ConfigManager::ConfigManager() {
 
-#if defined(UNIX)
 	char configFile[MAXPATHLEN];
+#if defined(UNIX)
 	if(getenv("HOME") != NULL)
 		sprintf(configFile,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);
-	else strcpy(configFile,DEFAULT_CONFIG_FILE);
+	else
+		strcpy(configFile, DEFAULT_CONFIG_FILE);
 #else
-	char configFile[256];
 	#if defined (WIN32) && !defined(_WIN32_WCE)
-		GetWindowsDirectory(configFile, 256);
-		strcat(configFile, "\\");
-		strcat(configFile, DEFAULT_CONFIG_FILE);
+		GetWindowsDirectory(configFile, MAXPATHLEN);
+		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
 	#elif defined(__PALM_OS__)
-		strcpy(configFile,"/PALM/Programs/ScummVM/");
-		strcat(configFile, DEFAULT_CONFIG_FILE);
+		strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
 	#else
 		strcpy(configFile, DEFAULT_CONFIG_FILE);
 	#endif





More information about the Scummvm-git-logs mailing list