ucx: comparison src/cx/map.h

-:83284b289430
+:3a89b31f0724
 * Add or overwrite an element.
 * If the @p value is @c NULL, the implementation
 * shall only allocate memory instead of adding an existing value to the map.
 * Returns a pointer to the allocated memory or @c NULL if allocation fails.
 */
-void *(*put)(
+void *(*put)(CxMap *map, CxHashKey key, void *value);
-CxMap *map,
-CxHashKey key,
-void *value
-);
 /**
 * Returns an element.
 */
-void *(*get)(
+void *(*get)(const CxMap *map, CxHashKey key);
-const CxMap *map,
-CxHashKey key
-);
 /**
 * Removes an element.
 *
 * Implementations SHALL check if @p targetbuf is set and copy the elements
 * When @p targetbuf is not set, the destructors SHALL be invoked.
 *
 * The function SHALL return zero when the @p key was found and
 * non-zero, otherwise.
 */
-int (*remove)(
+int (*remove)(CxMap *map, CxHashKey key, void *targetbuf);
-CxMap *map,
-CxHashKey key,
-void *targetbuf
-);
 /**
 * Creates an iterator for this map.
 */
 CxMapIterator (*iterator)(const CxMap *map, enum cx_map_iterator_type type);
 * Writing to that map is not allowed.
 *
 * You can use this as a placeholder for initializing CxMap pointers
 * for which you do not want to reserve memory right from the beginning.
 */
-cx_attr_export
+CX_EXPORT extern CxMap *const cxEmptyMap;
-extern CxMap *const cxEmptyMap;
 /**
 * Deallocates the memory of the specified map.
 *
 * Also calls the content destructor functions for each element, if specified.
 *
 * @param map the map to be freed
 */
-cx_attr_export
+CX_EXPORT void cxMapFree(CxMap *map);
-void cxMapFree(CxMap *map);
 /**
 * Clears a map by removing all elements.
 *
 * Also calls the content destructor functions for each element, if specified.
 *
 * @param map the map to be cleared
 */
 cx_attr_nonnull
-static inline void cxMapClear(CxMap *map) {
+CX_EXPORT void cxMapClear(CxMap *map);
-map->cl->clear(map);
-}
 /**
 * Returns the number of elements in this map.
 *
 * @param map the map
 * @return the number of stored elements
 */
 cx_attr_nonnull
-static inline size_t cxMapSize(const CxMap *map) {
+CX_EXPORT size_t cxMapSize(const CxMap *map);
-return map->collection.size;
-}
 /**
 * Creates a value iterator for a map.
 *
 * When the map is storing pointers, those pointers are returned.
 *
 * @param map the map to create the iterator for (can be @c NULL)
 * @return an iterator for the currently stored values
 */
 cx_attr_nodiscard
-static inline CxMapIterator cxMapIteratorValues(const CxMap *map) {
+CX_EXPORT CxMapIterator cxMapIteratorValues(const CxMap *map);
-if (map == NULL) map = cxEmptyMap;
-return map->cl->iterator(map, CX_MAP_ITERATOR_VALUES);
-}
 /**
 * Creates a key iterator for a map.
 *
 * The elements of the iterator are keys of type CxHashKey, and the pointer returned
 *
 * @param map the map to create the iterator for (can be @c NULL)
 * @return an iterator for the currently stored keys
 */
 cx_attr_nodiscard
-static inline CxMapIterator cxMapIteratorKeys(const CxMap *map) {
+CX_EXPORT CxMapIterator cxMapIteratorKeys(const CxMap *map);
-if (map == NULL) map = cxEmptyMap;
-return map->cl->iterator(map, CX_MAP_ITERATOR_KEYS);
-}
 /**
 * Creates an iterator for a map.
 *
 * The elements of the iterator are key/value pairs of type CxMapEntry, and the pointer returned
 * @return an iterator for the currently stored entries
 * @see cxMapIteratorKeys()
 * @see cxMapIteratorValues()
 */
 cx_attr_nodiscard
-static inline CxMapIterator cxMapIterator(const CxMap *map) {
+CX_EXPORT CxMapIterator cxMapIterator(const CxMap *map);
-if (map == NULL) map = cxEmptyMap;
-return map->cl->iterator(map, CX_MAP_ITERATOR_PAIRS);
-}
 /**
 * Creates a mutating iterator over the values of a map.
 *
 * When the map is storing pointers, those pointers are returned.
 *
 * @param map the map to create the iterator for (can be @c NULL)
 * @return an iterator for the currently stored values
 */
 cx_attr_nodiscard
-cx_attr_export
+CX_EXPORT CxMapIterator cxMapMutIteratorValues(CxMap *map);
-CxMapIterator cxMapMutIteratorValues(CxMap *map);
 /**
 * Creates a mutating iterator over the keys of a map.
 *
 * The elements of the iterator are keys of type CxHashKey, and the pointer returned
 *
 * @param map the map to create the iterator for (can be @c NULL)
 * @return an iterator for the currently stored keys
 */
 cx_attr_nodiscard
-cx_attr_export
+CX_EXPORT CxMapIterator cxMapMutIteratorKeys(CxMap *map);
-CxMapIterator cxMapMutIteratorKeys(CxMap *map);
 /**
 * Creates a mutating iterator for a map.
 *
 * The elements of the iterator are key/value pairs of type CxMapEntry, and the pointer returned
 * @return an iterator for the currently stored entries
 * @see cxMapMutIteratorKeys()
 * @see cxMapMutIteratorValues()
 */
 cx_attr_nodiscard
-cx_attr_export
+CX_EXPORT CxMapIterator cxMapMutIterator(CxMap *map);
-CxMapIterator cxMapMutIterator(CxMap *map);
 /**
 * Puts a key/value-pair into the map.
 *
 * A possible existing value will be overwritten.
 * @retval zero success
 * @retval non-zero value on memory allocation failure
 * @see cxMapPut()
 */
 cx_attr_nonnull
-static inline int cx_map_put(
+CX_EXPORT int cx_map_put(CxMap *map, CxHashKey key, void *value);
-CxMap *map,
-CxHashKey key,
-void *value
-) {
-return map->cl->put(map, key, value) == NULL;
-}
 /**
 * Puts a key/value-pair into the map.
 *
 * A possible existing value will be overwritten.
 * @retval zero success
 * @retval non-zero value on memory allocation failure
 * @see cxMapEmplace()
 */
 cx_attr_nonnull
-static inline void *cx_map_emplace(
+CX_EXPORT void *cx_map_emplace(CxMap *map, CxHashKey key);
-CxMap *map,
-CxHashKey key
-) {
-return map->cl->put(map, key, NULL);
-}
 /**
 * Allocates memory for a value in the map associated with the specified key.
 *
 * A possible existing value will be overwritten.
 * @param map the map
 * @param key the key
 * @return the value
 * @see cxMapGet()
 */
-cx_attr_nonnull
+cx_attr_nonnull cx_attr_nodiscard
-cx_attr_nodiscard
+CX_EXPORT void *cx_map_get(const CxMap *map, CxHashKey key);
-static inline void *cx_map_get(
-const CxMap *map,
-CxHashKey key
-) {
-return map->cl->get(map, key);
-}
 /**
 * Retrieves a value by using a key.
 *
 * If this map is storing pointers, the stored pointer is returned.
 *
 * @see cxMapRemove()
 * @see cxMapRemoveAndGet()
 */
 cx_attr_nonnull_arg(1)
-static inline int cx_map_remove(
+CX_EXPORT int cx_map_remove(CxMap *map, CxHashKey key, void *targetbuf);
-CxMap *map,
-CxHashKey key,
-void *targetbuf
-) {
-return map->cl->remove(map, key, targetbuf);
-}
 /**
 * Removes a key/value-pair from the map by using the key.
 *
 * Always invokes the destructor functions, if any, on the removed element.

Mercurial > hg > ucx / file comparison

comparison: src/cx/map.h

src/cx/map.h