C2F(putlhsvar)(); => PutLhsVar(); 76/4676/4
Sylvestre Ledru [Fri, 5 Aug 2011 13:10:31 +0000 (15:10 +0200)]
Change-Id: Id22ecc8877598e5caa741d7baceef90add9cf5eb

331 files changed:
scilab/modules/boolean/sci_gateway/c/sci_and.c
scilab/modules/boolean/sci_gateway/c/sci_or.c
scilab/modules/call_scilab/sci_gateway/c/sci_fromc.c
scilab/modules/call_scilab/sci_gateway/c/sci_fromjava.c
scilab/modules/completion/sci_gateway/c/sci_completion.c
scilab/modules/console/sci_gateway/c/sci_clc.c
scilab/modules/console/sci_gateway/c/sci_iswaitingforinput.c
scilab/modules/console/sci_gateway/c/sci_prompt.c
scilab/modules/console/sci_gateway/c/sci_tohome.c
scilab/modules/core/sci_gateway/c/sci_banner.c
scilab/modules/core/sci_gateway/c/sci_clearfun.c
scilab/modules/core/sci_gateway/c/sci_errclear.c
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/sci_gateway/c/sci_format.c
scilab/modules/core/sci_gateway/c/sci_funcprot.c
scilab/modules/core/sci_gateway/c/sci_funptr.c
scilab/modules/core/sci_gateway/c/sci_getdebuginfo.c
scilab/modules/core/sci_gateway/c/sci_getmd5.c
scilab/modules/core/sci_gateway/c/sci_getmemory.c
scilab/modules/core/sci_gateway/c/sci_getmodules.c
scilab/modules/core/sci_gateway/c/sci_getos.c
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/sci_gateway/c/sci_getvariablesonstack.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_gstacksize.c
scilab/modules/core/sci_gateway/c/sci_havewindow.c
scilab/modules/core/sci_gateway/c/sci_lasterror.c
scilab/modules/core/sci_gateway/c/sci_mode.c
scilab/modules/core/sci_gateway/c/sci_predef.c
scilab/modules/core/sci_gateway/c/sci_readgateway.c
scilab/modules/core/sci_gateway/c/sci_sciargs.c
scilab/modules/core/sci_gateway/c/sci_stacksize.c
scilab/modules/core/sci_gateway/c/sci_typename.c
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/sci_gateway/c/sci_what.c
scilab/modules/core/sci_gateway/c/sci_who.c
scilab/modules/core/sci_gateway/c/sci_with_module.c
scilab/modules/dynamic_link/sci_gateway/c/sci_addinter.c
scilab/modules/dynamic_link/sci_gateway/c/sci_c_link.c
scilab/modules/dynamic_link/sci_gateway/c/sci_getdynlibext.c
scilab/modules/dynamic_link/sci_gateway/c/sci_ilib_verbose.c
scilab/modules/dynamic_link/sci_gateway/c/sci_link.c
scilab/modules/dynamic_link/sci_gateway/c/sci_ulink.c
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/fftw/sci_gateway/c/sci_disposefftwlibrary.c
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/fftw/sci_gateway/c/sci_fftwlibraryisloaded.c
scilab/modules/fftw/sci_gateway/c/sci_get_fftw_wisdom.c
scilab/modules/fftw/sci_gateway/c/sci_loadfftwlibrary.c
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_createdir.c
scilab/modules/fileio/sci_gateway/c/sci_deletefile.c
scilab/modules/fileio/sci_gateway/c/sci_fileext.c
scilab/modules/fileio/sci_gateway/c/sci_fileinfo.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_filesep.c
scilab/modules/fileio/sci_gateway/c/sci_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fullpath.c
scilab/modules/fileio/sci_gateway/c/sci_get_absolute_file_path.c
scilab/modules/fileio/sci_gateway/c/sci_getdrives.c
scilab/modules/fileio/sci_gateway/c/sci_getlongpathname.c
scilab/modules/fileio/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/fileio/sci_gateway/c/sci_getshortpathname.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_maxfiles.c
scilab/modules/fileio/sci_gateway/c/sci_merror.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_newest.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/sci_gateway/c/sci_pathsep.c
scilab/modules/fileio/sci_gateway/c/sci_pwd.c
scilab/modules/fileio/sci_gateway/c/sci_removedir.c
scilab/modules/functions/sci_gateway/c/sci_execstr.c
scilab/modules/functions/sci_gateway/c/sci_librarieslist.c
scilab/modules/functions/sci_gateway/c/sci_libraryinfo.c
scilab/modules/functions/sci_gateway/c/sci_whereis.c
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphics/sci_gateway/c/sci_Legend.c
scilab/modules/graphics/sci_gateway/c/sci_StringBox.c
scilab/modules/graphics/sci_gateway/c/sci_addcb.c
scilab/modules/graphics/sci_gateway/c/sci_champ.c
scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c
scilab/modules/graphics/sci_gateway/c/sci_contour2di.c
scilab/modules/graphics/sci_gateway/c/sci_copy.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_draw.c
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_drawlater.c
scilab/modules/graphics/sci_gateway/c/sci_drawnow.c
scilab/modules/graphics/sci_gateway/c/sci_fec.c
scilab/modules/graphics/sci_gateway/c/sci_geom3d.c
scilab/modules/graphics/sci_gateway/c/sci_get.c
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/graphics/sci_gateway/c/sci_grayplot.c
scilab/modules/graphics/sci_gateway/c/sci_is_handle_valid.c
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/sci_gateway/c/sci_matplot1.c
scilab/modules/graphics/sci_gateway/c/sci_move.c
scilab/modules/graphics/sci_gateway/c/sci_newaxes.c
scilab/modules/graphics/sci_gateway/c/sci_param3d.c
scilab/modules/graphics/sci_gateway/c/sci_param3d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/c/sci_rotate_axes.c
scilab/modules/graphics/sci_gateway/c/sci_rubberbox.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c
scilab/modules/graphics/sci_gateway/c/sci_show_window.c
scilab/modules/graphics/sci_gateway/c/sci_showalluimenushandles.c
scilab/modules/graphics/sci_gateway/c/sci_swap_handles.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_unzoom.c
scilab/modules/graphics/sci_gateway/c/sci_winsid.c
scilab/modules/graphics/sci_gateway/c/sci_xarc.c
scilab/modules/graphics/sci_gateway/c/sci_xarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xchange.c
scilab/modules/graphics/sci_gateway/c/sci_xclick.c
scilab/modules/graphics/sci_gateway/c/sci_xdel.c
scilab/modules/graphics/sci_gateway/c/sci_xfarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xfpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xgetech.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/graphics/sci_gateway/c/sci_xgraduate.c
scilab/modules/graphics/sci_gateway/c/sci_xgrid.c
scilab/modules/graphics/sci_gateway/c/sci_xlfont.c
scilab/modules/graphics/sci_gateway/c/sci_xname.c
scilab/modules/graphics/sci_gateway/c/sci_xpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/sci_gateway/c/sci_xrects.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/graphics/sci_gateway/c/sci_xsetech.c
scilab/modules/graphics/sci_gateway/c/sci_xstring.c
scilab/modules/graphics/sci_gateway/c/sci_xstringb.c
scilab/modules/graphics/sci_gateway/c/sci_xtitle.c
scilab/modules/graphics/sci_gateway/c/sci_zoom_rect.c
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_getcallbackobject.c
scilab/modules/gui/sci_gateway/c/sci_messagebox.c
scilab/modules/gui/sci_gateway/c/sci_mpopup.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontextmenu.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uigetcolor.c
scilab/modules/gui/sci_gateway/c/sci_uigetdir.c
scilab/modules/gui/sci_gateway/c/sci_uigetfont.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/c/sci_uiwait.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/c/sci_x_choice.c
scilab/modules/gui/sci_gateway/c/sci_x_choose.c
scilab/modules/gui/sci_gateway/c/sci_x_choose_modeless.c
scilab/modules/gui/sci_gateway/c/sci_x_dialog.c
scilab/modules/gui/sci_gateway/c/sci_x_mdialog.c
scilab/modules/gui/sci_gateway/cpp/sci_getinstalledlookandfeels.cpp
scilab/modules/gui/sci_gateway/cpp/sci_getlookandfeel.cpp
scilab/modules/gui/sci_gateway/cpp/sci_printfigure.cpp
scilab/modules/gui/sci_gateway/cpp/sci_printsetupbox.cpp
scilab/modules/gui/sci_gateway/cpp/sci_setlookandfeel.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uigetdir.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/history_manager/sci_gateway/c/sci_addhistory.c
scilab/modules/history_manager/sci_gateway/c/sci_displayhistory.c
scilab/modules/history_manager/sci_gateway/c/sci_gethistory.c
scilab/modules/history_manager/sci_gateway/c/sci_gethistoryfile.c
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/history_manager/sci_gateway/c/sci_loadhistory.c
scilab/modules/history_manager/sci_gateway/c/sci_removelinehistory.c
scilab/modules/history_manager/sci_gateway/c/sci_resethistory.c
scilab/modules/history_manager/sci_gateway/c/sci_saveafterncommands.c
scilab/modules/history_manager/sci_gateway/c/sci_saveconsecutivecommands.c
scilab/modules/history_manager/sci_gateway/c/sci_savehistory.c
scilab/modules/history_manager/sci_gateway/c/sci_sethistoryfile.c
scilab/modules/io/sci_gateway/c/sci_diary.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_getio.c
scilab/modules/io/sci_gateway/c/sci_getpid.c
scilab/modules/io/sci_gateway/c/sci_host.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/jvm/sci_gateway/c/sci_javaclasspath.c
scilab/modules/jvm/sci_gateway/c/sci_javalibrarypath.c
scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c
scilab/modules/jvm/sci_gateway/c/sci_system_setproperty.c
scilab/modules/jvm/sci_gateway/c/sci_with_embedded_jre.c
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c
scilab/modules/localization/sci_gateway/c/sci_dgettext.c
scilab/modules/localization/sci_gateway/c/sci_getdefaultlanguage.c
scilab/modules/localization/sci_gateway/c/sci_getlanguage.c
scilab/modules/localization/sci_gateway/c/sci_getlanguagealias.c
scilab/modules/localization/sci_gateway/c/sci_getlanguagestable.c
scilab/modules/localization/sci_gateway/c/sci_gettext.c
scilab/modules/localization/sci_gateway/c/sci_setdefaultlanguage.c
scilab/modules/localization/sci_gateway/c/sci_setlanguage.c
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/mexlib/src/c/sci_gateway.c
scilab/modules/optimization/sci_gateway/c/sci_qld.c
scilab/modules/optimization/sci_gateway/c/sci_qp_solve.c
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
scilab/modules/scicos/sci_gateway/c/sci_buildouttb.c
scilab/modules/scicos/sci_gateway/c/sci_callblk.c
scilab/modules/scicos/sci_gateway/c/sci_coserror.c
scilab/modules/scicos/sci_gateway/c/sci_ctree2.c
scilab/modules/scicos/sci_gateway/c/sci_ctree3.c
scilab/modules/scicos/sci_gateway/c/sci_ctree4.c
scilab/modules/scicos/sci_gateway/c/sci_curblockc.c
scilab/modules/scicos/sci_gateway/c/sci_data2sig.c
scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c
scilab/modules/scicos/sci_gateway/c/sci_duplicate.c
scilab/modules/scicos/sci_gateway/c/sci_end_scicosim.c
scilab/modules/scicos/sci_gateway/c/sci_ftree2.c
scilab/modules/scicos/sci_gateway/c/sci_ftree3.c
scilab/modules/scicos/sci_gateway/c/sci_ftree4.c
scilab/modules/scicos/sci_gateway/c/sci_getscicosvars.c
scilab/modules/scicos/sci_gateway/c/sci_haltscicos.c
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/sci_gateway/c/sci_phase_simulation.c
scilab/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_time.c
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/scicos/sci_gateway/c/sci_set_blockerror.c
scilab/modules/scicos/sci_gateway/c/sci_set_xproperty.c
scilab/modules/scicos/sci_gateway/c/sci_sig2data.c
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/special_functions/sci_gateway/c/sci_besselh.c
scilab/modules/special_functions/sci_gateway/c/sci_besseli.c
scilab/modules/special_functions/sci_gateway/c/sci_besselj.c
scilab/modules/special_functions/sci_gateway/c/sci_besselk.c
scilab/modules/special_functions/sci_gateway/c/sci_bessely.c
scilab/modules/special_functions/sci_gateway/c/sci_beta.c
scilab/modules/special_functions/sci_gateway/c/sci_legendre.c
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_read.c
scilab/modules/string/sci_gateway/c/sci_ascii.c
scilab/modules/string/sci_gateway/c/sci_code2str.c
scilab/modules/string/sci_gateway/c/sci_convstr.c
scilab/modules/string/sci_gateway/c/sci_emptystr.c
scilab/modules/string/sci_gateway/c/sci_grep.c
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_isletter.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_part.c
scilab/modules/string/sci_gateway/c/sci_regexp.c
scilab/modules/string/sci_gateway/c/sci_str2code.c
scilab/modules/string/sci_gateway/c/sci_strcat.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/sci_gateway/c/sci_strcmp.c
scilab/modules/string/sci_gateway/c/sci_strcspn.c
scilab/modules/string/sci_gateway/c/sci_strindex.c
scilab/modules/string/sci_gateway/c/sci_string.c
scilab/modules/string/sci_gateway/c/sci_stripblanks.c
scilab/modules/string/sci_gateway/c/sci_strncpy.c
scilab/modules/string/sci_gateway/c/sci_strrev.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strspn.c
scilab/modules/string/sci_gateway/c/sci_strstr.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/sci_gateway/c/sci_strtok.c
scilab/modules/string/sci_gateway/c/sci_tokens.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_DeleteInterp.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_DoOneEvent.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalFile.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalStr.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_ExistArray.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_ExistInterp.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_ExistVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_SetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_UnsetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_UpVar.c
scilab/modules/tclsci/sci_gateway/c/sci_opentk.c
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/time/sci_gateway/c/sci_getdate.c
scilab/modules/time/sci_gateway/c/sci_realtime.c
scilab/modules/time/sci_gateway/c/sci_sleep.c
scilab/modules/time/sci_gateway/c/sci_timer.c
scilab/modules/time/sci_gateway/c/sci_xpause.c
scilab/modules/umfpack/sci_gateway/c/sci_res_with_prec.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chfact.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chget.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chinfo.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chsolve.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luget.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luinfo.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lusolve.c
scilab/modules/umfpack/sci_gateway/c/sci_umfpack.c
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
scilab/modules/windows_tools/sci_gateway/c/sci_consolebox.c
scilab/modules/windows_tools/sci_gateway/c/sci_createGUID.c
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/sci_gateway/c/sci_findfileassociation.c
scilab/modules/windows_tools/sci_gateway/c/sci_getsystemmetrics.c
scilab/modules/windows_tools/sci_gateway/c/sci_istssession.c
scilab/modules/windows_tools/sci_gateway/c/sci_mcisendstring.c
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c
scilab/modules/windows_tools/sci_gateway/c/sci_winhttpdownload.c
scilab/modules/windows_tools/sci_gateway/c/sci_winopen.c
scilab/modules/xcos/sci_gateway/cpp/sci_warnBlockByUID.cpp

