Reorganization
Allan Cornet [Fri, 28 Jul 2006 08:38:33 +0000 (08:38 +0000)]
move os_specific/getmemory.* --> core/src/c/getmemory.*
move interf/intfilestat --> core/sci_gateway/c/intfilestat

scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmemory.c [moved from scilab/routines/os_specific/getmemory.c with 100% similarity]
scilab/modules/core/src/c/getmemory.h [moved from scilab/routines/os_specific/getmemory.h with 100% similarity]
scilab/modules/fileio/sci_gateway/gw_fileio.c
scilab/modules/io/sci_gateway/c/intfilestat.c [moved from scilab/routines/interf/intfilestat.c with 99% similarity]
scilab/modules/io/src/c/io.vcproj
scilab/routines/interf/interf.vcproj
scilab/routines/os_specific/os_specific.vcproj

index 3b5284a..ae68c3a 100644 (file)
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\getmemory.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\sci_gateway\c\gw_core.c"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\getmemory.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\includes\gw_core.h"\r
                                >\r
                        </File>\r
index b0630b7..fb1f0cb 100644 (file)
@@ -1,90 +1,90 @@
-#include "gw_fileio.h"
-/*-----------------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET (Reorganisation)*/
-/*-----------------------------------------------------------------------------------*/
-#if _MSC_VER
-       #include <Windows.h>
-       #include "MALLOC.h"
-       extern char *GetExceptionString(DWORD ExceptionCode);
-#endif
-/*-----------------------------------------------------------------------------------*/
-/* interface for the function Table */ 
-/*-----------------------------------------------------------------------------------*/ 
-extern int int_objprintf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objfprintf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objsprintf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objscanf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objfscanf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objsscanf __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objfscanfMat __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objnumTokens __PARAMS((char *fname,unsigned long fname_len));
-extern int int_objfprintfMat __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmclearerr __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmeof __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmopen __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmputstr __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmclose __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmerror __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmputstr __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmput __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmget __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmgetstr __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmseek __PARAMS((char *fname,unsigned long fname_len));
-extern int intsmtell __PARAMS((char *fname,unsigned long fname_len));
+#include "gw_fileio.h"\r
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET (Reorganisation)*/\r
+/*-----------------------------------------------------------------------------------*/\r
+#if _MSC_VER\r
+       #include <Windows.h>\r
+       #include "MALLOC.h"\r
+       extern char *GetExceptionString(DWORD ExceptionCode);\r
+#endif\r
+/*-----------------------------------------------------------------------------------*/\r
+/* interface for the function Table */ \r
+/*-----------------------------------------------------------------------------------*/ \r
+extern int int_objprintf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objfprintf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objsprintf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objscanf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objfscanf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objsscanf __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objfscanfMat __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objnumTokens __PARAMS((char *fname,unsigned long fname_len));\r
+extern int int_objfprintfMat __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmclearerr __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmeof __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmopen __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmputstr __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmclose __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmerror __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmputstr __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmput __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmget __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmgetstr __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmseek __PARAMS((char *fname,unsigned long fname_len));\r
+extern int intsmtell __PARAMS((char *fname,unsigned long fname_len));\r
 extern int C2F(sci_xls_open) _PARAMS((char *fname,unsigned long fname_len));\r
