Merge remote branch 'origin/5.2' into MPI
Sylvestre Ledru [Mon, 18 Jan 2010 21:01:54 +0000 (22:01 +0100)]
Conflicts:
scilab/Version.incl
scilab/configure
scilab/etc/modules.xml.in
scilab/modules/api_scilab/help/en_US/string_reading_api.xml
scilab/modules/core/includes/version.h

83 files changed:
1  2 
scilab/Makefile.in
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/help/en_US/string_reading_api.xml
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/version.h
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xpad/Makefile.in

Simple merge
Simple merge
@@@ -9868,7 -9872,7 +9880,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 9871 "configure"
 -// #line 9875 "configure"
++// #line 9883 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -9914,7 -9930,7 +9938,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 9917 "configure"
 -// #line 9933 "configure"
++// #line 9941 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
@@@ -9941,7 -9969,7 +9977,7 @@@ EO
  
  
      cat << \EOF > conftest.java
- // #line 9944 "configure"
 -// #line 9972 "configure"
++// #line 9980 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11178,7 -11218,7 +11226,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11181 "configure"
 -// #line 11221 "configure"
++// #line 11229 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11230,6 -11292,56 +11300,56 @@@ $as_echo "$as_me: WARNING: Could not fi
                                JGRAPHX=$PACKAGE_JAR_FILE
  
  
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.2.0.0) of jgraphx" >&5
+ $as_echo_n "checking minimal version (1.2.0.0) of jgraphx... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 11302 "configure"
++// #line 11310 "configure"
+ import com.mxgraph.view.mxGraph;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="1.2.0.0";
+                                                       if (minVersion.compareTo(mxGraph.VERSION) > 0) {
+                                                               System.exit(-1);
+                                                               }
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error "Wrong version of jgraphx. Expected at least 1.2.0.0" "$LINENO" 5
+                                               fi
+               fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error "Wrong version of jgraphx. Expected at least 1.2.0.0" "$LINENO" 5
+             fi
+    ac_java_classpath=$saved_ac_java_classpath
                                # Docking system
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
@@@ -11250,7 -11362,7 +11370,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11253 "configure"
 -// #line 11365 "configure"
++// #line 11373 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11322,7 -11456,7 +11464,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11325 "configure"
 -// #line 11459 "configure"
++// #line 11467 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11394,7 -11550,7 +11558,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11397 "configure"
 -// #line 11553 "configure"
++// #line 11561 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11467,7 -11645,7 +11653,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11470 "configure"
 -// #line 11648 "configure"
++// #line 11656 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -11539,7 -11739,7 +11747,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11542 "configure"
 -// #line 11742 "configure"
++// #line 11750 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -11662,7 -11933,7 +11941,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11665 "configure"
 -// #line 11936 "configure"
++// #line 11944 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -11789,7 -12082,7 +12090,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11792 "configure"
 -// #line 12085 "configure"
++// #line 12093 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -11861,7 -12176,7 +12184,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11864 "configure"
 -// #line 12179 "configure"
++// #line 12187 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -11934,7 -12271,7 +12279,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11937 "configure"
 -// #line 12274 "configure"
++// #line 12282 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -12006,7 -12365,7 +12373,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12009 "configure"
 -// #line 12368 "configure"
++// #line 12376 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -12079,7 -12460,7 +12468,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12082 "configure"
 -// #line 12463 "configure"
++// #line 12471 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12152,7 -12555,7 +12563,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12155 "configure"
 -// #line 12558 "configure"
++// #line 12566 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -12224,7 -12649,7 +12657,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12227 "configure"
 -// #line 12652 "configure"
++// #line 12660 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -12302,7 -12749,7 +12757,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12305 "configure"
 -// #line 12752 "configure"
++// #line 12760 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -12374,7 -12843,7 +12851,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12377 "configure"
 -// #line 12846 "configure"
++// #line 12854 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -12446,7 -12937,7 +12945,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12449 "configure"
 -// #line 12940 "configure"
