[sword-svn] r3183 - in branches/sword-1-7-x: . bindings

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:30:03 -0700 (Wed, 16 Apr 2014)
New Revision: 3183

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/bindings/flatapi.cpp
Log:
Merging r3140 - fixed char** return types



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140

Modified: branches/sword-1-7-x/bindings/flatapi.cpp
===================================================================
--- branches/sword-1-7-x/bindings/flatapi.cpp	2014-04-17 04:28:36 UTC (rev 3182)
+++ branches/sword-1-7-x/bindings/flatapi.cpp	2014-04-17 04:30:03 UTC (rev 3183)
@@ -1003,7 +1003,7 @@
 	retVal = (const char **)calloc(count+1, sizeof(const char *));
 	count = 0;
 	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
-		stdstr((char **)&((*retVal)[count++]), it->c_str());
+		stdstr((char **)&(retVal[count++]), it->c_str());
 	}
 
 	hmgr->globalOptions = retVal;
@@ -1031,7 +1031,7 @@
 	retVal = (const char **)calloc(count+1, sizeof(const char *));
 	count = 0;
 	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
-		stdstr((char **)&((*retVal)[count++]), it->c_str());
+		stdstr((char **)&(retVal[count++]), it->c_str());
 	}
 
 	hmgr->globalOptionValues = retVal;
@@ -1084,7 +1084,7 @@
 	retVal = (const char **)calloc(count+1, sizeof(const char *));
 	count = 0;
 	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
-		stdstr((char **)&((*retVal)[count++]), it->c_str());
+		stdstr((char **)&(retVal[count++]), it->c_str());
 	}
 
 	hmgr->availableLocales = retVal;