[tracker/tracker-0.12] Fix Vala warnings

[Martyn James Russell <mr src gnome org>]

commit d80eadaac84d0a23a46c2d3b36cbab0abb3b87b2
Author: JÃrg Billeter <j bitron ch>
Date:   Wed Nov 16 11:58:33 2011 +0000

    Fix Vala warnings

 src/libtracker-bus/tracker-array-cursor.vala       |    4 +---
 src/libtracker-data/tracker-sparql-expression.vala |   16 ++++------------
 src/libtracker-data/tracker-sparql-scanner.vala    |   14 ++++++++------
 src/tracker-store/tracker-store.vala               |    2 +-
 4 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-array-cursor.vala b/src/libtracker-bus/tracker-array-cursor.vala
index ecc1d51..e7bb971 100644
--- a/src/libtracker-bus/tracker-array-cursor.vala
+++ b/src/libtracker-bus/tracker-array-cursor.vala
@@ -51,9 +51,7 @@ internal class Tracker.Bus.ArrayCursor : Tracker.Sparql.Cursor {
 
 		str = results[current_row, column];
 
-		if (&length != null) {
-			length = str.length;
-		}
+		length = str.length;
 
 		return str;
 	}
diff --git a/src/libtracker-data/tracker-sparql-expression.vala b/src/libtracker-data/tracker-sparql-expression.vala
index c04a5d1..b40b5cd 100644
--- a/src/libtracker-data/tracker-sparql-expression.vala
+++ b/src/libtracker-data/tracker-sparql-expression.vala
@@ -838,6 +838,8 @@ class Tracker.Sparql.Expression : Object {
 	}
 
 	internal string parse_string_literal (out PropertyType type = null) throws Sparql.Error {
+		type = PropertyType.STRING;
+
 		next ();
 		switch (last ()) {
 		case SparqlTokenType.STRING_LITERAL1:
@@ -889,12 +891,7 @@ class Tracker.Sparql.Expression : Object {
 
 			if (accept (SparqlTokenType.DOUBLE_CIRCUMFLEX)) {
 				// typed literal
-				var parsed_type = parse_type_uri ();
-				if (&type == null) {
-					// caller not interested in type
-				} else {
-					type = parsed_type;
-				}
+				type = parse_type_uri ();
 			}
 
 			return sb.str;
@@ -904,12 +901,7 @@ class Tracker.Sparql.Expression : Object {
 
 			if (accept (SparqlTokenType.DOUBLE_CIRCUMFLEX)) {
 				// typed literal
-				var parsed_type = parse_type_uri ();
-				if (&type == null) {
-					// caller not interested in type
-				} else {
-					type = parsed_type;
-				}
+				type = parse_type_uri ();
 			}
 
 			return result;
diff --git a/src/libtracker-data/tracker-sparql-scanner.vala b/src/libtracker-data/tracker-sparql-scanner.vala
index aed826d..7a52cdc 100644
--- a/src/libtracker-data/tracker-sparql-scanner.vala
+++ b/src/libtracker-data/tracker-sparql-scanner.vala
@@ -468,9 +468,7 @@ public class Tracker.SparqlScanner : Object {
 
 		SparqlTokenType type;
 		char* begin = current;
-		token_begin.pos = begin;
-		token_begin.line = line;
-		token_begin.column = column;
+		token_begin = SourceLocation (begin, line, column);
 
 		int token_length_in_chars = -1;
 
@@ -792,9 +790,7 @@ public class Tracker.SparqlScanner : Object {
 			column += token_length_in_chars;
 		}
 
-		token_end.pos = current;
-		token_end.line = line;
-		token_end.column = column - 1;
+		token_end = SourceLocation (current, line, column - 1);
 
 		return type;
 	}
@@ -850,6 +846,12 @@ public struct Tracker.SourceLocation {
 	public char* pos;
 	public int line;
 	public int column;
+
+	public SourceLocation (char* pos, int line, int column) {
+		this.pos = pos;
+		this.line = line;
+		this.column = column;
+	}
 }
 
 public enum Tracker.SparqlTokenType {
diff --git a/src/tracker-store/tracker-store.vala b/src/tracker-store/tracker-store.vala
index 2f4ad81..be4d94d 100644
--- a/src/tracker-store/tracker-store.vala
+++ b/src/tracker-store/tracker-store.vala
@@ -63,7 +63,7 @@ public class Tracker.Store {
 		public string query;
 		public Cancellable cancellable;
 		public uint watchdog_id;
-		public SparqlQueryInThread in_thread;
+		public unowned SparqlQueryInThread in_thread;
 
 		~QueryTask () {
 			if (watchdog_id > 0) {