++// #line 12948 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -20636,7 -20984,7 +21158,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 20639 "configure"
 -#line 20987 "configure"
++#line 21161 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -20948,7 -21296,7 +21470,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 20951 "configure"
 -#line 21299 "configure"
++#line 21473 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -21529,7 -21877,7 +22051,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21532 "configure"
 -// #line 21880 "configure"
++// #line 22054 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -21601,7 -21971,7 +22145,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21604 "configure"
 -// #line 21974 "configure"
++// #line 22148 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -21675,7 -22067,7 +22241,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21678 "configure"
 -// #line 22070 "configure"
++// #line 22244 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -21747,7 -22161,7 +22335,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21750 "configure"
 -// #line 22164 "configure"
++// #line 22338 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -21819,7 -22255,7 +22429,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21822 "configure"
 -// #line 22258 "configure"
++// #line 22432 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -21891,7 -22349,7 +22523,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21894 "configure"
 -// #line 22352 "configure"
++// #line 22526 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -21963,7 -22443,7 +22617,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 21966 "configure"
 -// #line 22446 "configure"
++// #line 22620 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -22035,7 -22537,7 +22711,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 22038 "configure"
 -// #line 22540 "configure"
++// #line 22714 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -22108,7 -22632,7 +22806,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 22111 "configure"
 -// #line 22635 "configure"
++// #line 22809 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 28354 "configure"
 -#line 28900 "configure"
++#line 29074 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 28460 "configure"
 -#line 29006 "configure"
++#line 29180 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
Simple merge
@@@ -83,5 -81,6 +81,7 @@@
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="@GUI_ENABLE@"/>
  <module name="xpad" activate="@GUI_ENABLE@"/>
 +<module name="mpi" activate="@MPI_ENABLE@"/>
+ <module name="api_scilab" activate="yes"/>
+ <module name="helptools" activate="@HELP_ENABLE@"/>
  </modules>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
          <!--Lib_name: string_reading-->
          <!--Func_list: read_string-->
          <title>Gateway Source</title>
