Steroids-client: Code cleanup, phase 1 - examples/ and libtracker-client/

7 files changed, 94 insertions, 90 deletions

diff --git a/examples/tracker-steroids/Makefile.am b/examples/tracker-steroids/Makefile.am
index 5b87d307b..024e493cc 100644
--- a/examples/tracker-steroids/Makefile.am
+++ b/examples/tracker-steroids/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES =							\
 	$(GIO_CFLAGS)						\
 	$(DBUS_CFLAGS)
 
-noinst_PROGRAMS = \
+noinst_PROGRAMS = 						\
 	steroids-sparql						\
 	steroids-sparql-async					\
 	steroids-sparql-update-async				\
@@ -23,11 +23,11 @@ noinst_PROGRAMS = \
 steroids_sparql_SOURCES =					\
 	steroids-sparql.c
 
-steroids_sparql_update_async_SOURCES=steroids-sparql-update-async.c
+steroids_sparql_update_async_SOURCES = steroids-sparql-update-async.c
 
-benchmark_SOURCES= benchmark.c
+benchmark_SOURCES = benchmark.c
 
-benchmark_update_SOURCES=benchmark-update.c
+benchmark_update_SOURCES = benchmark-update.c
 
 steroids_sparql_LDADD =						\
        $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \
@@ -41,10 +41,10 @@ steroids_sparql_LDADD =						\
        -lz							\
        -lm
 
-steroids_sparql_async_LDADD= $(steroids_sparql_LDADD)
+steroids_sparql_async_LDADD = $(steroids_sparql_LDADD)
 
-steroids_sparql_update_async_LDADD= $(steroids_sparql_LDADD)
+steroids_sparql_update_async_LDADD = $(steroids_sparql_LDADD)
 
-benchmark_LDADD= $(steroids_sparql_LDADD)
+benchmark_LDADD = $(steroids_sparql_LDADD)
 
