Properly detect attribute format types (netdata#17685)

webfutureiorepo · May 17, 2024 · 12b178c · 12b178c
1 parent 7a6d0c9
commit 12b178c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -486,10 +486,15 @@ int main() {
 }
 " HAVE_BUILTIN_ATOMICS)
 
+check_c_source_compiles("
+void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2)));
+int main() { return 0; }
+" HAVE_FUNC_ATTRIBUTE_FORMAT_GNU_PRINTF FAIL_REGEX "warning:")
+
 check_c_source_compiles("
 void my_printf(char const *s, ...) __attribute__((format(printf, 1, 2)));
 int main() { return 0; }
-" HAVE_FUNC_ATTRIBUTE_FORMAT)
+" HAVE_FUNC_ATTRIBUTE_FORMAT_PRINTF FAIL_REGEX "warning:")
 
 check_c_source_compiles("
 #include <stdio.h>

diff --git a/packaging/cmake/config.cmake.h.in b/packaging/cmake/config.cmake.h.in
@@ -94,7 +94,8 @@
 #cmakedefine HAVE_STRNDUP
 #cmakedefine SSL_HAS_PENDING
 
-#cmakedefine HAVE_FUNC_ATTRIBUTE_FORMAT
+#cmakedefine HAVE_FUNC_ATTRIBUTE_FORMAT_GNU_PRINTF
+#cmakedefine HAVE_FUNC_ATTRIBUTE_FORMAT_PRINTF
 #cmakedefine HAVE_FUNC_ATTRIBUTE_MALLOC
 #cmakedefine HAVE_FUNC_ATTRIBUTE_NOINLINE
 #cmakedefine HAVE_FUNC_ATTRIBUTE_NORETURN

diff --git a/src/collectors/log2journal/log2journal.h b/src/collectors/log2journal/log2journal.h
@@ -32,9 +32,9 @@ static inline char *os_strndup( const char *s1, size_t n)
 #define strndup(s, n) os_strndup(s, n)
 #endif
 
-#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT) && !defined(COMPILED_FOR_MACOS)
+#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT_GNU_PRINTF)
 #define PRINTFLIKE(f, a) __attribute__ ((format(gnu_printf, f, a)))
-#elif defined(HAVE_FUNC_ATTRIBUTE_FORMAT)
+#elif defined(HAVE_FUNC_ATTRIBUTE_FORMAT_PRINTF)
 #define PRINTFLIKE(f, a) __attribute__ ((format(printf, f, a)))
 #else
 #define PRINTFLIKE(f, a)

diff --git a/src/libnetdata/libnetdata.h b/src/libnetdata/libnetdata.h
@@ -291,9 +291,9 @@ typedef uint32_t uid_t;
 #define MALLOCLIKE
 #endif
 
-#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT) && !defined(COMPILED_FOR_MACOS)
+#if defined(HAVE_FUNC_ATTRIBUTE_FORMAT_GNU_PRINTF)
 #define PRINTFLIKE(f, a) __attribute__ ((format(gnu_printf, f, a)))
-#elif defined(HAVE_FUNC_ATTRIBUTE_FORMAT)
+#elif defined(HAVE_FUNC_ATTRIBUTE_FORMAT_PRINTF)
 #define PRINTFLIKE(f, a) __attribute__ ((format(printf, f, a)))
 #else
 #define PRINTFLIKE(f, a)