[tracker] tracker-extract: Cleaning up code and indentation fixes
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] tracker-extract: Cleaning up code and indentation fixes
- Date: Fri, 15 Jul 2011 13:29:03 +0000 (UTC)
commit a0c0db51668a4106b88265bb3ae45a1c6df15026
Author: Philip Van Hoof <philip codeminded be>
Date: Fri Jul 15 15:28:29 2011 +0200
tracker-extract: Cleaning up code and indentation fixes
src/tracker-extract/tracker-controller.c | 14 ++++----
src/tracker-extract/tracker-extract.c | 49 +++++++-----------------------
2 files changed, 18 insertions(+), 45 deletions(-)
---
diff --git a/src/tracker-extract/tracker-controller.c b/src/tracker-extract/tracker-controller.c
index eeab6cf..f59e3fc 100644
--- a/src/tracker-extract/tracker-controller.c
+++ b/src/tracker-extract/tracker-controller.c
@@ -234,8 +234,8 @@ tracker_controller_class_init (TrackerControllerClass *klass)
static GSource *
controller_timeout_source_new (guint interval,
- GSourceFunc func,
- gpointer user_data)
+ GSourceFunc func,
+ gpointer user_data)
{
GMainContext *context;
GSource *source;
@@ -256,7 +256,7 @@ watchdog_timeout_cb (gpointer user_data)
TrackerControllerPrivate *priv = data->controller->priv;
g_critical ("Extraction task for '%s' went rogue and took more than %d seconds. Forcing exit.",
- data->uri, WATCHDOG_TIMEOUT);
+ data->uri, WATCHDOG_TIMEOUT);
g_main_loop_quit (priv->main_loop);
@@ -281,8 +281,8 @@ metadata_data_new (TrackerController *controller,
data->request = request;
data->watchdog_source = controller_timeout_source_new (WATCHDOG_TIMEOUT,
- watchdog_timeout_cb,
- data);
+ watchdog_timeout_cb,
+ data);
return data;
}
@@ -377,8 +377,8 @@ reset_shutdown_timeout (TrackerController *controller)
}
priv->shutdown_source = controller_timeout_source_new (priv->shutdown_timeout,
- reset_shutdown_timeout_cb,
- controller);
+ reset_shutdown_timeout_cb,
+ controller);
}
static void
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index d45893d..5e2bfba 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -45,32 +45,6 @@
#warning Main thread traces enabled
#endif /* THREAD_ENABLE_TRACE */
-#define MAX_EXTRACT_TIME 10
-
-#define UNKNOWN_METHOD_MESSAGE "Method \"%s\" with signature \"%s\" on " \
- "interface \"%s\" doesn't exist, expected \"%s\""
-
-static const gchar introspection_xml[] =
- "<node>"
- " <interface name='org.freedesktop.Tracker1.Extract'>"
- " <method name='GetPid'>"
- " <arg type='i' name='value' direction='out' />"
- " </method>"
- " <method name='GetMetadata'>"
- " <arg type='s' name='uri' direction='in' />"
- " <arg type='s' name='mime' direction='in' />"
- " <arg type='s' name='preupdate' direction='out' />"
- " <arg type='s' name='embedded' direction='out' />"
- " <arg type='s' name='where' direction='out' />"
- " </method>"
- " <method name='GetMetadataFast'>"
- " <arg type='s' name='uri' direction='in' />"
- " <arg type='s' name='mime' direction='in' />"
- " <arg type='h' name='fd' direction='in' />"
- " </method>"
- " </interface>"
- "</node>";
-
#define TRACKER_EXTRACT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_EXTRACT, TrackerExtractPrivate))
extern gboolean debug;
@@ -158,7 +132,7 @@ tracker_extract_init (TrackerExtract *object)
priv = TRACKER_EXTRACT_GET_PRIVATE (object);
priv->statistics_data = g_hash_table_new_full (NULL, NULL, NULL,
- (GDestroyNotify) statistics_data_free);
+ (GDestroyNotify) statistics_data_free);
priv->single_thread_extractors = g_hash_table_new (NULL, NULL);
priv->thread_pool = g_thread_pool_new ((GFunc) get_metadata,
NULL, 10, TRUE, NULL);
@@ -276,13 +250,13 @@ notify_task_finish (TrackerExtractTask *task,
g_mutex_lock (priv->task_mutex);
stats_data = g_hash_table_lookup (priv->statistics_data,
- task->cur_module);
+ task->cur_module);
if (!stats_data) {
stats_data = g_slice_new0 (StatisticsData);
g_hash_table_insert (priv->statistics_data,
- task->cur_module,
- stats_data);
+ task->cur_module,
+ stats_data);
}
stats_data->extracted_count++;
@@ -462,8 +436,7 @@ extract_task_new (TrackerExtract *extract,
static void
extract_task_free (TrackerExtractTask *task)
{
- if (task->cancellable &&
- task->signal_id != 0) {
+ if (task->cancellable && task->signal_id != 0) {
g_cancellable_disconnect (task->cancellable, task->signal_id);
}
@@ -573,8 +546,8 @@ dispatch_task_cb (TrackerExtractTask *task)
if (!task->mimetype) {
error = g_error_new (TRACKER_DBUS_ERROR, 0,
- "No mimetype for '%s'",
- task->file);
+ "No mimetype for '%s'",
+ task->file);
} else {
if (!task->mimetype_handlers) {
/* First iteration for task, get the mimetype handlers */
@@ -582,8 +555,8 @@ dispatch_task_cb (TrackerExtractTask *task)
if (!task->mimetype_handlers) {
error = g_error_new (TRACKER_DBUS_ERROR, 0,
- "No mimetype extractor handlers for uri:'%s' and mime:'%s'",
- task->file, task->mimetype);
+ "No mimetype extractor handlers for uri:'%s' and mime:'%s'",
+ task->file, task->mimetype);
}
} else {
/* Any further iteration, should happen rarely if
@@ -595,8 +568,8 @@ dispatch_task_cb (TrackerExtractTask *task)
g_message (" There's no next extractor");
error = g_error_new (TRACKER_DBUS_ERROR, 0,
- "Could not get any metadata for uri:'%s' and mime:'%s'",
- task->file, task->mimetype);
+ "Could not get any metadata for uri:'%s' and mime:'%s'",
+ task->file, task->mimetype);
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]