ucx: comparison src/cx/map.h

-:b642eca4b956
+:3603bdf4a78b
 CxHashKey key
 );
 /**
 * Removes an element.
-*/
+*
-cx_attr_nonnull
+* Implementations SHALL check if \p targetbuf is set and copy the elements
-void *(*remove)(
+* to the buffer without invoking any destructor.
+* 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.
+*/
+cx_attr_nonnull_arg(1)
+cx_attr_access_w(3)
+int (*remove)(
 CxMap *map,
 CxHashKey key,
-bool destroy
+void *targetbuf
 );
 /**
 * Creates an iterator for this map.
 */
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* Always invokes the destructor function, if any, on the removed element.
+* Always invokes the destructors functions, if any, on the removed element.
-* If this map is storing pointers and you just want to retrieve the pointer
+*
-* without invoking the destructor, use cxMapRemoveAndGet().
+* @param map the map
-* If you just want to detach the element from the map without invoking the
+* @param key the key
-* destructor or returning the element, use cxMapDetach().
+* @return zero on success, non-zero if the key was not found
 *
-* @param map the map
-* @param key the key
 * @see cxMapRemoveAndGet()
-* @see cxMapDetach()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+static inline int cxMapRemove(
-static inline void cxMapRemove(
 CxMap *map,
 CxHashKey const &key
 ) {
-(void) map->cl->remove(map, key, true);
+return map->cl->remove(map, key, nullptr);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* Always invokes the destructor function, if any, on the removed element.
+* Always invokes the destructors functions, if any, on the removed element.
-* If this map is storing pointers and you just want to retrieve the pointer
+*
-* without invoking the destructor, use cxMapRemoveAndGet().
+* @param map the map
-* If you just want to detach the element from the map without invoking the
+* @param key the key
-* destructor or returning the element, use cxMapDetach().
+* @return zero on success, non-zero if the key was not found
 *
-* @param map the map
-* @param key the key
 * @see cxMapRemoveAndGet()
-* @see cxMapDetach()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+static inline int cxMapRemove(
-static inline void cxMapRemove(
 CxMap *map,
 cxstring const &key
 ) {
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), true);
+return map->cl->remove(map, cx_hash_key_cxstr(key), nullptr);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* Always invokes the destructor function, if any, on the removed element.
+* Always invokes the destructors functions, if any, on the removed element.
-* If this map is storing pointers and you just want to retrieve the pointer
+*
-* without invoking the destructor, use cxMapRemoveAndGet().
+* @param map the map
-* If you just want to detach the element from the map without invoking the
+* @param key the key
-* destructor or returning the element, use cxMapDetach().
+* @return zero on success, non-zero if the key was not found
 *
-* @param map the map
-* @param key the key
 * @see cxMapRemoveAndGet()
-* @see cxMapDetach()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+static inline int cxMapRemove(
-static inline void cxMapRemove(
 CxMap *map,
 cxmutstr const &key
 ) {
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), true);
+return map->cl->remove(map, cx_hash_key_cxstr(key), nullptr);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* Always invokes the destructor function, if any, on the removed element.
+* Always invokes the destructors functions, if any, on the removed element.
-* If this map is storing pointers and you just want to retrieve the pointer
+*
-* without invoking the destructor, use cxMapRemoveAndGet().
+* @param map the map
-* If you just want to detach the element from the map without invoking the
+* @param key the key
-* destructor or returning the element, use cxMapDetach().
+* @return zero on success, non-zero if the key was not found
 *
-* @param map the map
-* @param key the key
 * @see cxMapRemoveAndGet()
-* @see cxMapDetach()
 */
 cx_attr_nonnull
 cx_attr_cstr_arg(2)
-static inline void cxMapRemove(
+static inline int cxMapRemove(
 CxMap *map,
 const char *key
 ) {
-(void) map->cl->remove(map, cx_hash_key_str(key), true);
+return map->cl->remove(map, cx_hash_key_str(key), nullptr);
 }
 /**
-* Detaches a key/value-pair from the map by using the key
+* Removes a key/value-pair from the map by using the key.
-* without invoking the destructor.
+*
-*
+* This function will copy the contents to the target buffer
-* In general, you should only use this function if the map does not own
+* which must be guaranteed to be large enough to hold the element.
-* the data and there is a valid reference to the data somewhere else
+* The destructor functions, if any, will \em not be called.
-* in the program. In all other cases it is preferable to use
+*
-* cxMapRemove() or cxMapRemoveAndGet().
+* If this map is storing pointers, the element is the pointer itself
-*
+* and not the object it points to.
-* @param map the map
+*
-* @param key the key
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*
+* @see cxMapStorePointers()
 * @see cxMapRemove()
-* @see cxMapRemoveAndGet()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+cx_attr_access_w(3)
-static inline void cxMapDetach(
+static inline int cxMapRemoveAndGet(
 CxMap *map,
-CxHashKey const &key
+CxHashKey key,
-) {
+void *targetbuf
-(void) map->cl->remove(map, key, false);
+) {
-}
+return map->cl->remove(map, key, targetbuf);
+}
-/**
-* Detaches a key/value-pair from the map by using the key
+/**
-* without invoking the destructor.
+* Removes a key/value-pair from the map by using the key.
 *
-* In general, you should only use this function if the map does not own
+* This function will copy the contents to the target buffer
-* the data and there is a valid reference to the data somewhere else
+* which must be guaranteed to be large enough to hold the element.
-* in the program. In all other cases it is preferable to use
+* The destructor functions, if any, will \em not be called.
-* cxMapRemove() or cxMapRemoveAndGet().
+*
-*
+* If this map is storing pointers, the element is the pointer itself
-* @param map the map
+* and not the object it points to.
-* @param key the key
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*
+* @see cxMapStorePointers()
 * @see cxMapRemove()
-* @see cxMapRemoveAndGet()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+cx_attr_access_w(3)
-static inline void cxMapDetach(
+static inline int cxMapRemoveAndGet(
 CxMap *map,
-cxstring const &key
+cxstring key,
-) {
+void *targetbuf
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), false);
+) {
-}
+return map->cl->remove(map, cx_hash_key_cxstr(key), targetbuf);
+}
-/**
-* Detaches a key/value-pair from the map by using the key
+/**
-* without invoking the destructor.
+* Removes a key/value-pair from the map by using the key.
 *
-* In general, you should only use this function if the map does not own
+* This function will copy the contents to the target buffer
-* the data and there is a valid reference to the data somewhere else
+* which must be guaranteed to be large enough to hold the element.
-* in the program. In all other cases it is preferable to use
+* The destructor functions, if any, will \em not be called.
-* cxMapRemove() or cxMapRemoveAndGet().
+*
-*
+* If this map is storing pointers, the element is the pointer itself
-* @param map the map
+* and not the object it points to.
-* @param key the key
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*
+* @see cxMapStorePointers()
 * @see cxMapRemove()
-* @see cxMapRemoveAndGet()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+cx_attr_access_w(3)
-static inline void cxMapDetach(
+static inline int cxMapRemoveAndGet(
 CxMap *map,
-cxmutstr const &key
+cxmutstr key,
-) {
+void *targetbuf
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), false);
+) {
-}
+return map->cl->remove(map, cx_hash_key_cxstr(key), targetbuf);
+}
-/**
-* Detaches a key/value-pair from the map by using the key
+/**
-* without invoking the destructor.
+* Removes a key/value-pair from the map by using the key.
 *
-* In general, you should only use this function if the map does not own
+* This function will copy the contents to the target buffer
-* the data and there is a valid reference to the data somewhere else
+* which must be guaranteed to be large enough to hold the element.
-* in the program. In all other cases it is preferable to use
+* The destructor functions, if any, will \em not be called.
-* cxMapRemove() or cxMapRemoveAndGet().
+*
-*
+* If this map is storing pointers, the element is the pointer itself
-* @param map the map
+* and not the object it points to.
-* @param key the key
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*
+* @see cxMapStorePointers()
 * @see cxMapRemove()
-* @see cxMapRemoveAndGet()
+*/
-*/
+cx_attr_nonnull
-cx_attr_nonnull
+cx_attr_access_w(3)
 cx_attr_cstr_arg(2)
-static inline void cxMapDetach(
+static inline int cxMapRemoveAndGet(
 CxMap *map,
-const char *key
+const char *key,
-) {
+void *targetbuf
-(void) map->cl->remove(map, cx_hash_key_str(key), false);
+) {
-}
+return map->cl->remove(map, cx_hash_key_str(key), targetbuf);
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* This function can be used when the map is storing pointers,
-* in order to retrieve the pointer from the map without invoking
-* any destructor function. Sometimes you do not want the pointer
-* to be returned - in that case (instead of suppressing the "unused
-* result" warning) you can use cxMapDetach().
-*
-* If this map is not storing pointers, this function behaves like
-* cxMapRemove() and returns \c NULL.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-* @see cxMapStorePointers()
-* @see cxMapDetach()
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cxMapRemoveAndGet(
-CxMap *map,
-CxHashKey key
-) {
-return map->cl->remove(map, key, !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* This function can be used when the map is storing pointers,
-* in order to retrieve the pointer from the map without invoking
-* any destructor function. Sometimes you do not want the pointer
-* to be returned - in that case (instead of suppressing the "unused
-* result" warning) you can use cxMapDetach().
-*
-* If this map is not storing pointers, this function behaves like
-* cxMapRemove() and returns \c NULL.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-* @see cxMapStorePointers()
-* @see cxMapDetach()
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cxMapRemoveAndGet(
-CxMap *map,
-cxstring key
-) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* This function can be used when the map is storing pointers,
-* in order to retrieve the pointer from the map without invoking
-* any destructor function. Sometimes you do not want the pointer
-* to be returned - in that case (instead of suppressing the "unused
-* result" warning) you can use cxMapDetach().
-*
-* If this map is not storing pointers, this function behaves like
-* cxMapRemove() and returns \c NULL.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-* @see cxMapStorePointers()
-* @see cxMapDetach()
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cxMapRemoveAndGet(
-CxMap *map,
-cxmutstr key
-) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* This function can be used when the map is storing pointers,
-* in order to retrieve the pointer from the map without invoking
-* any destructor function. Sometimes you do not want the pointer
-* to be returned - in that case (instead of suppressing the "unused
-* result" warning) you can use cxMapDetach().
-*
-* If this map is not storing pointers, this function behaves like
-* cxMapRemove() and returns \c NULL.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-* @see cxMapStorePointers()
-* @see cxMapDetach()
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-cx_attr_cstr_arg(2)
-static inline void *cxMapRemoveAndGet(
-CxMap *map,
-const char *key
-) {
-return map->cl->remove(map, cx_hash_key_str(key), !map->collection.store_pointer);
 }
 #else // __cplusplus
 /**
 (map, key)
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* @param map the map
+* Always invokes the destructors functions, if any, on the removed element.
-* @param key the key
+*
-*/
+* @param map the map
-cx_attr_nonnull
+* @param key the key
-static inline void cx_map_remove(
+* @return zero on success, non-zero if the key was not found
+*/
+cx_attr_nonnull
+static inline int cx_map_remove(
 CxMap *map,
 CxHashKey key
 ) {
-(void) map->cl->remove(map, key, true);
+return map->cl->remove(map, key, NULL);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* @param map the map
+* Always invokes the destructors functions, if any, on the removed element.
-* @param key the key
+*
-*/
+* @param map the map
-cx_attr_nonnull
+* @param key the key
-static inline void cx_map_remove_cxstr(
+* @return zero on success, non-zero if the key was not found
+*/
+cx_attr_nonnull
+static inline int cx_map_remove_cxstr(
 CxMap *map,
 cxstring key
 ) {
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), true);
+return map->cl->remove(map, cx_hash_key_cxstr(key), NULL);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* @param map the map
+* Always invokes the destructors functions, if any, on the removed element.
-* @param key the key
+*
-*/
+* @param map the map
-cx_attr_nonnull
+* @param key the key
-static inline void cx_map_remove_mustr(
+* @return zero on success, non-zero if the key was not found
+*/
+cx_attr_nonnull
+static inline int cx_map_remove_mustr(
 CxMap *map,
 cxmutstr key
 ) {
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), true);
+return map->cl->remove(map, cx_hash_key_cxstr(key), NULL);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* @param map the map
+* Always invokes the destructors functions, if any, on the removed element.
-* @param key the key
+*
+* @param map the map
+* @param key the key
+* @return zero on success, non-zero if the key was not found
 */
 cx_attr_nonnull
 cx_attr_cstr_arg(2)
-static inline void cx_map_remove_str(
+static inline int cx_map_remove_str(
 CxMap *map,
 const char *key
 ) {
-(void) map->cl->remove(map, cx_hash_key_str(key), true);
+return map->cl->remove(map, cx_hash_key_str(key), NULL);
 }
 /**
 * Removes a key/value-pair from the map by using the key.
 *
-* Always invokes the destructor function, if any, on the removed element.
+* Always invokes the destructors functions, if any, on the removed element.
-* If this map is storing pointers and you just want to retrieve the pointer
+*
-* without invoking the destructor, use cxMapRemoveAndGet().
+* @param map the map
-* If you just want to detach the element from the map without invoking the
+* @param key the key
-* destructor or returning the element, use cxMapDetach().
+* @return zero on success, non-zero if the key was not found
 *
-* @param map the map
-* @param key the key
 * @see cxMapRemoveAndGet()
-* @see cxMapDetach()
 */
 #define cxMapRemove(map, key) _Generic((key), \
 CxHashKey: cx_map_remove,                 \
 cxstring: cx_map_remove_cxstr,            \
 cxmutstr: cx_map_remove_mustr,            \
 char*: cx_map_remove_str,                 \
 const char*: cx_map_remove_str)           \
 (map, key)
 /**
-* Detaches a key/value-pair from the map by using the key
+* Removes a key/value-pair from the map by using the key.
-* without invoking the destructor.
+*
-*
+* This function will copy the contents to the target buffer
-* @param map the map
+* which must be guaranteed to be large enough to hold the element.
-* @param key the key
+* The destructor functions, if any, will \em not be called.
-*/
+*
-cx_attr_nonnull
+* If this map is storing pointers, the element is the pointer itself
-static inline void cx_map_detach(
+* and not the object it points to.
-CxMap *map,
+*
-CxHashKey key
+* @param map the map
-) {
+* @param key the key
-(void) map->cl->remove(map, key, false);
+* @param targetbuf the buffer where the element shall be copied to
-}
+* @return zero on success, non-zero if the key was not found
+*/
-/**
+cx_attr_nonnull
-* Detaches a key/value-pair from the map by using the key
+cx_attr_access_w(3)
-* without invoking the destructor.
+static inline int cx_map_remove_and_get(
-*
+CxMap *map,
-* @param map the map
+CxHashKey key,
-* @param key the key
+void *targetbuf
-*/
+) {
-cx_attr_nonnull
+return map->cl->remove(map, key, targetbuf);
-static inline void cx_map_detach_cxstr(
+}
-CxMap *map,
-cxstring key
+/**
-) {
+* Removes a key/value-pair from the map by using the key.
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), false);
+*
-}
+* This function will copy the contents to the target buffer
+* which must be guaranteed to be large enough to hold the element.
-/**
+* The destructor functions, if any, will \em not be called.
-* Detaches a key/value-pair from the map by using the key
+*
-* without invoking the destructor.
+* If this map is storing pointers, the element is the pointer itself
-*
+* and not the object it points to.
-* @param map the map
+*
-* @param key the key
+* @param map the map
-*/
+* @param key the key
-cx_attr_nonnull
+* @param targetbuf the buffer where the element shall be copied to
-static inline void cx_map_detach_mustr(
+* @return zero on success, non-zero if the key was not found
-CxMap *map,
+*/
-cxmutstr key
+cx_attr_nonnull
-) {
+cx_attr_access_w(3)
-(void) map->cl->remove(map, cx_hash_key_cxstr(key), false);
+static inline int cx_map_remove_and_get_cxstr(
-}
+CxMap *map,
+cxstring key,
-/**
+void *targetbuf
-* Detaches a key/value-pair from the map by using the key
+) {
-* without invoking the destructor.
+return map->cl->remove(map, cx_hash_key_cxstr(key), targetbuf);
-*
+}
-* @param map the map
-* @param key the key
+/**
-*/
+* Removes a key/value-pair from the map by using the key.
-cx_attr_nonnull
+*
+* This function will copy the contents to the target buffer
+* which must be guaranteed to be large enough to hold the element.
+* The destructor functions, if any, will \em not be called.
+*
+* If this map is storing pointers, the element is the pointer itself
+* and not the object it points to.
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*/
+cx_attr_nonnull
+cx_attr_access_w(3)
+static inline int cx_map_remove_and_get_mustr(
+CxMap *map,
+cxmutstr key,
+void *targetbuf
+) {
+return map->cl->remove(map, cx_hash_key_cxstr(key), targetbuf);
+}
+/**
+* Removes a key/value-pair from the map by using the key.
+*
+* This function will copy the contents to the target buffer
+* which must be guaranteed to be large enough to hold the element.
+* The destructor functions, if any, will \em not be called.
+*
+* If this map is storing pointers, the element is the pointer itself
+* and not the object it points to.
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*/
+cx_attr_nonnull
+cx_attr_access_w(3)
 cx_attr_cstr_arg(2)
-static inline void cx_map_detach_str(
+static inline int cx_map_remove_and_get_str(
 CxMap *map,
-const char *key
+const char *key,
-) {
+void *targetbuf
-(void) map->cl->remove(map, cx_hash_key_str(key), false);
+) {
-}
+return map->cl->remove(map, cx_hash_key_str(key), targetbuf);
+}
-/**
-* Detaches a key/value-pair from the map by using the key
+/**
-* without invoking the destructor.
+* Removes a key/value-pair from the map by using the key.
 *
-* In general, you should only use this function if the map does not own
+* This function will copy the contents to the target buffer
-* the data and there is a valid reference to the data somewhere else
+* which must be guaranteed to be large enough to hold the element.
-* in the program. In all other cases it is preferable to use
+* The destructor functions, if any, will \em not be called.
-* cxMapRemove() or cxMapRemoveAndGet().
+*
-*
+* If this map is storing pointers, the element is the pointer itself
-* @param map the map
+* and not the object it points to.
-* @param key the key
+*
+* @param map the map
+* @param key the key
+* @param targetbuf the buffer where the element shall be copied to
+* @return zero on success, non-zero if the key was not found
+*
+* @see cxMapStorePointers()
 * @see cxMapRemove()
-* @see cxMapRemoveAndGet()
+*/
-*/
+#define cxMapRemoveAndGet(map, key, targetbuf) _Generic((key), \
-#define cxMapDetach(map, key) _Generic((key), \
-CxHashKey: cx_map_detach,                 \
-cxstring: cx_map_detach_cxstr,            \
-cxmutstr: cx_map_detach_mustr,            \
-char*: cx_map_detach_str,                 \
-const char*: cx_map_detach_str)           \
-(map, key)
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cx_map_remove_and_get(
-CxMap *map,
-CxHashKey key
-) {
-return map->cl->remove(map, key, !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cx_map_remove_and_get_cxstr(
-CxMap *map,
-cxstring key
-) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-static inline void *cx_map_remove_and_get_mustr(
-CxMap *map,
-cxmutstr key
-) {
-return map->cl->remove(map, cx_hash_key_cxstr(key), !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-*/
-cx_attr_nonnull
-cx_attr_nodiscard
-cx_attr_cstr_arg(2)
-static inline void *cx_map_remove_and_get_str(
-CxMap *map,
-const char *key
-) {
-return map->cl->remove(map, cx_hash_key_str(key), !map->collection.store_pointer);
-}
-/**
-* Removes a key/value-pair from the map by using the key.
-*
-* This function can be used when the map is storing pointers,
-* in order to retrieve the pointer from the map without invoking
-* any destructor function. Sometimes you do not want the pointer
-* to be returned - in that case (instead of suppressing the "unused
-* result" warning) you can use cxMapDetach().
-*
-* If this map is not storing pointers, this function behaves like
-* cxMapRemove() and returns \c NULL.
-*
-* @param map the map
-* @param key the key
-* @return the stored pointer or \c NULL if either the key is not present
-* in the map or the map is not storing pointers
-* @see cxMapStorePointers()
-* @see cxMapDetach()
-*/
-#define cxMapRemoveAndGet(map, key) _Generic((key), \
 CxHashKey: cx_map_remove_and_get,               \
 cxstring: cx_map_remove_and_get_cxstr,          \
 cxmutstr: cx_map_remove_and_get_mustr,          \
 char*: cx_map_remove_and_get_str,               \
 const char*: cx_map_remove_and_get_str)         \
-(map, key)
+(map, key, targetbuf)
 #endif // __cplusplus
 #endif // UCX_MAP_H

Mercurial > hg > ucx / file comparison

comparison: src/cx/map.h

src/cx/map.h