[sword-cvs] r1679 - in trunk: . src/mgr src/modules/texts/rawtext src/modules/texts/ztext

[scribe at crosswire.org]

Author: scribe
Date: 2004-09-22 16:51:58 -0700 (Wed, 22 Sep 2004)
New Revision: 1679

Modified:
   trunk/src/mgr/filemgr.cpp
   trunk/src/modules/texts/rawtext/rawtext.cpp
   trunk/src/modules/texts/ztext/ztext.cpp
   trunk/usrinst.sh
Log:
Fixed '\' line continuation error in SWConfig
Fixed -Werror problems on 64bit platforms


Modified: trunk/src/mgr/filemgr.cpp
===================================================================
--- trunk/src/mgr/filemgr.cpp	2004-09-14 10:36:32 UTC (rev 1678)
+++ trunk/src/mgr/filemgr.cpp	2004-09-22 23:51:58 UTC (rev 1679)
@@ -2,7 +2,7 @@
  *  filemgr.cpp	- implementation of class FileMgr used for pooling file
  *  					handles
  *
- * $Id: filemgr.cpp,v 1.39 2004/04/10 17:04:19 dglassey Exp $
+ * $Id$
  *
  * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
@@ -421,7 +421,7 @@
 			buf[size] = 0;
 
 			// clean up any trailing junk on buf
-			for (char *it = buf+(strlen(buf)); it > buf; it--) {
+			for (char *it = buf+(strlen(buf)-1); it > buf; it--) {
 				if ((*it != 10) && (*it != 13) && (*it != ' ') && (*it != '\t')) {
 					if (*it == '\\')
 						more = true;

Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp	2004-09-14 10:36:32 UTC (rev 1678)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp	2004-09-22 23:51:58 UTC (rev 1679)
@@ -439,13 +439,14 @@
 					*testKeyType = vk;
 
 					// check to see if it set ok and if so, add to our return list
-					if (*testKeyType == vk)
+					if (*testKeyType == vk) {
 						listkey << (const char *) vk;
-						listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
+						listkey.GetElement()->userData = reinterpret_cast<void *>((int)(h.score(i)*100));
+					}
 				}
 				else {
 					listkey << (const char*) vk;
-					listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
+					listkey.GetElement()->userData = reinterpret_cast<void *>((int)(h.score(i)*100));
 				}
 			}
 			(*percent)(98, percentUserData);

Modified: trunk/src/modules/texts/ztext/ztext.cpp
===================================================================
--- trunk/src/modules/texts/ztext/ztext.cpp	2004-09-14 10:36:32 UTC (rev 1678)
+++ trunk/src/modules/texts/ztext/ztext.cpp	2004-09-22 23:51:58 UTC (rev 1679)
@@ -404,13 +404,14 @@
 					*testKeyType = vk;
 
 					// check to see if it set ok and if so, add to our return list
-					if (*testKeyType == vk)
+					if (*testKeyType == vk) {
 						listkey << (const char *) vk;
-						listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
+						listkey.GetElement()->userData = reinterpret_cast<void *>((int)(h.score(i)*100));
+					}
 				}
 				else {
 					listkey << (const char*) vk;
-					listkey.GetElement()->userData = (void *)(int)(h.score(i)*100);
+					listkey.GetElement()->userData = reinterpret_cast<void *>((int)(h.score(i)*100));
 				}
 			}
 			(*percent)(98, percentUserData);

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2004-09-14 10:36:32 UTC (rev 1678)
+++ trunk/usrinst.sh	2004-09-22 23:51:58 UTC (rev 1679)
@@ -6,7 +6,7 @@
 OPTIONS="--sysconfdir=/etc $OPTIONS"
 OPTIONS="--with-icu $OPTIONS"
 #OPTIONS="--with-vcl $OPTIONS"
-#OPTIONS="--enable-debug $OPTIONS"
+OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
 OPTIONS="--with-lucene $OPTIONS"
 #OPTIONS="--enable-tests $OPTIONS"