Changed messages for g_return_[val]_if_fail to be somewhat more clear:

Thu Jun 18 02:35:21 1998  Owen Taylor  <otaylor@gtk.org>

	* glib.h: Changed messages for g_return_[val]_if_fail to
	be somewhat more clear: assertion "blah" failed.
This commit is contained in:
Owen Taylor 1998-06-19 01:24:25 +00:00 committed by Owen Taylor
parent 05b2f03c6a
commit 12edfe9084
10 changed files with 108 additions and 68 deletions

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

View File

@ -1,3 +1,8 @@
Thu Jun 18 02:35:21 1998 Owen Taylor <otaylor@gtk.org>
* glib.h: Changed messages for g_return_[val]_if_fail to
be somewhat more clear: assertion "blah" failed.
1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-06-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* testglib.c (main): Use GINT_TO_POINTER casts to remove compiler * testglib.c (main): Use GINT_TO_POINTER casts to remove compiler

68
glib.h
View File

@ -302,48 +302,48 @@
#ifdef __GNUC__ #ifdef __GNUC__
#define g_return_if_fail(expr) G_STMT_START{ \ #define g_return_if_fail(expr) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d (%s): \"%s\"", \ g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
__PRETTY_FUNCTION__, \ __PRETTY_FUNCTION__, \
#expr); \ #expr); \
return; \ return; \
}; }G_STMT_END }; }G_STMT_END
#define g_return_val_if_fail(expr,val) G_STMT_START{ \ #define g_return_val_if_fail(expr,val) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d (%s): \"%s\"", \ g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
__PRETTY_FUNCTION__, \ __PRETTY_FUNCTION__, \
#expr); \ #expr); \
return val; \ return val; \
}; }G_STMT_END }; }G_STMT_END
#else /* !__GNUC__ */ #else /* !__GNUC__ */
#define g_return_if_fail(expr) G_STMT_START{ \ #define g_return_if_fail(expr) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d: \"%s\"", \ g_warning ("file %s: line %d: assertion. \"%s\" failed", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
#expr); \ #expr); \
return; \ return; \
}; }G_STMT_END }; }G_STMT_END
#define g_return_val_if_fail(expr, val) G_STMT_START{ \ #define g_return_val_if_fail(expr, val) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d: \"%s\"", \ g_warning ("file %s: line %d: assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
#expr); \ #expr); \
return val; \ return val; \
}; }G_STMT_END }; }G_STMT_END
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */

View File

@ -302,48 +302,48 @@
#ifdef __GNUC__ #ifdef __GNUC__
#define g_return_if_fail(expr) G_STMT_START{ \ #define g_return_if_fail(expr) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d (%s): \"%s\"", \ g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
__PRETTY_FUNCTION__, \ __PRETTY_FUNCTION__, \
#expr); \ #expr); \
return; \ return; \
}; }G_STMT_END }; }G_STMT_END
#define g_return_val_if_fail(expr,val) G_STMT_START{ \ #define g_return_val_if_fail(expr,val) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d (%s): \"%s\"", \ g_warning ("file %s: line %d (%s): assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
__PRETTY_FUNCTION__, \ __PRETTY_FUNCTION__, \
#expr); \ #expr); \
return val; \ return val; \
}; }G_STMT_END }; }G_STMT_END
#else /* !__GNUC__ */ #else /* !__GNUC__ */
#define g_return_if_fail(expr) G_STMT_START{ \ #define g_return_if_fail(expr) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d: \"%s\"", \ g_warning ("file %s: line %d: assertion. \"%s\" failed", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
#expr); \ #expr); \
return; \ return; \
}; }G_STMT_END }; }G_STMT_END
#define g_return_val_if_fail(expr, val) G_STMT_START{ \ #define g_return_val_if_fail(expr, val) G_STMT_START{ \
if (!(expr)) \ if (!(expr)) \
{ \ { \
g_warning ("file %s: line %d: \"%s\"", \ g_warning ("file %s: line %d: assertion \"%s\" failed.", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
#expr); \ #expr); \
return val; \ return val; \
}; }G_STMT_END }; }G_STMT_END
#endif /* !__GNUC__ */ #endif /* !__GNUC__ */