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.

diff --git a/ChangeLog b/ChangeLog
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9a36dbf..0471ef7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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,

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 04ce705..868530b 100644 (file)
--- 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: