From 623efc182c9c3a001aa4e4634c48840d8124aa82 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 25 Jul 2000 22:48:09 +0000 Subject: [PATCH] applied patch from Darin Adler which supplies Wed Jul 26 00:46:03 2000 Tim Janik * glib.h: applied patch from Darin Adler which supplies g_return_if_reached(), g_return_val_if_reached() and g_critical(). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------ glib/glib.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------ 10 files changed, 156 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b00a136..e96c74f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b00a136..e96c74f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jul 26 00:46:03 2000 Tim Janik + + * glib.h: applied patch from Darin Adler which + supplies g_return_if_reached(), g_return_val_if_reached() and + g_critical(). + 2000-07-22 Tor Lillqvist * build-dll: Fix resource handling, the resource file got left out diff --git a/glib.h b/glib.h index fdfb687..1420ed6 100644 --- a/glib.h +++ b/glib.h @@ -426,6 +426,8 @@ extern "C" { #define g_return_if_fail(expr) #define g_return_val_if_fail(expr,val) +#define g_return_if_reached() return +#define g_return_val_if_reached(val) return (val) #else /* !G_DISABLE_CHECKS */ @@ -436,7 +438,7 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed.", \ + "file %s: line %d (%s): assertion `%s' failed", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -449,14 +451,32 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed.", \ + "file %s: line %d (%s): assertion `%s' failed", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ #expr); \ - return val; \ + return (val); \ }; }G_STMT_END +#define g_return_if_reached() G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__); \ + return; }G_STMT_END + +#define g_return_val_if_reached(val) G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): should not be reached", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__); \ + return (val); }G_STMT_END + #else /* !__GNUC__ */ #define g_return_if_fail(expr) G_STMT_START{ \ @@ -464,7 +484,7 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d: assertion `%s' failed.", \ + "file %s: line %d: assertion `%s' failed", \ __FILE__, \ __LINE__, \ #expr); \ @@ -476,13 +496,29 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d: assertion `%s' failed.", \ + "file %s: line %d: assertion `%s' failed", \ __FILE__, \ __LINE__, \ #expr); \ - return val; \ + return (val); \ }; }G_STMT_END +#define g_return_if_reached() G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed", \ + __FILE__, \ + __LINE__); \ + return; }G_STMT_END + +#define g_return_val_if_reached(val) G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: should not be reached", \ + __FILE__, \ + __LINE__); \ + return (val); }G_STMT_END + #endif /* !__GNUC__ */ #endif /* !G_DISABLE_CHECKS */ @@ -1442,6 +1478,9 @@ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); #define g_message(format, args...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_MESSAGE, \ format, ##args) +#define g_critical(format, args...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + format, ##args) #define g_warning(format, args...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_WARNING, \ format, ##args) @@ -1465,6 +1504,15 @@ g_message (const gchar *format, va_end (args); } static void +g_critical (const gchar *format, + ...) +{ + va_list args; + va_start (args, format); + g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args); + va_end (args); +} +static void g_warning (const gchar *format, ...) { diff --git a/glib/glib.h b/glib/glib.h index fdfb687..1420ed6 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -426,6 +426,8 @@ extern "C" { #define g_return_if_fail(expr) #define g_return_val_if_fail(expr,val) +#define g_return_if_reached() return +#define g_return_val_if_reached(val) return (val) #else /* !G_DISABLE_CHECKS */ @@ -436,7 +438,7 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed.", \ + "file %s: line %d (%s): assertion `%s' failed", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ @@ -449,14 +451,32 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed.", \ + "file %s: line %d (%s): assertion `%s' failed", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, \ #expr); \ - return val; \ + return (val); \ }; }G_STMT_END +#define g_return_if_reached() G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): assertion `%s' failed", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__); \ + return; }G_STMT_END + +#define g_return_val_if_reached(val) G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): should not be reached", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__); \ + return (val); }G_STMT_END + #else /* !__GNUC__ */ #define g_return_if_fail(expr) G_STMT_START{ \ @@ -464,7 +484,7 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d: assertion `%s' failed.", \ + "file %s: line %d: assertion `%s' failed", \ __FILE__, \ __LINE__, \ #expr); \ @@ -476,13 +496,29 @@ extern "C" { { \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d: assertion `%s' failed.", \ + "file %s: line %d: assertion `%s' failed", \ __FILE__, \ __LINE__, \ #expr); \ - return val; \ + return (val); \ }; }G_STMT_END +#define g_return_if_reached() G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: assertion `%s' failed", \ + __FILE__, \ + __LINE__); \ + return; }G_STMT_END + +#define g_return_val_if_reached(val) G_STMT_START{ \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d: should not be reached", \ + __FILE__, \ + __LINE__); \ + return (val); }G_STMT_END + #endif /* !__GNUC__ */ #endif /* !G_DISABLE_CHECKS */ @@ -1442,6 +1478,9 @@ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask); #define g_message(format, args...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_MESSAGE, \ format, ##args) +#define g_critical(format, args...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + format, ##args) #define g_warning(format, args...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_WARNING, \ format, ##args) @@ -1465,6 +1504,15 @@ g_message (const gchar *format, va_end (args); } static void +g_critical (const gchar *format, + ...) +{ + va_list args; + va_start (args, format); + g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args); + va_end (args); +} +static void g_warning (const gchar *format, ...) { -- 2.7.4