if __GNUC__ is defined, inline a test for an exact type match for

Wed Jul 18 19:42:31 2001  Tim Janik  <timj@gtk.org>

        * gtype.h: if __GNUC__ is defined, inline a test for an exact type
        match for instances and classes in G_TYPE_CHECK_INSTANCE_TYPE() and
        G_TYPE_CHECK_CLASS_TYPE() before calling g_type_instance_is_a().

Sun Jul 29 16:08:17 2001  Tim Janik  <timj@gtk.org>

        * glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().

        * glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
        errors and warnings to stderr.
This commit is contained in:
Tim Janik
2001-07-29 16:02:45 +00:00
committed by Tim Janik
parent aba9db3fd3
commit 9599c06203
13 changed files with 173 additions and 65 deletions

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -1,3 +1,10 @@
Sun Jul 29 16:08:17 2001 Tim Janik <timj@gtk.org>
* glib/gscanner.[hc]: removed deprecated g_scanner_stat_mode().
* glib/gscanner.c (g_scanner_msg_handler): by default, print scanner
errors and warnings to stderr.
2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-07-27 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gtypes.h: Use G_GNUC_EXTENSION instead of * glib/gtypes.h: Use G_GNUC_EXTENSION instead of

View File

@@ -59,6 +59,18 @@
@hook_list: @hook_list:
@hook: @hook:
<!-- ##### ENUM GIOFileMode ##### -->
<para>
</para>
@G_IO_FILE_MODE_READ:
@G_IO_FILE_MODE_WRITE:
@G_IO_FILE_MODE_APPEND:
@G_IO_FILE_MODE_READ_WRITE:
@G_IO_FILE_MODE_READ_WRITE_TRUNCATE:
@G_IO_FILE_MODE_READ_WRITE_APPEND:
<!-- ##### MACRO G_CHANNEL_ERROR ##### --> <!-- ##### MACRO G_CHANNEL_ERROR ##### -->
<para> <para>
@@ -79,6 +91,14 @@ depending on the system type.
</para> </para>
<!-- ##### MACRO G_IO_CHANNEL_ENCODE_RAW ##### -->
<para>
Encoding for nonbuffered IO. With this encoding, data must be
read using g_io_channel_read_chars(); the other functions will
not work.
</para>
<!-- ##### MACRO access ##### --> <!-- ##### MACRO access ##### -->
<para> <para>
@@ -97,6 +117,21 @@ depending on the system type.
</para> </para>
<!-- ##### FUNCTION g_channel_error_from_errno ##### -->
<para>
</para>
@en:
@Returns:
<!-- ##### FUNCTION g_channel_error_quark ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION g_convert_error_quark ##### --> <!-- ##### FUNCTION g_convert_error_quark ##### -->
<para> <para>
@@ -159,6 +194,17 @@ To use this function you must configure glib with the flag
@mem: the memory to check. @mem: the memory to check.
<!-- ##### FUNCTION g_scanner_stat_mode ##### -->
<para>
Gets the file attributes.
This is the <structfield>st_mode</structfield> field from the
<structname>stat</structname> structure. See the <function>stat()</function>
documentation.
</para>
@filename: the file name.
@Returns: the file attributes.
<!-- ##### FUNCTION g_source_add ##### --> <!-- ##### FUNCTION g_source_add ##### -->
<para> <para>
</para> </para>

View File

