From f268b0564ab10ee72f82271e2aaa58b392b830bb Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 18 Jun 2013 12:32:52 +0200
Subject: [PATCH] Scilab: remove SwigScilabStringFromCharPtrAndSize (same as
 SwigScilabStringFromCharPtr)

---
 Lib/scilab/scichar.swg  | 29 +++++++----------------------
 Lib/scilab/std_string.i |  4 ++--
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/Lib/scilab/scichar.swg b/Lib/scilab/scichar.swg
index cfc3e353a..f43c71198 100644
--- a/Lib/scilab/scichar.swg
+++ b/Lib/scilab/scichar.swg
@@ -2,6 +2,10 @@
  * C-type: char
  * Scilab type: string
  */
+
+/*
+ * CHAR
+*/
 %fragment(SWIG_AsVal_frag(char), "header", fragment="SwigScilabStringToChar") {
 #define SWIG_AsVal_char(scilabValue, valuePointer) SwigScilabStringToChar(pvApiCtx, scilabValue, valuePointer, fname)
 }
@@ -86,9 +90,10 @@ SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
 %fragment("SWIG_FromCharPtr", "header", fragment = "SwigScilabStringFromCharPtr") {
 #define SWIG_FromCharPtr(charPtr) SwigScilabStringFromCharPtr(pvApiCtx, $result, charPtr)
 }
-%fragment("SWIG_FromCharPtrAndSize", "header", fragment = "SwigScilabStringFromCharPtrAndSize") {
-#define SWIG_FromCharPtrAndSize(charPtr, charPtrLength) SwigScilabStringFromCharPtrAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), charPtr)
+%fragment("SWIG_FromCharPtrAndSize", "header", fragment = "SwigScilabStringFromCharPtr") {
+#define SWIG_FromCharPtrAndSize(charPtr, charPtrLength) SwigScilabStringFromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), charPtr)
 }
+
 %fragment("SwigScilabStringToCharPtr", "header") {
 SWIGINTERN int
 SwigScilabStringToCharPtr(void *_pvApiCtx, int _iVar, char *_pcValue, int _iLength, char *_fname) {
@@ -220,23 +225,3 @@ SwigScilabStringFromCharPtr(void *_pvApiCtx, int _iVarOut, const char *_pchValue
   return Rhs + _iVarOut;
 }
 }
-%fragment("SwigScilabStringFromCharPtrAndSize", "header") {
-SWIGINTERN int
-SwigScilabStringFromCharPtrAndSize(void *_pvApiCtx, int _iVarOut, const char *_pchValue) {
-  SciErr sciErr;
-  char **pstData = NULL;
-
-  pstData = (char **)malloc(sizeof(char *));
-  pstData[0] = strdup(_pchValue);
-
-  sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, (char **)pstData);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
-  }
-
-  free(pstData[0]);
-
-  return Rhs + _iVarOut;
-}
-}
diff --git a/Lib/scilab/std_string.i b/Lib/scilab/std_string.i
index 3a0106a70..7a20d5afa 100644
--- a/Lib/scilab/std_string.i
+++ b/Lib/scilab/std_string.i
@@ -29,10 +29,10 @@ SWIG_AsPtr_dec(std::string)(int _iVar, std::string **_pstValue) {
 }
 }
 
-%fragment(SWIG_From_frag(std::string), "header", fragment="SwigScilabStringFromCharPtrAndSize") {
+%fragment(SWIG_From_frag(std::string), "header", fragment="SwigScilabStringFromCharPtr") {
 SWIGINTERN int
 SWIG_From_dec(std::string)(std::string _pstValue) {
-    return SwigScilabStringFromCharPtrAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), _pstValue.c_str());
+    return SwigScilabStringFromCharPtr(pvApiCtx, SWIG_Scilab_GetOutputPosition(), _pstValue.c_str());
 }
 }