warnings (release)
Allan CORNET [Thu, 14 May 2009 07:45:57 +0000 (09:45 +0200)]
12 files changed:
scilab/modules/core/src/c/tmpdir.c
scilab/modules/fileio/src/c/readline.c
scilab/modules/functions/sci_gateway/c/gw_functions.c
scilab/modules/io/sci_gateway/c/sci_diary.c
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/localization/src/localization.vcproj
scilab/modules/metanet/src/c/loadg.c
scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c
scilab/modules/scicos/src/c/slider.c
scilab/modules/scicos_blocks/src/c/affich.c
scilab/modules/tclsci/src/c/TCL_getErrorLine.c
scilab/modules/time/sci_gateway/c/sci_timer.c

index f081c15..fcac9f1 100644 (file)
@@ -77,8 +77,8 @@ void createScilabTMPDIR(void)
                                }
                                #else
                                {
-                                       GetTempPath(PATH_MAX,wcTmpDirDefault);
-                                       strcpy(wctmp_dir,wcTmpDirDefault);
+                                       GetTempPathW(PATH_MAX,wcTmpDirDefault);
+                                       wcscpy(wctmp_dir,wcTmpDirDefault);
                                        wctmp_dir[wcslen(wctmp_dir)-1]='\0'; /* Remove last \ */
                                }
                                #endif
