1.1 --- a/src/cx/map.h Thu May 19 14:30:20 2022 +0200
1.2 +++ b/src/cx/map.h Sat May 21 11:22:47 2022 +0200
1.3 @@ -113,19 +113,19 @@
1.4 * Iterator over the key/value pairs.
1.5 */
1.6 __attribute__((__nonnull__, __warn_unused_result__))
1.7 - CxIterator (*iterator)(CxMap const *map);
1.8 + CxIterator (*iterator)(CxMap *map);
1.9
1.10 /**
1.11 * Iterator over the keys.
1.12 */
1.13 __attribute__((__nonnull__, __warn_unused_result__))
1.14 - CxIterator (*iterator_keys)(CxMap const *map);
1.15 + CxIterator (*iterator_keys)(CxMap *map);
1.16
1.17 /**
1.18 * Iterator over the values.
1.19 */
1.20 __attribute__((__nonnull__, __warn_unused_result__))
1.21 - CxIterator (*iterator_values)(CxMap const *map);
1.22 + CxIterator (*iterator_values)(CxMap *map);
1.23 };
1.24
1.25 /**
1.26 @@ -133,13 +133,13 @@
1.27 */
1.28 struct cx_map_entry_s {
1.29 /**
1.30 - * The key.
1.31 + * A pointer to the key.
1.32 */
1.33 - CxDataPtr key;
1.34 + CxDataPtr const *key;
1.35 /**
1.36 - * The value.
1.37 + * A pointer to the value.
1.38 */
1.39 - void const *value;
1.40 + void *value;
1.41 };
1.42
1.43
1.44 @@ -224,7 +224,7 @@
1.45 * @return an iterator for the currently stored values
1.46 */
1.47 __attribute__((__nonnull__, __warn_unused_result__))
1.48 -static inline CxIterator cxMapIteratorValues(CxMap const *map) {
1.49 +static inline CxIterator cxMapIteratorValues(CxMap *map) {
1.50 return map->cl->iterator_values(map);
1.51 }
1.52
1.53 @@ -238,7 +238,7 @@
1.54 * @return an iterator for the currently stored keys
1.55 */
1.56 __attribute__((__nonnull__, __warn_unused_result__))
1.57 -static inline CxIterator cxMapIteratorKeys(CxMap const *map) {
1.58 +static inline CxIterator cxMapIteratorKeys(CxMap *map) {
1.59 return map->cl->iterator_keys(map);
1.60 }
1.61
1.62 @@ -256,7 +256,7 @@
1.63 * @see cxMapIteratorValues()
1.64 */
1.65 __attribute__((__nonnull__, __warn_unused_result__))
1.66 -static inline CxIterator cxMapIterator(CxMap const *map) {
1.67 +static inline CxIterator cxMapIterator(CxMap *map) {
1.68 return map->cl->iterator(map);
1.69 }
1.70
