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.
This commit is contained in:
Tim Janik 2001-11-12 14:11:30 +00:00 committed by Tim Janik
parent 25df1bfce8
commit 115366f663
11 changed files with 43 additions and 6 deletions

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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

View File

@ -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;

View File

@ -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 */