From 340a3e809daf5eaf60dc485b97ed25ec55ebc59f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Sep 2002 21:35:50 +0000 Subject: [PATCH] Don't print scanner->input_name when it is NULL. (#93752) * glib/gscanner.c (g_scanner_msg_handler): Don't print scanner->input_name when it is NULL. (#93752) --- ChangeLog | 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 | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61d89b3..32165bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 61d89b3..32165bd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-09-20 Matthias Clasen + + * glib/gscanner.c (g_scanner_msg_handler): Don't print + scanner->input_name when it is NULL. (#93752) + 2002-09-06 Havoc Pennington * autogen.sh: automake 1.4 diff --git a/glib/gscanner.c b/glib/gscanner.c index 26c414a..4c5ce61 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -289,7 +289,8 @@ g_scanner_msg_handler (GScanner *scanner, { g_return_if_fail (scanner != NULL); - fprintf (stderr, "%s:%d: ", scanner->input_name, scanner->line); + if (scanner->input_name) + fprintf (stderr, "%s:%d: ", scanner->input_name, scanner->line); if (is_error) fprintf (stderr, "error: "); fprintf (stderr, "%s\n", message); -- 2.7.4