Many files cleaned ... warning, extern, include, duplicate code ...
Sylvestre Ledru [Sun, 2 Dec 2007 23:20:07 +0000 (23:20 +0000)]
93 files changed:
scilab/modules/arnoldi/sci_gateway/c/sci_dnaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dneupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dsaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dseupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/cacsd/sci_gateway/c/sci_contr.c
scilab/modules/cacsd/sci_gateway/c/sci_ereduc.c
scilab/modules/cacsd/sci_gateway/c/sci_freq.c
scilab/modules/cacsd/sci_gateway/c/sci_fstair.c
scilab/modules/cacsd/sci_gateway/c/sci_gschur.c
scilab/modules/cacsd/sci_gateway/c/sci_gspec.c
scilab/modules/cacsd/sci_gateway/c/sci_ldiv.c
scilab/modules/cacsd/sci_gateway/c/sci_ltitr.c
scilab/modules/cacsd/sci_gateway/c/sci_ppol.c
scilab/modules/cacsd/sci_gateway/c/sci_residu.c
scilab/modules/cacsd/sci_gateway/c/sci_rtitr.c
scilab/modules/cacsd/sci_gateway/c/sci_tzer.c
scilab/modules/data_structures/src/c/hmops.c
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/includes/gw_differential_equations4.h
scilab/modules/differential_equations/includes/gw_differential_equations5.h [deleted file]
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations4.c
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations5.c [deleted file]
scilab/modules/elementary_functions/includes/elementary_functions.h
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/includes/sci_fileio.h [deleted file]
scilab/modules/fileio/sci_gateway/c/sci_fileio.c
scilab/modules/fileio/src/c/merror.h
scilab/modules/fileio/src/c/mget.c
scilab/modules/fileio/src/c/mgetstr.h
scilab/modules/fileio/src/c/mopen.c
scilab/modules/fileio/src/c/mput.c
scilab/modules/fileio/src/c/mputstr.c
scilab/modules/fileio/src/c/mseek.c
scilab/modules/fileio/src/c/mtell.c
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/graphics/src/nographics/nographics.h
scilab/modules/integer/includes/gw_integer.h
scilab/modules/intersci/src/exe/crerhs.c
scilab/modules/intersci/src/exe/intersci.c
scilab/modules/intersci/src/exe/opt.c
scilab/modules/intersci/src/lib/libinter.h
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/intsetenv.c
scilab/modules/io/sci_gateway/c/sci_deff.c
scilab/modules/io/sci_gateway/c/sci_diary.c
scilab/modules/io/sci_gateway/c/sci_disp.c
scilab/modules/io/sci_gateway/c/sci_exec.c
scilab/modules/io/sci_gateway/c/sci_execstr.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_get_absolute_file_path.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_getf.c
scilab/modules/io/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/io/sci_gateway/c/sci_host.c
scilab/modules/io/sci_gateway/c/sci_lib.c
scilab/modules/io/sci_gateway/c/sci_load.c
scilab/modules/io/sci_gateway/c/sci_mgetl.c
scilab/modules/io/sci_gateway/c/sci_newest.c
scilab/modules/io/sci_gateway/c/sci_oldload.c
scilab/modules/io/sci_gateway/c/sci_oldsave.c
scilab/modules/io/sci_gateway/c/sci_print.c
scilab/modules/io/sci_gateway/c/sci_rat.c
scilab/modules/io/sci_gateway/c/sci_read.c
scilab/modules/io/sci_gateway/c/sci_read4b.c
scilab/modules/io/sci_gateway/c/sci_readb.c
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/io/sci_gateway/c/sci_write.c
scilab/modules/io/sci_gateway/c/sci_write4b.c
scilab/modules/io/sci_gateway/c/sci_writeb.c
scilab/modules/javasci/src/c/javasci_globals.c
scilab/modules/localization/src/c/loadsavelanguage.c
scilab/modules/optimization/src/c/intqld.c
scilab/modules/output_stream/src/c/errmsg.c
scilab/modules/polynomials/sci_gateway/c/sci_bezout.c
scilab/modules/polynomials/sci_gateway/c/sci_roots.c
scilab/modules/polynomials/sci_gateway/c/sci_simp.c
scilab/modules/polynomials/sci_gateway/c/sci_simp_mode.c
scilab/modules/polynomials/sci_gateway/c/sci_varn.c
scilab/modules/pvm/src/c/pvm_info.c
scilab/modules/randlib/src/c/igngeom.c
scilab/modules/sparse/src/c/mspelm.c
scilab/modules/special_functions/sci_gateway/c/sci_bessely.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/tclsci/src/c/TCL_ArrayDim.c
scilab/modules/tclsci/src/c/TCL_ArrayGetVar.c
scilab/modules/tclsci/src/c/TclUiSet.c
scilab/modules/windows_tools/src/c/spawncommand.c

index 5ab92a7..2534f64 100644 (file)
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "core_math.h"
+#include "gw_arnoldi.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(dnaupd) __PARAMS((int *ido, char *bmat, int *n, char *which, int *nev, double *tol, double *resid, int *ncv, double *v, int *ldv, int *iparam, int *ipntr, double *workd, double *workl, int *lworkl, int *info, unsigned long bmat_len, unsigned long which_len));
 /*--------------------------------------------------------------------------*/
-int C2F(intdnaupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intdnaupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int IDO,   mIDO,   nIDO,    pIDO;
index 43cf0d9..c53e176 100644 (file)
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "core_math.h"
+#include "gw_arnoldi.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(dneupd) __PARAMS((int *rvec, char *howmny, int *select, double *dr, double *di, double *z, int *ldz, double *sigmar, double *sigmai, double *workev, char *bmat, int *n, char *which, int *nev, double *tol, double *resid, int *ncv, double *v, int *ldv, int *iparam, int *ipntr, double *workd, double *workl, int *lworkl, int *info, unsigned long howmany_length, unsigned long bmat_length, unsigned long which_length));
 /*--------------------------------------------------------------------------*/
-int C2F(intdneupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intdneupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int RVEC,     mRVEC,     nRVEC,      pRVEC;
index 9eaecab..f7eb11f 100644 (file)
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "core_math.h"
+#include "gw_arnoldi.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(dsaupd) __PARAMS((int *ido, char *bmat, int *n, char *which, int *nev, double *tol, double *resid, int *ncv, double *v, int *ldv, int *iparam, int *ipntr, double *workd, double *workl, int *lworkl, int *info, unsigned long bmat_len, unsigned long which_len));
 /*--------------------------------------------------------------------------*/
-int C2F(intdsaupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intdsaupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int IDO,   mIDO,   nIDO,    pIDO;
index 61f55d5..0c3249e 100644 (file)
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "core_math.h"
+#include "gw_arnoldi.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(dseupd) __PARAMS((int *rvec, char *howmny, int *select, double *d, double *z, int *ldz, double *sigma, char *bmat, int *n, char *which, int *nev ,double *tol, double *resid, int *ncv, double *v ,int *ldv, int *iparam,int *ipntr, double *workd,double *workl,int *lworkl,int *info, unsigned long rvec_length, unsigned long howmany_length, unsigned long bmat_length, unsigned long which_len));
 /*--------------------------------------------------------------------------*/
-int C2F(intdseupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intdseupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int RVEC,     mRVEC,     nRVEC,      pRVEC;
index f5a49fe..789e39b 100644 (file)
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "core_math.h"
+#include "gw_arnoldi.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(znaupd)();
 /*--------------------------------------------------------------------------*/
-int C2F(intznaupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intznaupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int IDO,   mIDO,   nIDO,    pIDO;
index a112c05..df39d41 100644 (file)
@@ -1,6 +1,7 @@
 #include <math.h>
 #include <string.h>
 #include "stack-c.h"
+#include "gw_arnoldi.h"
 #include "core_math.h"
 /*--------------------------------------------------------------------------*/
 #define CHAR(x)         (cstk(x))
@@ -10,8 +11,6 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(zneupd)();
 /*--------------------------------------------------------------------------*/
-int C2F(intzneupd) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(intzneupd) _PARAMS((char *fname,unsigned long fname_len))
 { 
   int RVEC,     mRVEC,     nRVEC,      pRVEC;
index 6ec3b9b..a48f255 100644 (file)
@@ -21,11 +21,11 @@ int intab01od(char* fname)
        int N, M, mtol, ntol; int un, one; int INFO, INDCON, NCONT;
        char  *JOBU, *JOBV;
        double theTOL;
-       int minlhs=1, minrhs=2, maxlhs=6, maxrhs=3;
 
        /*     [NCONT,U,KSTAIR,V,A,B]=ab01od(A,B,[TOL])   */
 
-       CheckRhs(minrhs,maxrhs);  CheckLhs(minlhs,maxlhs);
+       CheckRhs(2,3);  
+       CheckLhs(1,6);
        theTOL=(double) C2F(dlamch)("e",1L);
        GetRhsVar(1,MATRIX_OF_DOUBLE_DATATYPE,&mA,&nA,&ptrA);   A=1;        /*     A */
        N=mA;
index 786369e..dfbb38b 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd0.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intereduc) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_ereduc) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_ereduc) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intereduc)(fname,fname_len);
index aa863cf..b7953b3 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd2.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scifreq) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_freq) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_freq) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scifreq)(fname,fname_len);
index 71fcb27..9d171dc 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd0.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intfstair) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_fstair) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_fstair) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intfstair)(fname,fname_len);
index ddbb147..d56a5b2 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd0.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scigschur) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_gschur) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_gschur) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scigschur)(fname,fname_len);
index 082c43b..a19bbfe 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd0.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scigspec) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_gspec) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_gspec) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scigspec)(fname,fname_len);
index 9202c23..5502402 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd3.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scildiv) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_ldiv) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_ldiv) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scildiv)(fname,fname_len);
index 8b977a7..0481fb6 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd2.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(sciltitr) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_ltitr) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_ltitr) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(sciltitr)(fname,fname_len);
index 8e6f1c5..83c82c4 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd2.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scippol) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_ppol) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_ppol) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scippol)(fname,fname_len);
index df65af8..9dc9b29 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd3.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(sciresidu) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_residu) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_residu) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(sciresidu)(fname,fname_len);
index c59dab2..e1beb6e 100644 (file)
@@ -4,11 +4,10 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_cacsd2.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scirtitr) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_rtitr) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_rtitr) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(scirtitr)(fname,fname_len);
index b9e816d..b285867 100644 (file)
@@ -1,29 +1,20 @@
 /*--------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET */
+/* INRIA 2006/2007 */
+/* @author Allan CORNET */
+/* @author Sylvestre LEDRU */
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
 #include "stack-c.h"
 #include "Scierror.h"
 #include "localization.h"
+#include "gw_cacsd2.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(scitzer) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_tzer) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_tzer) _PARAMS((char *fname,unsigned long fname_len))
 {
-       if (Rhs != 4)
-       {
-               Scierror(42,_("Incompatible input parameter (RHS).\n"));
-               return 0;
-       }
-       if ( (Lhs != 2) && (Lhs !=3) )
-       {
-               Scierror(41,_("Incompatible output parameter (LHS).\n"));
-               return 0;
-       }
-
+       CheckRhs(4,4);
+       CheckLhs(2,3);
        C2F(scitzer)(fname,fname_len);
        return 0;
 }
index a5c621d..e3a0d1e 100644 (file)
@@ -68,8 +68,6 @@ extern int C2F(ddmpev)();
 int C2F(createlistcvarfrom)();
 #endif
 
-extern int C2F(tpconv)(integer *xtyp, integer *ytyp, integer *n, void *dx, integer *incx, void *dy, integer *incy);
-
 static int get_length(int num)
 {
   int il;
index 6d05060..3c6e97a 100644 (file)
@@ -88,7 +88,6 @@ sci_gateway/c/gw_differential_equations2.c \
 sci_gateway/c/gw_differential_equations3.c \
 sci_gateway/c/gw_differential_equations4.c \
 sci_gateway/c/sci_bvode.c \
-sci_gateway/c/gw_differential_equations5.c \
 sci_gateway/c/gw_differential_equations6.c
 
 GATEWAY_FORTRAN_SOURCES = \
index 799c74f..c628bc1 100644 (file)
@@ -117,7 +117,6 @@ am__objects_3 = libscidifferential_equations_la-sci_int2d.lo \
        libscidifferential_equations_la-gw_differential_equations3.lo \
        libscidifferential_equations_la-gw_differential_equations4.lo \
        libscidifferential_equations_la-sci_bvode.lo \
-       libscidifferential_equations_la-gw_differential_equations5.lo \
        libscidifferential_equations_la-gw_differential_equations6.lo
 am__objects_4 = sci_dasrt.lo sci_feval.lo sci_odedc.lo sci_bvode.lo \
        sci_impl.lo sci_dassl.lo sci_ode.lo bsurf.lo bsurfd.lo \
@@ -411,7 +410,6 @@ sci_gateway/c/gw_differential_equations2.c \
 sci_gateway/c/gw_differential_equations3.c \
 sci_gateway/c/gw_differential_equations4.c \
 sci_gateway/c/sci_bvode.c \
-sci_gateway/c/gw_differential_equations5.c \
 sci_gateway/c/gw_differential_equations6.c
 
 GATEWAY_FORTRAN_SOURCES = \
@@ -608,7 +606,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-gw_differential_equations2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-gw_differential_equations3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-gw_differential_equations4.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-gw_differential_equations5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-gw_differential_equations6.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-impltable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidifferential_equations_la-int2dtable.Plo@am__quote@
@@ -812,13 +809,6 @@ libscidifferential_equations_la-sci_bvode.lo: sci_gateway/c/sci_bvode.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscidifferential_equations_la_CFLAGS) $(CFLAGS) -c -o libscidifferential_equations_la-sci_bvode.lo `test -f 'sci_gateway/c/sci_bvode.c' || echo '$(srcdir)/'`sci_gateway/c/sci_bvode.c
 
-libscidifferential_equations_la-gw_differential_equations5.lo: sci_gateway/c/gw_differential_equations5.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscidifferential_equations_la_CFLAGS) $(CFLAGS) -MT libscidifferential_equations_la-gw_differential_equations5.lo -MD -MP -MF $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations5.Tpo -c -o libscidifferential_equations_la-gw_differential_equations5.lo `test -f 'sci_gateway/c/gw_differential_equations5.c' || echo '$(srcdir)/'`sci_gateway/c/gw_differential_equations5.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations5.Tpo $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations5.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_differential_equations5.c' object='libscidifferential_equations_la-gw_differential_equations5.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscidifferential_equations_la_CFLAGS) $(CFLAGS) -c -o libscidifferential_equations_la-gw_differential_equations5.lo `test -f 'sci_gateway/c/gw_differential_equations5.c' || echo '$(srcdir)/'`sci_gateway/c/gw_differential_equations5.c
-
 libscidifferential_equations_la-gw_differential_equations6.lo: sci_gateway/c/gw_differential_equations6.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscidifferential_equations_la_CFLAGS) $(CFLAGS) -MT libscidifferential_equations_la-gw_differential_equations6.lo -MD -MP -MF $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations6.Tpo -c -o libscidifferential_equations_la-gw_differential_equations6.lo `test -f 'sci_gateway/c/gw_differential_equations6.c' || echo '$(srcdir)/'`sci_gateway/c/gw_differential_equations6.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations6.Tpo $(DEPDIR)/libscidifferential_equations_la-gw_differential_equations6.Plo
index 756d916..9113ce4 100644 (file)
@@ -10,7 +10,6 @@
 /*--------------------------------------------------------------------------*/
 int C2F(gw_differential_equations4)(void);
 /*--------------------------------------------------------------------------*/