index 685023c..4922796 100644 (file)
@@ -62,7 +62,7 @@ int C2F(intand)(char *fname,unsigned long l)
 
  if (Rhs==2 && m1*n1==0) {
    LhsVar(1)= 1;
-   C2F(putlhsvar)();
+   PutLhsVar();
    return 0;
  }
 
@@ -83,7 +83,7 @@ int C2F(intand)(char *fname,unsigned long l)
  }/* named: x */
  vect_and(istk(l1),m1,n1,istk(l2),opt);
  LhsVar(1)= 2+nopt;
- C2F(putlhsvar)();
+ PutLhsVar();
  return 0;
 }
 /*--------------------------------------------------------------------------*/
index 47ac8a6..297a686 100644 (file)
@@ -61,7 +61,7 @@ int C2F(intor)(char *fname,unsigned long l)
 
  if (Rhs==2 && m1*n1==0) {
    LhsVar(1)= 1;
-   C2F(putlhsvar)();
+   PutLhsVar();
    return 0;
  }
 
@@ -82,7 +82,7 @@ int C2F(intor)(char *fname,unsigned long l)
  }/* named: x */
  vect_or(istk(l1),m1,n1,istk(l2),opt);
  LhsVar(1)= 2+nopt;
- C2F(putlhsvar)();
+ PutLhsVar();
  return 0;
 }
 /*--------------------------------------------------------------------------*/
index 4ba31bb..37b9ab8 100644 (file)
@@ -34,10 +34,9 @@ int sci_fromc(char *fname,unsigned long fname_len)
 
        n1=1;
        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
+    if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
-       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
-
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index aca9e3b..7d89ad2 100644 (file)
@@ -34,9 +34,9 @@ int sci_fromjava(char *fname,unsigned long fname_len)
 
        n1=1;
        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
+    if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
-       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+       PutLhsVar();
 
        return 0;
 }
index a268549..17547c5 100644 (file)
@@ -60,7 +60,7 @@ int sci_completion(char *fname,unsigned long fname_len)
                        Results = completion(partOfWord, &sizeResults);
                        putResultOnStack(1,Results,sizeResults);
                        freePointerDictionary(Results,sizeResults);
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else /* Rhs == 2 */
                {
@@ -117,8 +117,12 @@ int sci_completion(char *fname,unsigned long fname_len)
                                }
                                putResultOnStack(1,Results,sizeResults);
                                freePointerDictionary(Results,sizeResults);
-                               freeArrayOfString(Inputs2,m2*n2);
-                               C2F(putlhsvar)();
+                freeArrayOfString(Inputs1,m1 * n1);
+                Inputs1 = NULL;
+
+                               freeArrayOfString(Inputs2,m2 * n2);
+                Inputs2 = NULL;
+                               PutLhsVar();
 
                        }
                        else
@@ -200,9 +204,9 @@ int sci_completion(char *fname,unsigned long fname_len)
                        freePointerDictionary(PathsList,sizePathsList);
                }
 
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
-       freeArrayOfString(Inputs1,m1 * n1);
+       if (Inputs1) freeArrayOfString(Inputs1,m1 * n1);
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 666f30f..acc89bc 100644 (file)
@@ -61,7 +61,7 @@ int sci_clc(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index e3f96c6..161a990 100644 (file)
@@ -42,7 +42,7 @@ int sci_iswaitingforinput(char *fname,unsigned long fname_len)
        *istk(outIndex) = res;
        
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index f134576..a8b787f 100644 (file)
@@ -47,7 +47,7 @@ int sci_prompt(char *fname,unsigned long fname_len)
             
                LhsVar(1) = Rhs+1;
                if (Lhs == 2) LhsVar(2) = Rhs+2;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else /* Tempory change of Scilab prompt */
        {
@@ -70,7 +70,7 @@ int sci_prompt(char *fname,unsigned long fname_len)
                        SetTemporaryPrompt(cstk(l1));
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
index 37841e4..1e3291d 100644 (file)
@@ -30,7 +30,7 @@ int sci_tohome(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0 ;
 }
index 2c00ccf..ac18cc8 100644 (file)
@@ -23,7 +23,7 @@ int C2F(sci_banner)(char *fname,unsigned long fname_len)
        banner();
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();       
+       PutLhsVar();    
 
        return 0;
 }
index 03c3f15..b484674 100644 (file)
@@ -57,8 +57,8 @@ int C2F(sci_clearfun)(char *fname,unsigned long fname_len)
                CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &Status);
                LhsVar(1)=Rhs+1;
 
-               C2F(putlhsvar)();
                if (Status) {FREE(Status);Status=NULL;}
+        PutLhsVar();
        }
        else
        {
index fc900b6..68b3427 100644 (file)
@@ -81,7 +81,7 @@ int C2F(sci_errclear)(char *fname,unsigned long fname_len)
         clearLastError();
     }
     LhsVar(1) = 0;
-    C2F(putlhsvar)();
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index b679c2b..5be1873 100644 (file)
@@ -87,7 +87,7 @@ int C2F(sci_exit)(char *fname,unsigned long fname_len)
        C2F(com).fun = -999;
 
        LhsVar(1) = 0; 
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index def259b..caf71d2 100644 (file)
@@ -94,9 +94,9 @@ static int sci_format_norhs(char *fname)
        n1 = 1; m1 = 2;
        CreateVarFromPtr(Rhs+1, MATRIX_OF_INTEGER_DATATYPE, &n1, &m1, &paramoutINT);
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
 
        if (paramoutINT) {FREE(paramoutINT); paramoutINT = NULL;}
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
@@ -127,7 +127,7 @@ static int sci_format_onerhs(char *fname)
                        }
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -179,7 +179,7 @@ static int sci_format_onerhs(char *fname)
                }
 
                LhsVar(1) = 0;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
@@ -239,7 +239,7 @@ static int sci_format_tworhs(char *fname)
                        setVariableMode();
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -322,7 +322,7 @@ static int sci_format_tworhs(char *fname)
                        }
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
index c3090d5..ef1c31e 100644 (file)
@@ -39,7 +39,7 @@ int C2F(sci_funcprot)(char *fname,unsigned long fname_len)
                }
 
                LhsVar(1) = Rhs + 1; 
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else if (Rhs == 1)
        {
@@ -102,7 +102,7 @@ int C2F(sci_funcprot)(char *fname,unsigned long fname_len)
                else
                {
                        LhsVar(1) = 0; 
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
        }
        return 0;
index 6b885ba..a8aa2a5 100644 (file)
@@ -42,7 +42,7 @@ int C2F(sci_funptr) (char *fname,unsigned long fname_len)
                *istk(l1) = funptr;
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index 80386cc..8396a7a 100644 (file)
@@ -50,10 +50,11 @@ int C2F(sci_getdebuginfo)(char *fname,unsigned long fname_len)
                CreateVarFromPtr(Rhs+2,MATRIX_OF_STRING_DATATYPE, &m2, &n2, outputStaticList);
                LhsVar(2) = Rhs+2;
        }
-       C2F(putlhsvar)();
-
+       
        freeArrayOfString(outputDynamicList,m1);
        freeArrayOfString(outputStaticList,m2);
+
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 39a5bd6..48d200b 100644 (file)
@@ -93,7 +93,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
 
                                CreateVarFromPtr( Rhs+1, MATRIX_OF_STRING_DATATYPE, &m1, &n1, Output_Matrix );
                                LhsVar(1) = Rhs+1 ;
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                        }
                        else
                        {
@@ -143,7 +143,7 @@ int C2F(sci_getmd5) (char *fname,unsigned long fname_len)
 
                                        CreateVarFromPtr(Rhs + 1, MATRIX_OF_STRING_DATATYPE, &m1, &n1, Output_Matrix );
                                        LhsVar(1) = Rhs + 1 ;
-                                       C2F(putlhsvar)();
+                                       PutLhsVar();
                                }
                                else
                                {
index ccce457..5cfe391 100644 (file)
@@ -30,7 +30,7 @@ int C2F(sci_getmemory) (char *fname,unsigned long fname_len)
                LhsVar(2) = Rhs+2;
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index c33e4dd..4f3ac9d 100644 (file)
@@ -35,7 +35,7 @@ int C2F(sci_getmodules) (char *fname,unsigned long fname_len)
 
     CreateVarFromPtr(Rhs+1,MATRIX_OF_STRING_DATATYPE, &nrow, &ncol, Modules->ModuleList);
     LhsVar(1)=Rhs+1;
-    C2F(putlhsvar)();
+    PutLhsVar();
 
     /* I do not free Modules on purpose in order to speed the next call
     * to call to getmodule.
index 5cbeead..d849fd3 100644 (file)
@@ -50,7 +50,7 @@ int C2F(sci_getos)(char *fname,unsigned long fname_len)
                                return 0;
                        }
                }
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index 944af66..dfda30d 100644 (file)
@@ -48,7 +48,7 @@ int C2F(sci_getscilabmode)(char *fname,unsigned long fname_len)
        if (output) {FREE(output);output=NULL;}
 
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 3aa2cf9..d776cac 100644 (file)
@@ -67,9 +67,9 @@ int C2F(sci_getvariablesonstack)(char *fname,unsigned long fname_len)
        CreateVarFromPtr(Rhs+1,MATRIX_OF_STRING_DATATYPE, &m1, &n1, Variables);
 
        LhsVar(1) = Rhs + 1;
-       C2F(putlhsvar)();
-
+       
        freeArrayOfString(Variables, sizeVariables);
+    PutLhsVar();
 
        return 0;
 }
index a4a7fb1..add704f 100644 (file)
@@ -97,7 +97,7 @@ int getversion_no_rhs(char *fname)
                }
        }
        
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
@@ -162,7 +162,7 @@ int getversion_one_rhs(char *fname)
                                                        }
 
                                                        LhsVar(1) = Rhs + 1;
-                                                       C2F(putlhsvar)();
+                                                       PutLhsVar();
                                                }
                                                else
                                                {
@@ -268,7 +268,7 @@ int getversion_two_rhs(char *fname)
                                                        versionInfo = NULL;
 
                                                        LhsVar(1) = Rhs + 1;
-                                                       C2F(putlhsvar)();
+                                                       PutLhsVar();
                                                }
                                                else
                                                {
index c933a7d..f054b33 100644 (file)
@@ -91,9 +91,10 @@ static int sci_gstacksizeNoRhs(char *fname)
     CreateVarFromPtr(Rhs + 1, MATRIX_OF_INTEGER_DATATYPE, &n1, &m1, &paramoutINT);
 
     LhsVar(1) = Rhs + 1;
-    C2F(putlhsvar)();
-
+    
     if (paramoutINT) {FREE(paramoutINT); paramoutINT = NULL;}
+
+    PutLhsVar();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
@@ -121,7 +122,7 @@ static int sci_gstacksizeOneRhs(char *fname)
                         if (setGStacksize(NEWMEMSTACKSIZE))
                         {
                             LhsVar(1) = 0;
-                            C2F(putlhsvar)();
+                            PutLhsVar();
                             return 0;
                         }
                         else
@@ -185,7 +186,7 @@ static int sci_gstacksizeMax(char *fname)
     if (setGStacksizeMax(fname))
     {
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     else
     {
@@ -200,7 +201,7 @@ static int sci_gstacksizeMin(char *fname)
     if (setGStacksizeMin(fname))
     {
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     else
     {
index 4a1f9e0..17823b9 100644 (file)
@@ -29,10 +29,10 @@ int C2F(sci_havewindow)(char *fname,unsigned long fname_len)
        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &Status);
        LhsVar(1)=Rhs+1;
 
-       C2F(putlhsvar)();
-
        if (Status) {FREE(Status);Status=NULL;}
 
+    PutLhsVar();
+
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 554bb1c..1c46b01 100644 (file)
@@ -101,7 +101,7 @@ int C2F(sci_lasterror)(char *fname,unsigned long fname_len)
         clearLastError();
     }
 
-    C2F(putlhsvar)();
+    PutLhsVar();
 
     return 0;
 }
index 34e9783..c3699b4 100644 (file)
@@ -72,7 +72,7 @@ int C2F(sci_mode)(char *fname,unsigned long fname_len)
                }
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 9d2a2ed..16cf8c1 100644 (file)
@@ -35,7 +35,7 @@ int C2F(sci_predef)(char *fname,unsigned long fname_len)
                *istk(l) = (int) previous_n_var_protected;
 
                LhsVar(1) = Rhs + 1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else /* Rhs == 1 */
        {
@@ -109,7 +109,7 @@ int C2F(sci_predef)(char *fname,unsigned long fname_len)
                if (out_values) {FREE(out_values); out_values = NULL;}
 
                LhsVar(1) = Rhs + 1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        return 0;
 }
index 96ae88b..700bc1e 100644 (file)
@@ -107,7 +107,7 @@ int C2F(sci_readgateway)(char *fname,unsigned long fname_len)
                                        FREE(gateway_content);
                                        gateway_content = NULL;
                                }
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                        }
                        else
                        {
index 0d58977..e5c3cd9 100644 (file)
@@ -29,10 +29,10 @@ int C2F(sci_sciargs)(char *fname,unsigned long fname_len)
        ncol = nb_arguments;
        CreateVarFromPtr(Rhs+1,MATRIX_OF_STRING_DATATYPE, &nrow, &ncol,arguments);
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
-
+       
        freeArrayOfString(arguments,nb_arguments);
 
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 6e77983..62d2b3e 100644 (file)
@@ -84,9 +84,10 @@ static int sci_stacksizeNoRhs(char *fname)
     CreateVarFromPtr(Rhs + 1, MATRIX_OF_INTEGER_DATATYPE, &n1, &m1, (int *)&paramoutINT);
 
     LhsVar(1) = Rhs + 1;
-    C2F(putlhsvar)();
-
+    
     if (paramoutINT) {FREE(paramoutINT); paramoutINT = NULL;}
+
+    PutLhsVar();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
@@ -114,7 +115,7 @@ static int sci_stacksizeOneRhs(char *fname)
                         if (setStacksize(NEWMEMSTACKSIZE))
                         {
                             LhsVar(1) = 0;
-                            C2F(putlhsvar)();
+                            PutLhsVar();
                             return 0;
                         }
                         else
@@ -178,7 +179,7 @@ static int sci_stacksizeMax(char *fname)
     if (setStacksizeMax(fname))
     {
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     else
     {
@@ -192,7 +193,7 @@ static int sci_stacksizeMin(char *fname)
     if (setStacksizeMin(fname))
     {
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     else
     {
index e11a0ab..0678601 100644 (file)
@@ -151,7 +151,7 @@ int sci_typename_two_rhs(char *fname,unsigned long fname_len)
                        break;
                case 0:
                                LhsVar(1) = 0; 
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                                break;
                        break;
 
@@ -219,7 +219,7 @@ int sci_typename_no_rhs(char *fname,unsigned long fname_len)
                if (TypesNames) freeArrayOfString(TypesNames,numberOfTypes);
                LhsVar(2) = Rhs + 2; 
        }
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index 0534fc3..c29efcb 100644 (file)
@@ -68,9 +68,11 @@ int C2F(sci_warning)(char *fname,unsigned long fname_len)
                                        n1=1;
                                        CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,(m1=(int)strlen(Output), &m1),&n1,&Output);
                                        LhsVar(1) = Rhs+1;
-                                       C2F(putlhsvar)();
+                                       
                                        if (Output) {FREE(Output);Output=NULL;}
                                        freeArrayOfString(Input_Strings,n1);
+
+                    PutLhsVar();
                                        return 0;
                                }
                                else if ( getWarningMode() )
@@ -101,7 +103,7 @@ int C2F(sci_warning)(char *fname,unsigned long fname_len)
                return 0;
        }
        LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index db17854..6b8c837 100644 (file)
@@ -70,7 +70,7 @@ int C2F(sci_what)(char *fname,unsigned long fname_len)
 
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index e817400..acd728c 100644 (file)
@@ -321,7 +321,7 @@ static BOOL FreeVariableStructArray(struct VariableStruct* Vstruct,int lenStruct
         DispVariables(GVstruct,_("Your global variables are:"),GlenStructArray,gmemused,gmemtotal,gvarused,gvartotal);
 
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
         return 0;
  }
 /*--------------------------------------------------------------------------*/
@@ -353,10 +353,10 @@ static BOOL FreeVariableStructArray(struct VariableStruct* Vstruct,int lenStruct
         CreateVarFromPtr(Rhs+2,MATRIX_OF_INTEGER_DATATYPE, &m, &n, &Size);
         LhsVar(2) = Rhs+2;
 
-        C2F(putlhsvar)();
-
         freeArrayOfString(Tab, lenStructArray);
         if (Size) {FREE(Size);Size=NULL;}
+
+     PutLhsVar();
         return 0;
  }
  /*--------------------------------------------------------------------------*/
@@ -386,7 +386,7 @@ static BOOL FreeVariableStructArray(struct VariableStruct* Vstruct,int lenStruct
         LhsVar(1)=Rhs+1;
 
         freeArrayOfString(LocalTab, lenStructArray);
-        C2F(putlhsvar)();
+        PutLhsVar();
         return 0;
  }
 /*--------------------------------------------------------------------------*/
index e1a0da8..39a0bcd 100644 (file)
@@ -38,9 +38,9 @@ int C2F(sci_with_module)(char *fname,unsigned long fname_len)
                CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &Status);
                LhsVar(1)=Rhs+1;
 
-               C2F(putlhsvar)();
-
                if (Status) {FREE(Status);Status=NULL;}
+
+        PutLhsVar();
        }
        else
        {
index 5b81831..1102db9 100644 (file)
@@ -90,7 +90,7 @@ int sci_addinter(char *fname,unsigned long fname_len)
                if (ierr == 0)
                {
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
index 3b230ea..ed31c5f 100644 (file)
@@ -92,9 +92,8 @@ int sci_c_link(char *fname,unsigned long fname_len)
                                LhsVar(2)=Rhs+2;
                        }
 
-                       C2F(putlhsvar)();
-                       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
-                       
+            if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+                       PutLhsVar();
                }
                else
                {
index 3d91306..bc6e35e 100644 (file)
@@ -30,7 +30,7 @@ int sci_getdynlibext(char *fname,unsigned long fname_len)
        strcpy(cstk(outIndex), SHARED_LIB_EXT );
 
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index da3d833..7854e86 100644 (file)
@@ -73,7 +73,7 @@ int sci_ilib_verbose(char *fname,unsigned long fname_len)
                }
        }
        
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index b2e3dd9..08863e2 100644 (file)
@@ -152,7 +152,7 @@ int sci_link(char *fname,unsigned long fname_len)
                        CreateVar(Rhs+1, MATRIX_OF_INTEGER_DATATYPE, &n, &n,&l);
                        *istk(l) = (int)returnedID;
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -186,11 +186,10 @@ static int linkNoRhs(void)
                m1 = sizeFunctionsList;
                n1 = 1;
                CreateVarFromPtr(Rhs+1, MATRIX_OF_STRING_DATATYPE, &n1, &m1, FunctionsList);
+        freeArrayOfString(FunctionsList,sizeFunctionsList);
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
-
-               freeArrayOfString(FunctionsList,sizeFunctionsList);
+               PutLhsVar();
        }
        else
        {
@@ -199,7 +198,7 @@ static int linkNoRhs(void)
                l1=0;
                CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        return retval;
 }
@@ -228,7 +227,7 @@ static int linkOneRhsShow(void)
                CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
        }
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
index 19df346..07cf3ae 100644 (file)
@@ -58,7 +58,7 @@ int sci_ulink(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 
index a641868..6b8954f 100644 (file)
@@ -92,7 +92,7 @@ int sci_gsort(char *fname, unsigned long fname_len)
                                                        CreateVar(Rhs+2,MATRIX_OF_DOUBLE_DATATYPE,&m,&n,&l);
                                                        LhsVar(2) = Rhs+2 ;
                                                }
-                                               C2F(putlhsvar)();
+                                               PutLhsVar();
                                                return 0;
                                        }
                                }
@@ -203,8 +203,8 @@ int sci_gsort(char *fname, unsigned long fname_len)
                                        }
                                        LhsVar(2)= Rhs+2 ;
                                }
-                               C2F(putlhsvar)();
                                if (indices) {FREE(indices); indices = NULL;}
+                PutLhsVar();
                        }
                }
                break;
@@ -289,7 +289,7 @@ int sci_gsort(char *fname, unsigned long fname_len)
                                LhsVar(2)= Rhs+2 ;
                        }
                        if (indices) {FREE(indices); indices = NULL;}
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                break;
 
@@ -312,9 +312,9 @@ int sci_gsort(char *fname, unsigned long fname_len)
                                }
                                LhsVar(2)= Rhs+2 ;
                        }
-                       C2F(putlhsvar)();
                        if (indices) {FREE(indices); indices = NULL;}
                        freeArrayOfString(S,m1*n1);
+            PutLhsVar();
                }
                break;
 
index c4306da..d4dc669 100644 (file)
@@ -31,7 +31,7 @@ int sci_disposefftwlibrary(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return(0);
 }
index ebda356..536dd6d 100644 (file)
@@ -679,20 +679,19 @@ int sci_fftw(char *fname,unsigned long fname_len)
   
   /* execute FFTW plan */
   call_fftw_execute_split_dft(p,ri,ii,ro,io);
-  
+
+  if (n_and_nspn_allocated)
+  {
+      FREE(n);
+      FREE(nspn);
+  }
+
   /***********************************
    * Return results in lhs argument *
    ***********************************/
   
   LhsVar(1) = 1;
-  
-  PutLhsVar();
-  
-  if (n_and_nspn_allocated)
-    {
-      FREE(n);
-      FREE(nspn);
-    }
+  PutLhsVar();  
 
   return(0);
 }
index 93dbd11..1e685d4 100644 (file)
@@ -217,11 +217,11 @@ int sci_fftw_flags(char *fname,unsigned long fname_len)
 
        n1=1;
        CreateVarFromPtr( Rhs+3,MATRIX_OF_STRING_DATATYPE, &j, &n1, Str3);
+       freeArrayOfString(Str3,j);
+
        LhsVar(1)=Rhs+2;
        LhsVar(2)=Rhs+3;
        PutLhsVar();
-
-       freeArrayOfString(Str3,j);
        return(0);
 }
 /*--------------------------------------------------------------------------*/ 
index 66c9ff4..30dbad2 100644 (file)
@@ -30,7 +30,7 @@ int sci_fftwlibraryisloaded(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return(0);
 }
index 6dc0e10..e3c92e6 100644 (file)
@@ -103,12 +103,13 @@ int sci_get_fftw_wisdom(char *fname,unsigned long fname_len)
        Str1[n1-1][0] = '\0';
 
        CreateVarFromPtr(Rhs+1,MATRIX_OF_STRING_DATATYPE, &n1, (j=1,&j), Str1);
-       LhsVar(1) = Rhs+1;
-       PutLhsVar();
 
        freeArrayOfString(Str1,n1);
        if (Str) {FREE(Str); Str = NULL;}
 
+    LhsVar(1) = Rhs+1;
+    PutLhsVar();
+
        return(0);
 }
 /*--------------------------------------------------------------------------*/
index b0bc10f..8c6a19a 100644 (file)
@@ -43,7 +43,7 @@ int sci_loadfftwlibrary(char *fname,unsigned long fname_len)
                }
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index 23cc385..6284be8 100644 (file)
@@ -167,7 +167,7 @@ int sci_basename(char *fname,unsigned long fname_len)
                        }
 
                        LhsVar(1) = Rhs + 1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -254,11 +254,13 @@ int sci_basename(char *fname,unsigned long fname_len)
                }
 
                LhsVar(1) = Rhs + 1;
-               C2F(putlhsvar)();
 
                if (lenStVarOne) {FREE(lenStVarOne); lenStVarOne = NULL;}
                freeArrayOfWideString(pStResult, m1 * n1);
                freeArrayOfWideString(pStVarOne, m1 * n1);
+
+        PutLhsVar();
+
        }
        else
        {
index 8b8f56b..c5084fb 100644 (file)
@@ -153,9 +153,10 @@ int sci_chdir(char *fname,unsigned long fname_len)
                        }
 
                        LhsVar(1) = Rhs + 1;
-                       C2F(putlhsvar)();
-                       
-                       if (bOutput) {FREE(bOutput); bOutput=NULL;}
+
+            if (bOutput) {FREE(bOutput); bOutput=NULL;}
+
+                       PutLhsVar();
                }
                else /* cd output string current path */
                {
@@ -180,9 +181,8 @@ int sci_chdir(char *fname,unsigned long fname_len)
                                }
 
                                LhsVar(1) = Rhs + 1;
-                               C2F(putlhsvar)();
-
                                if (currentDir) {FREE(currentDir); currentDir = NULL;}
+                PutLhsVar();
                        }
                        else
                        {
index aec75bb..6f1bda9 100644 (file)
@@ -385,7 +385,7 @@ static int returnCopyFileResultOnStack(int ierr, char *fname)
         sciError = NULL;
     }
 
-    C2F(putlhsvar)();
+    PutLhsVar();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 34228fc..de44c96 100644 (file)
@@ -61,7 +61,7 @@ int sci_createdir(char *fname,unsigned long l)
                *istk(l1) = bOK;
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index 7da6b1c..2176515 100644 (file)
@@ -45,7 +45,7 @@ int sci_deletefile(char *fname,unsigned long fname_len)
                }
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index e2d3a65..5770b7b 100644 (file)
@@ -62,9 +62,11 @@ int sci_fileext(char *fname,unsigned long fname_len)
                        }
                        CreateVarFromPtr( Rhs+1, MATRIX_OF_STRING_DATATYPE, &m1, &n1, Output_extensions );
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
+                       
                        freeArrayOfString(Input_filenames, m1*n1);
                        freeArrayOfString(Output_extensions,m1*n1);
