add "-append" argument to export_to_hdf5 function, fix some memory leaks in hdf5...

[scilab.git] / scilab / modules / hdf5 / sci_gateway / cpp / sci_listvar_in_hdf5.cpp

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
index 1b3c4b8..8eabb17 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
@@ -64,7 +64,6 @@ int sci_listvar_in_hdf5(char *fname, unsigned long fname_len)
     VarInfo* pInfo  = NULL;
     bool bRet       = true;
 
-
     CheckRhs(1, 1);
     CheckLhs(1, 4);
 
@@ -98,7 +97,7 @@ int sci_listvar_in_hdf5(char *fname, unsigned long fname_len)
         char** pstVarNameList = (char**)MALLOC(sizeof(char*) * iNbItem);
         pInfo = (VarInfo*)MALLOC(iNbItem * sizeof(VarInfo));
 
-        if(Lhs != 4)
+        if(Lhs == 1)
         {
             sciprint("Name                     Type           Size            Bytes\n");
             sciprint("---------------------------------------------------------------\n");
@@ -122,12 +121,23 @@ int sci_listvar_in_hdf5(char *fname, unsigned long fname_len)
                 break;
             }
 
-            if(Lhs != 4)
+            if(Lhs == 1)
             {
                 sciprint("%s\n", pInfo[i].pstInfo);
             }
         }
     }
+    else
+    {//no variable returms [] for each Lhs
+        for(int i = 0 ; i < Lhs ; i++)
+        {
+            createEmptyMatrix(pvApiCtx, Rhs + i + 1);
+            LhsVar(i+1) = Rhs + i + 1;
+        }
+
+        PutLhsVar();
+        return 0;
+    }
 
     //1st Lhs
     char** pstVarName = (char**)MALLOC(sizeof(char*) * iNbItem);