mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-13 15:56:23 +01:00
make third argument a gboolean. (g_scanner_add_symbol,
* glib/gscanner.h (GScannerMsgFunc): make third argument a gboolean. (g_scanner_add_symbol, g_scanner_remove_symbol, g_scanner_foreach_symbol): mark these G_DISABLE_DEPRECATED. (#61469) * glib/gscanner.c (g_scanner_msg_handler): make third argument gboolean. (#61468)
This commit is contained in:
parent
56d0914111
commit
6344b5be48
@ -143,7 +143,7 @@ static guchar g_scanner_get_char (GScanner *scanner,
|
|||||||
guint *position_p);
|
guint *position_p);
|
||||||
static void g_scanner_msg_handler (GScanner *scanner,
|
static void g_scanner_msg_handler (GScanner *scanner,
|
||||||
gchar *message,
|
gchar *message,
|
||||||
gint is_error);
|
gboolean is_error);
|
||||||
|
|
||||||
|
|
||||||
/* --- functions --- */
|
/* --- functions --- */
|
||||||
@ -285,7 +285,7 @@ g_scanner_destroy (GScanner *scanner)
|
|||||||
static void
|
static void
|
||||||
g_scanner_msg_handler (GScanner *scanner,
|
g_scanner_msg_handler (GScanner *scanner,
|
||||||
gchar *message,
|
gchar *message,
|
||||||
gint is_error)
|
gboolean is_error)
|
||||||
{
|
{
|
||||||
g_return_if_fail (scanner != NULL);
|
g_return_if_fail (scanner != NULL);
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ typedef union _GTokenValue GTokenValue;
|
|||||||
|
|
||||||
typedef void (*GScannerMsgFunc) (GScanner *scanner,
|
typedef void (*GScannerMsgFunc) (GScanner *scanner,
|
||||||
gchar *message,
|
gchar *message,
|
||||||
gint error);
|
gboolean error);
|
||||||
|
|
||||||
/* GScanner: Flexible lexical scanner for general purpose.
|
/* GScanner: Flexible lexical scanner for general purpose.
|
||||||
*/
|
*/
|
||||||
@ -244,6 +244,9 @@ 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);
|
||||||
|
|
||||||
|
#ifndef G_DISABLE_DEPRECATED
|
||||||
|
|
||||||
/* 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)); \
|
||||||
@ -255,8 +258,6 @@ void g_scanner_warn (GScanner *scanner,
|
|||||||
g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
|
g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
|
|
||||||
#ifndef G_DISABLE_DEPRECATED
|
|
||||||
|
|
||||||
/* The following two functions are deprecated and will be removed in
|
/* The following two functions are deprecated and will be removed in
|
||||||
* the next major release. They do no good. */
|
* the next major release. They do no good. */
|
||||||
#define g_scanner_freeze_symbol_table(scanner) ((void)0)
|
#define g_scanner_freeze_symbol_table(scanner) ((void)0)
|
||||||
|
Loading…
Reference in New Issue
Block a user