summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c1
-rw-r--r--scilab/modules/intersci/src/exe/crerhs.c2
-rw-r--r--scilab/modules/string/src/c/strsubst.c2
-rw-r--r--scilab/modules/umfpack/src/c/taucs_scilab.c2
-rw-r--r--scilab/modules/windows_tools/src/c/FindFileAssociation.c2
5 files changed, 4 insertions, 5 deletions
diff --git a/scilab/modules/graphics/src/c/SetProperty.c b/scilab/modules/graphics/src/c/SetProperty.c
index dec96f9..1c05419 100644
--- a/scilab/modules/graphics/src/c/SetProperty.c
+++ b/scilab/modules/graphics/src/c/SetProperty.c
@@ -247,7 +247,6 @@ void sciRecursiveUpdateBaW(sciPointObj *pobj, int old_m, int m)
247 (sciGetEntityType(pobj) == SCI_SUBWIN) || 247 (sciGetEntityType(pobj) == SCI_SUBWIN) ||
248 (sciGetEntityType(pobj) == SCI_LEGEND) || 248 (sciGetEntityType(pobj) == SCI_LEGEND) ||
249 (sciGetEntityType(pobj) == SCI_AXES) || 249 (sciGetEntityType(pobj) == SCI_AXES) ||
250 (sciGetEntityType(pobj) == SCI_SUBWIN) ||
251 (sciGetEntityType(pobj) == SCI_FIGURE) || 250 (sciGetEntityType(pobj) == SCI_FIGURE) ||
252 (sciGetEntityType(pobj) == SCI_LABEL)) 251 (sciGetEntityType(pobj) == SCI_LABEL))
253 { 252 {
diff --git a/scilab/modules/intersci/src/exe/crerhs.c b/scilab/modules/intersci/src/exe/crerhs.c
index 8e80ee6..789f8ae 100644
--- a/scilab/modules/intersci/src/exe/crerhs.c
+++ b/scilab/modules/intersci/src/exe/crerhs.c
@@ -543,7 +543,7 @@ void GetDim(char *lstr,IVAR ivar)
543 char *s; 543 char *s;
544 s=Forname2Int(variables[ivar-1],0); 544 s=Forname2Int(variables[ivar-1],0);
545 if ( strncmp(s,"stk",3)==0 || strncmp(s,"istk",4)==0 545 if ( strncmp(s,"stk",3)==0 || strncmp(s,"istk",4)==0
546 || strncmp(s,"sstk",4)==0 || strncmp(s,"stk",3)==0 || 546 || strncmp(s,"sstk",4)==0 ||
547 strncmp(s,"cstk",4)==0 ) 547 strncmp(s,"cstk",4)==0 )
548 { 548 {
549 strcpy(lstr,s); 549 strcpy(lstr,s);
diff --git a/scilab/modules/string/src/c/strsubst.c b/scilab/modules/string/src/c/strsubst.c
index d0f1f40..150102f 100644
--- a/scilab/modules/string/src/c/strsubst.c
+++ b/scilab/modules/string/src/c/strsubst.c
@@ -155,7 +155,7 @@ char *strsub_reg(char* input_string, const char* string_to_search, const char* r
155 wcreplacement_string = to_wide_string((char*)replacement_string); 155 wcreplacement_string = to_wide_string((char*)replacement_string);
156 wcinput_string = to_wide_string((char*)input_string); 156 wcinput_string = to_wide_string((char*)input_string);
157 157
158 if (wcreplacement_string == NULL || wcreplacement_string == NULL) 158 if (wcreplacement_string == NULL)
159 { 159 {
160 *ierr = (int)NOT_ENOUGH_MEMORY_FOR_VECTOR; 160 *ierr = (int)NOT_ENOUGH_MEMORY_FOR_VECTOR;
161 return strdup(input_string); 161 return strdup(input_string);
diff --git a/scilab/modules/umfpack/src/c/taucs_scilab.c b/scilab/modules/umfpack/src/c/taucs_scilab.c
index feaf403..5ba56c0 100644
--- a/scilab/modules/umfpack/src/c/taucs_scilab.c
+++ b/scilab/modules/umfpack/src/c/taucs_scilab.c
@@ -262,7 +262,7 @@ taucs_ccs_create(int m, int n, int nnz)
262 matrix->colptr = (int*) MALLOC((n+1) * sizeof(int)); 262 matrix->colptr = (int*) MALLOC((n+1) * sizeof(int));
263 matrix->rowind = (int*) MALLOC(nnz * sizeof(int)); 263 matrix->rowind = (int*) MALLOC(nnz * sizeof(int));
264 matrix->values = (double*) MALLOC(nnz * sizeof(double)); 264 matrix->values = (double*) MALLOC(nnz * sizeof(double));
265 if (!(matrix->colptr) || !(matrix->rowind) || !(matrix->rowind)) 265 if (!(matrix->colptr) || !(matrix->rowind))
266 { 266 {
267 sciprint(_("%s: No more memory (n=%d, nnz=%d).\n"),"taucs_ccs_create",n,nnz); 267 sciprint(_("%s: No more memory (n=%d, nnz=%d).\n"),"taucs_ccs_create",n,nnz);
268 FREE(matrix->colptr); FREE(matrix->rowind); FREE(matrix->values); 268 FREE(matrix->colptr); FREE(matrix->rowind); FREE(matrix->values);
diff --git a/scilab/modules/windows_tools/src/c/FindFileAssociation.c b/scilab/modules/windows_tools/src/c/FindFileAssociation.c
index 0898d23..c0ad9c3 100644
--- a/scilab/modules/windows_tools/src/c/FindFileAssociation.c
+++ b/scilab/modules/windows_tools/src/c/FindFileAssociation.c
@@ -32,7 +32,7 @@ char *FindFileAssociation (char *ptrFindStr,char *Extra)
32 wchar_t szDefault[PATH_MAX + FILENAME_MAX]; 32 wchar_t szDefault[PATH_MAX + FILENAME_MAX];
33 DWORD ccDefault = PATH_MAX + FILENAME_MAX; 33 DWORD ccDefault = PATH_MAX + FILENAME_MAX;
34 34
35 if (wcptrFindStr && wcptrFindStr) 35 if (wcptrFindStr)
36 { 36 {
37 HRESULT rc = AssocQueryStringW (0, ASSOCSTR_EXECUTABLE,wcptrFindStr, wcExtra, szDefault, &ccDefault); 37 HRESULT rc = AssocQueryStringW (0, ASSOCSTR_EXECUTABLE,wcptrFindStr, wcExtra, szDefault, &ccDefault);
38 if (ccDefault) 38 if (ccDefault)