Browse Source

fixed some interesting coverty messages

Leon Urbas 11 years ago
parent
commit
5b4776b7bc
4 changed files with 12 additions and 9 deletions
  1. 3 0
      examples/src/opcuaServerACPLT.c
  2. 4 4
      src/ua_basictypes.c
  3. 4 4
      src/ua_secureLayer.c
  4. 1 1
      tool/generate_namespace.py

+ 3 - 0
examples/src/opcuaServerACPLT.c

@@ -146,9 +146,12 @@ void server_run() {
 				server.writeData.length = 0;
 			}
 		}
+		shutdown(newsockfd,2);
 		close(newsockfd);
 		connection.connectionState = connectionState_CLOSED;
 	}
+	shutdown(sockfd,2);
+	close(sockfd);
 }
 
 #endif

+ 4 - 4
src/ua_basictypes.c

@@ -1294,16 +1294,16 @@ UA_TYPE_START_ENCODEBINARY(UA_Variant)
 UA_TYPE_END_XXCODEBINARY
 UA_Int32 UA_Variant_decodeBinary(UA_ByteString const * src, UA_Int32 *pos, UA_Variant *dst) {
 	UA_Int32 retval = UA_SUCCESS;
-	UA_Int32 ns0Id;
+	UA_Int32 ns0Id, uaIdx;
 
 	retval |= UA_Byte_decodeBinary(src,pos,&(dst->encodingMask));
 	ns0Id = dst->encodingMask & UA_VARIANT_ENCODINGMASKTYPE_TYPEID_MASK;
 
 	// initialize vTable
-	if (UA_toIndex(ns0Id) == UA_ERR_INVALID_VALUE) {
-		return UA_ERR_INVALID_VALUE;
+	if ((uaIdx = UA_toIndex(ns0Id)) < 0) {
+		return uaIdx;
 	} else {
-		dst->vt = &UA_[UA_toIndex(ns0Id)];
+		dst->vt = &UA_[uaIdx];
 	}
 
 	// get size of array

+ 4 - 4
src/ua_secureLayer.c

@@ -135,15 +135,15 @@ START_HANDLER(GetEndpoints)
 END_HANDLER
 
 START_HANDLER(CreateSession)
-	 service_createsession(channel, p, r);
+	 retval = service_createsession(channel, p, r);
 END_HANDLER
 
 START_HANDLER(ActivateSession)
-	 service_activatesession(channel, p, r);
+	 retval = service_activatesession(channel, p, r);
 END_HANDLER
 
 START_HANDLER(CloseSession)
-	 service_closesession(channel, p, r);
+	 retval = service_closesession(channel, p, r);
 END_HANDLER
 
 START_HANDLER(Browse)
@@ -158,7 +158,7 @@ END_HANDLER
 
 START_HANDLER(Read)
      // FIXME: Check if session is active 
-	 service_read(channel->session->application, p, r);
+	 retval = service_read(channel->session->application, p, r);
 END_HANDLER
 
 START_HANDLER(CreateSubscription)

+ 1 - 1
tool/generate_namespace.py

@@ -77,7 +77,7 @@ print('''/**********************************************************
 #include "opcua.h"
 
 UA_Int32 UA_toIndex(UA_Int32 id) {
-    UA_Int32 retval = -1;
+    UA_Int32 retval = UA_ERR_INVALID_VALUE;
     switch (id) { ''', end='\n',file=fc)
 
 i = 0