tracker r2749 - in trunk: . src/libtracker-common

[ifrade svn gnome org]

Author: ifrade
Date: Mon Dec 29 16:51:12 2008
New Revision: 2749
URL: http://svn.gnome.org/viewvc/tracker?rev=2749&view=rev

Log:
Fixing ultra-strict compilation warnings

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-config.c
   trunk/src/libtracker-common/tracker-config.h
   trunk/src/libtracker-common/tracker-hal.c
   trunk/src/libtracker-common/tracker-language.c
   trunk/src/libtracker-common/tracker-language.h
   trunk/src/libtracker-common/tracker-log.c
   trunk/src/libtracker-common/tracker-module-config.c
   trunk/src/libtracker-common/tracker-os-dependant-unix.c
   trunk/src/libtracker-common/tracker-parser.c

Modified: trunk/src/libtracker-common/tracker-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-config.c	(original)
+++ trunk/src/libtracker-common/tracker-config.c	Mon Dec 29 16:51:12 2008
@@ -1222,6 +1222,11 @@
 		config_load (config);
 		break;
 
+	case G_FILE_MONITOR_EVENT_DELETED:
+	case G_FILE_MONITOR_EVENT_CREATED:
+	case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
+	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+	case G_FILE_MONITOR_EVENT_UNMOUNTED:
 	default:
 		break;
 	}
@@ -1324,7 +1329,7 @@
 	 */
 	value = g_key_file_get_boolean (priv->key_file, "Emails", "IndexEvolutionEmails", &error);
 	if (!error) {
-		gchar * const modules[2] = { "evolution", NULL };
+		const gchar * const modules[2] = { "evolution", NULL };
 
 		g_message ("Legacy config option 'IndexEvolutionEmails' found");
 		g_message ("  This option has been replaced by 'DisabledModules'");
@@ -2379,11 +2384,11 @@
 
 void
 tracker_config_add_disabled_modules (TrackerConfig *config,
-				     gchar * const *modules)
+				     const gchar * const *modules)
 {
 	TrackerConfigPrivate *priv;
 	GSList		     *new_modules;
-	gchar * const	     *p;
+	const gchar * const  *p;
 
 	g_return_if_fail (TRACKER_IS_CONFIG (config));
 	g_return_if_fail (modules != NULL);

Modified: trunk/src/libtracker-common/tracker-config.h
==============================================================================
--- trunk/src/libtracker-common/tracker-config.h	(original)
+++ trunk/src/libtracker-common/tracker-config.h	Mon Dec 29 16:51:12 2008
@@ -140,7 +140,7 @@
 void	       tracker_config_add_no_watch_directory_roots	   (TrackerConfig *config,
 								    gchar * const *roots);
 void	       tracker_config_add_disabled_modules		   (TrackerConfig *config,
-								    gchar * const *modules);
+								    const gchar * const *modules);
 void	       tracker_config_add_no_index_file_types		   (TrackerConfig *config,
 								    gchar * const *file_types);
 

Modified: trunk/src/libtracker-common/tracker-hal.c
==============================================================================
--- trunk/src/libtracker-common/tracker-hal.c	(original)
+++ trunk/src/libtracker-common/tracker-hal.c	Mon Dec 29 16:51:12 2008
@@ -63,8 +63,6 @@
 	GList	      *roots;
 } GetRoots;
 
-static void	tracker_hal_class_init		(TrackerHalClass *klass);
-static void	tracker_hal_init		(TrackerHal	 *hal);
 static void	tracker_hal_finalize		(GObject	 *object);
 static void	hal_get_property		(GObject	 *object,
 						 guint		  param_id,
@@ -593,9 +591,9 @@
 		return "LIBHAL_DRIVE_TYPE_FLASHKEY";
 	case LIBHAL_DRIVE_TYPE_MO:
 		return "LIBHAL_DRIVE_TYPE_MO";
+	default:
+		return "";
 	}
-
-	return "";
 }
 
 static gboolean

Modified: trunk/src/libtracker-common/tracker-language.c
==============================================================================
--- trunk/src/libtracker-common/tracker-language.c	(original)
+++ trunk/src/libtracker-common/tracker-language.c	Mon Dec 29 16:51:12 2008
@@ -45,8 +45,8 @@
 };
 
 struct _Languages {
-	gchar *code;
-	gchar *name;
+	const gchar *code;
+	const gchar *name;
 };
 
 static Languages all_langs[] = {
@@ -474,23 +474,6 @@
 }
 
 GSList *
