From: Benjamin Otte <otte@gnome.org>
Date: Mon, 29 Jun 2009 11:21:08 +0000 (+0200)
Subject: split attribute hash initialization into its own function
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=66cebd72925406910f99c0fd826b8307c2a4814c;p=dana%2Fcg-glib.git

split attribute hash initialization into its own function
---

diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 2785a108..c9108d76 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -140,6 +140,16 @@ _lookup_namespace (const char *namespace)
   return ns_info;
 }
 
+static void
+ensure_attribute_hash (void)
+{
+  if (attribute_hash != NULL)
+    return;
+
+  ns_hash = g_hash_table_new (g_str_hash, g_str_equal);
+  attribute_hash = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
 static guint32
 lookup_namespace (const char *namespace)
 {
@@ -148,11 +158,7 @@ lookup_namespace (const char *namespace)
   
   G_LOCK (attribute_hash);
   
-  if (attribute_hash == NULL)
-    {
-      ns_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      attribute_hash = g_hash_table_new (g_str_hash, g_str_equal);
-    }
+  ensure_attribute_hash ();
 
   ns_info = _lookup_namespace (namespace);
   id = 0;
@@ -183,11 +189,7 @@ lookup_attribute (const char *attribute)
   NSInfo *ns_info;
   
   G_LOCK (attribute_hash);
-  if (attribute_hash == NULL)
-    {
-      ns_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      attribute_hash = g_hash_table_new (g_str_hash, g_str_equal);
-    }
+  ensure_attribute_hash ();
 
   attr_id = GPOINTER_TO_UINT (g_hash_table_lookup (attribute_hash, attribute));