fix INT and FLOAT warnings for invalid token values.

Sat Aug  4 01:04:08 2001  Tim Janik  <timj@gtk.org>

        * glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
        for invalid token values.
This commit is contained in:
Tim Janik 2001-08-12 01:00:47 +00:00 committed by Tim Janik
parent 535f773bd3
commit 1970d2e746
9 changed files with 44 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -1,3 +1,8 @@
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
for invalid token values.
2001-08-10 Ron Steinke <rsteinke@w-link.net>
* glib/giochannel.c: Fixed a "sense of comparison" bug,

View File

@ -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: