Duplicated argument to && or ||

Issues found thanks to Coccinelle: http://coccinelle.lip6.fr/
Thanks to Julia Lawall for producing the results

Change-Id: I53fafa7be06a80a576af037eb452511078f01c6c

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)
      (sciGetEntityType(pobj) == SCI_SUBWIN)      ||
      (sciGetEntityType(pobj) == SCI_LEGEND)      ||
      (sciGetEntityType(pobj) == SCI_AXES)        ||
-     (sciGetEntityType(pobj) == SCI_SUBWIN)      ||
      (sciGetEntityType(pobj) == SCI_FIGURE)      ||
      (sciGetEntityType(pobj) == SCI_LABEL))
     {
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)
   char *s;
   s=Forname2Int(variables[ivar-1],0);
   if ( strncmp(s,"stk",3)==0 || strncmp(s,"istk",4)==0
-       || strncmp(s,"sstk",4)==0 || strncmp(s,"stk",3)==0 ||
+       || strncmp(s,"sstk",4)==0 ||
        strncmp(s,"cstk",4)==0 )
     {
       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
         wcreplacement_string = to_wide_string((char*)replacement_string);
         wcinput_string = to_wide_string((char*)input_string);
 
-        if (wcreplacement_string == NULL || wcreplacement_string == NULL) 
+        if (wcreplacement_string == NULL) 
         {
                 *ierr = (int)NOT_ENOUGH_MEMORY_FOR_VECTOR;
                 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)
   matrix->colptr = (int*)    MALLOC((n+1) * sizeof(int));
   matrix->rowind = (int*)    MALLOC(nnz   * sizeof(int));
   matrix->values = (double*) MALLOC(nnz   * sizeof(double));
-  if (!(matrix->colptr) || !(matrix->rowind) || !(matrix->rowind)) 
+  if (!(matrix->colptr) || !(matrix->rowind)) 
   {
     sciprint(_("%s: No more memory (n=%d, nnz=%d).\n"),"taucs_ccs_create",n,nnz);
     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)
                 wchar_t szDefault[PATH_MAX + FILENAME_MAX];
                 DWORD ccDefault = PATH_MAX + FILENAME_MAX;
 
-                if (wcptrFindStr && wcptrFindStr)
+                if (wcptrFindStr)
                 {
                         HRESULT rc = AssocQueryStringW (0, ASSOCSTR_EXECUTABLE,wcptrFindStr, wcExtra, szDefault, &ccDefault);
                         if (ccDefault)