[sword-cvs] sword/src/mgr localemgr.cpp, 1.22, 1.23 swmgr.cpp, 1.104, 1.105

[sword at www.crosswire.org]

Committed by: joachim

Update of /cvs/core/sword/src/mgr
In directory www:/tmp/cvs-serv8206/src/mgr

Modified Files:
	localemgr.cpp swmgr.cpp 
Log Message:
fixed warnings

Index: localemgr.cpp
===================================================================
RCS file: /cvs/core/sword/src/mgr/localemgr.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- localemgr.cpp	19 May 2004 19:38:45 -0000	1.22
+++ localemgr.cpp	29 May 2004 01:12:42 -0000	1.23
@@ -131,7 +131,7 @@
 	struct dirent *ent;
 	SWBuf newmodfile;
 	LocaleMap::iterator it;
-	SWLog::getSystemLog()->logError("LocaleMgr::loadConfigDir loading %s", ipath);
+	SWLog::getSystemLog()->logInformation("LocaleMgr::loadConfigDir loading %s", ipath);
  
 	if ((dir = opendir(ipath))) {
 		rewinddir(dir);
@@ -190,7 +190,7 @@
 	if (it != locales->end())
 		return (*it).second;
 
-	SWLog::getSystemLog()->logError("LocaleMgr::getLocale failed to find %s\n", name);
+	SWLog::getSystemLog()->logWarning("LocaleMgr::getLocale failed to find %s\n", name);
 	return 0;
 }
 

Index: swmgr.cpp
===================================================================
RCS file: /cvs/core/sword/src/mgr/swmgr.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- swmgr.cpp	6 May 2004 10:46:25 -0000	1.104
+++ swmgr.cpp	29 May 2004 01:12:42 -0000	1.105
@@ -69,9 +69,11 @@
 #include <cipherfil.h>
 #include <rawfiles.h>
 #include <ztext.h>
+
 #ifdef SPLITLIB
 #include <ztext2.h>
 #endif
+
 #include <zld.h>
 #include <zcom.h>
 #include <lzsscomprs.h>
@@ -80,6 +82,9 @@
 #include <utf8hebrewpoints.h>
 #include <greeklexattribs.h>
 #include <swfiltermgr.h>
+
+#include <swlog.h>
+
 #ifndef EXCLUDEZLIB
 #include "zipcomprs.h"
 #endif
@@ -109,7 +114,7 @@
 #ifdef _MSC_VER
 #define DEBUGSTR(x)
 #else
-#define DEBUGSTR(x) if (debug) std::cerr << x;
+#define DEBUGSTR(x) if (SWMgr::debug) std::cerr << x;
 #endif  
 
 void SWMgr::init() {
@@ -340,7 +345,7 @@
 	char *envhomedir  = getenv ("HOME");
 
 	*configType = 0;
-	debug=1;
+	//debug=1;
 
 	// check working directory
 	DEBUGSTR("Checking working directory for mods.conf...");