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)

diff --git a/ChangeLog b/ChangeLog
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 61d89b3a7caf926a253542535493cadefa3afa34..32165bd79d8256f9914e044426433185e13453c4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-09-20  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gscanner.c (g_scanner_msg_handler): Don't print
+       scanner->input_name when it is NULL.  (#93752)
+
 2002-09-06  Havoc Pennington  <hp@redhat.com>
 
        * autogen.sh: automake 1.4

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 26c414a31c9ced0c78ad22b422aa7538cdd1f0ff..4c5ce61a2aa267bc80b9dae04f25c693f715f39f 100644 (file)
--- 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);