Mercurial > hg > ucx / file diff

     1.1 --- a/src/hash_map.c	Fri Apr 07 11:30:28 2023 +0200
     1.2 +++ b/src/hash_map.c	Sun Apr 09 19:03:58 2023 +0200
     1.3 @@ -103,13 +103,13 @@
     1.4          if (map->store_pointers) {
     1.5              memcpy(elm->data, &value, sizeof(void *));
     1.6          } else {
     1.7 -            memcpy(elm->data, value, map->itemsize);
     1.8 +            memcpy(elm->data, value, map->item_size);
     1.9          }
    1.10      } else {
    1.11          // allocate new element
    1.12          struct cx_hash_map_element_s *e = cxMalloc(
    1.13                  allocator,
    1.14 -                sizeof(struct cx_hash_map_element_s) + map->itemsize
    1.15 +                sizeof(struct cx_hash_map_element_s) + map->item_size
    1.16          );
    1.17          if (e == NULL) {
    1.18              return -1;
    1.19 @@ -119,7 +119,7 @@
    1.20          if (map->store_pointers) {
    1.21              memcpy(e->data, &value, sizeof(void *));
    1.22          } else {
    1.23 -            memcpy(e->data, value, map->itemsize);
    1.24 +            memcpy(e->data, value, map->item_size);
    1.25          }
    1.26  
    1.27          // copy the key
    1.28 @@ -434,10 +434,10 @@
    1.29  
    1.30      if (itemsize > 0) {
    1.31          map->base.store_pointers = false;
    1.32 -        map->base.itemsize = itemsize;
    1.33 +        map->base.item_size = itemsize;
    1.34      } else {
    1.35          map->base.store_pointers = true;
    1.36 -        map->base.itemsize = sizeof(void *);
    1.37 +        map->base.item_size = sizeof(void *);
    1.38      }
    1.39  
    1.40      return (CxMap *) map;