From 1970d2e746c51585e577447db292d94442f8c503 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 12 Aug 2001 01:00:47 +0000 Subject: [PATCH] fix INT and FLOAT warnings for invalid token values. Sat Aug 4 01:04:08 2001 Tim Janik * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings for invalid token values. --- 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/gscanner.c | 6 ++++-- 9 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a36dbf04..0471ef76f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Aug 4 01:04:08 2001 Tim Janik + + * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings + for invalid token values. + 2001-08-10 Ron Steinke * glib/giochannel.c: Fixed a "sense of comparison" bug, diff --git a/glib/gscanner.c b/glib/gscanner.c index 04ce705ae..868530b34 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -1027,11 +1027,13 @@ g_scanner_unexp_token (GScanner *scanner, break; case G_TOKEN_INT: - g_snprintf (expected_string, expected_string_len, "number (integer)"); + g_snprintf (expected_string, expected_string_len, "%snumber (integer)", + scanner->token == G_TOKEN_INT ? "valid " : ""); break; case G_TOKEN_FLOAT: - g_snprintf (expected_string, expected_string_len, "number (float)"); + g_snprintf (expected_string, expected_string_len, "%snumber (float)", + scanner->token == G_TOKEN_FLOAT ? "valid " : ""); break; case G_TOKEN_STRING: