Merge pull request #608 from open62541/Pro-hotfix/cppcheck_fixes

Fix all the cppcheck warnings and enable travis fail on cppcheck error

.travis.yml

@@ -27,9 +27,6 @@ matrix:
       compiler: gcc
     - os: osx
       env: ANALYZE=true
-  allow_failures:
-    - env: ANALYZE=true
-      compiler: gcc
 
 addons:
   apt:

plugins/networklayer_tcp.c

@@ -289,7 +289,7 @@ ServerNetworkLayerTCP_closeConnection(UA_Connection *connection) {
         return;
     connection->state = UA_CONNECTION_CLOSED;
 #endif
-
+    //cppcheck-suppress unreadVariable
     ServerNetworkLayerTCP *layer = connection->handle;
     UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK, "Closing the Connection %i",
                 connection->sockfd);

plugins/networklayer_udp.c

@@ -170,9 +170,9 @@ static size_t ServerNetworkLayerUDP_getJobs(ServerNetworkLayerUDP *layer, UA_Job
     struct sockaddr sender;
     socklen_t sendsize = sizeof(sender);
     bzero(&sender, sizeof(sender));
-    buf.length = recvfrom(layer->serversockfd, buf.data, layer->conf.recvBufferSize, 0, &sender, &sendsize);
-    if (buf.length <= 0) {
-    } else {
+	ssize_t rec_result = recvfrom(layer->serversockfd, buf.data, layer->conf.recvBufferSize, 0, &sender, &sendsize);
+    if (rec_result > 0) {
+    	buf.length = rec_result;
         UDPConnection *c = malloc(sizeof(UDPConnection));
         if(!c){
        	    free(items);
@@ -196,14 +196,13 @@ static size_t ServerNetworkLayerUDP_getJobs(ServerNetworkLayerUDP *layer, UA_Job
         items[j].job.binaryMessage.connection = (UA_Connection*)c;
         buf.data = NULL;
         j++;
-    }
+		*jobs = items;
+    } else {
+		free(items);
+		*jobs = NULL;
+	}
     if(buf.data)
         free(buf.data);
-    if(j == 0) {
-        free(items);
-        *jobs = NULL;
-    } else
-        *jobs = items;
     return j;
 }
 

src/server/ua_server_worker.c

@@ -554,6 +554,7 @@ static void processMainLoopJobs(UA_Server *server) {
         processJobs(server, &mlw->job, 1);
         next = (struct MainLoopJob*)mlw->node.next;
         UA_free(mlw);
+        //cppcheck-suppress unreadVariable
     } while((mlw = next));
     //UA_free(head);
 }

src/server/ua_services_attribute.c

@@ -10,9 +10,8 @@ readNumber(UA_Byte *buf, size_t buflen, UA_UInt32 *number) {
     UA_UInt32 n = 0;
     size_t progress = 0;
     /* read numbers until the end or a non-number character appears */
-    UA_Byte c;
     while(progress < buflen) {
-        c = buf[progress];
+        UA_Byte c = buf[progress];
         if('0' > c || '9' < c)
             break;
         n = (n*10) + (UA_UInt32)(c-'0');

src/server/ua_services_nodemanagement.c

@@ -823,7 +823,6 @@ void Service_AddReferences(UA_Server *server, UA_Session *session,
 	}
 #endif
 
-	response->resultsSize = size;
 	for(size_t i = 0; i < response->resultsSize; i++) {
 #ifdef UA_ENABLE_EXTERNAL_NAMESPACES
 		if(!isExternal[i])

src/server/ua_services_view.c

@@ -259,7 +259,7 @@ Service_Browse_single(UA_Server *server, UA_Session *session, struct Continuatio
     }
 
     /* if the node has no references, just return */
-    if(node->referencesSize <= 0) {
+    if(node->referencesSize == 0) {
         result->referencesSize = 0;
         if(!all_refs && descr->includeSubtypes)
             UA_Array_delete(relevant_refs, relevant_refs_size, &UA_TYPES[UA_TYPES_NODEID]);
@@ -270,7 +270,7 @@ Service_Browse_single(UA_Server *server, UA_Session *session, struct Continuatio
     size_t real_maxrefs = maxrefs;
     if(real_maxrefs == 0)
         real_maxrefs = node->referencesSize;
-    if(node->referencesSize <= 0)
+    if(node->referencesSize == 0)
         real_maxrefs = 0;
     else if(real_maxrefs > node->referencesSize)
         real_maxrefs = node->referencesSize;

src/server/ua_subscription.c

@@ -311,6 +311,7 @@ void UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_NotificationMessageEntry *nme;
     LIST_FOREACH(nme, &sub->retransmissionQueue, listEntry)
         available++;
+    //cppcheck-suppress knownConditionTrueFalse
     if(available > 0) {
         response->availableSequenceNumbers = UA_alloca(available * sizeof(UA_UInt32));
         response->availableSequenceNumbersSize = available;

src/ua_types.c

@@ -541,9 +541,11 @@ UA_StatusCode UA_Variant_setScalarCopy(UA_Variant *v, const void *p, const UA_Da
     UA_StatusCode retval = UA_copy(p, new, type);
 	if(retval != UA_STATUSCODE_GOOD) {
 		UA_free(new);
+        //cppcheck-suppress memleak
 		return retval;
 	}
     UA_Variant_setScalar(v, new, type);
+    //cppcheck-suppress memleak
     return UA_STATUSCODE_GOOD;
 }
 

src/ua_types_encoding_binary.c

@@ -275,7 +275,7 @@ static long double unpack754(uint64_t i, unsigned bits, unsigned expbits) {
     long long shift = (long long)((i>>significandbits) & (uint64_t)((1LL<<expbits)-1)) - bias;
     while(shift > 0) { result *= 2.0; shift--; }
     while(shift < 0) { result /= 2.0; shift++; }
-    result *= (i>>(bits-1))&1? -1.0: 1.0;
+    result *= ((i>>(bits-1))&1)? -1.0: 1.0;
     return result;
 }
 
@@ -286,18 +286,20 @@ static long double unpack754(uint64_t i, unsigned bits, unsigned expbits) {
 #define FLOAT_NEG_ZERO 0x80000000
 
 static UA_StatusCode
-Float_encodeBinary(UA_Float const *src, bufpos pos, bufend end) {
+Float_encodeBinary(UA_Float const *src, const UA_DataType *_, bufpos pos, bufend end) {
     UA_Float f = *src;
     UA_UInt32 encoded;
+    //cppcheck-suppress duplicateExpression
     if(f != f) encoded = FLOAT_NAN;
     else if(f == 0.0f) encoded = signbit(f) ? FLOAT_NEG_ZERO : 0;
+    //cppcheck-suppress duplicateExpression
     else if(f/f != f/f) encoded = f > 0 ? FLOAT_INF : FLOAT_NEG_INF;
     else encoded = (UA_UInt32)pack754(f, 32, 8);
     return UInt32_encodeBinary(&encoded, NULL, pos, end);
 }
 
 static UA_StatusCode
-Float_decodeBinary(bufpos pos, bufend end, UA_Float *dst) {
+Float_decodeBinary(bufpos pos, bufend end, UA_Float *dst, const UA_DataType *_) {
     UA_UInt32 decoded;
     UA_StatusCode retval = UInt32_decodeBinary(pos, end, &decoded, NULL);
     if(retval != UA_STATUSCODE_GOOD)
@@ -322,8 +324,10 @@ static UA_StatusCode
 Double_encodeBinary(UA_Double const *src, const UA_DataType *_, bufpos pos, bufend end) {
     UA_Double d = *src;
     UA_UInt64 encoded;
+    //cppcheck-suppress duplicateExpression
     if(d != d) encoded = DOUBLE_NAN;
     else if(d == 0.0) encoded = signbit(d) ? DOUBLE_NEG_ZERO : 0;
+    //cppcheck-suppress duplicateExpression
     else if(d/d != d/d) encoded = d > 0 ? DOUBLE_INF : DOUBLE_NEG_INF;
     else encoded = pack754(d, 64, 11);
     return UInt64_encodeBinary(&encoded, NULL, pos, end);
@@ -339,6 +343,7 @@ Double_decodeBinary(bufpos pos, bufend end, UA_Double *dst, const UA_DataType *_
     else if(decoded == DOUBLE_NEG_ZERO) *dst = -0.0;
     else if(decoded == DOUBLE_INF) *dst = INFINITY;
     else if(decoded == DOUBLE_NEG_INF) *dst = -INFINITY;
+    //cppcheck-suppress redundantCondition
     if((decoded >= 0x7ff0000000000001L && decoded <= 0x7fffffffffffffffL) ||
        (decoded >= 0xfff0000000000001L && decoded <= 0xffffffffffffffffL)) *dst = NAN;
     else *dst = (UA_Double)unpack754(decoded, 64, 11);

tools/travis/travis_linux_before_install.sh

@@ -2,32 +2,26 @@
 set -ev
 
 if [ $ANALYZE = "true" ]; then
-
-	cd $LOCAL_PKG
-	# travis caches the $LOCAL_PKG dir. If it is loaded, we don't need to reinstall the packages
-	if [ "$CC" = "clang" ]; then
-		clang --version
-	else
-
-		if [ ! -f $LOCAL_PKG/.cached_analyze ]; then
-
-			# Install newer cppcheck
-			wget https://github.com/danmar/cppcheck/archive/1.73.tar.gz -O cppcheck-1.73.tar.gz
-			tar xf cppcheck-1.73.tar.gz
-			cd $LOCAL_PKG/cppcheck-1.73
-			make SRCDIR=build CFGDIR="$LOCAL_PKG/cppcheck-1.73/cfg" HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" -j8
-			ln -s $LOCAL_PKG/cppcheck-1.73/cppcheck $LOCAL_PKG/cppcheck
-
-			# create cached flag
-			touch $LOCAL_PKG/.cached_analyze
-		else
-			echo "\n## Using local packages from cache\n"
-		fi
-
-		g++ --version
-		cppcheck --version
-	fi
-
+    cd $LOCAL_PKG
+    # travis caches the $LOCAL_PKG dir. If it is loaded, we don't need to reinstall the packages
+    if [ "$CC" = "clang" ]; then
+        clang --version
+    else
+        if [ ! -f $LOCAL_PKG/.cached_analyze ]; then
+            # Install newer cppcheck
+            wget https://github.com/danmar/cppcheck/archive/1.73.tar.gz -O cppcheck-1.73.tar.gz
+            tar xf cppcheck-1.73.tar.gz
+            cd $LOCAL_PKG/cppcheck-1.73
+            make SRCDIR=build CFGDIR="$LOCAL_PKG/cppcheck-1.73/cfg" HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" -j8
+            ln -s $LOCAL_PKG/cppcheck-1.73/cppcheck $LOCAL_PKG/cppcheck
+            # create cached flag
+            touch $LOCAL_PKG/.cached_analyze
+        else
+            echo "\n## Using local packages from cache\n"
+        fi
+        g++ --version
+        cppcheck --version
+    fi
 else
 	cd $LOCAL_PKG