yarp 0.6.0 → 0.8.0

data/src/util/yp_list.c

@@ -1,28 +1,15 @@
 #include "yarp/util/yp_list.h"
 
-// Initializes a new list.
-YP_EXPORTED_FUNCTION void
-yp_list_init(yp_list_t *list) {
-    *list = (yp_list_t) { .head = NULL, .tail = NULL };
-}
-
 // Returns true if the given list is empty.
 YP_EXPORTED_FUNCTION bool
 yp_list_empty_p(yp_list_t *list) {
     return list->head == NULL;
 }
 
-YP_EXPORTED_FUNCTION uint32_t
+// Returns the size of the list.
+YP_EXPORTED_FUNCTION size_t
 yp_list_size(yp_list_t *list) {
-    yp_list_node_t *node = list->head;
-    uint32_t length = 0;
-
-    while (node != NULL) {
-        length++;
-        node = node->next;
-    }
-
-    return length;
+    return list->size;
 }
 
 // Append a node to the given list.
@@ -33,7 +20,9 @@ yp_list_append(yp_list_t *list, yp_list_node_t *node) {
     } else {
         list->tail->next = node;
     }
+
     list->tail = node;
+    list->size++;
 }
 
 // Deallocate the internal state of the given list.
@@ -47,4 +36,6 @@ yp_list_free(yp_list_t *list) {
         free(node);
         node = next;
     }
+
+    list->size = 0;
 }

data/src/util/yp_state_stack.c

@@ -1,11 +1,5 @@
 #include "yarp/util/yp_state_stack.h"
 
-// Initializes the state stack to an empty stack.
-void
-yp_state_stack_init(yp_state_stack_t *stack) {
-    *stack = 0;
-}
-
 // Pushes a value onto the stack.
 void
 yp_state_stack_push(yp_state_stack_t *stack, bool value) {

data/src/util/yp_string.c

@@ -97,10 +97,8 @@ yp_string_free(yp_string_t *string) {
         void *memory = (void *) string->source;
         #if defined(_WIN32)
         UnmapViewOfFile(memory);
-        #elif defined(HAVE_MMAP)
-        munmap(memory, string->length);
         #else
-        free(memory);
+        munmap(memory, string->length);
         #endif
     }
 }
@@ -180,28 +178,21 @@ yp_string_mapped_init(yp_string_t *string, const char *filepath) {
         return true;
     }
 
-#ifdef HAVE_MMAP
     source = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
     if (source == MAP_FAILED) {
         perror("Map failed");
         return false;
     }
-#else
-    source = malloc(size);
-    if (source == NULL) {
-        return false;
-    }
-
-    ssize_t read_size = read(fd, (void *) source, size);
-    if (read_size < 0 || (size_t)read_size != size) {
-        perror("Read size is incorrect");
-        free((void *) source);
-        return false;
-    }
-#endif
 
     close(fd);
     yp_string_mapped_init_internal(string, source, size);
     return true;
 #endif
 }
+
+// Returns the size of the yp_string_t struct. This is necessary to allocate the
+// correct amount of memory in the FFI backend.
+YP_EXPORTED_FUNCTION size_t
+yp_string_sizeof(void) {
+    return sizeof(yp_string_t);
+}