[tracker/merge-control-status] tracker-control: Some small code clean ups
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/merge-control-status] tracker-control: Some small code clean ups
- Date: Thu, 3 Feb 2011 12:33:45 +0000 (UTC)
commit f81e7fcb2263d1ecd002a33b38af19ce9bd12f81
Author: Martyn Russell <martyn lanedo com>
Date: Thu Feb 3 12:03:51 2011 +0000
tracker-control: Some small code clean ups
src/tracker-control/tracker-control-general.c | 7 ++-----
src/tracker-control/tracker-control-miners.c | 4 +++-
src/tracker-control/tracker-control-status.c | 5 +++--
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker-control/tracker-control-general.c b/src/tracker-control/tracker-control-general.c
index 23924be..72c9cb0 100644
--- a/src/tracker-control/tracker-control-general.c
+++ b/src/tracker-control/tracker-control-general.c
@@ -52,6 +52,7 @@ static gboolean hard_reset;
static gboolean soft_reset;
static gboolean remove_config;
static gboolean start;
+
#define ENABLED() \
(list_processes || \
kill_option != TERM_NONE || \
@@ -390,7 +391,6 @@ tracker_control_general_run (void)
gsize chunk_size;
gint chunk_size_mb;
-
db_config = tracker_db_config_new ();
/* Set log handler for library messages */
@@ -406,11 +406,9 @@ tracker_control_general_run (void)
rotate_to = tracker_db_config_get_journal_rotate_destination (db_config);
/* This call is needed to set the journal's filename */
-
tracker_db_journal_set_rotating ((chunk_size_mb != -1),
chunk_size, rotate_to);
-
g_object_unref (db_config);
/* Clean up (select_cache_size and update_cache_size don't matter here) */
@@ -455,7 +453,6 @@ tracker_control_general_run (void)
/* Go through service files */
-
/* Check the default XDG_DATA_HOME location */
home_conf_dir = g_getenv ("XDG_CONFIG_HOME");
@@ -470,7 +467,6 @@ tracker_control_general_run (void)
path = g_build_path (G_DIR_SEPARATOR_S, home_conf_dir, ".config", "tracker", NULL);
}
-
file = g_file_new_for_path (path);
g_free (path);
@@ -540,5 +536,6 @@ tracker_control_general_get_option_group (void)
NULL,
NULL);
g_option_group_add_entries (group, entries);
+
return group;
}
diff --git a/src/tracker-control/tracker-control-miners.c b/src/tracker-control/tracker-control-miners.c
index 3f55bd7..ac63809 100644
--- a/src/tracker-control/tracker-control-miners.c
+++ b/src/tracker-control/tracker-control-miners.c
@@ -38,6 +38,7 @@ static gint resume_cookie = -1;
static gboolean list_miners_running;
static gboolean list_miners_available;
static gboolean pause_details;
+
#define ENABLED() \
(reindex_mime_types || \
index_file || \
@@ -291,7 +292,7 @@ tracker_control_miners_run (void)
}
/* All known options have their own exit points */
- g_warn_if_reached();
+ g_warn_if_reached ();
return EXIT_FAILURE;
}
@@ -308,5 +309,6 @@ tracker_control_miners_get_option_group (void)
NULL,
NULL);
g_option_group_add_entries (group, entries);
+
return group;
}
diff --git a/src/tracker-control/tracker-control-status.c b/src/tracker-control/tracker-control-status.c
index cd1a8ac..1eceeb3 100644
--- a/src/tracker-control/tracker-control-status.c
+++ b/src/tracker-control/tracker-control-status.c
@@ -42,6 +42,7 @@ static gboolean status;
static gboolean follow;
static gboolean detailed;
static gboolean list_common_statuses;
+
#define ENABLED() \
(status || \
follow || \
@@ -60,7 +61,6 @@ static const gchar *statuses[7] = {
N_("Idle")
};
-/* ---- STATUS options ---- */
static GOptionEntry entries[] = {
{ "status", 'S', 0, G_OPTION_ARG_NONE, &status,
N_("Show current status"),
@@ -600,7 +600,7 @@ tracker_control_status_run (void)
}
/* All known options have their own exit points */
- g_warn_if_reached();
+ g_warn_if_reached ();
return EXIT_FAILURE;
}
@@ -617,5 +617,6 @@ tracker_control_status_get_option_group (void)
NULL,
NULL);
g_option_group_add_entries (group, entries);
+
return group;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]