behave conservative with G_TOKEN_IDENTIFIER_NULL and always assume

Tue Apr 20 08:42:22 1999  Tim Janik  <timj@gtk.org>

        * gscanner.c (g_scanner_unexp_token): behave conservative with
        G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
        to be "null" in that case.
This commit is contained in:
Tim Janik 1999-04-21 00:57:16 +00:00 committed by Tim Janik
parent dfa88ed86d
commit 89713b8320
10 changed files with 50 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -1,3 +1,9 @@
Tue Apr 20 08:42:22 1999 Tim Janik <timj@gtk.org>
* gscanner.c (g_scanner_unexp_token): behave conservative with
G_TOKEN_IDENTIFIER_NULL and always assume scanner->value.v_string
to be "null" in that case.
1999-04-20 Havoc Pennington <hp@pobox.com>
* gutils.c (g_vsnprintf): When using the vsnprintf()

View File

@ -973,7 +973,7 @@ g_scanner_unexp_token (GScanner *scanner,
"%s%s `%s'",
print_unexp ? "" : "invalid ",
identifier_spec,
scanner->value.v_string);
scanner->token == G_TOKEN_IDENTIFIER ? scanner->value.v_string : "null");
break;
case G_TOKEN_BINARY:

View File

@ -973,7 +973,7 @@ g_scanner_unexp_token (GScanner *scanner,
"%s%s `%s'",
print_unexp ? "" : "invalid ",
identifier_spec,
scanner->value.v_string);
scanner->token == G_TOKEN_IDENTIFIER ? scanner->value.v_string : "null");
break;
case G_TOKEN_BINARY: