diff --git a/ChangeLog b/ChangeLog index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 33d339a15..b71f3fa9a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Apr 20 08:42:22 1999 Tim Janik + + * 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 * gutils.c (g_vsnprintf): When using the vsnprintf() diff --git a/glib/gscanner.c b/glib/gscanner.c index d52a2cb4a..61dfc41ef 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -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: diff --git a/gscanner.c b/gscanner.c index d52a2cb4a..61dfc41ef 100644 --- a/gscanner.c +++ b/gscanner.c @@ -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: