Selaa lähdekoodia

More clang warning removal

Fix warnings on tautological compares (e.g. unsigned < 0)

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 13 vuotta sitten
vanhempi
commit
9396b186f6

+ 2 - 1
cmake_modules/commonSetup.cmake

@@ -123,7 +123,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
       SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -fno-default-inline -fno-inline-functions")
     endif ()
     if (CMAKE_COMPILER_IS_CLANGXX)
-      SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=logical-op-parentheses -Werror=bool-conversions -Werror=return-type -Werror=comment -Werror=bitwise-op-parentheses")
+      SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=logical-op-parentheses -Werror=bool-conversions -Werror=return-type -Werror=comment")
+      SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -Werror=bitwise-op-parentheses -Werror=tautological-compare")
     endif()
     # All of these are defined in platform.h too, but need to be defned before any system header is included
     ADD_DEFINITIONS (-D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64=1 -D__USE_FILE_OFFSET64=1)

+ 1 - 2
esp/services/ws_topology/ws_topologyService.cpp

@@ -374,8 +374,7 @@ bool CWsTopologyEx::onTpLogFile(IEspContext &context,IEspTpLogFileRequest  &req,
                 resp.setPageFrom(readLogReq.pageFrom);
             if (readLogReq.pageTo > 0)
                 resp.setPageTo(readLogReq.pageTo);
-            if (readLogReq.prevPage >= 0)
-                resp.setPrevPage(readLogReq.prevPage);
+            resp.setPrevPage(readLogReq.prevPage);
             if (readLogReq.nextPage > 0)
                 resp.setNextPage(readLogReq.nextPage);
 

+ 1 - 1
esp/services/ws_workunits/ws_workunitsService.cpp

@@ -1477,7 +1477,7 @@ void doWUQueryWithSort(IEspContext &context, IEspWUQueryRequest & req, IEspWUQue
 
     IArrayOf<IEspECLWorkunit> results;
 
-    unsigned begin = 0;
+    int begin = 0;
     unsigned int count = 100;
     int pagesize = 100;
     if (version > 1.01)

+ 2 - 2
system/jlib/jfile.cpp

@@ -1562,7 +1562,7 @@ IFileIO *_createIFileIO(const void *buffer, unsigned sz, bool readOnly)
             Owned<IFileIO> fileio = file->open(IFOread);
             offset_t ret=0;
             while (len) {
-                size32_t toread = ((len>=buffsize)||(len<0))?buffsize:(size32_t)len;
+                size32_t toread = (len>=buffsize)?buffsize:(size32_t)len;
                 size32_t read = fileio->read(pos,toread,buffer);
                 if (read<buffsize) 
                     mb.setLength(mb.length()+read-buffsize);
@@ -1710,7 +1710,7 @@ offset_t CFileIO::appendFile(IFile *file,offset_t pos,offset_t len)
     offset_t ret=0;
     offset_t outp = size();
     while (len) {
-        size32_t toread = ((len>=buffsize)||(len<0))?buffsize:(size32_t)len;
+        size32_t toread = (len>=buffsize) ? buffsize : (size32_t)len;
         size32_t read = fileio->read(pos,toread,buffer);
         if (read==0)
             break;

+ 11 - 5
system/jlib/jutil.cpp

@@ -1547,11 +1547,17 @@ bool callExternalProgram(const char *progname, const StringBuffer &input, String
         size32_t count=input.length();
         for(;count>0;)
         {
-            size32_t w=pipe1.Write(data,count);
-            if(w<0 && errno!=EINTR)
-                throw MakeStringException(-1,"Pipe write failed: %d",errno); 
-            data+=w;
-            count-=w;
+            ssize_t w=pipe1.Write(data,count);
+            if(w<0)
+            {
+                if (errno!=EINTR)
+                    throw MakeStringException(-1,"Pipe write failed: %d",errno);
+            }
+            else
+            {
+                data+=w;
+                count-=w;
+            }
         }
         pipe1.CloseWrite();