void microsoft_com(void)
{
- g_list_foreach(mod_uri_microsoftcom_list(),(GFunc)mod_uri_load,NULL);
+ g_list_foreach(mod_uri_microsoftcom_list(),(GFunc)mod_uri_load_base_reporting,NULL);
}
static void scan_batch(void)
{
- g_list_foreach(optarg_scan_path_list,(GFunc)mod_uri_load,NULL);
+ g_list_foreach(optarg_scan_path_list,(GFunc)mod_uri_load_base_reporting,NULL);
if (optarg_scan_disks_quick)
scan_disks_quick();
if (!captivemodid_load(optarg_modid_path) && !captivemodid_load("./w32-mod-id.captivemodid.xml"))
g_error(_("Unable to load modid database: %s"),optarg_modid_path);
- mod_uri_load(gnome_vfs_uri_new("file://" G_STRINGIFY(VARLIBCAPTIVEDIR)));
+ mod_uri_load_base_reporting(gnome_vfs_uri_new("file://" G_STRINGIFY(VARLIBCAPTIVEDIR)));
if (!is_interactive)
scan_batch();
}
}
-void mod_uri_load(GnomeVFSURI *uri)
+static void mod_uri_load_internal(GnomeVFSURI *uri,gboolean base_reporting)
{
GnomeVFSFileInfo file_info_local;
GnomeVFSResult errvfsresult;
}
file_info_local.type=GNOME_VFS_FILE_TYPE_UNKNOWN;
- if (GNOME_VFS_OK!=(errvfsresult=gnome_vfs_get_file_info_uri(uri,&file_info_local,GNOME_VFS_FILE_INFO_DEFAULT)))
- return /* errvfsresult */;
+ if (GNOME_VFS_OK!=(errvfsresult=gnome_vfs_get_file_info_uri(uri,&file_info_local,GNOME_VFS_FILE_INFO_DEFAULT))) {
+ if (base_reporting) {
+gchar *uri_text;
+
+ uri_text=gnome_vfs_uri_to_string(uri,GNOME_VFS_URI_HIDE_PASSWORD);
+ g_warning(_("Error loading \"%s\": %s"),uri_text,gnome_vfs_result_to_string(errvfsresult));
+ g_free(uri_text);
+ }
+ return;
+ }
switch (file_info_local.type) {
case GNOME_VFS_FILE_TYPE_REGULAR: return mod_uri_load_file(uri);
case GNOME_VFS_FILE_TYPE_DIRECTORY: return mod_uri_load_directory(uri);
}
/* NOTREACHED */
}
+
+void mod_uri_load(GnomeVFSURI *uri)
+{
+ g_return_if_fail(uri!=NULL);
+
+ mod_uri_load_internal(uri,
+ FALSE); /* base_reporting */
+}
+
+void mod_uri_load_base_reporting(GnomeVFSURI *uri)
+{
+ g_return_if_fail(uri!=NULL);
+
+ mod_uri_load_internal(uri,
+ TRUE); /* base_reporting */
+}