+
+            PutLhsVar();
                }
                else
                {
index 0f37ff1..6a7440d 100644 (file)
@@ -79,7 +79,7 @@ int sci_fileinfo(char *fname,unsigned long fname_len)
                                LhsVar(2) = Rhs + 2;
                        }
 
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -136,7 +136,7 @@ int sci_fileinfo(char *fname,unsigned long fname_len)
                                freeArrayOfString(InputString_Parameter, mn);
                                if (results) {FREE(results); results = NULL;}
 
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                        }
                        else
                        {
index 1ff8653..905612a 100644 (file)
@@ -231,7 +231,34 @@ int sci_fileparts(char *fname, unsigned long fname_len)
         if (createSingleWideString(pvApiCtx, Rhs + 1, output_value) == 0)
         {
             LhsVar(1) = Rhs + 1;
-            C2F(putlhsvar) ();
+
+            if (drv)
+            {
+                FREE(drv);
+                drv = NULL;
+            }
+            if (dir)
+            {
+                FREE(dir);
+                dir = NULL;
+            }
+            if (name)
+            {
+                FREE(name);
+                name = NULL;
+            }
+            if (ext)
+            {
+                FREE(ext);
+                ext = NULL;
+            }
+            if (path_out)
+            {
+                FREE(path_out);
+                path_out = NULL;
+            }
+
+            PutLhsVar();
         }
 
         if (drv)
@@ -343,7 +370,7 @@ int sci_fileparts(char *fname, unsigned long fname_len)
             ext = NULL;
         }
         LhsVar(3) = Rhs + 3;
-        C2F(putlhsvar) ();
+        PutLhsVar();
     }
     return 0;
 }
index 1140f3b..71c5bd6 100644 (file)
@@ -33,11 +33,12 @@ int sci_filesep(char *fname,unsigned long fname_len)
        n1 = 1;
        CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(separator), &m1),&n1,&separator);
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
 
-       if (separator) {FREE(separator);separator=NULL;}
+    if (separator) {FREE(separator);separator=NULL;}
 
-       return 0;
+       PutLhsVar();
+
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 
index d250c23..bbc322a 100644 (file)
@@ -124,7 +124,7 @@ int sci_findfiles(char *fname,unsigned long fname_len)
 
        freeArrayOfString(FilesList,sizeListReturned);
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 69ac6a6..6844a7f 100644 (file)
@@ -349,7 +349,8 @@ int sci_fprintfMat(char *fname,unsigned long fname_len)
     case FPRINTFMAT_NO_ERROR:
         {
             LhsVar(1) = 0;
-            C2F(putlhsvar)();
+            if (filename) {FREE(filename); filename = NULL;}
+            PutLhsVar();
         }
         break;
     case FPRINTFMAT_FOPEN_ERROR:
index 9111b0c..fca2e33 100644 (file)
@@ -268,7 +268,9 @@ int sci_fscanfMat(char *fname,unsigned long fname_len)
                     }
                 }
 
-                C2F(putlhsvar)();
+                if (filename) {FREE(filename); filename = NULL;}
+
+                PutLhsVar();
             }
             break;
         case FSCANFMAT_MOPEN_ERROR:
@@ -306,7 +308,6 @@ int sci_fscanfMat(char *fname,unsigned long fname_len)
 
     if (filename) {FREE(filename); filename = NULL;}
 
-
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 9827abe..1105f4c 100644 (file)
@@ -48,9 +48,10 @@ int sci_fullpath(char *fname,unsigned long fname_len)
                        n1=1;
                        CreateVarFromPtr( Rhs+1,STRING_DATATYPE,(m1=(int)strlen(Output), &m1),&n1,&Output);
                        LhsVar(1) = Rhs+1;
-                       C2F(putlhsvar)();       
-
+                       
                        if (Output) {FREE(Output);Output=NULL;}
+
+            PutLhsVar();       
                }
                else
                {
index d00d5f6..1c92b43 100644 (file)
@@ -112,9 +112,10 @@ int sci_get_absolute_file_path(char *fname,unsigned long fname_len)
                                n1=1;
                                CreateVarFromPtr( Rhs+1,STRING_DATATYPE,(m1=(int)strlen(absolute_file_path), &m1),&n1,&absolute_file_path);
                                LhsVar(1)=Rhs+1;
-                               C2F(putlhsvar)();
-
+                               
                                if (absolute_file_path){FREE(absolute_file_path);absolute_file_path=NULL;}
+
+                PutLhsVar();
                        }
                }
                else
index 843d0b0..5cd3ccf 100644 (file)
@@ -45,10 +45,11 @@ int sci_getdrives(char *fname,unsigned long l)
        }
 
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
-
+       
        freeArrayOfString(Drives, nbDrives);
        nbDrives = 0;
+
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 5c5b130..a55bef9 100644 (file)
@@ -65,10 +65,10 @@ int sci_getlongpathname(char *fname,unsigned long l)
                        LhsVar(2) = Rhs+2;
                }
 
-               C2F(putlhsvar)();
-               
                freeArrayOfString(LongNames, m1n1);
                if (bOK) {FREE(bOK); bOK = NULL;}
+
+        PutLhsVar();
        }
        else
        {
index d22aaf7..7cd7b74 100644 (file)
@@ -75,7 +75,7 @@ int sci_getrelativefilename(char *fname, unsigned long l)
                CreateVarFromPtr(Rhs+3,STRING_DATATYPE,(m1=(int)strlen(result), &m1),&n1,&result);
                LhsVar(1)=Rhs+3;
                if (result) {FREE(result);result=NULL;}
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index b693854..2b3afc8 100644 (file)
@@ -65,10 +65,9 @@ int sci_getshortpathname(char *fname,unsigned long l)
                        LhsVar(2) = Rhs + 2;
                }
 
-               C2F(putlhsvar)();
-
                freeArrayOfString(ShortNames, m1n1);
                if (bOK) {FREE(bOK); bOK = NULL;}
+        PutLhsVar();
        }
        else
        {
index d85d027..5ebe4d1 100644 (file)
@@ -152,7 +152,7 @@ int sci_isdir(char *fname,unsigned long fname_len)
 
        if (results) {FREE(results); results = NULL;}
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index c1412de..96b7df0 100644 (file)
@@ -145,7 +145,7 @@ int sci_isfile(char *fname,unsigned long fname_len)
 
        if (results) {FREE(results); results = NULL;}
        
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 5404921..88b5c64 100644 (file)
@@ -103,9 +103,9 @@ int DoOneLhs(void)
        CreateVarFromPtr(Rhs+1,MATRIX_OF_INTEGER_DATATYPE, &n1, &m1, &paramoutINT);
 
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
-
+       
        if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+    PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index f998145..f6258c0 100644 (file)
@@ -68,7 +68,7 @@ int sci_merror(char *fname,unsigned long fname_len)
                        }
                }
 
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
@@ -113,7 +113,7 @@ int sci_merror(char *fname,unsigned long fname_len)
                                                        errmsg = NULL;
                                                }
                                        }
-                                       C2F(putlhsvar)();
+                                       PutLhsVar();
                                }
                                else
                                {
index a630535..971f726 100644 (file)
@@ -290,7 +290,7 @@ int sci_mgetl(char *fname,unsigned long fname_len)
         }
 
         LhsVar(1) = Rhs + 1;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     else
     {
index 1f2c51b..67f49a1 100644 (file)
@@ -27,7 +27,7 @@
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
 static wchar_t* getFilenameWithExtensionForMove(wchar_t* wcFullFilename);
-static void returnMoveFileResultOnStack(int ierr, char *fname);
+static int returnMoveFileResultOnStack(int ierr, char *fname);
 /*--------------------------------------------------------------------------*/
 int sci_movefile(char *fname,unsigned long fname_len)
 {
@@ -262,7 +262,7 @@ static wchar_t* getFilenameWithExtensionForMove(wchar_t* wcFullFilename)
        return wcfilename;
 }
 /*--------------------------------------------------------------------------*/
-static void returnMoveFileResultOnStack(int ierr, char *fname)
+static int returnMoveFileResultOnStack(int ierr, char *fname)
 {
        double dError = 0.;
        wchar_t **sciError = NULL;
@@ -272,7 +272,7 @@ static void returnMoveFileResultOnStack(int ierr, char *fname)
        if (sciError == NULL)
        {
                Scierror(999,_("%s: Memory allocation error.\n"),fname);
-               return;
+               return 0;
        }
 
 #ifdef _MSC_VER
@@ -296,7 +296,7 @@ static void returnMoveFileResultOnStack(int ierr, char *fname)
                if (sciError[0] == NULL)
                {
                        Scierror(999,_("%s: Memory allocation error.\n"),fname);
-                       return;
+                       return 0;
                }
 
                wcscpy(sciError[0], buffer);
@@ -308,7 +308,7 @@ static void returnMoveFileResultOnStack(int ierr, char *fname)
                if (sciError[0] == NULL)
                {
                        Scierror(999,_("%s: Memory allocation error.\n"),fname);
-                       return;
+                       return 0;
                }
                wcscpy(sciError[0], L"");
        }
@@ -350,7 +350,8 @@ static void returnMoveFileResultOnStack(int ierr, char *fname)
 
        freeArrayOfWideString(sciError, 1);
 
-       C2F(putlhsvar)();
+       PutLhsVar();
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 
index fcec39b..33e64ad 100644 (file)
@@ -39,7 +39,7 @@ int sci_newest(char *fname,unsigned long fname_len)
                int m1 = 0,n1 = 0,l1 = 0;
                CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
@@ -56,7 +56,7 @@ int sci_newest(char *fname,unsigned long fname_len)
                                        m1 = 0;n1 = 0;l1 = 0;
                                        CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                                        LhsVar(1)=Rhs+1;
-                                       C2F(putlhsvar)();
+                                       PutLhsVar();
                                        return 0;
                                }
                                else
@@ -121,9 +121,10 @@ int sci_newest(char *fname,unsigned long fname_len)
                        n1 = 1;
                        CreateVarFromPtr(Rhs+1,MATRIX_OF_INTEGER_DATATYPE, &n1, &n1, &paramoutINT);
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
 
-                       if (paramoutINT){FREE(paramoutINT); paramoutINT=NULL;}
+            if (paramoutINT){FREE(paramoutINT); paramoutINT=NULL;}
+
+                       PutLhsVar();
                }
                else
                {
@@ -133,7 +134,7 @@ int sci_newest(char *fname,unsigned long fname_len)
 
                        CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
        }
        return 0;
index 829342e..e7a5c83 100644 (file)
@@ -258,7 +258,7 @@ int sci_pathconvert(char *fname,unsigned long fname_len)
                        }
 
                        LhsVar(1) = Rhs + 1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
@@ -338,11 +338,10 @@ int sci_pathconvert(char *fname,unsigned long fname_len)
                }
 
                LhsVar(1) = Rhs + 1;
-               C2F(putlhsvar)();
-
                if (lenStVarOne) {FREE(lenStVarOne); lenStVarOne = NULL;}
                freeArrayOfWideString(results, m1 * n1);
                freeArrayOfWideString(pStVarOne, m1 * n1);
+               PutLhsVar();
        }
        else
        {
index dad5a6d..c218845 100644 (file)
@@ -30,9 +30,9 @@ int sci_pathsep(char *fname,unsigned long fname_len)
        n1 = 1;
        CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(separator), &m1),&n1,&separator);
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
-
+       
        if (separator) {FREE(separator);separator=NULL;}
+    PutLhsVar();
 
        return 0;
 }
index 93f6bf6..389321e 100644 (file)
@@ -42,9 +42,9 @@ int sci_pwd(char *fname,unsigned long fname_len)
                n1 = 1;
                CreateVarFromPtr(Rhs+1, STRING_DATATYPE, &m1, &n1, &path);
                LhsVar(1) = Rhs+1;
-               C2F(putlhsvar)();
-
+               
                if (path) {FREE(path); path = NULL;}
+        PutLhsVar();
        }
 
        return 0;
index a69c1bf..1ce04e6 100644 (file)
@@ -54,7 +54,7 @@ int sci_removedir(char *fname,unsigned long l)
                *istk(l1) = bOK;
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index f2f62f2..f831899 100644 (file)
@@ -79,7 +79,7 @@ int C2F(sci_execstr)(char *fname,unsigned long fname_len)
 
                                LhsVar(1) = Rhs + 1;
 
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                                return 0;
                        }
                        else
index 52c59ca..21a446e 100644 (file)
@@ -41,7 +41,7 @@ int sci_librarieslist(char *fname,unsigned long fname_len)
 
        freeArrayOfString(libraries, sizelibraries);
        
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index dbe5613..f804755 100644 (file)
@@ -93,7 +93,7 @@ int sci_libraryinfo(char *fname,unsigned long fname_len)
 
                     if (pathlibrary) {FREE(pathlibrary);pathlibrary=NULL;}
 
-                    C2F(putlhsvar)();
+                    PutLhsVar();
                 }
                 else
                 {
index 095553a..307ab13 100644 (file)
@@ -139,7 +139,7 @@ int sci_whereis(char *fname,unsigned long fname_len)
                freeArrayOfString(librariesResult, librariesResultSize);
                if (pStVarOne){FREE(pStVarOne); pStVarOne = NULL;}
 
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index e38e9aa..5dc414c 100644 (file)
@@ -52,7 +52,7 @@ int xs2file(char * fname, ExportFileType fileType )
     {
       Scierror(999,_("%s: Wrong type for input argument #%d: An integer or a handle expected.\n"),fname, 1);
       LhsVar(1) = 0;
-      C2F(putlhsvar)();
+      PutLhsVar();
       return 0;
     }
 
@@ -76,8 +76,6 @@ int xs2file(char * fname, ExportFileType fileType )
          if(m1*n1 != 1)
            {
              Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);        
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
              return 0;
            }
 
@@ -85,8 +83,6 @@ int xs2file(char * fname, ExportFileType fileType )
          if (!sciIsExistingFigure(figurenum))
            {
              Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
              return 0;
            }
          figurePtr = getFigureFromIndex(figurenum);
@@ -98,8 +94,6 @@ int xs2file(char * fname, ExportFileType fileType )
          if(m1*n1 != 1)
            {
              Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);        
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
              return 0;
            }
          figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