-int C2F(sci_intg) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_int2d) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_int3d) _PARAMS((char *fname,unsigned long fname_len));
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations5.h b/scilab/modules/differential_equations/includes/gw_differential_equations5.h
deleted file mode 100644 (file)
index f8038fb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*--------------------------------------------------------------------------*/
-/* INRIA 2007 */
-/* Allan CORNET */
-/* Sylvestre LEDRU */
-/*--------------------------------------------------------------------------*/ 
-#ifndef __GW_DIFFERENTIAL_EQUATIONS5__
-#define __GW_DIFFERENTIAL_EQUATIONS5__
-/*--------------------------------------------------------------------------*/ 
-#include "machine.h"
-/*--------------------------------------------------------------------------*/ 
-int C2F(gw_differential_equations5)(void);
-/*--------------------------------------------------------------------------*/ 
-int C2F(sci_feval) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/ 
-#endif  /* __GW_DIFFERENTIAL_EQUATIONS5__ */
-/*--------------------------------------------------------------------------*/
index 087b931..5f30df5 100644 (file)
@@ -11,7 +11,6 @@
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[]=
 {
-       {C2F(sci_intg),"intg"},
        {C2F(sci_int2d),"int2d"},
        {C2F(sci_int3d),"int3d"}
 };
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations5.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations5.c
deleted file mode 100644 (file)
index 0838bc7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#ifdef _MSC_VER
-#include <stdio.h>
-#endif
-#include "gw_differential_equations5.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[]=
-{
-       {C2F(sci_feval),"feval"}
-};
-/*--------------------------------------------------------------------------*/
-int C2F(gw_differential_equations5)(void)
-{  
-       callFunctionFromGateway(Tab);
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index ecb950a..2df6a2e 100644 (file)
@@ -4,7 +4,6 @@
 typedef integer (*I_fp)();
 
 int C2F(vfinite)  _PARAMS((int *n, double *v));
-int C2F(unsfdcopy) _PARAMS((int *n, double *dx, int *incx, double *dy, int *incy));
 
 extern int C2F(wsort) _PARAMS((double *countr, double *counti, int *n, int *index, I_fp test));
 
@@ -50,18 +49,16 @@ extern int C2F(dwpow1) _PARAMS((int *n, double *v, int *iv, double *pr, double *
 extern int C2F(dwpowe) _PARAMS((double *v, double *pr, double *pi, double *rr, double *ri, int *ierr));
 extern int C2F(dwpow) _PARAMS((int *n, double *vr, double *vi, int *iv, double *powr, double *powi, int *ierr));
 extern int C2F(dwrdiv) _PARAMS((double *ar, int *ia, double *br, double *bi, int *ib, double *rr, double *ri, int *ir, int *n, int *ierr));
-extern int C2F(entier) _PARAMS((int *n, double *d__, int *s));
 extern int C2F(franck) _PARAMS((double *a, int *na, int *n, int *job));
 extern double C2F(dgamma) _PARAMS((double *x));
 extern int C2F(gdcp2i) _PARAMS((int *n, int *itab, int *m));
 extern int C2F(hilber) _PARAMS((double *a, int *lda, int *n));
-extern int C2F(icopy) _PARAMS((int *n, int *dx, int *incx, int *dy, int *incy));
+
 extern int C2F(idmax) _PARAMS((int *n, double *dx, int *incx));
 extern int C2F(idmin) _PARAMS((int *n, double *dx, int *incx));
 extern int C2F(imcopy) _PARAMS((int *a, int *na, int *b, int *nb, int *m, int *n));
 extern double C2F(infinity) _PARAMS((double *x));
 extern int C2F(intp) _PARAMS((double *x, double *xd, double *yd, int *n, int *nc, double *y));
-extern int C2F(iset) _PARAMS((int *n, int *dx, int *dy, int *incy));
 extern int C2F(isort) _PARAMS((int *count, int *n, int *index));
 extern int C2F(isova0) _PARAMS((double *a, int *lda, int *m, int *n, double *path, int *kpath, int *ir, int *ic, int *dir, int *pend, int *h__, int *v, double *c__));
 extern int C2F(isoval) _PARAMS((double *a, int *lda, int *m, int *n, double *c__, double *path, int *npath, int *maxp, int *ierr, int *iw, int *job));
@@ -76,13 +73,11 @@ extern double C2F(nearfloat) _PARAMS((double *x, double *dir));
 extern double C2F(psi) _PARAMS((double *xx));
 extern double C2F(pythag) _PARAMS((double *a, double *b));
 extern int C2F(rat) _PARAMS((double *x, double *eps, int *n, int *d__, int *fail));
-extern int C2F(rcopy) _PARAMS((int *n, float *dx, int *incx, float *dy, int *incy));
 extern int C2F(ribesl) _PARAMS((double *x, double *alpha, int *nb, int *ize, double *b, int *ncalc));
 extern int C2F(rjbesl) _PARAMS((double *x, double *alpha, int *nb, double *b, int *ncalc));
 extern int C2F(rkbesl) _PARAMS((double *x, double *alpha, int *nb, int *ize, double *bk, int *ncalc));
 /*extern double C2F(round) _PARAMS((double *x1));*/
 extern int C2F(rybesl) _PARAMS((double *x, double *alpha, int *nb, double *by, int *ncalc));
-extern int C2F(simple) _PARAMS((int *n, double *d__, float *s));
 extern double C2F(urand) _PARAMS((int *iy));
 extern int C2F(vpythag) _PARAMS((int *n, double *xr, double *xi));
 extern int C2F(wacos) _PARAMS((double *zr, double *zi, double *ar, double *ai));
index bf50db4..a2bfed2 100644 (file)
@@ -112,7 +112,6 @@ libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 libscifileio_la_includedir=$(pkgincludedir)/fileio
 libscifileio_la_include_HEADERS = includes/FileExist.h \
 includes/gw_fileio.h \
-includes/sci_fileio.h \
 includes/findfiles.h \
 includes/FindFileExtension.h \
 includes/URIFileToFilename.h \
index 243908c..7142dbb 100644 (file)
@@ -422,7 +422,6 @@ libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 libscifileio_la_includedir = $(pkgincludedir)/fileio
 libscifileio_la_include_HEADERS = includes/FileExist.h \
 includes/gw_fileio.h \
-includes/sci_fileio.h \
 includes/findfiles.h \
 includes/FindFileExtension.h \
 includes/URIFileToFilename.h \
index caacec7..39651eb 100644 (file)
@@ -11,7 +11,6 @@ int C2F(gw_fileio)(void);
 /*--------------------------------------------------------------------------*/ 
 int intsmeof __PARAMS((char *fname,unsigned long fname_len));
 int intsmopen __PARAMS((char *fname,unsigned long fname_len));
-int intsmputstr __PARAMS((char *fname,unsigned long fname_len));
 int intsmclose __PARAMS((char *fname,unsigned long fname_len));
 int intsmerror __PARAMS((char *fname,unsigned long fname_len));
 int intsmputstr __PARAMS((char *fname,unsigned long fname_len));
@@ -24,14 +23,12 @@ int intsmclearerr __PARAMS((char *fname,unsigned long fname_len));
 int int_objfscanfMat __PARAMS((char *fname,unsigned long fname_len));
 int int_objsprintf __PARAMS((char *fname,unsigned long fname_len));
 int int_objnumTokens __PARAMS((char *fname,unsigned long fname_len));
-int int_objnumTokens __PARAMS((char *fname,unsigned long fname_len));
 int int_objfprintf __PARAMS((char *fname,unsigned long fname_len));
 int int_objscanf __PARAMS((char *fname,unsigned long fname_len));
 int int_objfprintfMat __PARAMS((char *fname,unsigned long fname_len));
 int int_objsscanf __PARAMS((char *fname,unsigned long fname_len));
 int int_objfscanf __PARAMS((char *fname,unsigned long fname_len));
 int int_objprintf __PARAMS((char *fname,unsigned long fname_len));
-int intsmopen __PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_findfiles) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_maxfiles) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_getdrives) _PARAMS((char *fname,unsigned long fname_len));
diff --git a/scilab/modules/fileio/includes/sci_fileio.h b/scilab/modules/fileio/includes/sci_fileio.h
deleted file mode 100644 (file)
index f97afee..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET (Reorganisation)*/
-/*--------------------------------------------------------------------------*/ 
-#ifndef __GW_FILEIO__
-#define __GW_FILEIO__
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <stdio.h>
-#endif
-
-#include "machine.h"
-#include "stack-c.h"
-
-int C2F(gw_fileio)(void);
-
-#endif /*  __GW_FILEIO__ */
-/*--------------------------------------------------------------------------*/
index 36afd3d..93eed87 100644 (file)
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "MALLOC.h" /* MALLOC */
-#include "sci_fileio.h"
+#include "stack-c.h"
 #include "gw_fileio.h"
 #include "cluni0.h"
 #include "mopen.h"
index cb281b8..6c54e3c 100644 (file)
@@ -8,8 +8,11 @@
 #include "machine.h"
 
 /**
-* check error
-*/
+ * check error
+ *
+ * @param fd    
+ * @param res   
+ */
 void C2F(merror) (integer *fd, double *res);
 
 #endif /* __MERROR_H__ */
index 9a1c681..091339e 100644 (file)
@@ -40,7 +40,7 @@ int swap = 0;
                  MGET_NC(NumType,Fswap); break; \
          case 'l': swap = (islittleendian()==1) ? 0:1; \
          MGET_NC(NumType,Fswap);  break; \
-         default: sciprint(_("mget : %s format not recognized\n"),type); \
+         default: sciprint(_("%s: %s format not recognized\n"),"mget",type); \
          *ierr=1; return; \
                                } \
 }
@@ -156,7 +156,7 @@ void C2F(mget) (integer *fd, double *res, integer *n, char *type, integer *ierr)
        *ierr=0;
        if ( nc == 0) 
        {
-               sciprint(_("mget : format is of length 0\n"),type);
+               sciprint(_("%s: Length of format is 0\n"),"mget");
                *ierr=2;
                return;
        }
@@ -165,7 +165,7 @@ void C2F(mget) (integer *fd, double *res, integer *n, char *type, integer *ierr)
        {
                swap2 = GetSwapStatus(*fd);
                mget2(fa,swap2,res,*n,type,ierr);
-               if (*ierr > 0) sciprint(_("mget : %s format not recognized\n"),type);
+               if (*ierr > 0) sciprint(_("%s: %s format not recognized\n"),"mget",type);
        }
        else 
        {
index c4e7caf..c3f36d9 100644 (file)
@@ -8,9 +8,23 @@
 #include "machine.h"
 
 /**
-* read a string 
-*/
+ * read a string 
+ *
+ * @param fd    
+ * @param start 
+ * @param n 
+ * @param ierr  
+ */
 void C2F(mgetstr) (integer *fd, char **start, integer *n, integer *ierr);
+
+/**
+ * read a string 
+ *
+ * @param fd    
+ * @param start 
+ * @param n 
+ * @param ierr  
+ */
 void C2F(mgetstr1) (integer *fd, char *start, integer *n, integer *ierr);
 
 #endif /* __MGETSTR_H__ */
index 5dfc439..f6fb5fb 100644 (file)
@@ -20,11 +20,10 @@ void C2F(mopen)(int *fd, char *file, char *status, int *f_swap, double *res, int
        int     littlendian = 1,type = 2,ierr,mode;
        char    *endptr;
        FILE * fa;
-       /* next line added by ss 16/10/98 */
 
        if ( getWarningMode() && IsAlreadyOpenedInScilab(file) )
        {
-               sciprint(_("Warning : file '%s' already opened in scilab.\n"),file);
+               sciprint(_("Warning: file '%s' already opened in Scilab.\n"),file);
        }
 
        swap =0;
index 145df09..e8313f8 100644 (file)
@@ -46,7 +46,7 @@ extern int swap; /* defined in mget.c */
                swap = (islittleendian()==1) ? 0 : 1; \
                MPUT_NC(Type,Fswap); break; \
                default: \
-               sciprint(_("mput : %s format not recognized\n"),type); \
+               sciprint(_("%s: %s format not recognized\n"),"mput",type); \
                *ierr=1;return; \
        }
 /*--------------------------------------------------------------------------*/
@@ -124,7 +124,7 @@ data **/
                swap = (islittleendian()==1) ? 0 : 1; \
                MPUT(Type,Fswap); break; \
                default: \
-               sciprint(_("mput : %s format not recognized\n"),type); \
+               sciprint(_("%s: %s format not recognized\n"),"mput",type); \
                *ierr=1;return; \
 }
 /*--------------------------------------------------------------------------*/
@@ -167,7 +167,7 @@ void C2F(mput) (integer *fd, double *res, integer *n, char *type, integer *ierr)
        *ierr=0;
        if ((nc = (int)strlen(type)) == 0) 
        {
-               sciprint(_("mput : format is of length 0\n"),type);
+               sciprint(_("%s: format is of length 0\n"),"mput",type);
                *ierr=2;
                return;
        }
@@ -175,7 +175,7 @@ void C2F(mput) (integer *fd, double *res, integer *n, char *type, integer *ierr)
        {
                swap2 = GetSwapStatus(*fd);
                mput2(fa,swap2,res,*n,type,ierr);
-               if (*ierr > 0) sciprint(_("mput : %s format not recognized\n"),type);
+               if (*ierr > 0) sciprint(_("%s: %s format not recognized\n"),"mput",type);
        }
        else 
        {
index 60129cf..27766d7 100644 (file)
@@ -15,7 +15,7 @@ void C2F(mputstr) (int *fd, char *str, double *res, int *ierr)
        fa = GetFileOpenedInScilab(*fd);
        if (!fa) 
        {
-               sciprint(_("No input file \n"));
+               sciprint(_("No input file.\n"));
                *ierr=1;
        }
        else 
index 0b35490..23b42cf 100644 (file)
@@ -30,7 +30,7 @@ void C2F(mseek) (integer *fd, integer *offset, char *flag, integer *err)
        *err=0;
        if ( fa == (FILE *) 0 ) 
        {
-               sciprint(_("mseek: wrong file logical unit\n"));
+               sciprint(_("%s: wrong file logical unit\n"),"mseek");
                *err=1;
                return;
        }
@@ -42,7 +42,7 @@ void C2F(mseek) (integer *fd, integer *offset, char *flag, integer *err)
                iflag = SEEK_END;
        else 
        {
-               sciprint(_("mseek : flag = %s not recognized\n"));
+               sciprint(_("%s : flag = %s not recognized. Should be 'set', 'cur' or 'end'.\n"),"mseek");
                *err=1;
                return;
        }
@@ -58,7 +58,7 @@ void C2F(mseek) (integer *fd, integer *offset, char *flag, integer *err)
 #else
        if (fseek(fa,(long) *offset,iflag) == -1 ) 
        {
-               sciprint(_("mseek: error\n"));
+               sciprint(_("%s: error\n"),"mseek"); /* @TODO : provide a real error message */
                *err=1;
        }
        else 
index e2c54ad..fe6896a 100644 (file)
@@ -14,7 +14,7 @@ void C2F(mtell) (integer *fd, double *offset, integer *err)
        FILE *fa= GetFileOpenedInScilab(*fd);
        if ( fa == (FILE *) 0 ) 
        {
-               sciprint(_("mtell: wrong file logical unit\n"));
+               sciprint(_("%s: wrong file logical unit\n"),"mtell");
                *err=1;
                return;
        }
index 32f6a14..aeec99e 100644 (file)
@@ -2,12 +2,10 @@
 /* INRIA 2007 */
 /* Allan CORNET */
 /*--------------------------------------------------------------------------*/
-#include "ObjectStructure.h"
-#include "Events.h"
+#include "nographics.h"
 #include "WindowList.h"
 #include "machine.h"
 #include "Scierror.h"
-#include "nographics.h"
 /*--------------------------------------------------------------------------*/
 int C2F(gw_graphics)()
 {
index cde083d..a4132d9 100644 (file)
@@ -4,7 +4,8 @@
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "Scierror.h"
-
+#include "ObjectStructure.h"
+#include "Events.h"
 int C2F(gw_graphics)(void);
 
 void loadGraphicModule(void);
@@ -15,14 +16,8 @@ int scig_2dzoom(integer win_num);
 
 int GetDriverId(void);
 
-int CheckClickQueue(int *win,int *x,int *y,int *ibut,int *motion,int *release);
-
 void scig_unzoom(integer win_num);
 
-void set_wait_click(int val);
-
-int ClearClickQueue(int win);
-
 int sciSetViewport( sciPointObj * pObj, int xSize, int ySize );
 
 void sciGetViewport( sciPointObj * pObj, int * xSize, int * ySize );
@@ -51,10 +46,6 @@ int scig_toPs(integer win_num, integer colored, char * bufname, char * driver);
 
 void delete_sgwin_entities(int win_num);
 
-Scig_deletegwin_handler get_scig_deletegwin_handler (void);
-
-void set_event_select(int val); 
-
 int C2F(entier2d)( integer * n, double * dx,integer * s );
 
 int C2F(dr)(char x0[],char x1[],integer *x2,integer *x3,integer *x4,integer *x5,integer *x6, integer *x7,double *dx1,double *dx2,double *dx3,double *dx4,integer lx0, integer lx1);
@@ -71,8 +62,6 @@ int C2F(SetDriver)(void);
 
 void GetDriver1(char *str, integer *v2,integer * v3,integer * v4, integer *v5,integer * v6,integer * v7,double * dv1,double * dv2,double * dv3,double * dv4);
 
-int PushClickQueue (int win,int x,int y,int ibut,int motion,int release);
-
 void sciGetIdFigure (int *vect, int *id, int *flag);
 
 void set_cf_type(int val);
index a8a9314..77bfa72 100644 (file)
@@ -31,7 +31,6 @@ int C2F(sciimin) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciimaxi) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciimini) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciip) _PARAMS((char *fname,unsigned long fname_len));
-int C2F(sciiconvert) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciimatrix) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciiprod) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sciicumprod) _PARAMS((char *fname,unsigned long fname_len));
index 7beae87..398865f 100644 (file)
@@ -85,11 +85,11 @@ void CreMATRIX(f,var)
   WriteCallRestCheck(f,var,"nn",0,0) ;
   GetDim(str4,var->el[0]);
   if ( str3[0] == '&' || str3[0] == '(') 
-    sprintf(str2,"%s",str3);
+    strcpy(str2,str3);
   else 
     sprintf(str2,"&%s",str3);
   if ( str4[0] == '&' || str4[0] == '(') 
-    sprintf(str1,"%s",str4);
+    strcpy(str1,str4);
   else 
     sprintf(str1,"&%s",str4);
   CreCommon(f,var);
@@ -534,13 +534,13 @@ void GetDim(char *lstr,IVAR ivar)
        || strncmp(s,"sstk",4)==0 || strncmp(s,"stk",3)==0 || 
        strncmp(s,"cstk",4)==0 )
     {
-      sprintf(lstr,"%s",s);
+      strcpy(lstr,s);
       return ;
     }
   else 
     {
       AddDeclare1(DEC_INT,s);
-      sprintf(lstr,"%s",s);
+      strcpy(lstr,s);
     }
 }
 
index d1c2a95..212895b 100644 (file)
@@ -63,7 +63,7 @@ void ISCIReadFile(file)
   sprintf(filin,"%s.desc",file);
   fin = fopen(filin,"r");
   if (fin == 0) {
-    printf("interface file \"%s\" does not exist\n",filin);
+    printf("Interface file \"%s\" does not exist\n",filin);
     exit(1);
   }
   Copyright();
index 72a5983..27f7517 100644 (file)
@@ -116,13 +116,13 @@ void WriteOptArgPhase2(FILE *f,IVAR i)
          OptMATRIX(f,var);
          break;
        case STRING:
-         sprintf(size,"%d",strlen(var->opt_name));
+         strcpy(size,strlen(var->opt_name));
          sprintf(data,"\"%s\"",var->opt_name);
          OptMATRIX(f,var);
          break;
        case SCIOPOINTER  :
          sprintf(size,"size-[%d]",strlen(var->opt_name));
-         sprintf(data,"%s",var->opt_name);
+         strcpy(data,var->opt_name);
          OptOpointer(f,var);
          break;
        default:
index 9dc7862..3aa0200 100644 (file)
@@ -5,21 +5,13 @@
 #include "stack-c.h"
 
 void C2F(out) __PARAMS ((char *str,unsigned int));
-void C2F(cchar) __PARAMS (( int *n, char **ip, int *op));
 void C2F(ccharf) __PARAMS (( int *n, char **ip, int *op));
-void C2F(cdouble) __PARAMS (( int *n, double *ip[], double *op));
 void C2F(cdoublef) __PARAMS (( int *n, double *ip[], double *op));
-void C2F(cint) __PARAMS (( int *n, int *ip[], double *op));
 void C2F(cintf) __PARAMS (( int *n, int *ip[], double *op));
-void C2F(cfloat) __PARAMS (( int *n, float *ip[], double *op));
 void C2F(cfloatf) __PARAMS (( int *n, float *ip[], double *op));
-void C2F(cbool) __PARAMS (( int *n, int *ip[], int *op));
 void C2F(cboolf) __PARAMS (( int *n, int *ip[], int *op));
 void Cout __PARAMS ((char *str));
-void C2F(cstringf) __PARAMS (( char ***ip,int *sciptr,int *m, int*n,int *max,int *ierr));
-int C2F(stringc) __PARAMS ((int *sciptr, char ***cptr, int *ierr));
 void C2F(dbl2cdbl) __PARAMS ((int *n,double *ip[], double *op));
-void C2F(freeptr)   __PARAMS (( double *ip[]));
 void C2F(int2cint) __PARAMS (( int *n, integer *ip[], integer *op));
 int C2F(csparsef)  __PARAMS ((SciSparse **x,int *mnel,int *icol,double *R,double *I));
 SciSparse *NewSparse __PARAMS((int *,int *,int *,int *));
index 0ff1b72..c7c36ed 100644 (file)
@@ -36,17 +36,16 @@ int C2F(sci_load) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_mgetl) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_fileinfo) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(sci_getio) _PARAMS((char *fname,unsigned long fname_len));
-int C2F(intexec)();
+int C2F(sci_getrelativefilename) _PARAMS((char *fname,unsigned long l));
+int C2F(sci_newest) _PARAMS((char *fname,unsigned long l));
+int C2F(sci_get_absolute_file_path) _PARAMS((char *fname,unsigned long l));
+int C2F(sci_setenv) _PARAMS((char *fname,unsigned long fname_len));
 int C2F(intexecstr)();
 int C2F(intgetf)();
 int C2F(intsave)();
 int C2F(intload)();
 int C2F(intdisp)();
 int C2F(intexec)();
-int C2F(sci_getrelativefilename) _PARAMS((char *fname,unsigned long l));
-int C2F(sci_newest) _PARAMS((char *fname,unsigned long l));
-int C2F(sci_get_absolute_file_path) _PARAMS((char *fname,unsigned long l));
-int C2F(sci_setenv) _PARAMS((char *fname,unsigned long fname_len));
 
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_IO__ */
index 77ab209..386ee92 100644 (file)
@@ -39,7 +39,7 @@ int   C2F(intsetenv) _PARAMS((char *fname, unsigned long len))
        }
        else
        {
-               Scierror(999,_("Invalid type : string required"));
+               Scierror(999,_("%s: Invalid type : string required"),fname);
        }
 
        return 0;
