G_TOKEN_ERROR is also an end of stream condition.

Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>

        * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
        of stream condition.

diff --git a/ChangeLog b/ChangeLog
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5e19716..d239df3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Nov 12 03:01:28 2001  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.c (g_scanner_eof): G_TOKEN_ERROR is also an end
+       of stream condition.
+
 2001-11-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib-zip.in (DEVZIP): Also share/glib-2.0.

diff --git a/glib/gscanner.c b/glib/gscanner.c
index c0bef30..09cfc7f 100644 (file)
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -638,7 +638,7 @@ g_scanner_eof (GScanner     *scanner)
 {
   g_return_val_if_fail (scanner != NULL, TRUE);
   
-  return scanner->token == G_TOKEN_EOF;
+  return scanner->token == G_TOKEN_EOF || scanner->token == G_TOKEN_ERROR;
 }
 
 void

diff --git a/gobject/gobject.c b/gobject/gobject.c
index acdb879..532af08 100644 (file)
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -98,9 +98,6 @@ static inline void       object_set_property          (GObject        *object,
                                                         GObjectNotifyQueue *nqueue);
 
 
-/* --- structures --- */
-
-
 /* --- variables --- */
 static GQuark              quark_closure_array = 0;
 static GQuark              quark_weak_refs = 0;

diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 1e3688e..9f795fa 100644 (file)
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -41,8 +41,8 @@
 #define REPORT_BUG      "please report occourance circumstances to gtk-devel-list@gnome.org"
 #ifdef G_ENABLE_DEBUG
 #define IF_DEBUG(debug_type, cond)     if ((_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type) || cond)
-static volatile gpointer *g_trace_instance_signals = NULL;
-static volatile gpointer *g_trap_instance_signals = NULL;
+static volatile gpointer g_trace_instance_signals = NULL;
+static volatile gpointer g_trap_instance_signals = NULL;
 #endif /* G_ENABLE_DEBUG */