@@ -107,16 +101,12 @@ int xs2file(char * fname, ExportFileType fileType )
          if(figurePtr == NULL)
            {
              Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
              return 0;        
            }
          startFigureDataReading(figurePtr);
          if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
            {
              Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
              return 0;        
            }
          endFigureDataReading(figurePtr);
@@ -223,7 +213,7 @@ int xs2file(char * fname, ExportFileType fileType )
     }
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index d91dcad..ce3a40e 100644 (file)
@@ -58,7 +58,7 @@ int sci_Legend( char * fname, unsigned long fname_len )
   {
     CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,&numrow,&numcol,&l1);
     LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
     return 0;
   }
   GetMatrixdims(2,&m2,&n2);
@@ -153,7 +153,7 @@ int sci_Legend( char * fname, unsigned long fname_len )
   CreateVar(Rhs+1,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&outindex);
   hstk(outindex)[0] = sciGetHandle((sciPointObj *) sciGetCurrentObj());
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index c5f51dc..5832c04 100644 (file)
@@ -185,7 +185,7 @@ int sci_stringbox( char * fname, unsigned long fname_len )
   *stk( stackPointer + 7 )  = corners[2][1] ;
 
   LhsVar( 1 ) = Rhs + 1 ;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 
index 08ca995..fb9719f 100644 (file)
@@ -64,7 +64,7 @@ int sci_addcb(char *fname,unsigned long fname_len)
   }
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index 4e292da..a72abf7 100644 (file)
@@ -79,7 +79,7 @@ int sci_champ_G(char *fname,
   if (m3 * n3 == 0)
   { 
     LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
     return 0;
   } 
 
@@ -99,7 +99,7 @@ int sci_champ_G(char *fname,
 
   (*func)(stk(l1 ),stk(l2 ),stk(l3 ),stk(l4 ),&m3,&n3,strf,rect, arfact, 4L);
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 42df2ef..b91faa1 100644 (file)
@@ -32,7 +32,7 @@ int sci_clear_pixmap(char *fname, unsigned long fname_len )
   clearPixmap(sciGetCurrentFigure());
 
   LhsVar(1)=0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index ff5c1d1..b0d3459 100644 (file)
@@ -41,7 +41,7 @@ int sci_contour2di( char * fname, unsigned long fname_len )
   GetRhsVar(3,MATRIX_OF_DOUBLE_DATATYPE, &m3, &n3, &l3);
   if (m3 * n3 == 0) {
                LhsVar(1) = 0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
   if (m3 == 1 || n3 == 1) {
@@ -86,7 +86,7 @@ int sci_contour2di( char * fname, unsigned long fname_len )
   }
   LhsVar(1)=Rhs+2;
   LhsVar(2)=Rhs+3;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 2ea832a..6603898 100644 (file)
@@ -86,7 +86,7 @@ int sci_copy(char *fname,unsigned long fname_len)
   *hstk(outindex) = sciGetHandle(pcopyobj = sciCopyObj((sciPointObj *)pobj,(sciPointObj *)psubwinparenttarget));
   sciDrawObj((sciPointObj *)sciGetParentFigure(pcopyobj));
   LhsVar(1) = Rhs+1;
-    C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 
index 7c749f5..ff6fbc1 100644 (file)
@@ -175,7 +175,7 @@ int sci_delete(char *fname,unsigned long fname_len)
     else
     {
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
 
     return 0;
index 55ec4ed..f2f5c8f 100644 (file)
@@ -71,7 +71,7 @@ int sci_draw( char * fname, unsigned long fname_len )
   }
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 00ddff9..5a40f86 100644 (file)
@@ -162,7 +162,7 @@ int sci_drawaxis( char * fname, unsigned long fname_len )
     if ( check_xy(fname,dir,3,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
       opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
        {
-         C2F(putlhsvar)();
+         PutLhsVar();
       return 0;
        }
     break;
@@ -170,7 +170,7 @@ int sci_drawaxis( char * fname, unsigned long fname_len )
     if ( check_xy(fname,dir,4,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
       opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
        {
-         C2F(putlhsvar)();
+         PutLhsVar();
       return 0;
        }
     break;
@@ -178,7 +178,7 @@ int sci_drawaxis( char * fname, unsigned long fname_len )
     if ( check_xy(fname,dir,-1,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
       opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
        {
-         C2F(putlhsvar)();
+         PutLhsVar();
       return 0;
        }
     break;
@@ -198,7 +198,7 @@ int sci_drawaxis( char * fname, unsigned long fname_len )
 
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 
index 154eef7..131faea 100644 (file)
@@ -39,7 +39,7 @@ int sci_drawlater( char * fname, unsigned long fname_len )
        }
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index c3d67a0..0cc11c8 100644 (file)
@@ -41,7 +41,7 @@ int sci_drawnow(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 800e87c..fed724f 100644 (file)
@@ -60,7 +60,7 @@ int sci_fec(char *fname,unsigned long fname_len)
 
   if ( get_optionals(fname,opts) == 0) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -86,7 +86,7 @@ int sci_fec(char *fname,unsigned long fname_len)
   if (m1 * n1 == 0 || m3 == 0) 
   { 
          LhsVar(1) = 0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   } 
 
@@ -121,7 +121,7 @@ int sci_fec(char *fname,unsigned long fname_len)
   Objfec (stk(l1),stk(l2),stk(l3),stk(l4),&mn1,&m3,strf,legend,rect,nax,zminmax,colminmax,colOut,withMesh,flagNax);
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index 3c3030e..117c1ba 100644 (file)
@@ -57,7 +57,7 @@ int sci_geom3d( char * fname, unsigned long fname_len )
   if (m1 * n1 == 0)  
   { 
          LhsVar(1) = 0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -66,7 +66,7 @@ int sci_geom3d( char * fname, unsigned long fname_len )
 
   LhsVar(1) = 1;
   LhsVar(2) = 2;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index fc6377f..71f3732 100644 (file)
@@ -103,7 +103,7 @@ int sci_get(char *fname,unsigned long fname_len)
                                return FALSE;
                        }
                        LhsVar(1) = Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else /* tclsci handle: should no more happen */
                {
@@ -167,7 +167,7 @@ int sci_get(char *fname,unsigned long fname_len)
                if (sciGet(NULL, cstk(l2)) != 0) 
                {
                        /* An error has occured */
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
        }
@@ -180,7 +180,7 @@ int sci_get(char *fname,unsigned long fname_len)
                        if (sciGet(pobj, cstk(l2)) != 0)
                        {
                                /* An error has occured */
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                                return 0;
                        }
                }
@@ -192,7 +192,7 @@ int sci_get(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1) = Rhs + 1;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index bd97dbf..fdbe09f 100644 (file)
@@ -101,8 +101,8 @@ int sci_glue( char * fname, unsigned long fname_len )
   CreateVar(Rhs+3,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&outindex);
   hstk(outindex)[0] = sciGetHandle((sciPointObj *) sciGetCurrentObj());
   LhsVar(1) = Rhs+3;
-  C2F(putlhsvar)();
   FREE(handelsvalue);
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index de7abe1..6dfb451 100644 (file)
@@ -52,7 +52,7 @@ int sci_grayplot( char *fname, unsigned long fname_len )
 
   if ( get_optionals(fname,opts) == 0) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0 ; 
   }
 
@@ -70,7 +70,7 @@ int sci_grayplot( char *fname, unsigned long fname_len )
   if (m3 * n3 == 0) 
   { 
          LhsVar(1)=0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   } 
 
@@ -110,7 +110,7 @@ int sci_grayplot( char *fname, unsigned long fname_len )
   Objgrayplot (stk(l1), stk(l2), stk(l3), &m3, &n3, strf, rect, nax, flagNax);
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index acc43a0..e17ae1e 100644 (file)
@@ -59,7 +59,7 @@ int sci_is_handle_valid(char *fname,unsigned long fname_len)
   }
 
   LhsVar(1) = Rhs + 1;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index 3db2e4f..09ffe20 100644 (file)
@@ -53,7 +53,7 @@ int sci_matplot(char *fname,unsigned long fname_len)
 
   if ( get_optionals(fname,opts) == 0 ) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0 ; 
   }
   if ( FirstOpt() < 2)
@@ -66,7 +66,7 @@ int sci_matplot(char *fname,unsigned long fname_len)
   if (m1 * n1 == 0) 
   {  
          LhsVar(1) = 0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -103,7 +103,7 @@ int sci_matplot(char *fname,unsigned long fname_len)
 
   /* NG end */
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 32d4b25..d7e0ec7 100644 (file)
@@ -36,7 +36,7 @@ int sci_matplot1( char * fname, unsigned long fname_len )
   if ( m1 * n1 == 0 )
   {
     LhsVar(1) = 0 ;
-       C2F(putlhsvar)();
+       PutLhsVar();
     return 0 ;
   } 
 
@@ -45,7 +45,7 @@ int sci_matplot1( char * fname, unsigned long fname_len )
   Objmatplot1 (stk(l1), &m1, &n1,stk(l2)) ;
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index 049db46..75d2896 100644 (file)
@@ -75,7 +75,7 @@ int sci_move( char * fname, unsigned long fname_len )
   Objmove(pobj, moveVector, nbDim, alone);
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index 0a5e6ec..e834f13 100644 (file)
@@ -42,7 +42,7 @@ int sci_newaxes( char * fname,unsigned long fname_len )
     *hstk(outindex) = sciGetHandle(masousfen);
 
     LhsVar(1) = 1;
-       C2F(putlhsvar)();
+       PutLhsVar();
   }
   else 
   {
index f1685e0..3d92811 100644 (file)
@@ -55,7 +55,7 @@ int sci_param3d( char * fname, unsigned long fname_len )
 
   if ( get_optionals(fname,opts) == 0) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
   if ( FirstOpt() < 4) 
@@ -68,7 +68,7 @@ int sci_param3d( char * fname, unsigned long fname_len )
   if (m1 * n1 == 0) 
   { 
          LhsVar(1) = 0; 
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   } 
   GetRhsVar(2,MATRIX_OF_DOUBLE_DATATYPE, &m2, &n2, &l2);
@@ -98,7 +98,7 @@ int sci_param3d( char * fname, unsigned long fname_len )
 
   /* NG end */
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*------------------------------------------------------------------------*/
index 0e8d1c0..85428f3 100644 (file)
@@ -56,7 +56,7 @@ int sci_param3d1( char *fname, unsigned long fname_len )
 
   if ( get_optionals(fname,opts) == 0) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -75,7 +75,7 @@ int sci_param3d1( char *fname, unsigned long fname_len )
   if (m1 * n1 == 0) 
   { 
          LhsVar(1) = 0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
   CheckSameDims(1,2,m1,n1,m2,n2); 
@@ -130,7 +130,7 @@ int sci_param3d1( char *fname, unsigned long fname_len )
   Objplot3d (fname,&isfac,&izcol,stk(l1),stk(l2),stk(l3),zcol,&m1,&n1,theta,alpha,labels,iflag,ebox,&m1,&n1,&m2,&n2,&m3,&n3,&m3n,&n3n); /*Adding F.Leray 12.03.04*/
   
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 42a5f65..64e1323 100644 (file)
@@ -71,7 +71,7 @@ int sci_plot2d( char * fname, unsigned long fname_len )
   iskip=0;
   if ( get_optionals(fname,opts) == 0) 
   { 
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0 ; 
   }
 
@@ -293,7 +293,7 @@ int sci_plot2d( char * fname, unsigned long fname_len )
   Objplot2d (1,logFlags,stk(l1), stk(l2), &n1, &m1, style, strf,legend, rect,nax,flagNax);
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*------------------------------------------------------------------------*/
index 07b075b..99dc781 100644 (file)
@@ -82,7 +82,7 @@ int sci_plot2d1_G( char * fname, int ptype, unsigned long fname_len )
   iskip=0;
   if ( get_optionals(fname,opts) == 0) 
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -228,7 +228,7 @@ int sci_plot2d1_G( char * fname, int ptype, unsigned long fname_len )
 
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index cf86b85..966f2fc 100644 (file)
@@ -66,7 +66,7 @@ int sci_plot3d( char * fname, unsigned long fname_len )
 
   if ( get_optionals(fname,opts) == 0)
   {
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -81,7 +81,7 @@ int sci_plot3d( char * fname, unsigned long fname_len )
   if (m1 * n1 == 0)
   {
          LhsVar(1) = 0;
-         C2F(putlhsvar)();
+         PutLhsVar();
          return 0;
   }
 
@@ -156,7 +156,7 @@ int sci_plot3d( char * fname, unsigned long fname_len )
 
   if (m1 * n1 == 0 || m2 * n2 == 0 || m3 * n3 == 0) {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
   SciWin() ;
@@ -175,7 +175,7 @@ int sci_plot3d( char * fname, unsigned long fname_len )
   Objplot3d (fname,&isfac,&izcol,stk(l1),stk(l2),stk(l3),zcol,&m3,&n3,theta,alpha,legend,iflag,ebox,&m1,&n1,&m2,&n2,&m3,&n3,&m3n,&n3n);/*Adding F.Leray 12.03.04 and 19.03.04*/
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 
 }
index 5037504..fdf041a 100644 (file)
@@ -68,14 +68,14 @@ int sci_relocate_handle( char * fname, unsigned long fname_len )
                            handleRow * handleCol,
                            (unsigned long) *hstk( parentStkIndex ) ) != 0 )
   {
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0 ;
   }
   FREE( handleArray ) ;
   CreateVar( Rhs + 1,GRAPHICAL_HANDLE_DATATYPE, &handleCol, &handleRow, &outIndex );
   *hstk(outIndex) = *hstk(handleStkIndex) ;
   LhsVar(1) = Rhs + 1 ;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0 ;
 
 }
index 1e4306a..d0da090 100644 (file)
@@ -54,8 +54,6 @@ int sci_rotate_axes(char *fname,unsigned long fname_len)
     if (GetType(1) != sci_handles)
     {
       Scierror(999, _("%s: Wrong type for input argument #%d: Single Figure or Axes handle expected.\n"), fname, 1);
-      LhsVar(1) = 0;
-         C2F(putlhsvar)();
       return -1;
     }
 
@@ -64,8 +62,6 @@ int sci_rotate_axes(char *fname,unsigned long fname_len)
     if (nbRow * nbCol != 1)
     {
       Scierror(999, _("%s: Wrong type for input argument #%d: Single Figure or Axes handle expected.\n"), fname, 1);
-      LhsVar(1) = 0;
-         C2F(putlhsvar)();
       return -1;
     }
 
@@ -92,7 +88,7 @@ int sci_rotate_axes(char *fname,unsigned long fname_len)
   }
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index f3b2dfe..fbb3202 100644 (file)
@@ -113,7 +113,7 @@ static int returnRectAndButton(const double selectedRect[4], int button)
     LhsVar(2) = Rhs + 2;
   }
 
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index c07544f..7528374 100644 (file)
@@ -242,7 +242,7 @@ int sci_set(char *fname, unsigned long fname_len)
             {
                 /* An error occured */
                 LhsVar(1)=0;
-                C2F(putlhsvar)();
+                PutLhsVar();
                 return 0 ;
             }
 
@@ -315,7 +315,7 @@ int sci_set(char *fname, unsigned long fname_len)
         }
 
         LhsVar(1) = 0;
-        C2F(putlhsvar)();
+        PutLhsVar();
     }
     return 0;
 }
index deb6755..653c0c9 100644 (file)
@@ -32,7 +32,7 @@ int sci_show_pixmap(char *fname, unsigned long fname_len )
   showPixmap(sciGetCurrentFigure());
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 40720e0..4e95d24 100644 (file)
@@ -117,7 +117,7 @@ int sci_show_window( char *fname,unsigned long fname_len )
        showWindow(shownFigure);
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index cd689d7..a518c9a 100644 (file)
@@ -56,7 +56,7 @@ int sci_showalluimenushandles( char *fname, unsigned long fname_len )
   }
 
   LhsVar(1) = 0;
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index 5cf9a90..69e6488 100644 (file)
@@ -46,7 +46,7 @@ int sci_swap_handles( char * fname, unsigned long fname_len )
   swapHandles( (unsigned long) *hstk( firstHdlStkIndex  ),
                (unsigned long) *hstk( secondHdlStkIndex ) ) ;
   LhsVar(1) = 0 ;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0 ;
 }
 /*--------------------------------------------------------------------------*/