-         <programlisting role="code_gateway"><![CDATA[ 
+         <programlisting role="code_gateway">
+       <![CDATA[ 
  int read_string(char *fname,unsigned long fname_len)
  {
-     int i,j;
-     int iLen        = 0;
-     int iRet        = 0;
-     //variable info
-     int iRows       = 0;
-     int iCols       = 0;
-     int* piAddr     = NULL;
-     int* piLen      = NULL;
-     char** pstData  = NULL;
-     //output variable
-     int iRowsOut    = 1;
-     int iColsOut    = 1;
-     char* pstOut    = NULL;
+       SciErr sciErr;
+       int i,j;
+       int iLen                = 0;
+       //variable info
+       int iRows               = 0;
+       int iCols               = 0;
+       int* piAddr             = NULL;
+       int* piLen              = NULL;
+       char** pstData  = NULL;
  
-     //check input and output arguments
-     CheckRhs(1,1);
-     CheckLhs(1,1);
+       //output variable
+       int iRowsOut    = 1;
+       int iColsOut    = 1;
+       char* pstOut    = NULL;
  
-     //get variable address
-     iRet = getVarAddressFromPosition(1, &piAddr);
-     if(iRet)
-     {
-         return 1;
-     }
+       //check input and output arguments
+       CheckRhs(1,1);
+       CheckLhs(1,1);
  
-     //check variable type
-     if(getVarType(piAddr) != sci_strings)
-     {
-         return 1;
-     }
+       //get variable address
+       sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
  
 -      //fisrt call to retrieve dimensions
 -      sciErr = getMatrixOfString(pvApiCtx, piAddr, &iRows, &iCols, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              printError(&sciErr, 0);
 -              return 0;
 -      }
 +    //first call to retrieve dimensions
 +    iRet = getMatrixOfString(piAddr, &iRows, &iCols, NULL, NULL);
 +    if(iRet)
 +    {
 +        return 1;
 +    }
  
-     piLen = (int*)malloc(sizeof(int) * iRows * iCols);
-     //second call to retrieve length of each string
-     iRet = getMatrixOfString(piAddr, &iRows, &iCols, piLen, NULL);
-     if(iRet)
-     {
-         return 1;
-     }
+       piLen = (int*)malloc(sizeof(int) * iRows * iCols);
+       //second call to retrieve length of each string
+       sciErr = getMatrixOfString(pvApiCtx, piAddr, &iRows, &iCols, piLen, NULL);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
  
-     pstData = (char**)malloc(sizeof(char*) * iRows * iCols);
-     for(i = 0 ; i < iRows * iCols ; i++)
-     {
-         pstData[i] = (char*)malloc(sizeof(char) * (piLen[i] + 1));//+ 1 for null termination
-     }
-     //third call to retrieve data
-     iRet = getMatrixOfString(piAddr, &iRows, &iCols, piLen, pstData);
-     if(iRet)
-     {
-         return 1;
-     }
+       pstData = (char**)malloc(sizeof(char*) * iRows * iCols);
+       for(i = 0 ; i < iRows * iCols ; i++)
+       {
+               pstData[i] = (char*)malloc(sizeof(char) * (piLen[i] + 1));//+ 1 for null termination
+       }
+       //third call to retrieve data
+       sciErr = getMatrixOfString(pvApiCtx, piAddr, &iRows, &iCols, piLen, pstData);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
  
-     //computer length of all strings
-     for(i = 0 ; i < iRows * iCols ; i++)
-     {
-         iLen += piLen[i];
-     }
+       //computer length of all strings
+       for(i = 0 ; i < iRows * iCols ; i++)
+       {
+               iLen += piLen[i];
+       }
  
-     //alloc output variable
-     pstOut = (char*)malloc(sizeof(char) * (iLen + iRows * iCols));
-     //initialize string to 0x00
-     memset(pstOut, 0x00, sizeof(char) * (iLen + iRows * iCols));
+       //alloc output variable
+       pstOut = (char*)malloc(sizeof(char) * (iLen + iRows * iCols));
+       //initialize string to 0x00
+       memset(pstOut, 0x00, sizeof(char) * (iLen + iRows * iCols));
  
-     //concat input strings in output string
-     for(i = 0 ; i < iRows ; i++)
-     {
-         for(j = 0 ; j < iCols ; j++)
-         {
-             int iCurLen = strlen(pstOut);
-             if(iCurLen)
-             {
-                 strcat(pstOut, " ");
-             }
-             strcpy(pstOut + strlen(pstOut), pstData[j * iRows + i]);
-         }
-     }
+       //concat input strings in output string
+       for(i = 0 ; i < iRows ; i++)
+       {
+               for(j = 0 ; j < iCols ; j++)
+               {
+                       int iCurLen = strlen(pstOut);
+                       if(iCurLen)
+                       {
+                               strcat(pstOut, " ");
+                       }
+                       strcpy(pstOut + strlen(pstOut), pstData[j * iRows + i]);
+               }
+       }
  
-     //create new variable
-     iRet = createMatrixOfString(Rhs + 1, iRowsOut, iColsOut, &pstOut);
-     if(iRet)
-     {
-         return 1;
-     }
+       //create new variable
+       sciErr = createMatrixOfString(pvApiCtx, Rhs + 1, iRowsOut, iColsOut, &pstOut);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
  
-     //free memory
-     free(piLen);
-     for(i = 0 ; i < iRows * iCols ; i++)
-     {
-         free(pstData[i]);
-     }
-     free(pstData);
-     free(pstOut);
+       //free memory
+       free(piLen);
+       for(i = 0 ; i < iRows * iCols ; i++)
+       {
+               free(pstData[i]);
+       }
+       free(pstData);
+       free(pstOut);
  
-     LhsVar(1) = Rhs + 1;
-     return 0;
+       LhsVar(1) = Rhs + 1;
+       return 0;
  }
   ]]></programlisting>
      </refsection>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge