@@ -25,18 +25,19 @@ * @struct of_map_table_functions_t OFMapTable.h ObjFW/OFMapTable.h * * @brief A struct describing the functions to be used by the map table. */ typedef struct { - /// The function to retain keys / objects - void *_Nonnull (*_Nullable retain)(void *object); - /// The function to release keys / objects - void (*_Nullable release)(void *object); - /// The function to hash keys - uint32_t (*_Nullable hash)(void *object); - /// The function to compare keys / objects - bool (*_Nullable equal)(void *object1, void *object2); + /*! The function to retain keys / objects */ + void *_Nullable (*_Nullable retain)(void *_Nullable object); + /*! The function to release keys / objects */ + void (*_Nullable release)(void *_Nullable object); + /*! The function to hash keys */ + uint32_t (*_Nullable hash)(void *_Nullable object); + /*! The function to compare keys / objects */ + bool (*_Nullable equal)(void *_Nullable object1, + void *_Nullable object2); } of_map_table_functions_t; #ifdef OF_HAVE_BLOCKS /*! * @brief A block for enumerating an OFMapTable. @@ -68,11 +69,11 @@ * and objects should be retained, released, compared and hashed. */ @interface OFMapTable: OFObject { of_map_table_functions_t _keyFunctions, _objectFunctions; - struct of_map_table_bucket **_buckets; + struct of_map_table_bucket *_Nonnull *_Nullable _buckets; uint32_t _count, _capacity; uint8_t _rotate; unsigned long _mutations; } @@ -235,14 +236,14 @@ * keys or objects. */ @interface OFMapTableEnumerator: OFObject { OFMapTable *_mapTable; - struct of_map_table_bucket **_buckets; + struct of_map_table_bucket *_Nonnull *_Nullable _buckets; uint32_t _capacity; unsigned long _mutations; - unsigned long *_mutationsPtr; + unsigned long *_Nullable _mutationsPtr; uint32_t _position; } - init OF_UNAVAILABLE; @@ -249,15 +250,15 @@ /*! * @brief Returns the next object. * * @return The next object */ -- (void *)nextObject; +- (nullable void *)nextObject; /*! * @brief Resets the enumerator, so the next call to @ref nextKey returns the * first key again. */ - (void)reset; @end OF_ASSUME_NONNULL_END