Don't store address of local variable in hashtable.

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

diff --git a/gscanner.c b/gscanner.c
index 8839dff..02e801c 100644 (file)
--- a/gscanner.c
+++ b/gscanner.c
@@ -127,7 +127,7 @@ static inline
 GScannerKey*   g_scanner_lookup_internal (GScanner     *scanner,
                                           guint         scope_id,
                                           const gchar  *symbol);
-static gint    g_scanner_key_equal       (gconstpointer v1,
+static gboolean        g_scanner_key_equal       (gconstpointer v1,
                                           gconstpointer v2);
 static guint   g_scanner_key_hash        (gconstpointer v);
 static void    g_scanner_get_token_ll    (GScanner     *scanner,
@@ -346,7 +346,7 @@ g_scanner_warn (GScanner       *scanner,
     }
 }
 
-static gint
+static gboolean
 g_scanner_key_equal (gconstpointer v1,
                     gconstpointer v2)
 {
@@ -570,8 +570,8 @@ g_scanner_freeze_symbol_table (GScanner *scanner)
 
   if (first_call)
     {
-      g_warning("g_scanner_freeze_symbol_table and "
-               "g_scanner_thaw_symbol_table are deprecated.");
+      g_message ("g_scanner_freeze_symbol_table() and "
+                "g_scanner_thaw_symbol_table() are deprecated.");
       first_call = FALSE;
     }
 #endif /* G_ENABLE_DEBUG */
@@ -580,6 +580,7 @@ g_scanner_freeze_symbol_table (GScanner *scanner)
 void
 g_scanner_thaw_symbol_table (GScanner *scanner)
 {
+  g_scanner_freeze_symbol_table (scanner);
 }
 
 GTokenType