if input_name is NULL, print out "<memory>" instead of completely skipping

Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>

        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
        print out "<memory>" instead of completely skipping input specification
        and thusly loosing error line information.

diff --git a/ChangeLog b/ChangeLog
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ea4012c..ed1f150 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Oct 10 23:27:02 2002  Tim Janik  <timj@gtk.org>
+
+        * glib/gscanner.c (g_scanner_msg_handler): if input_name is NULL,
+        print out "<memory>" instead of completely skipping input specification
+        and thusly loosing error line information.
+
 Sun Sep 29 12:15:44 2002  Manish Singh  <yosh@gimp.org>
 
        * tests/mainloop-test.c: use gsize instead of int where appropriate

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 4c5ce61..e09e63e 100644 (file)
--- 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 : "<memory>",
+          scanner->line);
   if (is_error)
     fprintf (stderr, "error: ");
   fprintf (stderr, "%s\n", message);