[sword-svn] r3100 - trunk/src/modules/filters

[chrislit at crosswire.org]

Author: chrislit
Date: 2014-03-11 21:34:32 -0700 (Tue, 11 Mar 2014)
New Revision: 3100

Modified:
   trunk/src/modules/filters/scsuutf8.cpp
   trunk/src/modules/filters/utf8scsu.cpp
Log:
this was just bad copypasta from the earlier call to utf16Test.extract(); we don't need the length for the second call


Modified: trunk/src/modules/filters/scsuutf8.cpp
===================================================================
--- trunk/src/modules/filters/scsuutf8.cpp	2014-03-11 11:40:58 UTC (rev 3099)
+++ trunk/src/modules/filters/scsuutf8.cpp	2014-03-12 04:34:32 UTC (rev 3100)
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * Copyright 2001-2014 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -141,8 +141,7 @@
 	int32_t len = utf16Text.extract(text.getRawData(), text.size(), utf8Conv, err);
 	if (len > (int32_t)text.size()+1) {
 		text.setSize(len+1);
-		int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
-		(void) len;	// avoid unused warning
+		utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
 	}
 #else
 	// If ICU is unavailable, decode using Czyborra's decoder

Modified: trunk/src/modules/filters/utf8scsu.cpp
===================================================================
--- trunk/src/modules/filters/utf8scsu.cpp	2014-03-11 11:40:58 UTC (rev 3099)
+++ trunk/src/modules/filters/utf8scsu.cpp	2014-03-12 04:34:32 UTC (rev 3100)
@@ -51,8 +51,7 @@
 	int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
 	if (len > (int32_t)text.size()+1) {
 		text.setSize(len+1);
-		int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
-		(void) len;
+		utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
 	}
 
 	return 0;