index 8c73f78..181b04b 100644 (file)
@@ -38,7 +38,6 @@ int LineRead(FILE *fd,char buf[],int n,int *cnt,int *nr)
 {
   int c,count,info;
   long int offset;
-  char *tmpChar = NULL;
   count=0;
   *nr=0;
 
index 49df6c2..f2c36a7 100644 (file)
@@ -36,22 +36,22 @@ int gw_functions(void)
                {
                        case RECURSION_CALL_DEFF:
                                #define deff_fname "deff"
-                               C2F(sci_deff)(deff_fname,strlen(deff_fname));
+                               C2F(sci_deff)(deff_fname,(unsigned long)strlen(deff_fname));
                                return 0;
 
                        case RECURSION_CALL_GETF:
                                #define getf_fname "getf"
-                               C2F(sci_getf)(deff_fname,strlen(getf_fname));
+                               C2F(sci_getf)(deff_fname,(unsigned long)strlen(getf_fname));
                                return 0;
 
                        case RECURSION_CALL_EXEC1: case RECURSION_CALL_EXEC2:
                                #define exec_fname "exec"
-                               C2F(sci_exec)(exec_fname,strlen(exec_fname));
+                               C2F(sci_exec)(exec_fname,(unsigned long)strlen(exec_fname));
                                return 0;
 
                        case RECURSION_CALL_EXECSTR:
                                #define execstr_fname "execstr"
-                               C2F(sci_execstr)(execstr_fname,strlen(execstr_fname));
+                               C2F(sci_execstr)(execstr_fname,(unsigned long)strlen(execstr_fname));
                                return 0;
 
                        default:
index b8e211c..6b5e276 100644 (file)
@@ -25,7 +25,7 @@
 int C2F(sci_diary)(char *fname,unsigned long fname_len)
 {
 
-       int l1 = 0, m1 = 0, n1 = 0;
+       int m1 = 0, n1 = 0, l1 = 0;
 
        CheckRhs(0,1);
        CheckLhs(0,1);
@@ -42,7 +42,6 @@ int C2F(sci_diary)(char *fname,unsigned long fname_len)
 
        if (GetType(1) == sci_strings)
        {
-               int l1 = 0, m1 = 0, n1 = 0;
                char ** Inputstr = NULL;
                
                GetRhsVar(1,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&Inputstr);
index cddc247..529adae 100644 (file)
@@ -23,7 +23,7 @@ lib /DEF:"$(InputDir)output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /M
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -57,7 +57,7 @@ lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /M
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
index 998d5dc..7bea88b 100644 (file)
                        <File
                                RelativePath=".\jni\Messages_wrap.c"
                                >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="STATIC_LINKED"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="STATIC_LINKED"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="STATIC_LINKED"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="STATIC_LINKED"
+                                       />
+                               </FileConfiguration>
                        </File>
                        <File
                                RelativePath="..\sci_gateway\c\sci_dgettext.c"
index 7fabe9f..a0d5be8 100644 (file)
@@ -17,6 +17,7 @@
 #include "loadg.h"
 #include "localization.h"
 #include "charEncoding.h"
+#include "Scierror.h"
 
 static int CompString(char **s1,char **s2)
 {
index badf2a8..cd66d3d 100644 (file)
@@ -33,7 +33,7 @@ int gw_output_stream(void)
                if ( getRecursionFunctionToCall() == RECURSION_CALL_DISP)
                {
                        #define disp_fname "disp"
-                       sci_disp(disp_fname,strlen(disp_fname));
+                       sci_disp(disp_fname,(unsigned long)strlen(disp_fname));
                        return 0;
                }
        }
index f60bec4..1bc828a 100644 (file)
@@ -106,20 +106,21 @@ static void block_draw_rect_3(double r[],double percent)
 #define REMOVE_REC_DRIVER() /*char old_rec[4]; int rem_flag ; rem_flag = scig_driverX11(old_rec); */
 #define RESTORE_DRIVER() /*if (rem_flag == 1) C2F(SetDriver)(old_rec,PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0);*/
 
-static int scig_driverX11(char *old) 
-{
-       /* disabled */
-       /* TO DO : new graphics version */
-  /*GetDriver1(old,PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0);*/
-  if ( old[0] == 'R' )
-    {
-               /* disabled */
-               /* TO DO : new graphics version */
-      /*C2F(SetDriver)("X11",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0);*/
-      return 1;
-    }
-  return 0;
-}
+
+//static int scig_driverX11(char *old) 
+//{
+//     /* disabled */
+//     /* TO DO : new graphics version */
+//  /*GetDriver1(old,PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0);*/
+//  if ( old[0] == 'R' )
+//    {
+//             /* disabled */
+//             /* TO DO : new graphics version */
+//      /*C2F(SetDriver)("X11",PI0,PI0,PI0,PI0,PI0,PI0,PD0,PD0,PD0,PD0);*/
+//      return 1;
+//    }
+//  return 0;
+//}
 
 /*----------------------------------------------------
  * changes the current window to win 
@@ -146,7 +147,8 @@ static int set_block_win( int win)
 
 static int set_slider_color( int color)
 {
-  static int verbose = 0, cur=0,narg;
+  static int cur = 0;
+  /* static int verbose = 0, cur=0,narg; */
   /*
   C2F(dr)("xget","color",&verbose,&cur,&narg,PI0,PI0,PI0,PD0,PD0,PD0,PD0,0L,0L);
   if ( cur != color ) 
index ccffb8b..69cac30 100644 (file)
@@ -156,7 +156,7 @@ void C2F(affup2)( double * winNum,
   /* For now we got the index of the block coupound within the axes children */
   /* Get the text handle */
   sciPointObj * pText = getAffichTextObject((int) *winNum, ((int) *textIndex) - 1);
-  StringMatrix * mat = sciGetText(pText);
+  /* StringMatrix * mat = sciGetText(pText); */
 
   /* Second step draw the object */
   sciDrawObj(pText);
index 066195a..ec59b84 100644 (file)
 int TCL_getErrorLine(Tcl_Interp *interp)
 {
 #ifdef TCL_MAJOR_VERSION
-#ifdef TCL_MINOR_VERSION
-#if TCL_MAJOR_VERSION >= 8
-#if TCL_MINOR_VERSION >= 6
-    return Tcl_GetErrorLine(interp);
-#endif
-#endif
-#else
-    return interp->errorLine;
-#endif
+       #ifdef TCL_MINOR_VERSION
+               #if TCL_MAJOR_VERSION >= 8
+                       #if TCL_MINOR_VERSION >= 6
+                               return Tcl_GetErrorLine(interp);
+                       #else
+                               /* 8.5 */
+                               return interp->errorLine;
+                       #endif
+               #endif
+       #else
+               return interp->errorLine;
+       #endif
 #else
 /* USE_INTERP_ERRORLINE does normally not need to be defined
    since it's only used by Tcl >= 8.6 to restore access to
index 369591f..bc3ae66 100644 (file)
@@ -20,7 +20,6 @@
 /*--------------------------------------------------------------------------*/
 int sci_timer(char *fname,unsigned long fname_len)
 {
-       int l1 = 0,n1 = 0;
        double timerval = 0;
 
        Rhs = Max(0, Rhs);