luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mark up warnings/critical functions for clang analyzer

Browse Source 
The clang code analyzer needs to know that functions like g_error
g_critical an g_return_if_fail should be seen by the analyzer in the
same way as g_assert(). That is the analyzer should think they are
fatal.

https://bugzilla.gnome.org/show_bug.cgi?id=700268
This commit is contained in:
Stef Walter 2013-05-14 08:49:55 +02:00 committed by Matthias Clasen
parent 547df5937c
commit 409a6db349
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gmacros.h
View File

@ -158,6 +158,19 @@
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */
#endif /* !G_DISABLE_DEPRECATED */ #endif /* !G_DISABLE_DEPRECATED */
/* Clang feature detection: http://clang.llvm.org/docs/LanguageExtensions.html */
#ifndef __has_feature
#define __has_feature(x) 0
#endif
#if __has_feature(attribute_analyzer_noreturn)
#define G_ANALYZER_ANALYZING 1
#define G_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
#else
#define G_ANALYZER_ANALYZING 0
#define G_ANALYZER_NORETURN
#endif
#define G_STRINGIFY(macro_or_string) G_STRINGIFY_ARG (macro_or_string) #define G_STRINGIFY(macro_or_string) G_STRINGIFY_ARG (macro_or_string)
#define G_STRINGIFY_ARG(contents) #contents #define G_STRINGIFY_ARG(contents) #contents

13
glib/gmessages.h
View File

@ -125,13 +125,13 @@ void _g_log_fallback_handler (const gchar *log_domain,
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_return_if_fail_warning (const char *log_domain, void g_return_if_fail_warning (const char *log_domain,
const char *pretty_function, const char *pretty_function,
const char *expression); const char *expression) G_ANALYZER_NORETURN;
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_warn_message (const char *domain, void g_warn_message (const char *domain,
const char *file, const char *file,
int line, int line,
const char *func, const char *func,
const char *warnexpr); const char *warnexpr) G_ANALYZER_NORETURN;
GLIB_DEPRECATED GLIB_DEPRECATED
void g_assert_warning (const char *log_domain, void g_assert_warning (const char *log_domain,
const char *file, const char *file,
@ -143,7 +143,8 @@ void g_assert_warning (const char *log_domain,
#ifndef G_LOG_DOMAIN #ifndef G_LOG_DOMAIN
#define G_LOG_DOMAIN ((gchar*) 0) #define G_LOG_DOMAIN ((gchar*) 0)
#endif /* G_LOG_DOMAIN */ #endif /* G_LOG_DOMAIN */
#ifdef G_HAVE_ISO_VARARGS
#if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING
/* for(;;) ; so that GCC knows that control doesn't go past g_error(). /* for(;;) ; so that GCC knows that control doesn't go past g_error().
* Put space before ending semicolon to avoid C++ build warnings. * Put space before ending semicolon to avoid C++ build warnings.
*/ */
@ -166,7 +167,7 @@ void g_assert_warning (const char *log_domain,
#define g_debug(...) g_log (G_LOG_DOMAIN, \ #define g_debug(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \ G_LOG_LEVEL_DEBUG, \
__VA_ARGS__) __VA_ARGS__)
#elif defined(G_HAVE_GNUC_VARARGS) #elif defined(G_HAVE_GNUC_VARARGS) && !G_ANALYZER_ANALYZING
#define g_error(format...) G_STMT_START { \ #define g_error(format...) G_STMT_START { \
g_log (G_LOG_DOMAIN, \ g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_ERROR, \ G_LOG_LEVEL_ERROR, \
@ -189,7 +190,7 @@ void g_assert_warning (const char *log_domain,
#else /* no varargs macros */ #else /* no varargs macros */
static void static void
g_error (const gchar *format, g_error (const gchar *format,
...) ...) G_ANALYZER_NORETURN
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);
@ -209,7 +210,7 @@ g_message (const gchar *format,
} }
static void static void
g_critical (const gchar *format, g_critical (const gchar *format,
...) ...) G_ANALYZER_NORETURN
{ {
va_list args; va_list args;
va_start (args, format); va_start (args, format);