Move GCC attributes into a centraized defines

Instead of having ifdef __GNUC__ all over the headers
to use special compiler's hints use a special file where
all things like this are concentrated.

Makes code easier to follow and allows to manage special
attributes in more efficient way.

Thanks Campbell for review!

1 files changed, 24 insertions, 36 deletions

diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h
index db32190494a..4aef2318683 100644
--- a/source/blender/blenlib/BLI_string_utf8.h
+++ b/source/blender/blenlib/BLI_string_utf8.h
@@ -31,57 +31,45 @@
 extern "C" {
 #endif
 
-#ifdef __GNUC__
-#  define ATTR_NONULL __attribute__((nonnull))
-#  define ATTR_NONULL_FIRST  __attribute__((nonnull(1)))
-#  define ATTR_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-#  define ATTR_NONULL
-#  define ATTR_NONULL_FIRST
-#  define ATTR_UNUSED_RESULT
-#endif
+#include "BLI_compiler_attrs.h"
 
-char        *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy)  ATTR_NONULL;
-char        *BLI_strncat_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy)  ATTR_NONULL;
-int          BLI_utf8_invalid_byte(const char *str, int length)  ATTR_NONULL;
-int          BLI_utf8_invalid_strip(char *str, int length)  ATTR_NONULL;
+char        *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL();
+char        *BLI_strncat_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL();
+int          BLI_utf8_invalid_byte(const char *str, int length) ATTR_NONNULL();
+int          BLI_utf8_invalid_strip(char *str, int length) ATTR_NONNULL();
 
-int          BLI_str_utf8_size(const char *p)  ATTR_NONULL; /* warning, can return -1 on bad chars */
-int          BLI_str_utf8_size_safe(const char *p)  ATTR_NONULL;
+int          BLI_str_utf8_size(const char *p) ATTR_NONNULL(); /* warning, can return -1 on bad chars */
+int          BLI_str_utf8_size_safe(const char *p) ATTR_NONNULL();
 /* copied from glib */
-unsigned int BLI_str_utf8_as_unicode(const char *p)  ATTR_NONULL;
-unsigned int BLI_str_utf8_as_unicode_and_size(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
-unsigned int BLI_str_utf8_as_unicode_and_size_safe(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
-unsigned int BLI_str_utf8_as_unicode_step(const char *__restrict p, size_t *__restrict index)  ATTR_NONULL;
+unsigned int BLI_str_utf8_as_unicode(const char *p) ATTR_NONNULL();
+unsigned int BLI_str_utf8_as_unicode_and_size(const char *__restrict p, size_t *__restrict index) ATTR_NONNULL();
+unsigned int BLI_str_utf8_as_unicode_and_size_safe(const char *__restrict p, size_t *__restrict index) ATTR_NONNULL();
+unsigned int BLI_str_utf8_as_unicode_step(const char *__restrict p, size_t *__restrict index) ATTR_NONNULL();
 size_t       BLI_str_utf8_from_unicode(unsigned int c, char *outbuf);
 
-char        *BLI_str_find_prev_char_utf8(const char *str, const char *p)  ATTR_NONULL;
-char        *BLI_str_find_next_char_utf8(const char *p, const char *end)  ATTR_NONULL_FIRST;
-char        *BLI_str_prev_char_utf8(const char *p)  ATTR_NONULL;
+char        *BLI_str_find_prev_char_utf8(const char *str, const char *p) ATTR_NONNULL();
+char        *BLI_str_find_next_char_utf8(const char *p, const char *end) ATTR_NONNULL(1);
+char        *BLI_str_prev_char_utf8(const char *p)  ATTR_NONNULL();
 
 /* wchar_t functions, copied from blenders own font.c originally */
-size_t       BLI_wstrlen_utf8(const wchar_t *src)  ATTR_NONULL;
-size_t       BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes)  ATTR_NONULL;
-size_t       BLI_strlen_utf8(const char *strc)  ATTR_NONULL;
-size_t       BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, size_t *r_len_bytes)  ATTR_NONULL;
-size_t       BLI_strnlen_utf8(const char *strc, const size_t maxlen)  ATTR_NONULL;
-size_t       BLI_strncpy_wchar_as_utf8(char *__restrict dst, const wchar_t *__restrict src, const size_t maxcpy)  ATTR_NONULL;
-size_t       BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst, const char *__restrict src, const size_t maxcpy)  ATTR_NONULL;
+size_t       BLI_wstrlen_utf8(const wchar_t *src)  ATTR_NONNULL();
+size_t       BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes) ATTR_NONNULL();
+size_t       BLI_strlen_utf8(const char *strc)  ATTR_NONNULL();
+size_t       BLI_strnlen_utf8_ex(const char *strc, const size_t maxlen, size_t *r_len_bytes) ATTR_NONNULL();
+size_t       BLI_strnlen_utf8(const char *strc, const size_t maxlen)  ATTR_NONNULL();
+size_t       BLI_strncpy_wchar_as_utf8(char *__restrict dst, const wchar_t *__restrict src, const size_t maxcpy) ATTR_NONNULL();
+size_t       BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst, const char *__restrict src, const size_t maxcpy) ATTR_NONNULL();
 
 /* count columns that character/string occupies, based on wcwidth.c */
 int          BLI_wcwidth(wchar_t ucs);
-int          BLI_wcswidth(const wchar_t *pwcs, size_t n)  ATTR_NONULL;
-int          BLI_str_utf8_char_width(const char *p)  ATTR_NONULL; /* warning, can return -1 on bad chars */
-int          BLI_str_utf8_char_width_safe(const char *p)  ATTR_NONULL;
+int          BLI_wcswidth(const wchar_t *pwcs, size_t n) ATTR_NONNULL();
+int          BLI_str_utf8_char_width(const char *p) ATTR_NONNULL(); /* warning, can return -1 on bad chars */
+int          BLI_str_utf8_char_width_safe(const char *p) ATTR_NONNULL();
 
 #define      BLI_UTF8_MAX 6        /* mem */
 #define      BLI_UTF8_WIDTH_MAX 2  /* columns */
 #define      BLI_UTF8_ERR ((unsigned int)-1)
 
-#undef ATTR_NONULL
-#undef ATTR_NONULL_FIRST
-#undef ATTR_UNUSED_RESULT
-
 #ifdef __cplusplus
 }
 #endif