[glib/glib-2-26] Bug 635093: Fixed C99-declarations & typo in GIO

[Chun-wei Fan <fanchunwei src gnome org>]

commit fa1fa04aa08ab605b48512a12bf5c465ade265ac
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Nov 30 10:21:11 2010 +0800

    Bug 635093: Fixed C99-declarations & typo in GIO
    
    -gio/gregistrysettingsbackend.c:
     Fixed C99-style variable declarations
     Fixed typo: g_message_win32_error (result, "gregistrybackend:
                 setting value %s\%s\\%s failed.\n",
    ->
                 g_message_win32_error (result, "gregistrybackend:
                 setting value %s\\%s\\%s failed.\n",
    
    -gio/gdbusmessage.c:
     Moved G_STATIC_ASSERT(sizeof (gdouble) == sizeof (guint64));
     to just after the variable declarations of the block to avoid
     C99-style variable declaration

 gio/gdbusmessage.c             |    2 +-
 gio/gregistrysettingsbackend.c |   20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 0aca1e0..552eafc 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -1183,10 +1183,10 @@ parse_value_from_blob (GMemoryInputStream    *mis,
         {
           guint64 v;
           gdouble *encoded;
+		  G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64));
           v = g_data_input_stream_read_uint64 (dis, NULL, &local_error);
           if (local_error != NULL)
             goto fail;
-          G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64));
           encoded = (gdouble *) &v;
           ret = g_variant_new_double (*encoded);
         }
diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c
index 6c1ce1b..368664c 100644
--- a/gio/gregistrysettingsbackend.c
+++ b/gio/gregistrysettingsbackend.c
@@ -569,6 +569,7 @@ registry_cache_get_node_for_key_recursive (GNode    *node,
   RegistryCacheItem *item;
   gchar *component = key_name,
         *c         = strchr (component, '/');
+  GNode *child;
 
   if (c != NULL)
     *c = 0;
@@ -581,7 +582,7 @@ registry_cache_get_node_for_key_recursive (GNode    *node,
   if (item->subscription_count > 0)
     n_parent_watches ++;  
 
-  GNode *child = registry_cache_find_immediate_child (node, component);
+  child = registry_cache_find_immediate_child (node, component);
   if (child == NULL && create_if_not_found)
     {
       item = g_slice_new (RegistryCacheItem);
@@ -903,6 +904,7 @@ g_registry_backend_write_one (const char *key_name,
 
   GNode    *node;
   gboolean  changed;
+  const gchar *type_string = g_variant_get_type_string (variant);
 
   action = user_data;
   self = G_REGISTRY_BACKEND (action->self);
@@ -911,7 +913,6 @@ g_registry_backend_write_one (const char *key_name,
   value.type = REG_NONE;
   value.ptr = NULL;
 
-  const gchar *type_string = g_variant_get_type_string (variant);
   switch (type_string[0])
     {
       case 'b': case 'y': case 'n': case 'q': case 'i': case 'u':
@@ -984,7 +985,7 @@ g_registry_backend_write_one (const char *key_name,
 
   result = RegSetValueExA (hpath, value_name, 0, value.type, value_data, value_data_size);
   if (result != ERROR_SUCCESS)
-      g_message_win32_error (result, "gregistrybackend: setting value %s\%s\\%s failed.\n",
+      g_message_win32_error (result, "gregistrybackend: setting value %s\\%s\\%s failed.\n",
                              self->base_path, path_name, value_name);
 
   /* If the write fails then it will seem like the value has changed until the
@@ -1011,6 +1012,7 @@ g_registry_backend_write (GSettingsBackend *backend,
   GRegistryBackend *self = G_REGISTRY_BACKEND (backend);
   LONG result;
   HKEY hroot;
+  RegistryWrite action;
 
   result = RegCreateKeyExA (HKEY_CURRENT_USER, self->base_path, 0, NULL, 0,
                             KEY_WRITE, NULL, &hroot, NULL);
@@ -1019,7 +1021,8 @@ g_registry_backend_write (GSettingsBackend *backend,
     return FALSE;
   }
 
-  RegistryWrite action = { self, hroot };
+  action.self = self;
+  action.hroot = hroot;
   g_registry_backend_write_one (key_name, value, &action);
   g_settings_backend_changed (backend, key_name, origin_tag);
 
@@ -1036,6 +1039,7 @@ g_registry_backend_write_tree (GSettingsBackend *backend,
   GRegistryBackend *self = G_REGISTRY_BACKEND (backend);
   LONG result;
   HKEY hroot;
+  RegistryWrite action;
 
   result = RegCreateKeyExA (HKEY_CURRENT_USER, self->base_path, 0, NULL, 0,
                             KEY_WRITE, NULL, &hroot, NULL);
@@ -1044,7 +1048,8 @@ g_registry_backend_write_tree (GSettingsBackend *backend,
     return FALSE;
   }
 
-  RegistryWrite action = { self, hroot };
+  action.self = self;
+  action.hroot = hroot;
   g_tree_foreach (values, (GTraverseFunc)g_registry_backend_write_one,
                   &action);
 
@@ -1144,11 +1149,11 @@ registry_cache_destroy_tree (GNode            *node,
 
   if (item->subscription_count > 0)
     {
+	  gint i;
       /* There must be some watches active if this node is a watch point */
       g_warn_if_fail (self->cache_nodes->len > 1);
 
       /* This is a watch point that has been deleted. Let's free the watch! */
-      gint i;
       for (i=1; i<self->cache_nodes->len; i++)
         if (g_ptr_array_index (self->cache_nodes, i) == node)
           break;
@@ -1953,9 +1958,10 @@ g_registry_backend_class_init (GRegistryBackendClass *class)
 static void
 g_registry_backend_init (GRegistryBackend *self)
 {
+  RegistryCacheItem *item;
   self->base_path = g_strdup_printf ("Software\\GSettings");
 
-  RegistryCacheItem *item = g_slice_new (RegistryCacheItem);
+  item = g_slice_new (RegistryCacheItem);
   item->value.type = REG_NONE;
   item->value.ptr = NULL;
   item->name = g_strdup ("<root>");