-extern int C2F(sci_xls_read) _PARAMS((char *fname,unsigned long fname_len));
-/*-----------------------------------------------------------------------------------*/ 
-/*  interface function */
-/*-----------------------------------------------------------------------------------*/ 
-static TabF Tab[]={
-       { intsmopen, "mopen"},
-       { intsmputstr, "mputstr"},
-       { intsmclose, "mclose"},
-       { intsmput, "mput"},
-       { intsmget, "mget"},
-       { intsmgetstr, "mgetstr"},
-       { intsmeof, "meof"},
-       { intsmseek, "mseek"},
-       { intsmtell, "mtell"},
-       { intsmclearerr, "mclearerr"},
-       {int_objprintf,"mprintf"},
-       {int_objfprintf,"mfprintf"},
-       {int_objsprintf,"msprintf"},
-       {int_objscanf,"mscanf"},
-       {int_objfscanf,"mfscanf"},
-       {int_objsscanf,"msscanf"},
-       {int_objfscanfMat,"fscanfMat"},
-       {int_objfprintfMat,"fprintfMat"},
-       {int_objnumTokens,"NumTokens"},
-       {intsmerror, "merror"},
+extern int C2F(sci_xls_read) _PARAMS((char *fname,unsigned long fname_len));\r
+/*-----------------------------------------------------------------------------------*/ \r
+/*  interface function */\r
+/*-----------------------------------------------------------------------------------*/ \r
+static TabF Tab[]={\r
+       { intsmopen, "mopen"},\r
+       { intsmputstr, "mputstr"},\r
+       { intsmclose, "mclose"},\r
+       { intsmput, "mput"},\r
+       { intsmget, "mget"},\r
+       { intsmgetstr, "mgetstr"},\r
+       { intsmeof, "meof"},\r
+       { intsmseek, "mseek"},\r
+       { intsmtell, "mtell"},\r
+       { intsmclearerr, "mclearerr"},\r
+       {int_objprintf,"mprintf"},\r
+       {int_objfprintf,"mfprintf"},\r
+       {int_objsprintf,"msprintf"},\r
+       {int_objscanf,"mscanf"},\r
+       {int_objfscanf,"mfscanf"},\r
+       {int_objsscanf,"msscanf"},\r
+       {int_objfscanfMat,"fscanfMat"},\r
+       {int_objfprintfMat,"fprintfMat"},\r
+       {int_objnumTokens,"NumTokens"},\r
+       {intsmerror, "merror"},\r
        {C2F(sci_xls_open),"xls_open"},\r
-       {C2F(sci_xls_read),"xls_read"}
-       };
-/*-----------------------------------------------------------------------------------*/ 
-int C2F(gw_fileio)(void)
-{
-       Rhs=Max(0,Rhs);
-#if _MSC_VER
-#ifndef _DEBUG
-       _try
-       {
-               (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
-       }
-       _except (EXCEPTION_EXECUTE_HANDLER)
-       {
-               char *ExceptionString=GetExceptionString(GetExceptionCode());
-               sciprint("Warning !!!\nScilab has found a critical error (%s)\nwith \"%s\" function.\nScilab may become unstable.\n",ExceptionString,Tab[Fin-1].name);
-               if (ExceptionString) {FREE(ExceptionString);ExceptionString=NULL;}
-       }
-#else
-       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
-#endif
-#else
-       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
-#endif
-
-       return 0;
-}
-/*-----------------------------------------------------------------------------------*/ 
-
+       {C2F(sci_xls_read),"xls_read"}\r
+       };\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(gw_fileio)(void)\r
+{\r
+       Rhs=Max(0,Rhs);\r
+#if _MSC_VER\r
+#ifndef _DEBUG\r
+       _try\r
+       {\r
+               (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));\r
+       }\r
+       _except (EXCEPTION_EXECUTE_HANDLER)\r
+       {\r
+               char *ExceptionString=GetExceptionString(GetExceptionCode());\r
+               sciprint("Warning !!!\nScilab has found a critical error (%s)\nwith \"%s\" function.\nScilab may become unstable.\n",ExceptionString,Tab[Fin-1].name);\r
+               if (ExceptionString) {FREE(ExceptionString);ExceptionString=NULL;}\r
+       }\r
+#else\r
+       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));\r
+#endif\r
+#else\r
+       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));\r
+#endif\r
+\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+\r
similarity index 99%
rename from scilab/routines/interf/intfilestat.c
rename to scilab/modules/io/sci_gateway/c/intfilestat.c
index 68b439b..a10ebd6 100644 (file)
@@ -9,7 +9,7 @@
 #include <Windows.h>
 #endif
 
-#include "../stack-c.h"
+#include "stack-c.h"
 
 #include "../os_specific/Os_specific.h"
 
index 0179cc2..5074969 100644 (file)
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\sci_gateway\c\intfilestat.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\sci_gateway\c\sci_deff.c"\r
                                >\r
                        </File>\r
index d496f87..748eebf 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\intfilestat.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\intinterp.c"\r
                                >\r
                        </File>\r
index 1b93fda..5409a80 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\getmemory.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\getpidc.c"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\getmemory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="link.h"\r
                                >\r
                        </File>\r