sync with crosswire 20021007-1300

11 files changed, 9 insertions, 11 deletions

diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index d1055c4..6dd7c05 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
diff --git a/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp b/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp
index 42e0500..4b59124 100644
--- a/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp
+++ b/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp
@@ -322,7 +322,7 @@ void TMainForm::fillSourceTree(const char *sourceConf, TTreeView *tree)
 		}
 		
 		mods = mgr->Modules.find(sections->first.c_str());
-                if (mods != mgr->Modules.end())
+		if (mods != mgr->Modules.end())
 			secName = mods->second->Type();
 		else {
 			secName = "Other";
diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp
index 00e177d..de400d6 100644
--- a/src/modules/comments/rawcom/rawcom.cpp
+++ b/src/modules/comments/rawcom/rawcom.cpp
@@ -80,7 +80,7 @@ char *RawCom::getRawEntry() {
      entrybuf[size] = 0;
 
 	rawFilter(entrybuf, size, 0);	// hack, decipher
-	rawFilter(entrybuf, size, key);
+	rawFilter(entrybuf, size*FILTERPAD, key);
 
         if (!isUnicode())
 		preptext(entrybuf);
diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp
index a820e2e..7d5d3c2 100644
--- a/src/modules/comments/zcom/zcom.cpp
+++ b/src/modules/comments/zcom/zcom.cpp
@@ -82,7 +82,7 @@ char *zCom::getRawEntry() {
 
 	zreadtext(key->Testament(), start, (size + 2), entrybuf);
 
-	rawFilter(entrybuf, size, key);
+	rawFilter(entrybuf, size*FILTERPAD, key);
 
 	if (!isUnicode())
 		preptext(entrybuf);
diff --git a/src/modules/filters/latin1utf8.cpp b/src/modules/filters/latin1utf8.cpp
index 5d3daba..2bcbb22 100644
--- a/src/modules/filters/latin1utf8.cpp
+++ b/src/modules/filters/latin1utf8.cpp
@@ -23,8 +23,6 @@ char Latin1UTF8::ProcessText(char *text, int maxlen, const SWKey *key, const SWM
 	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
 		return -1;
         len = strlen(text) + 1;
-	if (len == maxlen + 1)
-        	maxlen = (maxlen + 1) * FILTERPAD;
         // shift string to right of buffer
 	if (len < maxlen) {
 	  memmove(&text[maxlen - len], text, len);
diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp
index 46be783..f576a4a 100644
--- a/src/modules/genbook/rawgenbook/rawgenbook.cpp
+++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp
@@ -117,7 +117,7 @@ char *RawGenBook::getRawEntry() {
           entryBuf[size] = 0;
 
 		rawFilter(entryBuf, size, 0);	// hack, decipher
-		rawFilter(entryBuf, size, key);
+		rawFilter(entryBuf, size*FILTERPAD, key);
 
 		   if (!isUnicode())
 			RawStr::preptext(entryBuf);
diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp
index 44e8d3c..52321a4 100644
--- a/src/modules/lexdict/rawld/rawld.cpp
+++ b/src/modules/lexdict/rawld/rawld.cpp
@@ -92,7 +92,7 @@ char RawLD::getEntry(long away)
 	if (!(retval = findoffset(buf, &start, &size, away))) {
 		readtext(start, &size, &idxbuf, &entrybuf);
 		rawFilter(entrybuf, size, 0);	// hack, decipher
-		rawFilter(entrybuf, size, key);
+		rawFilter(entrybuf, size*FILTERPAD, key);
 		entrySize = size;        // support getEntrySize call
 		if (!key->Persist())			// If we have our own key
 			*key = idxbuf;				// reset it to entry index buffer
diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp
index a055e18..62a01f6 100644
--- a/src/modules/lexdict/rawld4/rawld4.cpp
+++ b/src/modules/lexdict/rawld4/rawld4.cpp
@@ -93,7 +93,7 @@ char RawLD4::getEntry(long away)
 	if (!(retval = findoffset(buf, &start, &size, away))) {
 		readtext(start, &size, &idxbuf, &entrybuf);
 		rawFilter(entrybuf, size, 0);	// hack, decipher
-		rawFilter(entrybuf, size, key);
+		rawFilter(entrybuf, size*FILTERPAD, key);
 		entrySize = size;        // support getEntrySize call
 		if (!key->Persist())			// If we have our own key
 			*key = idxbuf;				// reset it to entry index buffer
diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp
index 5be55ca..c3d7b25 100644
--- a/src/modules/lexdict/zld/zld.cpp
+++ b/src/modules/lexdict/zld/zld.cpp
@@ -94,7 +94,7 @@ char zLD::getEntry(long away) {
 		entrybuf = new char [ size * FILTERPAD ];
 		strcpy(entrybuf, ebuf);
 
-		rawFilter(entrybuf, size, key);
+		rawFilter(entrybuf, size*FILTERPAD, key);
 
 		entrySize = size;        // support getEntrySize call
 		if (!key->Persist())			// If we have our own key
diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp
index 072a341..fe14e9b 100644
--- a/src/modules/texts/rawtext/rawtext.cpp
+++ b/src/modules/texts/rawtext/rawtext.cpp
@@ -114,7 +114,7 @@ char *RawText::getRawEntry() {
      entrybuf[size] = 0;
 
 	rawFilter(entrybuf, size, 0);	// hack, decipher
-	rawFilter(entrybuf, size, key);
+	rawFilter(entrybuf, size*FILTERPAD, key);
 
 	if (!isUnicode())
 		preptext(entrybuf);
diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp
index a51b338..fe90216 100644
--- a/src/modules/texts/ztext/ztext.cpp
+++ b/src/modules/texts/ztext/ztext.cpp
@@ -88,7 +88,7 @@ char *zText::getRawEntry()
 
 	zreadtext(key->Testament(), start, (size + 2), entrybuf);
 
-	rawFilter(entrybuf, size, key);
+	rawFilter(entrybuf, size*FILTERPAD, key);
 
 	if (!isUnicode())
 		preptext(entrybuf);