Просмотр исходного кода

Change local variable types to size_t, matching intended usage.

Resolves Visual Studio warnings about assigning a size_t to an integer.
Jason Valenzuela 6 лет назад
Родитель
Сommit
3b670b7acc
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      source/src/cip/cipcommon.c

+ 4 - 4
source/src/cip/cipcommon.c

@@ -1300,8 +1300,8 @@ EipStatus SetAttributeList(CipInstance *instance,
           AddSintToMessage(0, &message_router_response->message); // Reserved, shall be 0
 
           //move request message pointer
-          int attribute_data_length = GetCipDataTypeLength(attribute->type,
-                                                           message_router_request->data);
+          size_t attribute_data_length = GetCipDataTypeLength(attribute->type,
+                                                              message_router_request->data);
           if(0 != attribute_data_length) {
             message_router_request->data += attribute_data_length;
             message_router_response->general_status =
@@ -1603,9 +1603,9 @@ EipStatus CipResetService(CipInstance *RESTRICT const instance,
 }
 
 void AllocateAttributeMasks(CipClass *target_class) {
-  unsigned size = 1 + CalculateIndex(target_class->highest_attribute_number);
+  size_t size = 1 + CalculateIndex(target_class->highest_attribute_number);
   OPENER_TRACE_INFO(
-    ">>> Allocate memory for %s %u bytes times 3 for masks\n",
+    ">>> Allocate memory for %s %zu bytes times 3 for masks\n",
     target_class->class_name, size);
   target_class->get_single_bit_mask = CipCalloc( size, sizeof(uint8_t) );
   target_class->set_bit_mask = CipCalloc( size, sizeof(uint8_t) );