index 61c7231..85223b4 100644 (file)
@@ -65,8 +65,8 @@ int sci_unglue(char *fname,unsigned long fname_len)
       i++;
     }
     LhsVar(1) = Rhs+1;
-               C2F(putlhsvar)();
     sciUnCompound ((sciPointObj *)pobj);
+    PutLhsVar();
   }
   else
   {
index 8be62df..9802723 100644 (file)
@@ -74,7 +74,7 @@ int sci_unzoom(char *fname,unsigned long fname_len)
   
 
   LhsVar(1)=0; 
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 700af29..7201d62 100644 (file)
@@ -48,7 +48,7 @@ int sci_winsid(char *fname,unsigned long fname_len)
     FREE(ids);
   }
   LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return status;
 }
 /*--------------------------------------------------------------------------*/
index 490166a..281f21f 100644 (file)
@@ -70,7 +70,7 @@ int sci_xarc(char *fname,unsigned long fname_len)
   sciDrawObj(sciGetCurrentObj());
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index afbdf8d..957002b 100644 (file)
@@ -96,7 +96,7 @@ int sci_xarcs(char *fname,unsigned long fname_len)
 
   /* NG end */
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index d1e74a5..b6c4dcd 100644 (file)
@@ -40,7 +40,7 @@ int sci_xarrows(char *fname,unsigned long fname_len)
   if (mn2 == 0)
        {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        } 
 
@@ -70,7 +70,7 @@ int sci_xarrows(char *fname,unsigned long fname_len)
   sciDrawObj(sciGetCurrentObj());
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 } 
 
index 40b70d7..ffaedf8 100644 (file)
@@ -91,7 +91,7 @@ int sci_xchange( char * fname, unsigned long fname_len )
   LhsVar(1)=Rhs+1;
   LhsVar(2)=Rhs+2;
   LhsVar(3)=Rhs+3;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 70b9b90..b20f9cd 100644 (file)
@@ -117,7 +117,7 @@ int sci_xclick(char *fname,unsigned long fname_len)
 
   deleteMenuCallBack(menuCallback);
 
-       C2F(putlhsvar)();
+  PutLhsVar();
 
   return 0;
 }
index e3d6537..55e1382 100644 (file)
@@ -54,7 +54,7 @@ int sci_xdel(char *fname,unsigned long fname_len)
     sciDeleteWindow( sciGetNum(sciGetCurrentFigure()) ) ;
   }
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 } 
 
index 908a53d..27e1cd6 100644 (file)
@@ -76,7 +76,7 @@ int sci_xfarcs( char * fname, unsigned long fname_len )
   sciDrawObj(sciGetCurrentObj());
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 
 }
index d097eb8..3d6cf17 100644 (file)
@@ -60,7 +60,7 @@ int sci_xfpoly(char *fname,unsigned long fname_len)
   sciDrawObjIfRequired(sciGetCurrentObj ());
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 
 }
index 3752ca5..8bdfca8 100644 (file)
@@ -45,7 +45,7 @@ int sci_xfpolys( char *fname, unsigned long fname_len )
   mn2 = m2 * n2;
   if ( mn2 == 0 ) {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        } 
 
@@ -106,7 +106,7 @@ int sci_xfpolys( char *fname, unsigned long fname_len )
   sciDrawObjIfRequired(sciGetCurrentObj ());
  
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;  
 } 
 
index 42aabbc..c8773b0 100644 (file)
@@ -77,7 +77,7 @@ int sci_xget(char *fname,unsigned long fname_len)
     CreateVar(Rhs+1,STRING_DATATYPE,&bufl,&one,&l3);
     strncpy(cstk(l3),C2F(cha1).buf,bufl);
     LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
     return 0;
   }
   else if ( strcmp(cstk(l1),"colormap") == 0) 
@@ -294,7 +294,7 @@ int sci_xget(char *fname,unsigned long fname_len)
     }
     LhsVar(1)=Rhs+1;
   }
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 14ec595..12a0dc3 100644 (file)
@@ -37,7 +37,7 @@ int sci_xgetech( char *fname, unsigned long fname_len )
 
   getscale2d(W,F,L,A);
        for ( i = 1 ; i <= Lhs ; i++) { LhsVar(i) = i; }
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index 9e5d76f..570513e 100644 (file)
@@ -112,16 +112,16 @@ int sci_xgetmouse( char *fname,unsigned long fname_len )
 
   switch (Lhs) {
   case 1:
-               C2F(putlhsvar)();
+               PutLhsVar();
     return 0;
   case 2:
     CreateVar(Rhs+2,MATRIX_OF_DOUBLE_DATATYPE,&m1,&m1,&l2);
     *stk(l2) = windowsID; /* this is the window number */
     LhsVar(2) = Rhs+2;
-               C2F(putlhsvar)();
+               PutLhsVar();
     return 0;
   }
-       C2F(putlhsvar)();
+       PutLhsVar();
   return -1 ;
 }
 
index 33bffad..5c3b3ae 100644 (file)
@@ -43,7 +43,7 @@ int sci_xgraduate(char *fname,unsigned long fname_len)
   if (Lhs >= 6) { CreateVar(6,MATRIX_OF_DOUBLE_DATATYPE,&un,&un,&lr); *stk(lr ) = (double) kMaxr;  }
   if (Lhs >= 7) { CreateVar(7,MATRIX_OF_DOUBLE_DATATYPE,&un,&un,&lr); *stk(lr ) = (double) ar;  }
   for (i= 1; i <= Lhs ; i++) { LhsVar(i) = i ; }
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index bded725..272568e 100644 (file)
@@ -34,7 +34,7 @@ int sci_xgrid(char *fname,unsigned long fname_len)
     style = (int)  *stk(l1);
   }
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+  C2F(putlhsvar)();
 
   status = sciSetGridStyle( sciGetCurrentSubWin(), style, style, style ) ;
   if ( status == 0 )
index 74c3c2e..910726d 100644 (file)
@@ -61,7 +61,7 @@ static int xlfont_no_rhs(char * fname)
        freeArrayOfString(fontsname,nbElements);
 
        LhsVar(1) = Rhs+1 ;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
@@ -83,14 +83,14 @@ static int xlfont_one_rhs(char * fname)
                        freeArrayOfString(fontsname,nbElements);
 
                        LhsVar(1) = Rhs+1 ;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
                else if ( strcmp(cstk(l1),"reset")==0)
                {
                        resetFontManager();
                        LhsVar(1) = 0 ;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
                else
@@ -104,7 +104,7 @@ static int xlfont_one_rhs(char * fname)
                                *istk(l1) = fontID ;
 
                                LhsVar(1) = Rhs+1 ;
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                                return 0;
                        }
                        else if (FileExist(cstk(l1)))
@@ -116,7 +116,7 @@ static int xlfont_one_rhs(char * fname)
                                *istk(l1) = fontID ;
 
                                LhsVar(1) = Rhs+1 ;
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                                return 0;
                        }
                        else
@@ -189,7 +189,7 @@ static int xlfont_n_rhs(char * fname)
                                *istk(l1) = Id ;
 
                                LhsVar(1) = Rhs+1 ;
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                        }
                        else if ( isAvailableFontsName(fontname) )
                        {
@@ -199,7 +199,7 @@ static int xlfont_n_rhs(char * fname)
                                *istk(l1) = Id ;
 
                                LhsVar(1) = Rhs+1 ;
-                               C2F(putlhsvar)();
+                               PutLhsVar();
                        }
                        else
                        {
index ee22694..1c43299 100644 (file)
@@ -32,7 +32,7 @@ int sci_xname(char *fname,unsigned long fname_len)
   sciSetName( sciGetCurrentFigure(), cstk(l1) ) ;
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 0f0191a..cd47777 100644 (file)
@@ -96,7 +96,7 @@ int sci_xpoly( char * fname, unsigned long fname_len )
 
   /* NG end */
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 
index 2f99f14..36fbe80 100644 (file)
@@ -43,7 +43,7 @@ int sci_xpolys(char *fname,unsigned long fname_len)
   {
     /* dimension 0, 0 polyline to draw */
     LhsVar(1)=0 ;
-               C2F(putlhsvar)();
+               PutLhsVar();
     return 0 ;
   }
 
@@ -77,7 +77,7 @@ int sci_xpolys(char *fname,unsigned long fname_len)
   sciDrawObjIfRequired(sciGetCurrentObj ());
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 
index fcaf3e9..67f19ac 100644 (file)
@@ -112,7 +112,7 @@ int sci_xrect( char *fname, unsigned long fname_len )
   if ( hdl > 0 )
   {
     LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
   }
   return 0;
 } 
index 303265b..4e1e8d5 100644 (file)
@@ -103,7 +103,7 @@ int sci_xrects( char *fname, unsigned long fname_len )
   endFigureDataReading(pFigure);
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index 81fbf50..7e60d73 100644 (file)
@@ -43,7 +43,7 @@ int sci_xsegs(char *fname,unsigned long fname_len)
        {
                /* Empty segs */
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        } 
 
@@ -105,7 +105,7 @@ int sci_xsegs(char *fname,unsigned long fname_len)
     
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index c7291ac..c3d0534 100644 (file)
@@ -82,7 +82,7 @@ int sci_xset( char *fname, unsigned long fname_len )
     GetRhsVar(2,STRING_DATATYPE,&m2,&n2,&l2);
     C2F(xsetg)(cstk(l1),cstk(l2),m1,m2);
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
     return 0;
   }
 
@@ -359,7 +359,7 @@ int sci_xset( char *fname, unsigned long fname_len )
   }
    
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 3c2267d..9e4e11b 100644 (file)
@@ -103,7 +103,7 @@ int sci_xsetech(char* fname,unsigned long fname_len)
   }
   setscale2d(wrect,arect,frect,logflag);
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 
 }
index f174eb9..938590b 100644 (file)
@@ -44,7 +44,7 @@ int sci_xstring( char *fname, unsigned long fname_len )
        if ( m3*n3 == 0 )
        {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
@@ -64,14 +64,14 @@ int sci_xstring( char *fname, unsigned long fname_len )
        {
                Scierror(999,_("%s: Incompatible input arguments #%d and #%d: Same element number expected.\n"), fname, 1, 2);
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
        if(nbElement == 0)
        {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
@@ -82,7 +82,7 @@ int sci_xstring( char *fname, unsigned long fname_len )
                {
                        Scierror(999,_("%s: Wrong size for input argument #%d: %d or %d elements expected.\n"), fname, 4, 1, nbElement);
                        LhsVar(1)=0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
        }
@@ -93,7 +93,7 @@ int sci_xstring( char *fname, unsigned long fname_len )
                {
                        Scierror(999,_("%s: Wrong size for input argument #%d: %d or %d elements expected.\n"), fname, 5, 1, nbElement);
                        LhsVar(1)=0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
        }
@@ -135,7 +135,7 @@ int sci_xstring( char *fname, unsigned long fname_len )
        freeArrayOfString(Str,m3*n3);
 
        LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 } 
 /*--------------------------------------------------------------------------*/
index c39ec94..3de0094 100644 (file)
@@ -49,7 +49,7 @@ int sci_xstringb(char *fname,unsigned long fname_len)
   if ( m3*n3 == 0 )
        {
                LhsVar(1)=0;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        } 
 
@@ -77,7 +77,7 @@ int sci_xstringb(char *fname,unsigned long fname_len)
        freeArrayOfString(Str,m3*n3);
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
   return 0;
 
index c4c553d..df7cea2 100644 (file)
@@ -141,7 +141,7 @@ int sci_xtitle( char * fname, unsigned long fname_len )
   sciDrawObj(pFigure);
 
   LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 }
 
index 2d6cd0b..bcbe0f6 100644 (file)
@@ -185,7 +185,7 @@ int sci_zoom_rect(char *fname,unsigned long fname_len)
   }
 
   LhsVar(1)=0; 
