src/hash_map.c

changeset 855
35bcb3216c0d
parent 854
fe0d69d72bcd
child 856
6bbbf219251d
     1.1 --- a/src/hash_map.c	Thu May 23 20:29:28 2024 +0200
     1.2 +++ b/src/hash_map.c	Thu May 23 20:31:37 2024 +0200
     1.3 @@ -107,13 +107,13 @@
     1.4          if (map->base.store_pointer) {
     1.5              memcpy(elm->data, &value, sizeof(void *));
     1.6          } else {
     1.7 -            memcpy(elm->data, value, map->base.item_size);
     1.8 +            memcpy(elm->data, value, map->base.elem_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->base.item_size
    1.15 +                sizeof(struct cx_hash_map_element_s) + map->base.elem_size
    1.16          );
    1.17          if (e == NULL) {
    1.18              return -1;
    1.19 @@ -123,7 +123,7 @@
    1.20          if (map->base.store_pointer) {
    1.21              memcpy(e->data, &value, sizeof(void *));
    1.22          } else {
    1.23 -            memcpy(e->data, value, map->base.item_size);
    1.24 +            memcpy(e->data, value, map->base.elem_size);
    1.25          }
    1.26  
    1.27          // copy the key
    1.28 @@ -342,7 +342,7 @@
    1.29              iter.base.current = cx_hash_map_iter_current_key;
    1.30              break;
    1.31          case CX_MAP_ITERATOR_VALUES:
    1.32 -            iter.elem_size = map->base.item_size;
    1.33 +            iter.elem_size = map->base.elem_size;
    1.34              iter.base.current = cx_hash_map_iter_current_value;
    1.35              break;
    1.36          default:
    1.37 @@ -417,10 +417,10 @@
    1.38  
    1.39      if (itemsize > 0) {
    1.40          map->base.base.store_pointer = false;
    1.41 -        map->base.base.item_size = itemsize;
    1.42 +        map->base.base.elem_size = itemsize;
    1.43      } else {
    1.44          map->base.base.store_pointer = true;
    1.45 -        map->base.base.item_size = sizeof(void *);
    1.46 +        map->base.base.elem_size = sizeof(void *);
    1.47      }
    1.48  
    1.49      return (CxMap *) map;

mercurial