Bläddra i källkod

Fix PC-lint warning: Declaration of symbol 'index' hides symbol 'index(...)' (#2148)

* rename index variable

PC-lint complains about the naming:
Declaration of symbol 'index' hides symbol 'index(const char *, int)' (file ..\arm-none-eabi-gcc\4.5.2\arm-none-eabi\include\string.h)

* Update src/server/ua_subscription_datachange.c

* Update ua_subscription_datachange.c
Martin Lang 6 år sedan
förälder
incheckning
c17b068960
2 ändrade filer med 26 tillägg och 26 borttagningar
  1. 5 5
      src/server/ua_server.c
  2. 21 21
      src/server/ua_subscription_datachange.c

+ 5 - 5
src/server/ua_server.c

@@ -397,16 +397,16 @@ UA_Server_updateCertificate(UA_Server *server,
         }
     }
 
-    size_t index = 0;
-    while (index < server->config.endpointsSize) {
-        UA_EndpointDescription *ed = &server->config.endpoints[index].endpointDescription;
+    size_t i = 0;
+    while (i < server->config.endpointsSize) {
+        UA_EndpointDescription *ed = &server->config.endpoints[i].endpointDescription;
         if (UA_ByteString_equal(&ed->serverCertificate, oldCertificate)) {
             UA_String_deleteMembers(&ed->serverCertificate);
             UA_String_copy(newCertificate, &ed->serverCertificate);
-            UA_SecurityPolicy *sp = &server->config.endpoints[index].securityPolicy;
+            UA_SecurityPolicy *sp = &server->config.endpoints[i].securityPolicy;
             sp->updateCertificateAndPrivateKey(sp, *newCertificate, *newPrivateKey);
         }
-        index++;
+        i++;
     }
 
     return UA_STATUSCODE_GOOD;

+ 21 - 21
src/server/ua_subscription_datachange.c

@@ -20,47 +20,47 @@
 #define ABS_SUBTRACT_TYPE_INDEPENDENT(a,b) ((a)>(b)?(a)-(b):(b)-(a))
 
 static UA_Boolean
-outOfDeadBand(const void *data1, const void *data2, const size_t index,
+outOfDeadBand(const void *data1, const void *data2, const size_t arrayPos,
               const UA_DataType *type, const UA_Double deadbandValue) {
     if(type == &UA_TYPES[UA_TYPES_SBYTE]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_SByte*)data1)[index],
-                                         ((const UA_SByte*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_SByte*)data1)[arrayPos],
+                                         ((const UA_SByte*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_BYTE]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Byte*)data1)[index],
-                                         ((const UA_Byte*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Byte*)data1)[arrayPos],
+                                         ((const UA_Byte*)data2)[arrayPos]) <= deadbandValue)
                 return false;
     } else if(type == &UA_TYPES[UA_TYPES_INT16]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int16*)data1)[index],
-                                          ((const UA_Int16*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int16*)data1)[arrayPos],
+                                          ((const UA_Int16*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_UINT16]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt16*)data1)[index],
-                                          ((const UA_UInt16*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt16*)data1)[arrayPos],
+                                          ((const UA_UInt16*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_INT32]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int32*)data1)[index],
-                                         ((const UA_Int32*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int32*)data1)[arrayPos],
+                                         ((const UA_Int32*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_UINT32]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt32*)data1)[index],
-                                         ((const UA_UInt32*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt32*)data1)[arrayPos],
+                                         ((const UA_UInt32*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_INT64]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int64*)data1)[index],
-                                         ((const UA_Int64*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Int64*)data1)[arrayPos],
+                                         ((const UA_Int64*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_UINT64]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt64*)data1)[index],
-                                         ((const UA_UInt64*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_UInt64*)data1)[arrayPos],
+                                         ((const UA_UInt64*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_FLOAT]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Float*)data1)[index],
-                                         ((const UA_Float*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Float*)data1)[arrayPos],
+                                         ((const UA_Float*)data2)[arrayPos]) <= deadbandValue)
             return false;
     } else if(type == &UA_TYPES[UA_TYPES_DOUBLE]) {
-        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Double*)data1)[index],
-                                         ((const UA_Double*)data2)[index]) <= deadbandValue)
+        if(ABS_SUBTRACT_TYPE_INDEPENDENT(((const UA_Double*)data1)[arrayPos],
+                                         ((const UA_Double*)data2)[arrayPos]) <= deadbandValue)
             return false;
     }
     return true;