From f43458e3a21dc18cd376356c6960a19a16b60b1f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 9 Sep 2004 14:42:00 +0000 Subject: [PATCH] Use a helper function to reduce code size; omit FILE/LINE when we have Thu Sep 9 10:37:41 2004 Owen Taylor * glib/gmessages.h (g_return_[val_]if_fail): Use a helper function to reduce code size; omit FILE/LINE when we have __PRETTY_FUNCTION__. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmessages.h | 25 +++++++++++-------------- 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index f91299f..38eb64b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 9 10:37:41 2004 Owen Taylor + + * glib/gmessages.h (g_return_[val_]if_fail): Use + a helper function to reduce code size; omit FILE/LINE + when we have __PRETTY_FUNCTION__. + 2004-09-09 Matthias Clasen * glib/gutils.c (g_get_home_dir): Remove a misleading comment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f91299f..38eb64b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Sep 9 10:37:41 2004 Owen Taylor + + * glib/gmessages.h (g_return_[val_]if_fail): Use + a helper function to reduce code size; omit FILE/LINE + when we have __PRETTY_FUNCTION__. + 2004-09-09 Matthias Clasen * glib/gutils.c (g_get_home_dir): Remove a misleading comment. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f91299f..38eb64b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Thu Sep 9 10:37:41 2004 Owen Taylor + + * glib/gmessages.h (g_return_[val_]if_fail): Use + a helper function to reduce code size; omit FILE/LINE + when we have __PRETTY_FUNCTION__. + 2004-09-09 Matthias Clasen * glib/gutils.c (g_get_home_dir): Remove a misleading comment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f91299f..38eb64b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Sep 9 10:37:41 2004 Owen Taylor + + * glib/gmessages.h (g_return_[val_]if_fail): Use + a helper function to reduce code size; omit FILE/LINE + when we have __PRETTY_FUNCTION__. + 2004-09-09 Matthias Clasen * glib/gutils.c (g_get_home_dir): Remove a misleading comment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f91299f..38eb64b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Sep 9 10:37:41 2004 Owen Taylor + + * glib/gmessages.h (g_return_[val_]if_fail): Use + a helper function to reduce code size; omit FILE/LINE + when we have __PRETTY_FUNCTION__. + 2004-09-09 Matthias Clasen * glib/gutils.c (g_get_home_dir): Remove a misleading comment. diff --git a/glib/gmessages.h b/glib/gmessages.h index ab76c4c..2f8c59b 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -269,29 +269,26 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); #ifdef __GNUC__ +/* Internal function, used to implement following macros */ +void g_return_if_fail_warning (const char *log_domain, + const char *pretty_function, + const char *expression); + #define g_return_if_fail(expr) G_STMT_START{ \ if G_LIKELY(expr) { } else \ { \ - g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ + g_return_if_fail_warning (G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + #expr); \ return; \ }; }G_STMT_END #define g_return_val_if_fail(expr,val) G_STMT_START{ \ if G_LIKELY(expr) { } else \ { \ - g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ + g_return_if_fail_warning (G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + #expr); \ return (val); \ }; }G_STMT_END -- 2.7.4