index f299fd1..a84e6a6 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intdeff)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_deff) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intdeff)();
index f3ab2ae..bcbbaf1 100644 (file)
@@ -5,8 +5,6 @@
 #include <stdio.h>
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-int C2F(intdiary)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_diary) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intdiary)();
index aac1595..0202764 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intdisp)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_disp) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intdisp)();
index 4301ffa..9268d7a 100644 (file)
@@ -4,11 +4,9 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intexec)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_exec) _PARAMS((char *fname,unsigned long fname_len))
 {
-       C2F(intexec)();
+       C2F(intexec)(fname, fname_len);
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index a821f5f..f527186 100644 (file)
@@ -4,11 +4,9 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intexecstr)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_execstr) _PARAMS((char *fname,unsigned long fname_len))
 {
-       C2F(intexecstr)();
+       C2F(intexecstr)(fname, fname_len);
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 18b0ec5..0494bb7 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intfile)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_file) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intfile)();
index c5f54c8..b8f4fc0 100644 (file)
@@ -31,7 +31,7 @@ int C2F(sci_get_absolute_file_path) _PARAMS((char *fname,unsigned long fname_len
        
        if (! (GetType(1) == sci_strings))
        {
-               Scierror(999,_("parameter incorrect must be a string (a filename).\n"));
+               Scierror(999,_("%s: Input argument incorrect must be a string (a filename).\n"),fname);
                return 0;
        }
        else
@@ -117,7 +117,7 @@ int C2F(sci_get_absolute_file_path) _PARAMS((char *fname,unsigned long fname_len
                }
                else
                {
-                       Scierror(999,_("First parameter incorrect, must be a string (a file).\n"));
+                       Scierror(999,_("%s: First input argument incorrect, must be a string (a file).\n"),fname);
                        return 0;
                }
        }
index 78b60fd..43e6e11 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intgetenv) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_getenv) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intgetenv)(fname,fname_len);
index 89b28fb..28306d0 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intgetf)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_getf) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intgetf)();
index 5e1f718..71f03f3 100644 (file)
@@ -25,7 +25,7 @@ int C2F(sci_getrelativefilename) _PARAMS((char *fname, unsigned long l))
 
        if (! ((GetType(1) == sci_strings) && (GetType(2) == sci_strings ) ) ){
 
-               Scierror(999,_("parameter incorrect must be a string (a filename)."));
+               Scierror(999,_("%s: Input argument incorrect must be a string (a filename)."),fname);
                return 0;
 
        }else{
@@ -40,14 +40,14 @@ int C2F(sci_getrelativefilename) _PARAMS((char *fname, unsigned long l))
                if ( n1==1 ){
                        param1=cstk(l1);
                }else{
-                       Scierror(999,_("First input argument incorrect, must be a string (a directory)."));
+                       Scierror(999,_("%s: First input argument incorrect, must be a string (a directory)."),fname);
                        return 0;
                }
 
                if ( n2==1 ){
                        param2=cstk(l2);
                }else{
-                       Scierror(999,_("Second input argument incorrect, must be a string (a filename)."));
+                       Scierror(999,_("%s: Second input argument incorrect, must be a string (a filename)."),fname);
                        return 0;
                }
 
@@ -55,12 +55,12 @@ int C2F(sci_getrelativefilename) _PARAMS((char *fname, unsigned long l))
 
                if( strlen(param1) > PATH_MAX )
                {
-                       Scierror(999,_("The first input argument is too long : must be less than %d characters"),PATH_MAX);
+                       Scierror(999,_("%s: The first input argument is too long : must be less than %d characters"),fname, PATH_MAX);
                }
 
                if( strlen(param2) > PATH_MAX )
                {
-                       Scierror(999,_("The second input argument is too long : must be less than %d characters"),PATH_MAX);
+                       Scierror(999,_("%s: The second input argument is too long : must be less than %d characters"),fname,PATH_MAX);
                }
 
                result = getrelativefilename(param1,param2);
index f3b4da8..63ddc2a 100644 (file)
@@ -24,7 +24,7 @@ int C2F(sci_host) _PARAMS((char *fname,unsigned long fname_len))
                if ( (m1 != 1) && (n1 != 1) )
                {
                        freeArrayOfString(Str,m1*n1);
-                       Scierror(89,_("Input argument has incorrect dimensions.\n"));
+                       Scierror(89,_("%s: Input argument has incorrect dimensions.\n"),fname);
                        return 0;
                }
                else
@@ -44,7 +44,7 @@ int C2F(sci_host) _PARAMS((char *fname,unsigned long fname_len))
        }
        else
        {
-               Scierror(55,_("Input argument type must be a character string.\n"));
+               Scierror(55,_("%s: Input argument type must be a character string.\n"),fname);
        }
 
        return 0;
index 43c7194..637efa4 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intlib)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_lib) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intlib)();
index 5f0c877..b8abc1f 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intload)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_load) _PARAMS((char *fname,unsigned long fname_len))
 {
        int Val=40;
index 02115f1..11ad7f4 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intmgetl)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_mgetl) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intmgetl)();
index 4b27270..03e4348 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 /*--------------------------------------------------------------------------*/
-int GetIndexLastModifiedFileInList(char **ListFilename,int numberelemnts);
+static int GetIndexLastModifiedFileInList(char **ListFilename,int numberelemnts);
 /*--------------------------------------------------------------------------*/
 int C2F(sci_newest) _PARAMS((char *fname,unsigned long fname_len))
 {
@@ -84,7 +84,7 @@ int C2F(sci_newest) _PARAMS((char *fname,unsigned long fname_len))
 
                        if ( (m1 != 1) && (n1 != 1) )
                        {
-                               Scierror(999,_("not a vector of filenames.\n"));
+                               Scierror(999,_("Not a vector of filename.\n"));
                                return 0;
                        }
                        RetIndex=GetIndexLastModifiedFileInList(Str,m1*n1);
@@ -137,7 +137,7 @@ int C2F(sci_newest) _PARAMS((char *fname,unsigned long fname_len))
        return 0;
 }
 /*--------------------------------------------------------------------------*/
-int GetIndexLastModifiedFileInList(char **ListFilename,int numberelemnts)
+static int GetIndexLastModifiedFileInList(char **ListFilename,int numberelemnts)
 {
 #ifdef _MSC_VER
        struct _stat buf;
index bd57ee0..09ea5ab 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(oldload)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_oldload) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(oldload)();
index 9b23f08..fbc37a8 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(oldsave)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_oldsave) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(oldsave)();
index 6aa0963..6ce1401 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intprint)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_print) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intprint)();
index c89d7fc..d83c272 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intrat)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_rat) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intrat)();
index bae0036..206ad21 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intread)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_read) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intread)();
index c3d5adc..61a3a6d 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intread4b)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_read4b) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intread4b)();
index a6a91e4..38e9610 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intreadb)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_readb) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intreadb)();
index 51fa618..32f6dd7 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intsave)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_save) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intsave)();
index 425d074..60e4101 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intwrite)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_write) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intwrite)();
index afefe07..63e4677 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intwrite4b)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_write4b) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intwrite4b)();
index 778a888..5727acf 100644 (file)
@@ -4,8 +4,6 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_io.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intwritb)();
-/*--------------------------------------------------------------------------*/
 int C2F(sci_writb) _PARAMS((char *fname,unsigned long fname_len))
 {
        C2F(intwritb)();
index a4bf0df..cf0f6b4 100644 (file)
@@ -85,7 +85,7 @@ void Initialize(void)
     else 
        {
                char *pathSCI=(char*)MALLOC((strlen(p1)+1)*sizeof(char));
-               sprintf(pathSCI,"%s",p1);
+               strcpy(pathSCI,p1);
                SetScilabEnvironmentVariables(pathSCI);
                if (pathSCI) {FREE(pathSCI);pathSCI=NULL;}
        }
index 9b4d11b..7613ab8 100644 (file)
@@ -48,7 +48,6 @@ BOOL savelanguagepref(void)
 #ifndef _MSC_VER
 static BOOL loadlanguagepref_linux(void)
 {
-       BOOL bOK=FALSE;
        char *filepref=NULL;
        FILE *fileR;
 
@@ -70,11 +69,11 @@ static BOOL loadlanguagepref_linux(void)
                        fclose(fileR);
 
                        if (LANGUAGE){FREE(LANGUAGE);LANGUAGE=NULL;}
-                       bOK=TRUE;
+                       return TRUE;
                }
        }
        // TODO : if this file is not available load the locale of the system for the language
-       return bOK;
+       return FALSE;
 }
 #endif
 /*--------------------------------------------------------------------------*/
@@ -131,7 +130,7 @@ static char *getfilenamelanguagepref(void)
        else
        {
                retFilename=(char*)MALLOC((strlen(namelanguagepref)+1)*sizeof(char));
-               sprintf(retFilename,"%s",namelanguagepref);
+               strcpy(retFilename,namelanguagepref);
        }
 
        return retFilename;