-       C2F(putlhsvar)();
+       PutLhsVar();
   return 0;
 } 
 /*--------------------------------------------------------------------------*/
index 9afa131..06c320d 100644 (file)
@@ -64,7 +64,7 @@ int sci_ClipBoard(char *fname,unsigned long l)
                     FREE(output);
                     LhsVar(1)=Rhs+1;
 
-                    C2F(putlhsvar)();  
+                    PutLhsVar();       
                     return TRUE;
                 }
                 else
@@ -132,7 +132,7 @@ int sci_ClipBoard(char *fname,unsigned long l)
                         n1=0;
                         CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                         LhsVar(1)=Rhs+1;
-                        C2F(putlhsvar)();      
+                        PutLhsVar();   
                         return TRUE;
                     }
 
@@ -208,7 +208,7 @@ int sci_ClipBoard(char *fname,unsigned long l)
                         n1 = 0;
                         CreateVar(Rhs+1, MATRIX_OF_DOUBLE_DATATYPE, &m1, &n1, &l1);
                         LhsVar(1) = Rhs+1;
-                        C2F(putlhsvar)();      
+                        PutLhsVar();           
                         return TRUE;
                     }
                     else
@@ -267,7 +267,7 @@ int sci_ClipBoard(char *fname,unsigned long l)
                             n1=0;
                             CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                             LhsVar(1)=Rhs+1;
-                            C2F(putlhsvar)();  
+                            PutLhsVar();               
                             return TRUE;
                         }
                         else
index 7caa278..d444180 100644 (file)
@@ -81,7 +81,7 @@ int sci_delmenu(char *fname,unsigned long fname_len)
     }
   
   LhsVar(1)=0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index e0680ca..45c9781 100644 (file)
@@ -61,7 +61,7 @@ int sci_getcallbackobject(char *fname,unsigned long fname_len)
       
   LhsVar(1)=Rhs+1;
 
-  C2F(putlhsvar)();
+ PutLhsVar();
 
   return TRUE;
 }
index dd0f8e2..5cef351 100644 (file)
@@ -216,7 +216,7 @@ int sci_messagebox(char *fname,unsigned long fname_len)
       LhsVar(1) = 0;
     }
   
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index 8a8b1ac..8cafa04 100644 (file)
@@ -57,7 +57,7 @@ int sci_mpopup(char *fname,unsigned long fname_len)
 
   LhsVar(1)=Rhs+1;
 
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return TRUE;
 }
index cdb36e3..1a15948 100644 (file)
@@ -140,7 +140,7 @@ int sci_setmenu(char *fname,unsigned long fname_len)
     }
   
   LhsVar(1)=0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index a28a8a0..6ead18a 100644 (file)
@@ -143,7 +143,6 @@ int sci_toolbar(char *fname,unsigned long l)
   nbRow = (int)strlen(Output);
   CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,&nbRow,&nbCol,&Output);
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();    
 
   if (Output) 
     {
@@ -151,6 +150,7 @@ int sci_toolbar(char *fname,unsigned long l)
       Output=NULL;
     }
 
+  PutLhsVar(); 
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index 69a0527..c6f8582 100644 (file)
@@ -50,7 +50,7 @@ int sci_uicontextmenu( char *fname,unsigned long fname_len )
 
   LhsVar(1)=Rhs+1;
 
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return TRUE;
 }
index dcfe84d..66d5502 100644 (file)
@@ -409,7 +409,7 @@ int sci_uicontrol(char *fname, unsigned long fname_len)
 
   LhsVar(1)=Rhs+1;
 
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return TRUE;
 }
index 93f0ee4..09fce18 100644 (file)
@@ -262,7 +262,7 @@ int sci_uigetcolor(char *fname,unsigned long fname_len)
         }
     }
 
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index 0f21101..4a47490 100644 (file)
@@ -137,7 +137,7 @@ int sci_uigetdir(char *fname,unsigned long l)
     }
 
   LhsVar(1)=Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();;
 
   return TRUE;
 }
index ccac156..286bad5 100644 (file)
@@ -226,8 +226,8 @@ int sci_uigetfont(char *fname,unsigned long fname_len)
   LhsVar(3) = Rhs+3;
   LhsVar(4) = Rhs+4;
   
-  C2F(putlhsvar)();
   if (fontNameSize) freeArrayOfString(fontNameAdr, fontNameSize);
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index a1858bd..5dd03d9 100644 (file)
@@ -217,7 +217,7 @@ int sci_uimenu( char *fname,unsigned long fname_len )
 
     LhsVar(1)=Rhs+1;
 
-    C2F(putlhsvar)();
+    PutLhsVar();
 
     return TRUE;
 }
index 6e57398..0148aa2 100644 (file)
@@ -79,7 +79,7 @@ int sci_uiwait( char *fname,unsigned long fname_len )
 
   LhsVar(1)=Rhs+1;
 
-  C2F(putlhsvar)();
+  PutLhsVar();
 
   return TRUE;
 }
index 5739e6a..24ef0a1 100644 (file)
@@ -141,7 +141,7 @@ int sci_unsetmenu(char *fname,unsigned long fname_len)
     }
   
   LhsVar(1)=0;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return 0;
 }
 /*--------------------------------------------------------------------------*/
index 2f75bd2..d434b1d 100644 (file)
@@ -135,7 +135,7 @@ int sci_x_choice(char *fname,unsigned long fname_len)
   FREE(defaultValuesInt);
 
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index 8d0cb08..f30bf06 100644 (file)
@@ -99,7 +99,7 @@ int sci_x_choose(char *fname,unsigned long fname_len)
   *stk(userValueAdr) = userValue;
 
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index ee1a993..ff0adcf 100644 (file)
@@ -105,7 +105,7 @@ int sci_x_choose_modeless(char *fname,unsigned long fname_len)
   *stk(userValueAdr) = userValue;
 
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index b702968..327007a 100644 (file)
@@ -94,7 +94,7 @@ int sci_x_dialog(char *fname,unsigned long fname_len)
     }
 
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index e9590bc..879dffc 100644 (file)
@@ -162,7 +162,7 @@ int sci_x_mdialog(char *fname,unsigned long fname_len)
     }
 
   LhsVar(1) = Rhs+1;
-  C2F(putlhsvar)();
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index afc8ccd..afe3770 100644 (file)
@@ -55,7 +55,7 @@ int sci_getinstalledlookandfeels(char *fname,unsigned long fname_len)
                delete lnf;
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index fde20ba..337c4fe 100644 (file)
@@ -41,7 +41,7 @@ int sci_getlookandfeel(char *fname,unsigned long fname_len)
                        if (look) {delete [] look; look = NULL;}
                        delete lnf;
                        LhsVar(1) = Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                }
                else
                {
index 74a4bd2..28744df 100644 (file)
@@ -56,8 +56,8 @@ int sci_printfigure(char *fname,unsigned long l)
               n1=1;
               CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE,  &m1, &n1, &status);
               LhsVar(1)=Rhs+1;
-              C2F(putlhsvar)();        
               delete[] status;
+              PutLhsVar();     
               return TRUE;
             }
           else
index 4dbd18c..308958e 100644 (file)
@@ -38,7 +38,7 @@ int sci_printsetupbox(char *fname,unsigned long l)
        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1,&paramoutINT);
        LhsVar(1)=Rhs+1;
        delete[] paramoutINT;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index b0d1b73..a3bf06c 100644 (file)
@@ -43,9 +43,8 @@ int sci_setlookandfeel(char *fname,unsigned long fname_len)
                        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
                        LhsVar(1)=Rhs+1;
 
-                       C2F(putlhsvar)();
-
                        if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+            PutLhsVar();
                }
                else
                {
@@ -72,9 +71,8 @@ int sci_setlookandfeel(char *fname,unsigned long fname_len)
                        CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
                        LhsVar(1)=Rhs+1;
 
-                       C2F(putlhsvar)();
-
                        if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+            PutLhsVar();
                }
                else
                {
index af744ca..afef0ab 100644 (file)
@@ -141,10 +141,9 @@ int sci_uigetdir(char *fname,unsigned long l)
     }
 
   LhsVar(1)=Rhs+1;
-  PutLhsVar();
-
-  if (expandedpath) {FREE(expandedpath); expandedpath = NULL;}
   
+  if (expandedpath) {FREE(expandedpath); expandedpath = NULL;}
+  PutLhsVar();
   return TRUE;
 }
 /*--------------------------------------------------------------------------*/
index 06f8458..2a97d46 100644 (file)
@@ -293,8 +293,9 @@ int sci_uigetfile(char *fname, unsigned long fname_len)
                        FREE(tmp); tmp = NULL;
                        LhsVar(3) = Rhs + 3 ;
                }
-               C2F(putlhsvar)();
+               
                freePointersUigetfile();
+        PutLhsVar();
                return 0;
        }
 
@@ -303,8 +304,9 @@ int sci_uigetfile(char *fname, unsigned long fname_len)
        {
           CreateVarFromPtr(Rhs+1, MATRIX_OF_STRING_DATATYPE, &nbRowOutSelection, &nbColOutSelection, selection);
           LhsVar(1) = Rhs + 1 ;
-          C2F(putlhsvar)();
+          
                  freePointersUigetfile();
+          PutLhsVar();
           return 0;
        }
 
@@ -331,9 +333,9 @@ int sci_uigetfile(char *fname, unsigned long fname_len)
                LhsVar(3) = Rhs + 3 ;
        }
         
-       C2F(putlhsvar)();
-
+       
        freePointersUigetfile();
+    PutLhsVar();
 
        return 0;
 }
index d69b2d6..43db434 100644 (file)
@@ -226,7 +226,7 @@ int sci_uiputfile(char *fname, unsigned long fname_len)
                        FREE(tmp); tmp = NULL;
                        LhsVar(3) = Rhs + 3 ;
                }
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
@@ -235,7 +235,7 @@ int sci_uiputfile(char *fname, unsigned long fname_len)
        {
           CreateVarFromPtr(Rhs+1, MATRIX_OF_STRING_DATATYPE, &nbRowOutSelection, &nbColOutSelection, selection);
           LhsVar(1) = Rhs + 1 ;
-          C2F(putlhsvar)();
+          PutLhsVar();
           return 0;
        }
 
@@ -261,7 +261,7 @@ int sci_uiputfile(char *fname, unsigned long fname_len)
                LhsVar(3) = Rhs + 3 ;
        }
         
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 33eb2f0..5b4821b 100644 (file)
@@ -249,7 +249,7 @@ extern "C"
             delete doc;
         }
         LhsVar(1) = 0 ;
-        C2F(putlhsvar)();
+        PutLhsVar();
         return 0;
     }
     /*--------------------------------------------------------------------------*/
index 9a144eb..b37aea2 100644 (file)
@@ -245,7 +245,7 @@ extern "C"
             delete doc;
         }
         LhsVar(1) = 0 ;
-        C2F(putlhsvar)();
+        PutLhsVar();
         return 0;
     }
     /*--------------------------------------------------------------------------*/
index 42c66bd..2c9b989 100644 (file)
@@ -33,11 +33,10 @@ int sci_addhistory(char *fname,unsigned long fname_len)
 
                GetRhsVar(1,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&lines);
                bOK = appendLinesToScilabHistory(lines,m1*n1);
+               freeArrayOfString(lines, m1*n1);
 
                LhsVar(1) = 0;
-               C2F(putlhsvar)();
-
-               freeArrayOfString(lines, m1*n1);
+               PutLhsVar();
        }
        else
        {
index 385dfef..6a75a70 100644 (file)
@@ -20,7 +20,7 @@ int sci_displayhistory(char *fname,unsigned long fname_len)
 {
        displayScilabHistory();
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 7ff81ed..831e776 100644 (file)
@@ -30,7 +30,7 @@ int sci_gethistory(char *fname,unsigned long fname_len)
                m1=0; n1=0;
                CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
                return 0;
        }
 
@@ -88,7 +88,7 @@ int sci_gethistory(char *fname,unsigned long fname_len)
        }
 
        LhsVar(1)=Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 9cd371f..62b3ed0 100644 (file)
@@ -34,7 +34,7 @@ int sci_gethistoryfile(char *fname,unsigned long fname_len)
                CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,(m1=(int)strlen(filename), &m1),&n1,&filename);
                if (filename) {FREE(filename);filename=NULL;}
                LhsVar(1) = Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index 2aba25a..97f7508 100644 (file)
@@ -84,9 +84,9 @@ int sci_historymanager(char *fname,unsigned long fname_len)
 
     n1=1;
     CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,(m1=(int)strlen(Output), &m1),&n1,&Output);
-    LhsVar(1) = Rhs+1;
-    C2F(putlhsvar)();
     if (Output) {FREE(Output);Output=NULL;}
+    LhsVar(1) = Rhs+1;
+    PutLhsVar();
 
     return 0;
 }
index 3ee950a..82e2e16 100644 (file)
@@ -61,7 +61,7 @@ int sci_loadhistory(char *fname,unsigned long fname_len)
     */
 
     LhsVar(1) = 0;
-    C2F(putlhsvar)();
+    PutLhsVar();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index de087fb..743046d 100644 (file)
@@ -50,7 +50,7 @@ int sci_removelinehistory(char *fname,unsigned long fname_len)
 
 
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index e39cfec..726e590 100644 (file)
@@ -23,7 +23,7 @@ int sci_resethistory(char *fname,unsigned long fname_len)
        resetScilabHistory();
 
        LhsVar(1)=0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 292d6d9..4306c82 100644 (file)
@@ -58,7 +58,7 @@ int sci_saveafterncommands(char *fname,unsigned long fname_len)
                }
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index aaac798..61def38 100644 (file)
@@ -56,7 +56,7 @@ int sci_saveconsecutivecommands(char *fname,unsigned long fname_len)
                }
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index fc7fccf..1fc5c93 100644 (file)
@@ -53,7 +53,7 @@ int sci_savehistory(char *fname,unsigned long fname_len)
                }
        }
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 3775461..b605c89 100644 (file)
@@ -35,7 +35,7 @@ int sci_sethistoryfile(char *fname,unsigned long fname_len)
                setFilenameScilabHistory(filename);
        }
        LhsVar(1) = 0;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index 6b5e276..56e0a99 100644 (file)
@@ -35,7 +35,7 @@ int C2F(sci_diary)(char *fname,unsigned long fname_len)
                closeAllDiaries();
 
                LhsVar(1) = 0;
-               C2F(putlhsvar)();
+               PutLhsVar();;
 
                return 0;
        }
@@ -74,7 +74,7 @@ int C2F(sci_diary)(char *fname,unsigned long fname_len)
                        setDiaryId(fd_newdiary);
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();;
                }
                else
                {
@@ -100,7 +100,7 @@ int C2F(sci_diary)(char *fname,unsigned long fname_len)
                        closeAllDiaries();
 
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();
+                       PutLhsVar();;
                }
                else
                {
index 5741b2b..c21e797 100644 (file)
@@ -258,7 +258,7 @@ int sci_file(char *fname,unsigned long fname_len)
 
                                                        LhsVar(2) = Rhs + 2;
                                                        LhsVar(1) = Rhs + 1;
-                                                       C2F(putlhsvar)();
+                                                       PutLhsVar();
                                                }
                                                else
                                                {
@@ -402,7 +402,7 @@ static int sci_file_no_rhs(char *fname)
                }
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
@@ -601,7 +601,7 @@ static int sci_file_one_rhs(char *fname)
                LhsVar(5) = Rhs + 5; 
        }
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 5c9198c..1bd5086 100644 (file)
@@ -187,7 +187,7 @@ int sci_getenv(char *fname,unsigned long fname_len)
                        }
 
                        LhsVar(1) = Rhs + 1;
-                       C2F(putlhsvar)();       
+                       PutLhsVar();    
                }
                else
                {
@@ -201,7 +201,7 @@ int sci_getenv(char *fname,unsigned long fname_len)
                                }
 
                                LhsVar(1) = Rhs + 1;
-                               C2F(putlhsvar)();       
+                               PutLhsVar();
                        }
                        else
                        {
index 4e56ae5..21cd5c5 100644 (file)
@@ -32,9 +32,8 @@ int sci_getio(char *fname,unsigned long fname_len)
 
        CreateVarFromPtr(Rhs+1,MATRIX_OF_INTEGER_DATATYPE,&one,&four,&values);
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
-
-       if (values) {FREE(values);values = NULL;}
+    if (values) {FREE(values);values = NULL;}
+       PutLhsVar();
 
        return 0;
 }
index 8556a96..7284a33 100644 (file)
@@ -28,7 +28,7 @@ int sci_getpid(char *fname,unsigned long fname_len)
        *istk(l1) = (int) pid;
 
        LhsVar(1)= Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 3247bb4..578eddc 100644 (file)
@@ -44,10 +44,11 @@ int sci_host(char *fname,unsigned long fname_len)
                        C2F(systemc)(Str[0], &stat);
                        CreateVar(Rhs+1,MATRIX_OF_INTEGER_DATATYPE, &one,&one, &l1);
                        *istk(l1) = (int) stat;
+            freeArrayOfString(Str,m1*n1);
 
                        LhsVar(1)= Rhs+1;
-                       C2F(putlhsvar)();
-                       freeArrayOfString(Str,m1*n1);
+                       PutLhsVar();
+                       
                }
        }
        else
index cff2ffb..9794df8 100644 (file)
@@ -161,7 +161,7 @@ int sci_setenv(char *fname,unsigned long fname_len)
 
        LhsVar(1) = Rhs + 1; 
 
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 982a266..f68a59b 100644 (file)
@@ -36,8 +36,8 @@ int sci_javaclasspath(char *fname,unsigned long fname_len)
                CreateVarFromPtr( Rhs+1,MATRIX_OF_STRING_DATATYPE, &nbRow, &nbCol,Strings );
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
                freeArrayOfString(Strings,nbRow*nbCol);
+        PutLhsVar();
        }
        else
        {
@@ -59,8 +59,8 @@ int sci_javaclasspath(char *fname,unsigned long fname_len)
                                }
                        }
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();       
                        freeArrayOfString(classPaths,m1*n1);
+            PutLhsVar();       
                }
                else
                {
index 47be985..2e78f0a 100644 (file)
@@ -36,8 +36,8 @@ int sci_javalibrarypath(char *fname,unsigned long fname_len)
                CreateVarFromPtr( Rhs+1,MATRIX_OF_STRING_DATATYPE, &nbRow, &nbCol,Strings );
 
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
                freeArrayOfString(Strings,nbRow*nbCol);
+        PutLhsVar();
        }
        else
        {
@@ -61,8 +61,8 @@ int sci_javalibrarypath(char *fname,unsigned long fname_len)
                                }
                        }
                        LhsVar(1) = 0;
-                       C2F(putlhsvar)();       
                        freeArrayOfString(libraryPaths,m1*n1);
+            PutLhsVar();       
                }
                else
                {
index 199f427..ea22dc2 100644 (file)
@@ -38,8 +38,8 @@ int sci_system_getproperty(char *fname,unsigned long fname_len)
                n1=1;
                CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(propertyValue), &m1),&n1,&propertyValue);
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
                if (propertyValue) {FREE(propertyValue);propertyValue=NULL;}
+        PutLhsVar();
        }
        else
        {
index 743267b..4fbe77e 100644 (file)
@@ -54,8 +54,8 @@ int sci_system_setproperty(char *fname,unsigned long fname_len)
                        CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,&n1,&m1,&l1);
                }
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
                if (previousValue) {FREE(previousValue); previousValue = NULL;}
+        PutLhsVar();
        }
        else
        {
index 096caf3..1aa2b8b 100644 (file)
@@ -26,7 +26,7 @@ int sci_with_embedded_jre(char *fname,unsigned long fname_len)
     *istk(l1)=(int)withEmbeddedJRE();
     
     LhsVar(1)=Rhs+1;
-    C2F(putlhsvar)();
+    PutLhsVar();
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index a712dc7..cf1134f 100644 (file)
@@ -35,7 +35,7 @@ int gw_linear_algebra(void)
 {  
        Rhs = Max(0, Rhs);
        callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/ 
index 6b0641d..8455e8d 100644 (file)
@@ -39,7 +39,7 @@ int gw_linear_algebra2(void)
 {  
        Rhs = Max(0, Rhs);
        callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-       if (Err <= 0 && C2F(errgst).err1 <= 0) C2F(putlhsvar)();
+       if (Err <= 0 && C2F(errgst).err1 <= 0) PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/ 
index c8b9a3b..b0a00fe 100644 (file)
@@ -42,7 +42,7 @@ int sci_dgettext(char *fname,unsigned long fname_len)
                        n1=1;
                        CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(TranslatedString), &m1),&n1,&TranslatedString);
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
                else
index 1c9c9b5..f778fcf 100644 (file)
@@ -29,7 +29,7 @@ int sci_getdefaultlanguage(char *fname,unsigned long fname_len)
        strcpy(cstk(l1), SCILABDEFAULTLANGUAGE );
 
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index d2e93bd..84c65a5 100644 (file)
@@ -28,7 +28,7 @@ int sci_getlanguage(char *fname,unsigned long fname_len)
        n1=1;
        CreateVarFromPtr( Rhs+1,STRING_DATATYPE,(m1=(int)strlen(Output), &m1),&n1,&Output);
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
+       PutLhsVar();
 
        return 0;
 }
index 462990a..45a3123 100644 (file)
@@ -30,7 +30,7 @@ int C2F(sci_getlanguagealias)(char *fname,unsigned long fname_len)
                n1=1;
                CreateVarFromPtr( Rhs+1,STRING_DATATYPE,(m1=(int)strlen(Output), &m1),&n1,&Output);
                LhsVar(1) = Rhs+1;
-               C2F(putlhsvar)();       
+               PutLhsVar();;   
                if (Output) {FREE(Output);Output=NULL;}
        }
        else
@@ -40,7 +40,7 @@ int C2F(sci_getlanguagealias)(char *fname,unsigned long fname_len)
                l1=0;
                CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,  &m1, &n1, &l1);
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();;
                return 0;
        }
 
index 820ea7d..52c91ad 100644 (file)
@@ -48,7 +48,7 @@ int C2F(sci_getlanguagestable)(char *fname,unsigned long fname_len)
        n1=2;
        CreateVarFromPtr( Rhs+1,MATRIX_OF_STRING_DATATYPE,&m1,&n1,Output);
        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();       
+       PutLhsVar();;   
 
        if (Output) 
        {
index 8c92508..23f0b27 100644 (file)
@@ -117,10 +117,11 @@ int sci_gettext(char *fname,unsigned long fname_len)
                n1 = 1;
                m1 = (int)strlen(TranslatedString);
                CreateVarFromPtr(Rhs + 1, STRING_DATATYPE, &m1, &n1, &TranslatedString);
-               LhsVar(1) = Rhs + 1;
-               C2F(putlhsvar)();
 
-               if (TranslatedString) {FREE(TranslatedString); TranslatedString = NULL;}
+        if (TranslatedString) {FREE(TranslatedString); TranslatedString = NULL;}
+
+               LhsVar(1) = Rhs + 1;
+               PutLhsVar();
                return 0;
        }
        else
index e9f1a9c..73b7161 100644 (file)
@@ -45,7 +45,7 @@ int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
                *istk(l1)=(int)(FALSE);
 
                LhsVar(1) = Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        #else
        {
@@ -64,9 +64,9 @@ int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
                                m1 = 1; n1 = 1;
                                CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
                                *istk(l1) = (int)(FALSE);
+                if (newlang) { FREE(newlang); newlang = NULL; }
                                LhsVar(1) = Rhs+1;
-                               C2F(putlhsvar)();
-                               if (newlang) { FREE(newlang); newlang = NULL; }
+                               PutLhsVar();
                                return 0;
                        }
                        else
@@ -79,9 +79,9 @@ int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
                                        CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &l1);
                                        *istk(l1) = (int)(TRUE);
                                        LhsVar(1) = Rhs+1;
-                                       C2F(putlhsvar)();
                                        if (newlang) { FREE(newlang); newlang = NULL; }
                                        if (savedLanguage) { FREE(savedLanguage); savedLanguage = NULL; }
+                                       PutLhsVar();
                                        return 0;
                                }
                                else
@@ -93,8 +93,9 @@ int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
                                                CreateVar(Rhs+1, MATRIX_OF_BOOLEAN_DATATYPE, &n1,&n1,&l1);
                                                *istk(l1) = (int)(FALSE);
                                                LhsVar(1) = Rhs+1;
-                                               C2F(putlhsvar)();
-                                               if (newlang) { FREE(newlang); newlang = NULL; }
+                        if (newlang) { FREE(newlang); newlang = NULL; }
+                                               PutLhsVar();
+
                                                return 0;
                                        }
                                        else
@@ -111,10 +112,9 @@ int sci_setdefaultlanguage(char *fname,unsigned long fname_len)
 
                                                if ( setLanguagePreferences() ) *istk(l1) = (int)TRUE;
                                                else *istk(l1) = (int)FALSE;
-
-                                               LhsVar(1) = Rhs+1;
-                                               C2F(putlhsvar)();
                                                if (newlang) { FREE(newlang); newlang = NULL; }
+                                               LhsVar(1) = Rhs+1;
+                                               PutLhsVar();
                                                return 0;
                                        }
                                }
index 077ae34..fe6c4ce 100644 (file)
@@ -58,7 +58,7 @@ int sci_setlanguage(char *fname,unsigned long fname_len)
                        if (newlanguage) { FREE(newlanguage); newlanguage = NULL; }
 
                        LhsVar(1)=Rhs+1;
-                       C2F(putlhsvar)();
+                       PutLhsVar();
                        return 0;
                }
 
@@ -97,7 +97,7 @@ int sci_setlanguage(char *fname,unsigned long fname_len)
                        *istk(l1)=(int)(FALSE);
                }
                LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
+               PutLhsVar();
        }
        else
        {
index abd38a7..f340bbe 100644 (file)
@@ -129,11 +129,11 @@ int sci_matfile_listvar(char *fname,unsigned long fname_len)
       LhsVar(3) = Rhs+3;
     }
   
-  PutLhsVar();
-  
   freeArrayOfString(varnames, nbvar);
   FREE(varclasses);
   FREE(vartypes);
+
+  PutLhsVar();
   
   return TRUE;
 }
index 21de44b..506e385 100644 (file)
@@ -150,12 +150,11 @@ int sci_matfile_open(char *fname,unsigned long fname_len)
   /* Return the index */
   createScalarDouble(pvApiCtx, Rhs+1, (double)fileIndex);
   
-  LhsVar(1) = Rhs+1;
-  
-  PutLhsVar();
-  
   freeAllocatedSingleString(filename);
   freeAllocatedSingleString(optionStr);
+
+  LhsVar(1) = Rhs+1;
+  PutLhsVar();
   
   return TRUE;
 }
index 5c5c14c..91407ac 100644 (file)
@@ -127,9 +127,7 @@ int sci_matfile_varreadnext(char *fname,unsigned long fname_len)
       LhsVar(3) = Rhs+3;
     }
   
-  PutLhsVar();
-  
   Mat_VarFree(matvar);
-  
+  PutLhsVar();
   return TRUE;
 }