[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / glib / gscanner.h

diff --git a/glib/gscanner.h b/glib/gscanner.h
index cbcc48c..704c2cb 100644 (file)
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -12,21 +12,24 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __G_SCANNER_H__
 #define __G_SCANNER_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gdataset.h>
 #include <glib/ghash.h>
 
 G_BEGIN_DECLS
@@ -37,7 +40,7 @@ typedef union  _GTokenValue     GTokenValue;
 
 typedef void           (*GScannerMsgFunc)      (GScanner      *scanner,
                                                 gchar         *message,
-                                                gint           error);
+                                                gboolean       error);
 
 /* GScanner: Flexible lexical scanner for general purpose.
  */
@@ -100,6 +103,8 @@ typedef enum
   
   G_TOKEN_COMMENT_SINGLE,
   G_TOKEN_COMMENT_MULTI,
+
+  /*< private >*/
   G_TOKEN_LAST
 } GTokenType;
 
@@ -110,6 +115,7 @@ union       _GTokenValue
   gulong       v_binary;
   gulong       v_octal;
   gulong       v_int;
+  guint64       v_int64;
   gdouble      v_float;
   gulong       v_hex;
   gchar                *v_string;
@@ -144,8 +150,8 @@ struct      _GScannerConfig
   guint                scan_binary : 1;
   guint                scan_octal : 1;
   guint                scan_float : 1;
-  guint                scan_hex : 1;                   /* `0x0ff0' */
-  guint                scan_hex_dollar : 1;            /* `$0ff0' */
+  guint                scan_hex : 1;                   /* '0x0ff0' */
+  guint                scan_hex_dollar : 1;            /* '$0ff0' */
   guint                scan_string_sq : 1;             /* string: 'anything' */
   guint                scan_string_dq : 1;             /* string: "\\-escapes!\n" */
   guint                numbers_2_int : 1;              /* bin, octal, hex => int */
@@ -154,6 +160,10 @@ struct     _GScannerConfig
   guint                char_2_token : 1;               /* return G_TOKEN_CHAR? */
   guint                symbol_2_token : 1;
   guint                scope_0_fallback : 1;           /* try scope 0 on lookups? */
+  guint                store_int64 : 1;                /* use value.v_int64 rather than v_int */
+
+  /*< private >*/
+  guint                padding_dummy;
 };
 
 struct _GScanner
@@ -185,7 +195,8 @@ struct      _GScanner
   GTokenValue          next_value;
   guint                        next_line;
   guint                        next_position;
-  
+
+  /*< private >*/
   /* to be considered private */
   GHashTable           *symbol_table;
   gint                 input_fd;
@@ -193,44 +204,64 @@ struct    _GScanner
   const gchar          *text_end;
   gchar                        *buffer;
   guint                        scope_id;
-  
+
+  /*< public >*/
   /* handler function for _warn and _error */
   GScannerMsgFunc      msg_handler;
 };
 
+GLIB_AVAILABLE_IN_ALL
 GScanner*      g_scanner_new                   (const GScannerConfig *config_templ);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_destroy               (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_input_file            (GScanner       *scanner,
                                                 gint           input_fd);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_sync_file_offset      (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_input_text            (GScanner       *scanner,
                                                 const  gchar   *text,
                                                 guint          text_len);
+GLIB_AVAILABLE_IN_ALL
 GTokenType     g_scanner_get_next_token        (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 GTokenType     g_scanner_peek_next_token       (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 GTokenType     g_scanner_cur_token             (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 GTokenValue    g_scanner_cur_value             (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 guint          g_scanner_cur_line              (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 guint          g_scanner_cur_position          (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 gboolean       g_scanner_eof                   (GScanner       *scanner);
+GLIB_AVAILABLE_IN_ALL
 guint          g_scanner_set_scope             (GScanner       *scanner,
                                                 guint           scope_id);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_scope_add_symbol      (GScanner       *scanner,
                                                 guint           scope_id,
                                                 const gchar    *symbol,
                                                 gpointer       value);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_scope_remove_symbol   (GScanner       *scanner,
                                                 guint           scope_id,
                                                 const gchar    *symbol);
+GLIB_AVAILABLE_IN_ALL
 gpointer       g_scanner_scope_lookup_symbol   (GScanner       *scanner,
                                                 guint           scope_id,
                                                 const gchar    *symbol);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_scope_foreach_symbol  (GScanner       *scanner,
                                                 guint           scope_id,
                                                 GHFunc          func,
                                                 gpointer        user_data);
+GLIB_AVAILABLE_IN_ALL
 gpointer       g_scanner_lookup_symbol         (GScanner       *scanner,
                                                 const gchar    *symbol);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_unexp_token           (GScanner       *scanner,
                                                 GTokenType     expected_token,
                                                 const gchar    *identifier_spec,
@@ -238,13 +269,17 @@ void              g_scanner_unexp_token           (GScanner       *scanner,
                                                 const gchar    *symbol_name,
                                                 const gchar    *message,
                                                 gint            is_error);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_error                 (GScanner       *scanner,
                                                 const gchar    *format,
                                                 ...) G_GNUC_PRINTF (2,3);
+GLIB_AVAILABLE_IN_ALL
 void           g_scanner_warn                  (GScanner       *scanner,
                                                 const gchar    *format,
                                                 ...) G_GNUC_PRINTF (2,3);
-gint           g_scanner_stat_mode             (const gchar    *filename);
+
+#ifndef G_DISABLE_DEPRECATED
+
 /* keep downward source compatibility */
 #define                g_scanner_add_symbol( scanner, symbol, value )  G_STMT_START { \
   g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
@@ -256,8 +291,6 @@ gint                g_scanner_stat_mode             (const gchar    *filename);
   g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
 } G_STMT_END
 
-#ifndef G_DISABLE_DEPRECATED
-
 /* The following two functions are deprecated and will be removed in
  * the next major release. They do no good. */
 #define g_scanner_freeze_symbol_table(scanner) ((void)0)
@@ -268,4 +301,3 @@ gint                g_scanner_stat_mode             (const gchar    *filename);
 G_END_DECLS
 
 #endif /* __G_SCANNER_H__ */
-