From 12edfe9084596d9c5bd727ff9435ae544d9c6ad3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 19 Jun 1998 01:24:25 +0000 Subject: [PATCH] Changed messages for g_return_[val]_if_fail to be somewhat more clear: Thu Jun 18 02:35:21 1998 Owen Taylor * glib.h: Changed messages for g_return_[val]_if_fail to be somewhat more clear: assertion "blah" failed. --- ChangeLog | 5 ++++ ChangeLog.pre-2-0 | 5 ++++ ChangeLog.pre-2-10 | 5 ++++ ChangeLog.pre-2-12 | 5 ++++ ChangeLog.pre-2-2 | 5 ++++ ChangeLog.pre-2-4 | 5 ++++ ChangeLog.pre-2-6 | 5 ++++ ChangeLog.pre-2-8 | 5 ++++ glib.h | 68 +++++++++++++++++++++++++++--------------------------- glib/glib.h | 68 +++++++++++++++++++++++++++--------------------------- 10 files changed, 108 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a3f4974d7..97a10c3e8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jun 18 02:35:21 1998 Owen Taylor + + * glib.h: Changed messages for g_return_[val]_if_fail to + be somewhat more clear: assertion "blah" failed. + 1998-06-18 Federico Mena Quintero * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler diff --git a/glib.h b/glib.h index cac097fc5..ba44691e2 100644 --- a/glib.h +++ b/glib.h @@ -302,48 +302,48 @@ #ifdef __GNUC__ -#define g_return_if_fail(expr) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d (%s): \"%s\"", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ - return; \ +#define g_return_if_fail(expr) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, \ + #expr); \ + return; \ }; }G_STMT_END -#define g_return_val_if_fail(expr,val) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d (%s): \"%s\"", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ - return val; \ +#define g_return_val_if_fail(expr,val) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, \ + #expr); \ + return val; \ }; }G_STMT_END #else /* !__GNUC__ */ -#define g_return_if_fail(expr) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d: \"%s\"", \ - __FILE__, \ - __LINE__, \ - #expr); \ - return; \ +#define g_return_if_fail(expr) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d: assertion. \"%s\" failed", \ + __FILE__, \ + __LINE__, \ + #expr); \ + return; \ }; }G_STMT_END -#define g_return_val_if_fail(expr, val) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d: \"%s\"", \ - __FILE__, \ - __LINE__, \ - #expr); \ - return val; \ +#define g_return_val_if_fail(expr, val) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d: assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + #expr); \ + return val; \ }; }G_STMT_END #endif /* !__GNUC__ */ diff --git a/glib/glib.h b/glib/glib.h index cac097fc5..ba44691e2 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -302,48 +302,48 @@ #ifdef __GNUC__ -#define g_return_if_fail(expr) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d (%s): \"%s\"", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ - return; \ +#define g_return_if_fail(expr) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, \ + #expr); \ + return; \ }; }G_STMT_END -#define g_return_val_if_fail(expr,val) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d (%s): \"%s\"", \ - __FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, \ - #expr); \ - return val; \ +#define g_return_val_if_fail(expr,val) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + __PRETTY_FUNCTION__, \ + #expr); \ + return val; \ }; }G_STMT_END #else /* !__GNUC__ */ -#define g_return_if_fail(expr) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d: \"%s\"", \ - __FILE__, \ - __LINE__, \ - #expr); \ - return; \ +#define g_return_if_fail(expr) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d: assertion. \"%s\" failed", \ + __FILE__, \ + __LINE__, \ + #expr); \ + return; \ }; }G_STMT_END -#define g_return_val_if_fail(expr, val) G_STMT_START{ \ - if (!(expr)) \ - { \ - g_warning ("file %s: line %d: \"%s\"", \ - __FILE__, \ - __LINE__, \ - #expr); \ - return val; \ +#define g_return_val_if_fail(expr, val) G_STMT_START{ \ + if (!(expr)) \ + { \ + g_warning ("file %s: line %d: assertion \"%s\" failed.", \ + __FILE__, \ + __LINE__, \ + #expr); \ + return val; \ }; }G_STMT_END #endif /* !__GNUC__ */ -- 2.11.4.GIT