[Firebird-checkins] CVS: vulcan/src/config ConfigFile.cpp,1.2,1.3

[Jim S. <jim...@us...>]

Update of /cvsroot/firebird/vulcan/src/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19935/src/config

Modified Files:
	ConfigFile.cpp 
Log Message:
Tweaks to config, minor coding cleanups, and loose ends

Index: ConfigFile.cpp
===================================================================
RCS file: /cvsroot/firebird/vulcan/src/config/ConfigFile.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- ConfigFile.cpp	24 Sep 2005 20:14:18 -0000	1.2
+++ ConfigFile.cpp	25 Sep 2005 16:24:30 -0000	1.3
@@ -275,7 +275,6 @@
 		}
 	
 #ifdef _WIN32
-	/***
 	char keyString [256];
 	HKEY key;
 	long ret = RegOpenKey (HKEY_LOCAL_MACHINE, PATH_KEY, &key);
@@ -300,15 +299,12 @@
 			if (keyString [length - 2] == '\\')
 				keyString [length - 2] = 0;
 			installDirectory = keyString;
+			return installDirectory;
 			}
-		else
-			installDirectory = "c:\\Program Files\\Firebird";
 		}
-	***/
 
-#ifdef _WIN32
 	HMODULE handle = GetModuleHandle("firebird.dll");
-	char modulePathname[256];
+	char modulePathname[MAXPATHLEN];
 	int len = GetModuleFileName(handle, modulePathname, sizeof(modulePathname));
 	
 	if (len > 0)
@@ -325,7 +321,6 @@
 		return installDirectory;
 		}
 		
-#endif
 #else
 	installDirectory = "/opt/firebird";