@@ -142,9 +141,10 @@ static char *getfilenamelanguagepref(void)
 static BOOL loadlanguagepref_windows(void)
 {
        BOOL bOK=FALSE;
-       /* Modification Restauration depuis la base de registre dans
-       HKEY_CURRENT_USER\\SOFTWARE\\Scilab\\"VERSION"\\Settings\\LANGUAGE
-       "Version" correspondant à la version de Scilab
+       /* @TODO translate to english
+          Modification Restauration depuis la base de registre dans
+          HKEY_CURRENT_USER\\SOFTWARE\\Scilab\\"VERSION"\\Settings\\LANGUAGE
+          "Version" correspondant à la version de Scilab
        */
        HKEY key;
 
index 7bcd1b0..276e8fb 100644 (file)
@@ -1,13 +1,6 @@
 #include "intqld.h"
 #include "localization.h"
-
-extern double C2F(dlamch)  __PARAMS((char *CMACH, unsigned long int));
-
-extern int C2F(ql0001)(int *m,int *me,int *mmax,int *n,int *nmax,int *mnn,
-            double *c,double *d,double *a,double *b,double *xl,
-            double *xu,double *x,double *u,int *iout,int *ifail,
-            int *iprint,double *war,int *lwar,int *iwar,int *liwar,
-            double *eps1);
+#include "error.h"
 
 int C2F(intqld)(char *fname)
 {
@@ -25,12 +18,9 @@ int C2F(intqld)(char *fname)
   static int war, lwar, iwar, iout, C_mmax, b_mmax, k, l;
   static double eps1;
 
-  /*    Define minls=1, maxlhs, minrhs, maxrhs   */
-  static int minlhs=1, minrhs=7, maxlhs=3, maxrhs=8;
-
   /*   Check rhs and lhs   */
-  CheckRhs(minrhs,maxrhs) ;
-  CheckLhs(minlhs,maxlhs) ;
+  CheckRhs(7,9) ;
+  CheckLhs(1,3) ;
 
   /* RhsVar: qld(Q,p,C,b,lb,ub,me,eps) */
   /*             1,2,3,4,5 ,6 ,7, 8  */
@@ -48,7 +38,7 @@ int C2F(intqld)(char *fname)
   GetRhsVar(3,MATRIX_OF_DOUBLE_DATATYPE, &m, &nbis, &C);
   if (( nbis != n ) && (m > 0))
     {
-      Scierror(205,_("qld: Argument 3: wrong number of columns %d expected\n"), n);
+      Scierror(205,_("%s: Argument 3: wrong number of columns %d expected\n"), "qld", n);
       return 0;
     }
   mmax = m+1;
@@ -142,13 +132,13 @@ int C2F(intqld)(char *fname)
     C2F(putlhsvar)();
   }
   else if (ifail==1)
-    Scierror(24,_("qld: Too many iterations (more than %d)\n"), 40*(n+m));
+    Scierror(24,_("%s: Too many iterations (more than %d)\n"),"qld",40*(n+m));
   else if (ifail==2)
-    Scierror(24,_("qld: Accuracy insufficient to statify convergence criterion.\n"));
+    Scierror(24,_("%s: Accuracy insufficient to statify convergence criterion.\n"),"qld");
   else if (ifail==5)
-    Scierror(999,_("qld: Length of working array is too short.\n"));
+    Scierror(999,_("%s: Length of working array is too short.\n"),"qld");
  else if (ifail>10)
-    Scierror(999,_("qld: The constraints are inconsistent.\n"));
+    Scierror(999,_("%s: The constraints are inconsistent.\n"),"qld");
 
 
   return 0;
index 5eb17dd..8a2be80 100644 (file)
@@ -16,7 +16,6 @@
 #include "msgout.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(showstack)(); /* used in error 115 */
-extern int C2F(cvname)(); /* used to get function name */
 extern int C2F(prntid)(); /* to print variables on stack */
 /*--------------------------------------------------------------------------*/
 static void strip_blank(char *source);
index aa2f817..66c92ad 100644 (file)
@@ -5,11 +5,10 @@
 #include <string.h>
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_polynomials.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intbez) _PARAMS((int *id));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_bezout) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_bezout) _PARAMS((char *fname,unsigned long fname_len))
 {
        static int id[6];
index ad99aa2..e2de466 100644 (file)
@@ -5,11 +5,10 @@
 #include <string.h>
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_polynomials.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(introots) _PARAMS((int *id));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_roots) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_roots) _PARAMS((char *fname,unsigned long fname_len))
 {
        static int id[6];
index 30da997..1a97e3b 100644 (file)
@@ -5,11 +5,10 @@
 #include <string.h>
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_polynomials.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intsimp) _PARAMS((int *id));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_simp) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_simp) _PARAMS((char *fname,unsigned long fname_len))
 {
        static int id[6];
index 910baf6..57b0384 100644 (file)
@@ -5,11 +5,10 @@
 #include <string.h>
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_polynomials.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intsimpmd) _PARAMS((int *id));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_simp_mode) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_simp_mode) _PARAMS((char *fname,unsigned long fname_len))
 {
        static int id[6];
index 7a0a065..94a783a 100644 (file)
@@ -5,11 +5,10 @@
 #include <string.h>
 #include "machine.h"
 #include "stack-c.h"
+#include "gw_polynomials.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intvarn) _PARAMS((int *id));
 /*--------------------------------------------------------------------------*/
-int C2F(sci_varn) _PARAMS((char *fname,unsigned long fname_len));
-/*--------------------------------------------------------------------------*/
 int C2F(sci_varn) _PARAMS((char *fname,unsigned long fname_len))
 {
        static int id[6];
index 96620dd..5e234b9 100644 (file)
@@ -36,7 +36,7 @@ void C2F(scipvmconfig)(int *nhost, int *narch, int **dtid,
   *n = *nhost;
   
   if (*info) {
-    Scierror(999,_("pvm_config: Error  %d\n"), *info);
+    Scierror(999,_("%s: Error %d\n"), "pvm_config", *info);
     *n = 0;
     *name = NULL;
     *arch = NULL;
@@ -69,14 +69,14 @@ void C2F(scipvmconfig)(int *nhost, int *narch, int **dtid,
       *info = PvmNoMem;
       return;
     }
-    (void) sprintf((*name)[i], "%s", hostp[i].hi_name);
+    strcpy((*name)[i], hostp[i].hi_name);
     
     if (((*arch)[i] = (char *) MALLOC((1+strlen(hostp[i].hi_arch)) * 
                                      sizeof(char*))) == NULL) {
       *info = PvmNoMem;
       return;
     }
-    (void) sprintf((*arch)[i], "%s", hostp[i].hi_arch);
+    strcpy((*arch)[i], hostp[i].hi_arch);
     
     (*dtid)[i] =hostp[i].hi_tid;
     (*speed)[i] =hostp[i].hi_speed;
@@ -137,7 +137,7 @@ void C2F(scipvmtasks)(int *where, int *ntask,
       *info = PvmNoMem;
       return;
     }
-    (void) sprintf((*name)[i], "%s", taskp[i].ti_a_out);
+    strcpy((*name)[i], taskp[i].ti_a_out);
   }
 }
 
index 3f44f83..e52f590 100644 (file)
@@ -50,9 +50,6 @@
 
 /* the external functions used  here : */
 double F2C(logp1)(double *x);  /* celle-ci est ds SCI/routines/calelm/watan.f */
-double C2F(ranf)();
-
-
 double igngeom(double p)
 {
   static double p_save = 1.0, ln_1_m_p = 0.0;
index 914a69e..78f2bfb 100644 (file)
@@ -2,6 +2,8 @@
 #include "../../elementary_functions/includes/elementary_functions.h"
 #include "../../elementary_functions/includes/int2db.h"
 #include "basout.h"
+#include "error.h"
+
 #define CHAR(x)         (cstk(x))
 #define INT(x)         (istk(x))
 #define DOUBLE(x)      ( stk(x))
@@ -36,10 +38,6 @@ static int dmspful(integer *ma, integer *na, double *a, integer *nela, integer *
 
 extern  int C2F(dspt)();
 extern  int C2F(wspt)();
-extern  int C2F(unsfdcopy)();
-extern  int C2F(icopy)();
-extern  int C2F(error)();
-extern  int C2F(dset)();
 extern  int empty(void);
 
 int C2F(intmsparse)(integer *id)
index 1efbd6f..8d49b47 100644 (file)
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "gw_special_functions2.h"
 #include "stack-c.h"
+#include "error.h"
 /*--------------------------------------------------------------------------*/
 extern void C2F(msgs)(int *n, int* ierr);
 extern void C2F(dset)(int *n, double *a,double *x,int *ix);
index b3f81ed..bae6d72 100644 (file)
@@ -51,7 +51,7 @@ int C2F(sci_TCL_GetVar) _PARAMS((char *fname,unsigned long l))
                        }
                        else
                        {
-                               Scierror(999,_("%s : Argument type must be character string.\n"),fname);
+                               Scierror(999,_("%s: Argument type must be character string.\n"),fname);
                                return 0;
                        }
                }
@@ -104,7 +104,7 @@ int C2F(sci_TCL_GetVar) _PARAMS((char *fname,unsigned long l))
                                AsciiFromUTF8=UTF8toANSI(TCLinterpreter,RetStr);
 
                                output=(char*)MALLOC((strlen(AsciiFromUTF8)+1)*sizeof(char));
-                               sprintf(output,"%s",AsciiFromUTF8);
+                               strcpy(output,AsciiFromUTF8);
                                n1=1;
                                CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,(m1=(int)strlen(output), &m1),&n1,&output);
 
@@ -116,14 +116,14 @@ int C2F(sci_TCL_GetVar) _PARAMS((char *fname,unsigned long l))
                        }
                        else
                        {
-                               Scierror(999,_("TCL_GetVar: Could not read Tcl Var.\n"));
+                               Scierror(999,_("%s: Could not read Tcl Var.\n"),"TCL_GetVar");
                                return 0;
                        }
                }
        }
        else
        {
-               Scierror(999,_("%s : Argument type must be character string.\n"),fname);
+               Scierror(999,_("%s : Input rgument type must be character string.\n"),fname);
                return 0;
        }
        
