@@ -106,13 +106,13 @@ # define OF_BIGGEST_ALIGNMENT 16 # endif #endif #ifdef __GNUC__ -# define __GCC_VERSION__ (__GNUC__ * 100 + __GNUC_MINOR__) +# define OF_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #else -# define __GCC_VERSION__ 0 +# define OF_GCC_VERSION 0 #endif #ifndef __has_feature # define __has_feature(x) 0 #endif @@ -196,17 +196,17 @@ # define OF_KINDOF(cls) __kindof cls #else # define OF_KINDOF(cls) id #endif -#if defined(__clang__) || __GCC_VERSION__ >= 405 +#if defined(__clang__) || OF_GCC_VERSION >= 405 # define OF_UNREACHABLE __builtin_unreachable(); #else # define OF_UNREACHABLE abort(); #endif -#if defined(__clang__) || __GCC_VERSION__ >= 406 +#if defined(__clang__) || OF_GCC_VERSION >= 406 # define OF_SENTINEL __attribute__((__sentinel__)) # define OF_NO_RETURN __attribute__((__noreturn__)) #else # define OF_SENTINEL # define OF_NO_RETURN @@ -602,29 +602,29 @@ OF_HASH_ADD(hash, (otherCopy >> 8) & 0xFF); \ OF_HASH_ADD(hash, otherCopy & 0xFF); \ } static OF_INLINE bool -of_bitset_isset(uint8_t *storage, size_t index) +of_bitset_isset(uint8_t *_Nonnull storage, size_t idx) { - return storage[index / 8] & (1 << (index % 8)); + return storage[idx / 8] & (1 << (idx % 8)); } static OF_INLINE void -of_bitset_set(uint8_t *storage, size_t index) +of_bitset_set(uint8_t *_Nonnull storage, size_t idx) { - storage[index / 8] |= (1 << (index % 8)); + storage[idx / 8] |= (1 << (idx % 8)); } static OF_INLINE void -of_bitset_clear(uint8_t *storage, size_t index) +of_bitset_clear(uint8_t *_Nonnull storage, size_t idx) { - storage[index / 8] &= ~(1 << (index % 8)); + storage[idx / 8] &= ~(1 << (idx % 8)); } -static OF_INLINE char * -of_strdup(const char *string) +static OF_INLINE char *_Nullable +of_strdup(const char *_Nonnull string) { char *copy; size_t length = strlen(string); if ((copy = (char *)malloc(length + 1)) == NULL) @@ -634,11 +634,11 @@ return copy; } static OF_INLINE void -of_explicit_memset(void *buffer_, int character, size_t length) +of_explicit_memset(void *_Nonnull buffer_, int character, size_t length) { volatile unsigned char *buffer = (volatile unsigned char *)buffer_; while (buffer < (unsigned char *)buffer_ + length) *buffer++ = character;