[tracker] TrackerMinerFS: Handle errors when moving items recursively.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] TrackerMinerFS: Handle errors when moving items recursively.
- Date: Wed, 11 Nov 2009 15:59:29 +0000 (UTC)
commit 2c79d7da8cf495a68d5e886722448d2a391ff23d
Author: Carlos Garnacho <carlos lanedo com>
Date: Wed Nov 11 16:58:00 2009 +0100
TrackerMinerFS: Handle errors when moving items recursively.
If error is set, result is likely an invalid pointer.
src/libtracker-miner/tracker-miner-fs.c | 32 +++++++++++++++++-------------
1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 7d7ef67..d59a6cb 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1016,26 +1016,30 @@ item_update_uri_recursively_cb (TrackerMiner *miner,
TrackerMinerFS *fs = TRACKER_MINER_FS (miner);
RecursiveMoveData *data = user_data;
- if (result) {
- gint i;
+ if (error) {
+ g_critical ("Could not query children: %s", error->message);
+ } else {
+ if (result) {
+ gint i;
- for (i = 0; i < result->len; i++) {
- gchar **child_source_uri, *child_uri;
+ for (i = 0; i < result->len; i++) {
+ gchar **child_source_uri, *child_uri;
- child_source_uri = g_ptr_array_index (result, i);
+ child_source_uri = g_ptr_array_index (result, i);
- if (!g_str_has_prefix (*child_source_uri, data->source_uri)) {
- g_warning ("Child URI '%s' does not start with parent URI '%s'",
- *child_source_uri,
- data->source_uri);
- continue;
- }
+ if (!g_str_has_prefix (*child_source_uri, data->source_uri)) {
+ g_warning ("Child URI '%s' does not start with parent URI '%s'",
+ *child_source_uri,
+ data->source_uri);
+ continue;
+ }
- child_uri = g_strdup_printf ("%s%s", data->uri, *child_source_uri + strlen (data->source_uri));
+ child_uri = g_strdup_printf ("%s%s", data->uri, *child_source_uri + strlen (data->source_uri));
- item_update_uri_recursively (fs, data, *child_source_uri, child_uri);
+ item_update_uri_recursively (fs, data, *child_source_uri, child_uri);
- g_free (child_uri);
+ g_free (child_uri);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]