From 41c5704578c2c939f4a01a7c86e3dff7e70a2a74 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 10 Oct 2002 21:26:25 +0000 Subject: [PATCH] if input_name is NULL, print out "" instead of completely skipping Thu Oct 10 23:27:02 2002 Tim Janik * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, print out "" instead of completely skipping input specification and thusly loosing error line information. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gscanner.c | 5 +++-- 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea4012c4..ed1f150c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ea4012c4..ed1f150c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Oct 10 23:27:02 2002 Tim Janik + + * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL, + print out "" instead of completely skipping input specification + and thusly loosing error line information. + Sun Sep 29 12:15:44 2002 Manish Singh * tests/mainloop-test.c: use gsize instead of int where appropriate diff --git a/glib/gscanner.c b/glib/gscanner.c index 4c5ce61a..e09e63e6 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -289,8 +289,9 @@ g_scanner_msg_handler (GScanner *scanner, { g_return_if_fail (scanner != NULL); - if (scanner->input_name) - fprintf (stderr, "%s:%d: ", scanner->input_name, scanner->line); + fprintf (stderr, "%s:%d: ", + scanner->input_name ? scanner->input_name : "", + scanner->line); if (is_error) fprintf (stderr, "error: "); fprintf (stderr, "%s\n", message); -- 2.34.1