tracker r2986 - in trunk: . src/tracker-extract src/tracker-utils

[carlosg svn gnome org]

Author: carlosg
Date: Fri Feb 27 10:54:17 2009
New Revision: 2986
URL: http://svn.gnome.org/viewvc/tracker?rev=2986&view=rev

Log:
2009-02-27  Carlos Garnacho  <carlos imendio com>

        * src/tracker-extract/tracker-extract-jpeg.c (extract_jpeg):
        * src/tracker-extract/tracker-extract-ps.c (extract_ps_gz):
        * src/tracker-utils/tracker-search.c (main):
        * src/tracker-utils/tracker-services.c (main): Fix compiler warnings.

Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/tracker-extract-jpeg.c
   trunk/src/tracker-extract/tracker-extract-ps.c
   trunk/src/tracker-utils/tracker-search.c
   trunk/src/tracker-utils/tracker-services.c

Modified: trunk/src/tracker-extract/tracker-extract-jpeg.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-jpeg.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-jpeg.c	Fri Feb 27 10:54:17 2009
@@ -302,8 +302,6 @@
 	if ((jpeg = fdopen (fd_jpeg, "rb"))) {
 		gchar *str;
 		gsize  len;
-		gsize  offset;
-		gsize  sublen;
 
 		cinfo.err = jpeg_std_error (&tejerr.jpeg);
 		tejerr.jpeg.error_exit = tracker_extract_jpeg_error_exit;

Modified: trunk/src/tracker-extract/tracker-extract-ps.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-ps.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-ps.c	Fri Feb 27 10:54:17 2009
@@ -338,7 +338,7 @@
 
 		if ((f = fdopen (fd, "w"))) {
 			unsigned char buf[8192];
-			size_t b, accum;
+			size_t w, b, accum;
 			size_t max;
 
 			/* 20 MiB should be enough! */
@@ -347,7 +347,11 @@
 
 			while ((b = fread (buf, 1, 8192, fz)) && accum <= max) {
 				accum += b;
-				fwrite (buf, 1, b, f);
+				w = 0;
+
+				while (w < b) {
+					w += fwrite (buf, 1, b, f);
+				}
 			}
 
 			fclose (f);

Modified: trunk/src/tracker-utils/tracker-search.c
==============================================================================
--- trunk/src/tracker-utils/tracker-search.c	(original)
+++ trunk/src/tracker-utils/tracker-search.c	Fri Feb 27 10:54:17 2009
@@ -217,15 +217,11 @@
 			g_print ("%s\n",
 				 _("No results found matching your query"));
 		} else {
-			gint length;
-
-			length = g_strv_length (strv);
-
 			g_print (tracker_dngettext (NULL,
 						    _("Result: %d"), 
 						    _("Results: %d"),
-						    length),
-				 length);
+						    array->len),
+				 array->len);
 			g_print ("\n");
 
 			g_ptr_array_foreach (array, (GFunc) get_meta_table_data, NULL);

Modified: trunk/src/tracker-utils/tracker-services.c
==============================================================================
--- trunk/src/tracker-utils/tracker-services.c	(original)
+++ trunk/src/tracker-utils/tracker-services.c	Fri Feb 27 10:54:17 2009
@@ -132,7 +132,7 @@
 			g_print ("%s\n",
 				 _("No properties available"));
 		} else {
-			GList  *sorted, *l;
+			GList *l, *sorted = NULL;
 			gchar **p;
 
 			g_print ("%s:\n",