Replace rcutils_allocator with the system allocator

Signed-off-by: Nikolai Morin <[email protected]>
ros2 · Mar 8, 2022 · c48741a · c48741a
1 parent d5d0b1a
commit c48741a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/rosidl_generator_c/resource/msg__functions.c.em b/rosidl_generator_c/resource/msg__functions.c.em
@@ -456,10 +456,8 @@ bool
   if (output->capacity < input->size) {
     const size_t allocation_size =
       input->size * sizeof(@(message_typename));
-    rcutils_allocator_t allocator = rcutils_get_default_allocator();
     @(message_typename) * data =
-      (@(message_typename) *)allocator.reallocate(
-      output->data, allocation_size, allocator.state);
+      (@(message_typename) *)realloc(output->data, allocation_size);
     if (!data) {
       return false;
     }
@@ -469,7 +467,7 @@ bool
         for (; i-- > output->capacity; ) {
           @(message_typename)__fini(&data[i]);
         }
-        allocator.deallocate(data, allocator.state);
+        free(data);
         return false;
       }
     }

diff --git a/rosidl_runtime_c/src/primitives_sequence_functions.c b/rosidl_runtime_c/src/primitives_sequence_functions.c
@@ -85,9 +85,8 @@
       return false; \
     } \
     if (output->capacity < input->size) { \
-      rcutils_allocator_t allocator = rcutils_get_default_allocator(); \
-      TYPE_NAME * data = (TYPE_NAME *)allocator.reallocate( \
-        output->data, sizeof(TYPE_NAME) * input->size, allocator.state); \
+      TYPE_NAME * data = (TYPE_NAME *)realloc( \
+        output->data, sizeof(TYPE_NAME) * input->size); \
       if (!data) { \
         return false; \
       } \

diff --git a/rosidl_runtime_c/src/string_functions.c b/rosidl_runtime_c/src/string_functions.c
@@ -229,10 +229,8 @@ rosidl_runtime_c__String__Sequence__copy(
   if (output->capacity < input->size) {
     const size_t allocation_size =
       input->size * sizeof(rosidl_runtime_c__String);
-    rcutils_allocator_t allocator = rcutils_get_default_allocator();
     rosidl_runtime_c__String * data =
-      (rosidl_runtime_c__String *)allocator.reallocate(
-      output->data, allocation_size, allocator.state);
+      (rosidl_runtime_c__String *)realloc(output->data, allocation_size);
     if (!data) {
       return false;
     }
@@ -242,7 +240,7 @@ rosidl_runtime_c__String__Sequence__copy(
         for (; i-- > output->capacity; ) {
           rosidl_runtime_c__String__fini(&data[i]);
         }
-        allocator.deallocate(data, allocator.state);
+        free(data);
         return false;
       }
     }

diff --git a/rosidl_runtime_c/src/u16string_functions.c b/rosidl_runtime_c/src/u16string_functions.c
@@ -272,10 +272,8 @@ rosidl_runtime_c__U16String__Sequence__copy(
   if (output->capacity < input->size) {
     const size_t size =
       input->size * sizeof(rosidl_runtime_c__U16String);
-    rcutils_allocator_t allocator = rcutils_get_default_allocator();
     rosidl_runtime_c__U16String * data =
-      (rosidl_runtime_c__U16String *)allocator.reallocate(
-      output->data, size, allocator.state);
+      (rosidl_runtime_c__U16String *)realloc(output->data, size);
     if (!data) {
       return false;
     }
@@ -285,7 +283,7 @@ rosidl_runtime_c__U16String__Sequence__copy(
         for (; i-- > output->capacity; ) {
           rosidl_runtime_c__U16String__fini(&data[i]);
         }
-        allocator.deallocate(data, allocator.state);
+        free(data);
         return false;
       }
     }