-benchmark_update_LDADD= $(steroids_sparql_LDADD)
+benchmark_update_LDADD = $(steroids_sparql_LDADD)
diff --git a/examples/tracker-steroids/benchmark_tracker_ipc.c b/examples/tracker-steroids/benchmark-tracker-ipc.c
index a866f2095..e39045e23 100644
--- a/examples/tracker-steroids/benchmark_tracker_ipc.c
+++ b/examples/tracker-steroids/benchmark-tracker-ipc.c
@@ -20,24 +20,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libtracker-client/tracker.h>
+
+#include <libtracker-client/tracker-client.h>
 
 int
 main (int argc, char **argv)
 {
-	const char *query;
+	const gchar *query;
 	TrackerClient *client;
 	GError *error = NULL;
 	GPtrArray *results;
 	TrackerResultIterator *iterator;
-	char buffer[1024*1024];
+	gchar buffer[1024 * 1024];
 	GTimer *timer;
-	int i, j;
-	double time_normal, time_steroids;
+	gint i, j;
+	gdouble time_normal, time_steroids;
 
 	if (argc != 2) {
-		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		g_printerr ("Usage: %s query\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -52,7 +53,7 @@ main (int argc, char **argv)
 		g_critical ("Query error: %s", error->message);
 		g_error_free (error);
 		g_timer_destroy (timer);
-		exit (1);
+		return EXIT_FAILURE;
 	}
 
 	for (i = 0; i < results->len; i++) {
@@ -67,15 +68,15 @@ main (int argc, char **argv)
 
 	g_ptr_array_free (results, TRUE);
 
-	g_timer_start (timer);
-
 	iterator = tracker_resources_sparql_query_iterate (client, query, &error);
 
 	while (tracker_result_iterator_has_next (iterator)) {
 		tracker_result_iterator_next (iterator);
 
 		for (i = 0; i < tracker_result_iterator_n_columns (iterator); i++) {
-			const char *data = tracker_result_iterator_value (iterator, i);
+			const char *data;
+
+			data = tracker_result_iterator_value (iterator, i);
 			memcpy (buffer, data, g_utf8_strlen (data, -1));
 		}
 	}
@@ -84,9 +85,9 @@ main (int argc, char **argv)
 
 	tracker_result_iterator_free (iterator);
 
-	printf ("Normal:   %f seconds\n", time_normal);
-	printf ("Steroids: %f seconds\n", time_steroids);
-	printf ("Speedup:  %f %%\n", 100 * (time_normal/time_steroids - 1));
+	g_print ("Normal:   %f seconds\n", time_normal);
+	g_print ("Steroids: %f seconds\n", time_steroids);
+	g_print ("Speedup:  %f %%\n", 100 * (time_normal / time_steroids - 1));
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/tracker-steroids/benchmark-update.c b/examples/tracker-steroids/benchmark-update.c
index f8d84ff9b..70a2992bb 100644
--- a/examples/tracker-steroids/benchmark-update.c
+++ b/examples/tracker-steroids/benchmark-update.c
@@ -20,23 +20,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libtracker-client/tracker.h>
+
+#include <libtracker-client/tracker-client.h>
 
 #define N_TRIES 500
 
 int
 main (int argc, char **argv)
 {
-	const char *query;
+	const gchar *query;
 	TrackerClient *client;
 	GError *error = NULL;
 	GTimer *timer;
-	int i;
-	double time_normal, time_steroids;
+	gint i;
+	gdouble time_normal, time_steroids;
 
 	if (argc != 2) {
-		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		g_printerr ("Usage: %s query\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -50,7 +51,7 @@ main (int argc, char **argv)
 		if (error) {
 			g_critical ("Query error: %s", error->message);
 			g_error_free (error);
-			exit (1);
+			return EXIT_FAILURE;
 		}
 	}
 
@@ -64,14 +65,12 @@ main (int argc, char **argv)
 			g_critical ("Query error: %s", error->message);
 			g_error_free (error);
 			g_timer_destroy (timer);
-			exit (1);
+			return EXIT_FAILURE;
 		}
 	}
 
 	time_normal = g_timer_elapsed (timer, NULL);
 
-	g_timer_start (timer);
-
 	for (i = 0; i < N_TRIES; i++) {
 		tracker_resources_sparql_update (client, query, &error);
 
@@ -79,15 +78,15 @@ main (int argc, char **argv)
 			g_critical ("Query error: %s", error->message);
 			g_error_free (error);
 			g_timer_destroy (timer);
-			exit (1);
+			return EXIT_FAILURE;
 		}
 	}
 
 	time_steroids = g_timer_elapsed (timer, NULL);
 
-	printf ("Normal:   %f seconds\n", time_normal/N_TRIES);
-	printf ("Steroids: %f seconds\n", time_steroids/N_TRIES);
-	printf ("Speedup:  %f %%\n", 100 * (time_normal/time_steroids - 1));
+	g_print ("Normal:   %f seconds\n", time_normal/N_TRIES);
+	g_print ("Steroids: %f seconds\n", time_steroids/N_TRIES);
+	g_print ("Speedup:  %f %%\n", 100 * (time_normal / time_steroids - 1));
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/tracker-steroids/benchmark.c b/examples/tracker-steroids/benchmark.c
index a866f2095..f74c9f39c 100644
--- a/examples/tracker-steroids/benchmark.c
+++ b/examples/tracker-steroids/benchmark.c
@@ -20,24 +20,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libtracker-client/tracker.h>
+
+#include <libtracker-client/tracker-client.h>
 
 int
 main (int argc, char **argv)
 {
-	const char *query;
+	const gchar *query;
 	TrackerClient *client;
 	GError *error = NULL;
 	GPtrArray *results;
 	TrackerResultIterator *iterator;
-	char buffer[1024*1024];
+	gchar buffer[1024 * 1024];
 	GTimer *timer;
-	int i, j;
-	double time_normal, time_steroids;
+	gint i, j;
+	gdouble time_normal, time_steroids;
 
 	if (argc != 2) {
 		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -52,7 +53,7 @@ main (int argc, char **argv)
 		g_critical ("Query error: %s", error->message);
 		g_error_free (error);
 		g_timer_destroy (timer);
-		exit (1);
+		return EXIT_FAILURE;
 	}
 
 	for (i = 0; i < results->len; i++) {
@@ -67,15 +68,15 @@ main (int argc, char **argv)
 
 	g_ptr_array_free (results, TRUE);
 
-	g_timer_start (timer);
-
 	iterator = tracker_resources_sparql_query_iterate (client, query, &error);
 
 	while (tracker_result_iterator_has_next (iterator)) {
 		tracker_result_iterator_next (iterator);
 
 		for (i = 0; i < tracker_result_iterator_n_columns (iterator); i++) {
-			const char *data = tracker_result_iterator_value (iterator, i);
+			const char *data;
+
+			data = tracker_result_iterator_value (iterator, i);
 			memcpy (buffer, data, g_utf8_strlen (data, -1));
 		}
 	}
@@ -84,9 +85,9 @@ main (int argc, char **argv)
 
 	tracker_result_iterator_free (iterator);
 
-	printf ("Normal:   %f seconds\n", time_normal);
-	printf ("Steroids: %f seconds\n", time_steroids);
-	printf ("Speedup:  %f %%\n", 100 * (time_normal/time_steroids - 1));
+	g_print ("Normal:   %f seconds\n", time_normal);
+	g_print ("Steroids: %f seconds\n", time_steroids);
+	g_print ("Speedup:  %f %%\n", 100 * (time_normal / time_steroids - 1));
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/tracker-steroids/steroids-sparql-async.c b/examples/tracker-steroids/steroids-sparql-async.c
index ee2d04a3f..24b24e215 100644
--- a/examples/tracker-steroids/steroids-sparql-async.c
+++ b/examples/tracker-steroids/steroids-sparql-async.c
@@ -20,20 +20,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libtracker-client/tracker.h>
+#include <libtracker-client/tracker-client.h>
 
 static TrackerClient *client;
 static GMainLoop *main_loop;
 
 static void
 query_cb (TrackerResultIterator *iterator,
-          GError          *error,
-          gpointer         user_data)
+          GError                *error,
+          gpointer               user_data)
 {
 	if (!iterator) {
-		fprintf (stderr, "Query preparation failed, %s\n", error->message);
+		g_printerr ("Query preparation failed, %s\n", error->message);
 		g_error_free (error);
-		exit (1);
+		exit (EXIT_FAILURE);
 	}
 
 	while (tracker_result_iterator_has_next (iterator)) {
@@ -42,14 +42,14 @@ query_cb (TrackerResultIterator *iterator,
 		tracker_result_iterator_next (iterator);
 
 		for (i = 0; i < tracker_result_iterator_n_columns (iterator); i++) {
-			printf ("%s", tracker_result_iterator_value (iterator, i));
+			g_print ("%s", tracker_result_iterator_value (iterator, i));
 
 			if (i != tracker_result_iterator_n_columns (iterator) - 1) {
-				printf (", ");
+				g_print (", ");
 			}
 		}
 
-		printf ("\n");
+		g_print ("\n");
 	}
 
 	tracker_result_iterator_free (iterator);
@@ -59,12 +59,13 @@ query_cb (TrackerResultIterator *iterator,
 }
 
 int
-main (int argc, char **argv) {
-	const char *query;
+main (int argc, char **argv) 
+{
+	const gchar *query;
 
 	if (argc != 2) {
-		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		g_printerr ("Usage: %s query\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -77,5 +78,5 @@ main (int argc, char **argv) {
 
 	g_main_loop_run (main_loop);
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/tracker-steroids/steroids-sparql-update-async.c b/examples/tracker-steroids/steroids-sparql-update-async.c
index 2c1994fea..4f68a6118 100644
--- a/examples/tracker-steroids/steroids-sparql-update-async.c
+++ b/examples/tracker-steroids/steroids-sparql-update-async.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libtracker-client/tracker.h>
+#include <libtracker-client/tracker-client.h>
 
 #include <glib.h>
 
@@ -28,11 +28,11 @@ static TrackerClient *client;
 static GMainLoop *main_loop;
 
 static void
-query_cb (GPtrArray       *results,
-          GError          *error,
-          gpointer         user_data)
+query_cb (GPtrArray *results,
+          GError    *error,
+          gpointer   user_data)
 {
-	int i, j;
+	gint i, j;
 
 	if (error) {
 		g_critical ("Update failed: %s", error->message);
@@ -57,7 +57,7 @@ query_cb (GPtrArray       *results,
 			g_hash_table_iter_init (&iter, hash);
 
 			while (g_hash_table_iter_next (&iter, &key, &value)) {
-				g_printf ("%s -> %s\n", (char *)key, (char *)value);
+				g_print ("%s -> %s\n", (gchar*) key, (gchar*) value);
 			}
 
 			g_hash_table_unref (hash);
@@ -72,12 +72,13 @@ query_cb (GPtrArray       *results,
 }
 
 int
-main (int argc, char **argv) {
-	const char *query;
-
+main (int argc, char **argv) 
+{
+	const gchar *query;
+	
 	if (argc != 2) {
-		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		g_printerr ("Usage: %s query\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -88,10 +89,10 @@ main (int argc, char **argv) {
 
 	if (tracker_resources_sparql_update_blank_async (client, query, query_cb, NULL) == 0) {
 		g_critical ("error running update");
-		return 1;
+		return EXIT_FAILURE;
 	}
 
 	g_main_loop_run (main_loop);
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/examples/tracker-steroids/steroids-sparql.c b/examples/tracker-steroids/steroids-sparql.c
index ba2fc71dc..ecf2a2cce 100644
--- a/examples/tracker-steroids/steroids-sparql.c
+++ b/examples/tracker-steroids/steroids-sparql.c
@@ -20,18 +20,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libtracker-client/tracker.h>
+#include <libtracker-client/tracker-client.h>
 
 int
-main (int argc, char **argv) {
-	const char *query;
+main (int argc, char **argv) 
+{
+	const gchar *query;
 	TrackerClient *client;
 	GError *error = NULL;
 	TrackerResultIterator *iterator;
 
 	if (argc != 2) {
-		fprintf (stderr, "Usage: %s query\n", argv[0]);
-		exit (1);
+		g_printerr ( "Usage: %s query\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	query = argv[1];
@@ -41,29 +42,29 @@ main (int argc, char **argv) {
 	iterator = tracker_resources_sparql_query_iterate (client, query, &error);
 
 	if (!iterator) {
-		fprintf (stderr, "Query preparation failed, %s\n", error->message);
+		g_printerr ("Query preparation failed, %s\n", error->message);
 		g_error_free (error);
-		exit (1);
+		return EXIT_FAILURE;
 	}
 
 	while (tracker_result_iterator_has_next (iterator)) {
-		int i;
+		gint i;
 
 		tracker_result_iterator_next (iterator);
 
 		for (i = 0; i < tracker_result_iterator_n_columns (iterator); i++) {
-			printf ("%s", tracker_result_iterator_value (iterator, i));
+			g_print ("%s", tracker_result_iterator_value (iterator, i));
 
 			if (i != tracker_result_iterator_n_columns (iterator) - 1) {
-				printf (", ");
+				g_print (", ");
 			}
 		}
 
-		printf ("\n");
+		g_print ("\n");
 	}
 
 	tracker_result_iterator_free (iterator);
 	g_object_unref (client);
 
-	return 0;
+	return EXIT_SUCCESS;
 }