summaryrefslogtreecommitdiff
path: root/client/gdaemonvfs.c
diff options
context:
space:
mode:
authorChristian Kellner <gicmo@gnome.org>2008-01-11 18:59:53 +0000
committerChristian Kellner <gicmo@src.gnome.org>2008-01-11 18:59:53 +0000
commitc03236a8151fb034cffa98165177a3924ab899e7 (patch)
treef8dad60bc4bb7f7daf315c5f206db5b49a1e730c /client/gdaemonvfs.c
parente2a7bf54ea7a07920ec932fcfaa7e510a6fb50e9 (diff)
downloadgvfs-c03236a8151fb034cffa98165177a3924ab899e7.tar.gz
Fix the double use of a counter variable inside nested loops.
2008-01-11 Christian Kellner <gicmo@gnome.org> * client/gdaemonvfs.c: Fix the double use of a counter variable inside nested loops. * client/Makefile.am: * client/httpuri.c: UriMapper added, which is needed for plain http method. * configure.ac: Check for libsoup version >= 2.2.104 * daemon/gvfsbackendhttp.c: Initial implementation of plain http methods. * daemon/Makefile.am: * daemon/http.mount.in: Added. * daemon/soup-input-stream.c: * daemon/soup-input-stream.h: Import of Dan Winship's libsoup based streaming classes. svn path=/trunk/; revision=1101
Diffstat (limited to 'client/gdaemonvfs.c')
-rw-r--r--client/gdaemonvfs.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 751e209a..f41fd852 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -209,18 +209,20 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
vfs->to_uri_hash = g_hash_table_new (g_str_hash, g_str_equal);
mappers = g_type_children (G_VFS_TYPE_URI_MAPPER, &n_mappers);
+
for (i = 0; i < n_mappers; i++)
{
+ int j;
mapper = g_object_new (mappers[i], NULL);
schemes = g_vfs_uri_mapper_get_handled_schemes (mapper);
- for (i = 0; schemes != NULL && schemes[i] != NULL; i++)
- g_hash_table_insert (vfs->from_uri_hash, (char *)schemes[i], mapper);
+ for (j = 0; schemes != NULL && schemes[j] != NULL; j++)
+ g_hash_table_insert (vfs->from_uri_hash, (char *)schemes[j], mapper);
mount_types = g_vfs_uri_mapper_get_handled_mount_types (mapper);
- for (i = 0; mount_types != NULL && mount_types[i] != NULL; i++)
- g_hash_table_insert (vfs->to_uri_hash, (char *)mount_types[i], mapper);
+ for (j = 0; mount_types != NULL && mount_types[j] != NULL; j++)
+ g_hash_table_insert (vfs->to_uri_hash, (char *)mount_types[j], mapper);
}
/* The above should have ref:ed the modules anyway */
@@ -780,6 +782,7 @@ g_daemon_vfs_class_init (GDaemonVfsClass *class)
/* Module API */
void g_vfs_uri_mapper_smb_register (GIOModule *module);
+void g_vfs_uri_mapper_http_register (GIOModule *module);
void
g_io_module_load (GIOModule *module)
@@ -789,6 +792,7 @@ g_io_module_load (GIOModule *module)
g_vfs_uri_mapper_register (module);
g_vfs_uri_mapper_smb_register (module);
+ g_vfs_uri_mapper_http_register (module);
}
void