index 9aed458..3c96323 100644 (file)
@@ -64,7 +64,7 @@ int C2F(sci_TCL_GetVersion) _PARAMS((char *fname,unsigned long l))
                if (msg_) {FREE(msg_);msg_=NULL;}
 
                output=(char*)MALLOC((strlen(VersionString)+1)*sizeof(char));
-               sprintf(output,"%s",VersionString);
+               strcpy(output,VersionString);
                n1=1;
                CreateVarFromPtr(Rhs+ 1,STRING_DATATYPE,(m1=(int)strlen(output), &m1),&n1,&output);
                if (output) {FREE(output);output=NULL;}
@@ -100,12 +100,12 @@ int C2F(sci_TCL_GetVersion) _PARAMS((char *fname,unsigned long l))
                        }
                        else
                        {
-                               Scierror(999,_("%s: invalid rhs parameter : help TCL_GetVersion.\n"),fname);
+                               Scierror(999,_("%s: invalid output argument : help TCL_GetVersion.\n"),fname);
                        }
                }
                else
                {
-                       Scierror(999,_("%s: invalid rhs parameter : help TCL_GetVersion.\n"),fname);
+                       Scierror(999,_("%s: invalid input argument : help TCL_GetVersion.\n"),fname);
                }
                
        }
index 46d210f..db65310 100644 (file)
@@ -17,7 +17,7 @@ BOOL TCL_ArrayDim(Tcl_Interp *TCLinterpreter,char *VarName,int *m,int *n)
        *m=0;
        *n=0;
        if (strcmp(VarName,TCL_SCILAB_VARIABLE_TMP))
-       {
+               {
                char MyTclCommand[2048];
                char *StrArrayDims=NULL;
 
@@ -42,8 +42,14 @@ BOOL TCL_ArrayDim(Tcl_Interp *TCLinterpreter,char *VarName,int *m,int *n)
                        {
                                int loop=0;
                                if (token[0]==CHAR_BLANK) token=&token[1];
-                               for(loop=0;loop<(int)strlen(token);loop++) if (token[loop] == CHAR_PERIOD) token[loop]=CHAR_BLANK;
-                               sprintf(StrDimensions,"%s",token);
+                               for(loop=0;loop<(int)strlen(token);loop++) 
+                                       {
+                                               if (token[loop] == CHAR_PERIOD) 
+                                                       {
+                                                               token[loop]=CHAR_BLANK;
+                                                       }
+                                       }
+                               strcpy(StrDimensions,token);
                                sscanf(StrDimensions,"%d %d",&DimX,&DimY);
                                *n=DimX;
                                *m=DimY;
@@ -52,7 +58,7 @@ BOOL TCL_ArrayDim(Tcl_Interp *TCLinterpreter,char *VarName,int *m,int *n)
                        {
                                int loop=0;
                                for(loop=0;loop<(int)strlen(StrArrayDims);loop++) if ( StrArrayDims[loop] == CHAR_PERIOD)  StrArrayDims[loop]=CHAR_BLANK;
-                               sprintf(StrDimensions,"%s", StrArrayDims);
+                               strcpy(StrDimensions,StrArrayDims);
                                sscanf(StrDimensions,"%d %d",&DimX,&DimY);
                                *n=DimX;
                                *m=DimY;
index 955b2e2..f9e7ec2 100644 (file)
@@ -22,12 +22,12 @@ char *TCL_ArrayGetVar(Tcl_Interp *TCLinterpreter,char *VarName,int i,int j)
        if (RetStr)
        {
                StrValue=MALLOC((strlen(RetStr)+1)*sizeof(char));
-               sprintf(StrValue,"%s",RetStr);
+               strcpy(StrValue,RetStr);
        }
        else
        {
                StrValue=MALLOC((strlen(TCL_NOT_DEFINE)+1)*sizeof(char));
-               sprintf(StrValue,"%s",TCL_NOT_DEFINE);
+               strcpy(StrValue,TCL_NOT_DEFINE);
        }
 
        return StrValue;
index 8d87842..beaf377 100644 (file)
@@ -56,7 +56,7 @@ int InterfaceScilabToUiSet(int Handle,int RhsPropertieField,int RhsPropertieValu
                                        GetRhsVar(RhsPropertieValue,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&Str);
                                        sprintf(VarName,"USERDATA_%d",Handle);
 
-                                       /* Efface valeur precedente */
+                                       /* Erase the previous value */
                                        Tcl_UnsetVar(TCLinterp, VarName, TCL_GLOBAL_ONLY);
 
                                        if ( (m1==1) && (n1==1) )
@@ -158,7 +158,7 @@ int InterfaceScilabToUiSet(int Handle,int RhsPropertieField,int RhsPropertieValu
                                        else
                                        {
                                                /* doit une chaine ou matrice de chaine */
-                                               Scierror(999,_("Argument type incorrect: Must be a string.\n"));
+                                               Scierror(999,_("Input argument type incorrect: Must be a string.\n"));
                                                return 0;
                                        }
 
@@ -170,7 +170,7 @@ int InterfaceScilabToUiSet(int Handle,int RhsPropertieField,int RhsPropertieValu
                                        char *PropertieValue=NULL;
 
                                        PropertieField=(char*)MALLOC((strlen(StrField)+1)*sizeof(char));
-                                       sprintf(PropertieField,"%s",StrField);
+                                       strcpy(PropertieField,StrField);
 
                                        if (GetType(RhsPropertieValue) == sci_strings)
                                        {
@@ -180,7 +180,7 @@ int InterfaceScilabToUiSet(int Handle,int RhsPropertieField,int RhsPropertieValu
                                                TmpCharValue=cstk(l1);
 
                                                PropertieValue=(char*)MALLOC((strlen(TmpCharValue)+1)*sizeof(char));
-                                               sprintf(PropertieValue,"%s",TmpCharValue);
+                                               strcpy(PropertieValue,TmpCharValue);
                                        }
                                        else if (GetType(RhsPropertieValue) == sci_matrix)
                                        {
@@ -241,7 +241,7 @@ int TCL_UiSet(int Handle,char *PropertieField,char *PropertieValue)
                        StyleValue=GetStyleInternalName(PropertieValue);
                        if (StyleValue!=-1)
                        {
-                               sprintf(MyTclCommand,_("SetField %d \"%s\" \"%s\""),Handle,PropertieField,UiStyleExternalName[StyleValue]);
+                               sprintf(MyTclCommand,"SetField %d \"%s\" \"%s\"",Handle,PropertieField,UiStyleExternalName[StyleValue]);
                        }
                        else
                        {
@@ -251,7 +251,7 @@ int TCL_UiSet(int Handle,char *PropertieField,char *PropertieValue)
                }
                else
                {
-                       sprintf(MyTclCommand,_("SetField %d \"%s\" \"%s\""),Handle,PropertieField,PropertieValue);
+                       sprintf(MyTclCommand,"SetField %d \"%s\" \"%s\"",Handle,PropertieField,PropertieValue);
                }
 
                if ( Tcl_Eval(TCLinterp,MyTclCommand) == TCL_ERROR  )
index 1e2d73b..155f6fb 100644 (file)
@@ -207,7 +207,7 @@ char **CreateOuput(pipeinfo *pipe,BOOL DetachProcess)
                        {
                                if (DetachProcess)
                                {
-                                       sprintf(OuputStrings[i],"%s",line);
+                                       strpcy(OuputStrings[i],line);
                                }
                                else
                                {
@@ -222,7 +222,7 @@ char **CreateOuput(pipeinfo *pipe,BOOL DetachProcess)
                                }
                                else
                                {
-                                       sprintf(OuputStrings[i],"%s",line);
+                                       strcpy(OuputStrings[i],line);
                                }
                        }