From 00a9d30b67ed0e5e4a58201eca85214d5eeeae86 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Nov 2002 18:50:34 +0000 Subject: [PATCH] Use G_LIKELY without surrounding parentheses in g_assert() and * glib/gmessages.h: Use G_LIKELY without surrounding parentheses in g_assert() and g_return_[val]_if_fail() so that we always trigger the gcc warning about "assignment used as truth value". * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/gmacros.h | 4 ++-- glib/gmessages.h | 12 ++++++------ 9 files changed, 64 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9deb2b..f14ee9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b9deb2b..f14ee9b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-11-27 Matthias Clasen + + * glib/gmessages.h: Use G_LIKELY without surrounding parentheses + in g_assert() and g_return_[val]_if_fail() so that we always trigger + the gcc warning about "assignment used as truth value". + + * glib/gmacros.h: Always put parentheses in G_LIKELY and G_UNLIKELY. + 2002-11-26 Matthias Clasen * glib/gmessages.h: Only use G_LIKELY in g_assert() and diff --git a/glib/gmacros.h b/glib/gmacros.h index 20555e3..0576140 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -222,8 +222,8 @@ _g_boolean_var_ = 0; \ _g_boolean_var_; \ }) -#define G_LIKELY(expr) __builtin_expect (_G_BOOLEAN_EXPR(expr), 1) -#define G_UNLIKELY(expr) __builtin_expect (_G_BOOLEAN_EXPR(expr), 0) +#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1)) +#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0)) #else #define G_LIKELY(expr) (expr) #define G_UNLIKELY(expr) (expr) diff --git a/glib/gmessages.h b/glib/gmessages.h index da3f15b..cc36388 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -198,11 +198,11 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); #else /* !G_DISABLE_ASSERT */ -#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +#ifdef __GNUC__ #define g_assert(expr) G_STMT_START{ \ - if (!G_LIKELY (expr)) \ - g_log (G_LOG_DOMAIN, \ + if G_LIKELY(expr) { } else \ + g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_ERROR, \ "file %s: line %d (%s): assertion failed: (%s)", \ __FILE__, \ @@ -250,10 +250,10 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); #else /* !G_DISABLE_CHECKS */ -#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +#ifdef __GNUC__ #define g_return_if_fail(expr) G_STMT_START{ \ - if (!G_LIKELY (expr)) \ + if G_LIKELY(expr) { } else \ { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ @@ -266,7 +266,7 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); }; }G_STMT_END #define g_return_val_if_fail(expr,val) G_STMT_START{ \ - if (!G_LIKELY (expr)) \ + if G_LIKELY(expr) { } else \ { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ -- 2.7.4