-tracker_language_get_all_by_name (void)
-{
-	GSList *list = NULL;
-	gint i;
-
-	/* Shouldn't we use g_get_language_names() instead? -mr */
-
-	for (i = 0; all_langs[i].code; i++) {
-		list = g_slist_prepend (list, all_langs[i].name);
-	}
-
-	list = g_slist_reverse (list);
-
-	return list;
-}
-
-GSList *
 tracker_language_get_all_by_code (void)
 {
 	GSList *list = NULL;
@@ -499,7 +482,7 @@
 	/* Shouldn't we use g_get_language_names() instead? -mr */
 
 	for (i = 0; all_langs[i].code; i++) {
-		list = g_slist_prepend (list, all_langs[i].code);
+		list = g_slist_prepend (list, (gchar *)all_langs[i].code);
 	}
 
 	list = g_slist_reverse (list);

Modified: trunk/src/libtracker-common/tracker-language.h
==============================================================================
--- trunk/src/libtracker-common/tracker-language.h	(original)
+++ trunk/src/libtracker-common/tracker-language.h	Mon Dec 29 16:51:12 2008
@@ -65,7 +65,6 @@
 gboolean	 tracker_language_check_exists	   (const gchar     *language_code);
 gchar *		 tracker_language_get_default_code (void);
 
-GSList *         tracker_language_get_all_by_name  (void);
 GSList *         tracker_language_get_all_by_code  (void);
 
 const gchar *    tracker_language_get_name_by_code (const gchar     *language_code);

Modified: trunk/src/libtracker-common/tracker-log.c
==============================================================================
--- trunk/src/libtracker-common/tracker-log.c	(original)
+++ trunk/src/libtracker-common/tracker-log.c	Mon Dec 29 16:51:12 2008
@@ -89,7 +89,12 @@
 	case G_LOG_LEVEL_ERROR:
 		log_level_str = "-Error **";
 		break;
-
+	case G_LOG_FLAG_RECURSION:
+	case G_LOG_FLAG_FATAL:
+	case G_LOG_LEVEL_MESSAGE:
+	case G_LOG_LEVEL_INFO:
+	case G_LOG_LEVEL_DEBUG:
+	case G_LOG_LEVEL_MASK:
 	default:
 		log_level_str = NULL;
 		break;

Modified: trunk/src/libtracker-common/tracker-module-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-module-config.c	(original)
+++ trunk/src/libtracker-common/tracker-module-config.c	Mon Dec 29 16:51:12 2008
@@ -556,7 +556,7 @@
 }
 
 static void
-changed_cb (GFileMonitor     *monitor,
+changed_cb (GFileMonitor     *fmonitor,
 	    GFile	     *file,
 	    GFile	     *other_file,
 	    GFileMonitorEvent event_type,
@@ -576,8 +576,13 @@
 
 		load_directory ();
 		break;
-
+	case G_FILE_MONITOR_EVENT_DELETED:
+	case G_FILE_MONITOR_EVENT_CREATED:
+	case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
+	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+	case G_FILE_MONITOR_EVENT_UNMOUNTED:
 	default:
+
 		break;
 	}
 }

Modified: trunk/src/libtracker-common/tracker-os-dependant-unix.c
==============================================================================
--- trunk/src/libtracker-common/tracker-os-dependant-unix.c	(original)
+++ trunk/src/libtracker-common/tracker-os-dependant-unix.c	Mon Dec 29 16:51:12 2008
@@ -178,6 +178,9 @@
 		case S_IFBLK:  str[0] = 'b'; break;
 		case S_IFDIR:  str[0] = 'd'; break;
 		case S_IFREG:  str[0] = '-'; break;
+	default:
+		/* By default a regular file */
+		str[0] = '-';
 	}
 
 	for (bit = 0400, n = 1; bit; bit >>= 1, ++n) {

Modified: trunk/src/libtracker-common/tracker-parser.c
==============================================================================
--- trunk/src/libtracker-common/tracker-parser.c	(original)
+++ trunk/src/libtracker-common/tracker-parser.c	Mon Dec 29 16:51:12 2008
@@ -353,7 +353,11 @@
 			}
 
 			break;
-
+			
+		case TRACKER_PARSER_WORD_ALPHA:
+		case TRACKER_PARSER_WORD_ALPHA_NUM:
+		case TRACKER_PARSER_WORD_IGNORE:
+		case TRACKER_PARSER_WORD_NEWLINE:
 		default:
 			break;
 		}
@@ -640,6 +644,10 @@
 
 			break;
 
+		case TRACKER_PARSER_WORD_ALPHA:
+		case TRACKER_PARSER_WORD_ALPHA_NUM:
+		case TRACKER_PARSER_WORD_IGNORE:
+		case TRACKER_PARSER_WORD_NEWLINE:
 		default:
 			break;
 		}
@@ -870,11 +878,14 @@
 gboolean
 tracker_parser_is_stop_word (TrackerParser *parser, const gchar *word)
 {
+	gboolean result;
+	char *processed_word;
+
 	if (get_encoding (word) == TRACKER_PARSER_ENCODING_CJK) return FALSE;
 
+	processed_word = tracker_parser_process_word (parser, word, -1, TRUE);
+	result = is_stop_word (parser->language, processed_word);
 
-	char *processed_word = tracker_parser_process_word (parser, word, -1, TRUE);
-	gboolean result = is_stop_word (parser->language, processed_word);
 	g_free (processed_word);
 	return result;
 }