tracker r2119 - in branches/indexer-split: . src/tracker-applet src/tracker-extract src/tracker-indexer src/trackerd tests/libtracker-common utils/qdbm

[mr svn gnome org]

Author: mr
Date: Wed Aug 20 16:08:34 2008
New Revision: 2119
URL: http://svn.gnome.org/viewvc/tracker?rev=2119&view=rev

Log:
	* src/tracker-applet/tracker-applet.c: 
	* src/tracker-extract/tracker-extract-tiff.c:
	* src/tracker-indexer/tracker-indexer-db.c:
	* src/trackerd/tracker-xesam.c:
	* tests/libtracker-common/tracker-type-utils-test.c:
	* utils/qdbm/search-word.c: More uninitialised variable crapness
	fixed to make it the all new hotness.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-applet/tracker-applet.c
   branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
   branches/indexer-split/src/trackerd/tracker-xesam.c
   branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c
   branches/indexer-split/utils/qdbm/search-word.c

Modified: branches/indexer-split/src/tracker-applet/tracker-applet.c
==============================================================================
--- branches/indexer-split/src/tracker-applet/tracker-applet.c	(original)
+++ branches/indexer-split/src/tracker-applet/tracker-applet.c	Wed Aug 20 16:08:34 2008
@@ -232,14 +232,13 @@
 
 	TrayIconPrivate *priv = TRAY_ICON_GET_PRIVATE (icon);
 
-	const char *status;
+	const char *status = NULL;
 	GString *hint;
 
 	/* Translators: this will appear like "Tracker : Idle" */
 	hint = g_string_new (_("Tracker : "));
 
 	switch (priv->index_state) {
-
 	case INDEX_IDLE:
 		status = _("Idle");
 		break;
@@ -251,7 +250,6 @@
 	case INDEX_MERGING:
 		status = _("Merging");
 		break;
-
 	}
 
 

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-tiff.c	Wed Aug 20 16:08:34 2008
@@ -103,8 +103,8 @@
 	TiffTag  *tag;
 
 	gchar buffer[1024];
-	guint16 varui16;
-	guint32 varui32;
+	guint16 varui16 = 0;
+	guint32 varui32 = 0;
 	float vardouble;
 
 #ifdef HAVE_EXEMPI
@@ -119,7 +119,6 @@
 	}
 	
 	for (tag = tags; tag->name; ++tag) {
-
 		switch (tag->type) {
 			case TIFF_TAGTYPE_STRING:
 				if (!TIFFGetField(image, tag->tag, &buffer)) {

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	Wed Aug 20 16:08:34 2008
@@ -422,7 +422,7 @@
 				TrackerField       *field_def)
 {
 	TrackerDBInterface *iface;
-	TrackerDBResultSet *result_set;
+	TrackerDBResultSet *result_set = NULL;
 	gint                metadata_key;
 	gchar             **final_result = NULL;
 	gboolean            is_numeric = FALSE;

Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c	Wed Aug 20 16:08:34 2008
@@ -27,6 +27,7 @@
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include <libtracker-db/tracker-db-index.h>

Modified: branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c	(original)
+++ branches/indexer-split/tests/libtracker-common/tracker-type-utils-test.c	Wed Aug 20 16:08:34 2008
@@ -337,48 +337,48 @@
         gchar *result;
 
         /* Correct true values */
-        result = tracker_boolean_as_text_to_number ("True");
+        result = tracker_string_boolean_to_string_gint ("True");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
         g_free (result);
 
 
-        result = tracker_boolean_as_text_to_number ("TRUE");
+        result = tracker_string_boolean_to_string_gint ("TRUE");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
         g_free (result);
 
-        result = tracker_boolean_as_text_to_number ("true");
+        result = tracker_string_boolean_to_string_gint ("true");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "1"));
         g_free (result);
 
         /* Correct false values */
-        result = tracker_boolean_as_text_to_number ("False");
+        result = tracker_string_boolean_to_string_gint ("False");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
         g_free (result);
 
-        result = tracker_boolean_as_text_to_number ("FALSE");
+        result = tracker_string_boolean_to_string_gint ("FALSE");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
         g_free (result);
 
-        result = tracker_boolean_as_text_to_number ("false");
+        result = tracker_string_boolean_to_string_gint ("false");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "0"));
         g_free (result);
 
         /* Invalid values */
-        result = tracker_boolean_as_text_to_number ("Thrue");
+        result = tracker_string_boolean_to_string_gint ("Thrue");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "Thrue"));
         g_free (result);
 
-        result = tracker_boolean_as_text_to_number ("Falsez");
+        result = tracker_string_boolean_to_string_gint ("Falsez");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "Falsez"));
         g_free (result);
 
-        result = tracker_boolean_as_text_to_number ("Other invalid value");
+        result = tracker_string_boolean_to_string_gint ("Other invalid value");
         g_assert (tracker_test_helpers_cmpstr_equal (result, "Other invalid value"));
         g_free (result);
 
         
         if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) {
-                result = tracker_boolean_as_text_to_number (NULL);
+                result = tracker_string_boolean_to_string_gint (NULL);
         }
         g_test_trap_assert_failed ();
 }

Modified: branches/indexer-split/utils/qdbm/search-word.c
==============================================================================
--- branches/indexer-split/utils/qdbm/search-word.c	(original)
+++ branches/indexer-split/utils/qdbm/search-word.c	Wed Aug 20 16:08:34 2008
@@ -77,6 +77,8 @@
     DEPOT              *depot;
     guint               hits, i;
 
+    hits = 0;
+
     depot = dpopen (filename, DP_OREADER, -1);
 
     if (depot == NULL) {