@@ -77,7 +77,6 @@ A data structure representing an IO Channel. The fields should be considered
private and should only be accessed with the following functions. private and should only be accessed with the following functions.
</para> </para>
@channel_flags:
@ref_count: @ref_count:
@funcs: @funcs:
@encoding: @encoding:
@@ -88,12 +87,12 @@ private and should only be accessed with the following functions.
@read_buf: @read_buf:
@encoded_read_buf: @encoded_read_buf:
@write_buf: @write_buf:
@partial_write_buf:
@use_buffer: @use_buffer:
@do_encode: @do_encode:
@ready_to_read:
@ready_to_write:
@close_on_unref: @close_on_unref:
@seekable_cached: @is_readable:
@is_writeable:
@is_seekable: @is_seekable:
<!-- ##### FUNCTION g_io_channel_unix_new ##### --> <!-- ##### FUNCTION g_io_channel_unix_new ##### -->
@@ -138,18 +137,6 @@ programmer (unless you are creating a new type of #GIOChannel).
@Returns: @Returns:
<!-- ##### ENUM GIOFileMode ##### -->
<para>
</para>
@G_IO_FILE_MODE_READ:
@G_IO_FILE_MODE_WRITE:
@G_IO_FILE_MODE_APPEND:
@G_IO_FILE_MODE_READ_WRITE:
@G_IO_FILE_MODE_READ_WRITE_TRUNCATE:
@G_IO_FILE_MODE_READ_WRITE_APPEND:
<!-- ##### FUNCTION g_io_channel_read_chars ##### --> <!-- ##### FUNCTION g_io_channel_read_chars ##### -->
<para> <para>
@@ -271,14 +258,51 @@ operation.
@G_SEEK_SET: @G_SEEK_SET:
@G_SEEK_END: @G_SEEK_END:
<!-- ##### FUNCTION g_io_channel_close ##### --> <!-- ##### FUNCTION g_io_channel_shutdown ##### -->
<para> <para>
</para> </para>
@channel: @channel:
@flush:
@err:
@Returns:
<!-- ##### FUNCTION g_channel_error_quark ##### --> <!-- ##### ENUM GIOStatus ##### -->
<para>
</para>
@G_IO_STATUS_ERROR:
@G_IO_STATUS_NORMAL:
@G_IO_STATUS_EOF:
@G_IO_STATUS_AGAIN:
<!-- ##### ENUM GIOChannelError ##### -->
<para>
</para>
@G_IO_CHANNEL_ERROR_FBIG:
@G_IO_CHANNEL_ERROR_INVAL:
@G_IO_CHANNEL_ERROR_IO:
@G_IO_CHANNEL_ERROR_ISDIR:
@G_IO_CHANNEL_ERROR_NOSPC:
@G_IO_CHANNEL_ERROR_NXIO:
@G_IO_CHANNEL_ERROR_OVERFLOW:
@G_IO_CHANNEL_ERROR_PIPE:
@G_IO_CHANNEL_ERROR_PCHAR_FLUSH:
@G_IO_CHANNEL_ERROR_FAILED:
<!-- ##### MACRO G_IO_CHANNEL_ERROR ##### -->
<para>
</para>
<!-- ##### FUNCTION g_io_channel_error_quark ##### -->
<para> <para>
</para> </para>
@@ -286,7 +310,7 @@ operation.
@Returns: @Returns:
<!-- ##### FUNCTION g_channel_error_from_errno ##### --> <!-- ##### FUNCTION g_io_channel_error_from_errno ##### -->
<para> <para>
</para> </para>
@@ -538,6 +562,24 @@ generic way.
<!-- ##### FUNCTION g_io_channel_get_buffered ##### -->
<para>
</para>
@channel:
@Returns:
<!-- ##### FUNCTION g_io_channel_set_buffered ##### -->
<para>
</para>
@channel:
@buffered:
<!-- ##### FUNCTION g_io_channel_get_encoding ##### --> <!-- ##### FUNCTION g_io_channel_get_encoding ##### -->
<para> <para>
@@ -558,15 +600,6 @@ generic way.
@Returns: @Returns:
<!-- ##### MACRO G_IO_CHANNEL_ENCODE_RAW ##### -->
<para>
Encoding for nonbuffered IO. With this encoding, data must be
read using g_io_channel_read_chars(); the other functions will
not work.
</para>
<!-- ##### FUNCTION g_io_channel_read ##### --> <!-- ##### FUNCTION g_io_channel_read ##### -->
<para> <para>
</para> </para>
@@ -611,3 +644,10 @@ g_io_channel_write(), and g_io_channel_seek().
@Returns: @Returns:
<!-- ##### FUNCTION g_io_channel_close ##### -->
<para>
</para>
@channel:

View File

@@ -152,18 +152,6 @@ Prepares to scan a file.
@scanner: @scanner:
<!-- ##### FUNCTION g_scanner_stat_mode ##### -->
<para>
Gets the file attributes.
This is the <structfield>st_mode</structfield> field from the
<structname>stat</structname> structure. See the <function>stat()</function>
documentation.
</para>
@filename: the file name.
@Returns: the file attributes.
<!-- ##### FUNCTION g_scanner_input_text ##### --> <!-- ##### FUNCTION g_scanner_input_text ##### -->
<para> <para>
Prepares to scan a text buffer. Prepares to scan a text buffer.

View File

@@ -46,8 +46,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <sys/types.h> /* needed for sys/stat.h */
#include <sys/stat.h>
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> /* For _read() */ #include <io.h> /* For _read() */
#endif #endif
@@ -293,10 +291,10 @@ g_scanner_msg_handler (GScanner *scanner,
{ {
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
fprintf (stdout, "%s:%d: ", scanner->input_name, scanner->line); fprintf (stderr, "%s:%d: ", scanner->input_name, scanner->line);
if (is_error) if (is_error)
fprintf (stdout, "error: "); fprintf (stderr, "error: ");
fprintf (stdout, "%s\n", message); fprintf (stderr, "%s\n", message);
} }
void void
@@ -1106,25 +1104,6 @@ g_scanner_unexp_token (GScanner *scanner,
g_free (expected_string); g_free (expected_string);
} }
gint
g_scanner_stat_mode (const gchar *filename)
{
struct stat *stat_buf;
gint st_mode;
stat_buf = g_new0 (struct stat, 1);
#ifdef HAVE_LSTAT
lstat (filename, stat_buf);
#else
stat (filename, stat_buf);
#endif
st_mode = stat_buf->st_mode;
g_free (stat_buf);
return st_mode;
}
static void static void
g_scanner_get_token_i (GScanner *scanner, g_scanner_get_token_i (GScanner *scanner,
GTokenType *token_p, GTokenType *token_p,

View File

@@ -244,7 +244,6 @@ void g_scanner_error (GScanner *scanner,
void g_scanner_warn (GScanner *scanner, void g_scanner_warn (GScanner *scanner,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF (2,3); ...) G_GNUC_PRINTF (2,3);
gint g_scanner_stat_mode (const gchar *filename);
/* keep downward source compatibility */ /* keep downward source compatibility */
#define g_scanner_add_symbol( scanner, symbol, value ) G_STMT_START { \ #define g_scanner_add_symbol( scanner, symbol, value ) G_STMT_START { \
g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \ g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \