Bug 502511 – g_assert_cmphex prints invalid message

* glib/gtestutils.c (g_assertion_message_cmpnum): Actually print
        hex numbers in hex.
        Pointed out by Tor Lillqvist


svn path=/branches/glib-2-16/; revision=7115
This commit is contained in:
Matthias Clasen
2008-06-30 22:40:13 +00:00
parent 281f4c58bf
commit 695a864c2a
2 changed files with 11 additions and 1 deletions

View File

@@ -1,3 +1,13 @@
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:
Bug 502511 g_assert_cmphex prints invalid message
* glib/gtestutils.c (g_assertion_message_cmpnum): Actually print
hex numbers in hex.
Pointed out by Tor Lillqvist
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Backport from trunk:

View File

@@ -1245,7 +1245,7 @@ g_assertion_message_cmpnum (const char *domain,
switch (numtype)
{
case 'i': s = g_strdup_printf ("assertion failed (%s): (%.0Lf %s %.0Lf)", expr, arg1, cmp, arg2); break;
case 'x': s = g_strdup_printf ("assertion failed (%s): (0x%08" G_GUINT64_FORMAT " %s 0x%08" G_GUINT64_FORMAT ")", expr, (guint64) arg1, cmp, (guint64) arg2); break;
case 'x': s = g_strdup_printf ("assertion failed (%s): (0x%08" G_GINT64_MODIFIER "x %s 0x%08" G_GINT64_MODIFIER "x)", expr, (guint64) arg1, cmp, (guint64) arg2); break;
case 'f': s = g_strdup_printf ("assertion failed (%s): (%.9Lg %s %.9Lg)", expr, arg1, cmp, arg2); break;
/* ideally use: floats=%.7g double=%.17g */
}