diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/datamodel.vala | 8 | ||||
| -rw-r--r-- | src/engine.vala | 1 | ||||
| -rw-r--r-- | src/sql.vala | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/datamodel.vala b/src/datamodel.vala index 8161e2d1..0ae297a8 100644 --- a/src/datamodel.vala +++ b/src/datamodel.vala @@ -25,7 +25,7 @@ namespace Zeitgeist private void assert_sig (bool condition, string error_message) throws EngineError { - if (!condition) + if (unlikely (!condition)) throw new EngineError.INVALID_SIGNATURE (error_message); } @@ -297,7 +297,7 @@ namespace Zeitgeist Variant payload_variant = iter.next_value (); var event_props = event_array.n_children (); - warn_if_fail (event_props >= 5); + assert_sig (event_props >= 5, "Missing event information."); id = (uint32) uint64.parse (event_array.next_value().get_string ()); var str_timestamp = event_array.next_value().get_string (); if (str_timestamp == "") @@ -539,7 +539,7 @@ namespace Zeitgeist VariantIter iter = subject_variant.iterator(); var subject_props = iter.n_children (); - warn_if_fail (subject_props >= 7); + assert_sig (subject_props >= 7, "Missing subject information"); uri = iter.next_value().get_string (); interpretation = iter.next_value().get_string (); manifestation = iter.next_value().get_string (); @@ -551,7 +551,7 @@ namespace Zeitgeist if (subject_props >= 8) current_uri = iter.next_value().get_string (); else - current_uri = ""; // FIXME: uri? + current_uri = ""; } public Variant to_variant () diff --git a/src/engine.vala b/src/engine.vala index fd6d9e22..f9ee3a8a 100644 --- a/src/engine.vala +++ b/src/engine.vala @@ -699,6 +699,7 @@ public class Engine : Object } public TimeRange? delete_events (uint32[] event_ids, BusName? sender) + throws EngineError { event_ids = extension_collection.call_pre_delete_events ( event_ids, sender); diff --git a/src/sql.vala b/src/sql.vala index a99bbd5b..bfaeb5f0 100644 --- a/src/sql.vala +++ b/src/sql.vala @@ -176,10 +176,7 @@ namespace Zeitgeist.SQLite } public void close () - { - // FIXME: make sure symbol tables are consistent (ie. - // _fix_cache is empty) - + { // SQLite connection is implicitly closed upon destruction database = null; } @@ -195,7 +192,7 @@ namespace Zeitgeist.SQLite public void assert_query_success (int rc, string msg, int success_code=Sqlite.OK) throws EngineError { - if (rc != success_code) + if (unlikely (rc != success_code)) { string error_message = "%s: %d, %s".printf( msg, rc, database.errmsg ()); |