From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/db/TagTable.c | 798 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 420 insertions(+), 378 deletions(-) (limited to 'src/db/TagTable.c') diff --git a/src/db/TagTable.c b/src/db/TagTable.c index e0aa0b1..986af84 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.34.7, the Vala compiler +/* TagTable.c generated by valac 0.36.6, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -152,7 +152,7 @@ enum { }; TagRow* tag_row_new (void); TagRow* tag_row_construct (GType object_type); -static void tag_row_finalize (TagRow* obj); +static void tag_row_finalize (TagRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -183,7 +183,7 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou void tag_table_remove (TagTable* self, TagID* tag_id, GError** error); void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt); +gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error); static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list); void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); @@ -195,14 +195,14 @@ void photo_id_free (PhotoID* self); gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id); gint64 parse_int64 (const gchar* str, gint num_base); void photo_id_init (PhotoID *self, gint64 id); -static void tag_table_finalize (DatabaseTable* obj); +static void tag_table_finalize (DatabaseTable * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); void tag_id_init (TagID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/TagTable.vala" memset (self, 0, sizeof (TagID)); #line 13 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -215,7 +215,7 @@ void tag_id_init (TagID *self, gint64 id) { gboolean tag_id_is_invalid (TagID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -228,7 +228,7 @@ gboolean tag_id_is_invalid (TagID *self) { gboolean tag_id_is_valid (TagID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -328,7 +328,7 @@ static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (collect_values[0].v_pointer) { #line 331 "TagTable.c" - TagRow* object; + TagRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (object->parent_instance.g_class == NULL) { @@ -355,7 +355,7 @@ static gchar* value_tag_row_collect_value (GValue* value, guint n_collect_values static gchar* value_tag_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TagRow** object_p; + TagRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!object_p) { @@ -407,7 +407,7 @@ gpointer value_get_tag_row (const GValue* value) { void value_set_tag_row (GValue* value, gpointer v_object) { - TagRow* old; + TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -438,7 +438,7 @@ void value_set_tag_row (GValue* value, gpointer v_object) { void value_take_tag_row (GValue* value, gpointer v_object) { - TagRow* old; + TagRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TAG_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -482,7 +482,7 @@ static void tag_row_instance_init (TagRow * self) { } -static void tag_row_finalize (TagRow* obj) { +static void tag_row_finalize (TagRow * obj) { TagRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_ROW, TagRow); @@ -511,7 +511,7 @@ GType tag_row_get_type (void) { gpointer tag_row_ref (gpointer instance) { - TagRow* self; + TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_atomic_int_inc (&self->ref_count); @@ -522,7 +522,7 @@ gpointer tag_row_ref (gpointer instance) { void tag_row_unref (gpointer instance) { - TagRow* self; + TagRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -539,13 +539,13 @@ static TagTable* tag_table_construct (GType object_type) { TagTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 35 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = (TagTable*) database_table_construct (object_type); #line 36 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -575,7 +575,7 @@ static TagTable* tag_table_construct (GType object_type) { #line 50 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 578 "TagTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp7_ = res; #line 51 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -606,15 +606,15 @@ static gpointer _database_table_ref0 (gpointer self) { TagTable* tag_table_get_instance (void) { TagTable* result = NULL; - TagTable* _tmp0_ = NULL; - TagTable* _tmp2_ = NULL; - TagTable* _tmp3_ = NULL; + TagTable* _tmp0_; + TagTable* _tmp2_; + TagTable* _tmp3_; #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp0_ = tag_table_instance; #line 55 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp0_ == NULL) { #line 617 "TagTable.c" - TagTable* _tmp1_ = NULL; + TagTable* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = tag_table_new (); #line 56 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -644,137 +644,179 @@ static gpointer _g_object_ref0 (gpointer self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 655 "TagTable.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 661 "TagTable.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 668 "TagTable.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 674 "TagTable.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 684 "TagTable.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 688 "TagTable.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 696 "TagTable.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 686 "TagTable.c" +#line 728 "TagTable.c" goto __catch21_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 695 "TagTable.c" +#line 737 "TagTable.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 711 "TagTable.c" +#line 753 "TagTable.c" goto __catch21_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 722 "TagTable.c" +#line 764 "TagTable.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 736 "TagTable.c" +#line 778 "TagTable.c" } goto __finally21; __catch21_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 750 "TagTable.c" +#line 792 "TagTable.c" } __finally21: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 761 "TagTable.c" +#line 803 "TagTable.c" } } void tag_table_upgrade_for_htags (void) { TagTable* table = NULL; - TagTable* _tmp0_ = NULL; + TagTable* _tmp0_; GError * _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp0_ = tag_table_get_instance (); #line 62 "/home/jens/Source/shotwell/src/db/TagTable.vala" table = _tmp0_; -#line 774 "TagTable.c" +#line 816 "TagTable.c" { GeeList* rows = NULL; - TagTable* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + TagTable* _tmp1_; + GeeList* _tmp2_; #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = table; #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -785,7 +827,7 @@ void tag_table_upgrade_for_htags (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 789 "TagTable.c" +#line 831 "TagTable.c" goto __catch20_database_error; } #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -796,16 +838,16 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 65 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 800 "TagTable.c" +#line 842 "TagTable.c" } { GeeList* _row_list = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + GeeList* _tmp3_; + GeeList* _tmp4_; gint _row_size = 0; - GeeList* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; gint _row_index = 0; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp3_ = rows; @@ -825,23 +867,23 @@ void tag_table_upgrade_for_htags (void) { _row_index = -1; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 829 "TagTable.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 871 "TagTable.c" + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; TagRow* row = NULL; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gpointer _tmp13_ = NULL; - TagRow* _tmp14_ = NULL; - TagRow* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - TagTable* _tmp18_ = NULL; - TagRow* _tmp19_ = NULL; - TagID _tmp20_ = {0}; - TagRow* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + TagRow* _tmp14_; + TagRow* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + TagTable* _tmp18_; + TagRow* _tmp19_; + TagID _tmp20_; + TagRow* _tmp21_; + const gchar* _tmp22_; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp8_ = _row_index; #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -854,7 +896,7 @@ void tag_table_upgrade_for_htags (void) { if (!(_tmp9_ < _tmp10_)) { #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 858 "TagTable.c" +#line 900 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp11_ = _row_list; @@ -898,7 +940,7 @@ void tag_table_upgrade_for_htags (void) { _g_object_unref0 (rows); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 902 "TagTable.c" +#line 944 "TagTable.c" goto __catch20_database_error; } #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -915,25 +957,25 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 69 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 919 "TagTable.c" +#line 961 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 923 "TagTable.c" +#line 965 "TagTable.c" } #line 67 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_row_list); -#line 927 "TagTable.c" +#line 969 "TagTable.c" } #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); -#line 931 "TagTable.c" +#line 973 "TagTable.c" } goto __finally20; __catch20_database_error: { GError* e = NULL; - const gchar* _tmp23_ = NULL; + const gchar* _tmp23_; #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" e = _inner_error_; #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -945,7 +987,7 @@ void tag_table_upgrade_for_htags (void) { "ag support: %s", _tmp23_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_error_free0 (e); -#line 948 "TagTable.c" +#line 990 "TagTable.c" } __finally20: #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -958,11 +1000,11 @@ void tag_table_upgrade_for_htags (void) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 961 "TagTable.c" +#line 1003 "TagTable.c" } #line 61 "/home/jens/Source/shotwell/src/db/TagTable.vala" _database_table_unref0 (table); -#line 965 "TagTable.c" +#line 1007 "TagTable.c" } @@ -970,36 +1012,36 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; time_t time_created = 0; - gulong _tmp4_ = 0UL; - sqlite3_stmt* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GDestroyNotify _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - sqlite3_stmt* _tmp11_ = NULL; - time_t _tmp12_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; + time_t _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + gint _tmp16_; + gint _tmp17_; TagRow* row = NULL; - TagRow* _tmp19_ = NULL; - TagRow* _tmp20_ = NULL; - sqlite3* _tmp21_ = NULL; - gint64 _tmp22_ = 0LL; - TagRow* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - TagRow* _tmp26_ = NULL; - TagRow* _tmp27_ = NULL; - time_t _tmp28_ = 0; + TagRow* _tmp19_; + TagRow* _tmp20_; + sqlite3* _tmp21_; + gint64 _tmp22_; + TagRow* _tmp23_; + const gchar* _tmp24_; + gchar* _tmp25_; + TagRow* _tmp26_; + TagRow* _tmp27_; + time_t _tmp28_; GError * _inner_error_ = NULL; #line 76 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1061,8 +1103,8 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { _tmp17_ = res; #line 90 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp17_ != SQLITE_DONE) { -#line 1064 "TagTable.c" - gint _tmp18_ = 0; +#line 1106 "TagTable.c" + gint _tmp18_; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp18_ = res; #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1077,7 +1119,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { _sqlite3_finalize0 (stmt); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1080 "TagTable.c" +#line 1122 "TagTable.c" } else { #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1087,7 +1129,7 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { g_clear_error (&_inner_error_); #line 91 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1090 "TagTable.c" +#line 1132 "TagTable.c" } } } @@ -1131,41 +1173,41 @@ TagRow* tag_table_add (TagTable* self, const gchar* name, GError** error) { _sqlite3_finalize0 (stmt); #line 99 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1134 "TagTable.c" +#line 1176 "TagTable.c" } void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GError** error) { sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; - TagRow* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GDestroyNotify _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - sqlite3_stmt* _tmp11_ = NULL; - TagRow* _tmp12_ = NULL; - GeeSet* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - GDestroyNotify _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - TagRow* _tmp19_ = NULL; - time_t _tmp20_ = 0; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - sqlite3* _tmp27_ = NULL; - gint64 _tmp28_ = 0LL; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + TagRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; + TagRow* _tmp12_; + GeeSet* _tmp13_; + gchar* _tmp14_; + GDestroyNotify _tmp15_; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; + TagRow* _tmp19_; + time_t _tmp20_; + gint _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; + gint _tmp25_; + sqlite3* _tmp27_; + gint64 _tmp28_; TagID _tmp29_ = {0}; GError * _inner_error_ = NULL; #line 103 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1247,8 +1289,8 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr _tmp25_ = res; #line 117 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp25_ != SQLITE_DONE) { -#line 1249 "TagTable.c" - gint _tmp26_ = 0; +#line 1291 "TagTable.c" + gint _tmp26_; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp26_ = res; #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1263,7 +1305,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1265 "TagTable.c" +#line 1307 "TagTable.c" } else { #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1273,7 +1315,7 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1275 "TagTable.c" +#line 1317 "TagTable.c" } } } @@ -1289,13 +1331,13 @@ void tag_table_create_from_row (TagTable* self, TagRow* row, TagID* result, GErr _sqlite3_finalize0 (stmt); #line 120 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1291 "TagTable.c" +#line 1333 "TagTable.c" } void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { - TagID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + TagID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 123 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1315,7 +1357,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_propagate_error (error, _inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1317 "TagTable.c" +#line 1359 "TagTable.c" } else { #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1323,7 +1365,7 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 124 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1325 "TagTable.c" +#line 1367 "TagTable.c" } } } @@ -1332,13 +1374,13 @@ void tag_table_remove (TagTable* self, TagID* tag_id, GError** error) { gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { gchar* result = NULL; sqlite3_stmt* stmt = NULL; - TagID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + TagID _tmp0_; + gint64 _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - sqlite3_stmt* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gboolean _tmp3_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 127 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1361,7 +1403,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 130 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1363 "TagTable.c" +#line 1405 "TagTable.c" } #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = stmt; @@ -1375,7 +1417,7 @@ gchar* tag_table_get_name (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 132 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1377 "TagTable.c" +#line 1419 "TagTable.c" } @@ -1383,33 +1425,33 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { TagRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; - TagID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + TagID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; TagRow* row = NULL; - TagRow* _tmp14_ = NULL; - TagRow* _tmp15_ = NULL; - TagID _tmp16_ = {0}; - TagRow* _tmp17_ = NULL; - sqlite3_stmt* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - TagRow* _tmp21_ = NULL; - sqlite3_stmt* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - GeeSet* _tmp24_ = NULL; - TagRow* _tmp25_ = NULL; - sqlite3_stmt* _tmp26_ = NULL; - gint64 _tmp27_ = 0LL; + TagRow* _tmp14_; + TagRow* _tmp15_; + TagID _tmp16_; + TagRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + TagRow* _tmp21_; + sqlite3_stmt* _tmp22_; + const gchar* _tmp23_; + GeeSet* _tmp24_; + TagRow* _tmp25_; + sqlite3_stmt* _tmp26_; + gint64 _tmp27_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1459,15 +1501,15 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 146 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1461 "TagTable.c" +#line 1503 "TagTable.c" } else { - gint _tmp12_ = 0; + gint _tmp12_; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp12_ = res; #line 147 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp12_ != SQLITE_ROW) { -#line 1468 "TagTable.c" - gint _tmp13_ = 0; +#line 1510 "TagTable.c" + gint _tmp13_; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp13_ = res; #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1482,7 +1524,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1484 "TagTable.c" +#line 1526 "TagTable.c" } else { #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1492,7 +1534,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { g_clear_error (&_inner_error_); #line 148 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1494 "TagTable.c" +#line 1536 "TagTable.c" } } } @@ -1545,7 +1587,7 @@ TagRow* tag_table_get_row (TagTable* self, TagID* tag_id, GError** error) { _sqlite3_finalize0 (stmt); #line 156 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1547 "TagTable.c" +#line 1589 "TagTable.c" } @@ -1553,12 +1595,12 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; GeeList* rows = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; GError * _inner_error_ = NULL; #line 159 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); @@ -1580,38 +1622,38 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, (GDestroyNotify) tag_row_unref, NULL, NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 1582 "TagTable.c" +#line 1624 "TagTable.c" { gboolean _tmp5_ = FALSE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = TRUE; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1589 "TagTable.c" - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 1631 "TagTable.c" + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint _tmp8_; TagRow* row = NULL; - TagRow* _tmp11_ = NULL; - TagRow* _tmp12_ = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - TagRow* _tmp15_ = NULL; - sqlite3_stmt* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - TagRow* _tmp19_ = NULL; - sqlite3_stmt* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GeeSet* _tmp22_ = NULL; - TagRow* _tmp23_ = NULL; - sqlite3_stmt* _tmp24_ = NULL; - gint64 _tmp25_ = 0LL; - GeeList* _tmp26_ = NULL; - TagRow* _tmp27_ = NULL; + TagRow* _tmp11_; + TagRow* _tmp12_; + sqlite3_stmt* _tmp13_; + gint64 _tmp14_; + TagRow* _tmp15_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + TagRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + GeeSet* _tmp22_; + TagRow* _tmp23_; + sqlite3_stmt* _tmp24_; + gint64 _tmp25_; + GeeList* _tmp26_; + TagRow* _tmp27_; #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (!_tmp5_) { -#line 1613 "TagTable.c" +#line 1655 "TagTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5_ = FALSE; @@ -1627,15 +1669,15 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { if (_tmp8_ == SQLITE_DONE) { #line 170 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1629 "TagTable.c" +#line 1671 "TagTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp9_ = res; #line 171 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp9_ != SQLITE_ROW) { -#line 1636 "TagTable.c" - gint _tmp10_ = 0; +#line 1678 "TagTable.c" + gint _tmp10_; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp10_ = res; #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1652,7 +1694,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1654 "TagTable.c" +#line 1696 "TagTable.c" } else { #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (rows); @@ -1664,7 +1706,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { g_clear_error (&_inner_error_); #line 172 "/home/jens/Source/shotwell/src/db/TagTable.vala" return NULL; -#line 1666 "TagTable.c" +#line 1708 "TagTable.c" } } } @@ -1721,7 +1763,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 167 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tag_row_unref0 (row); -#line 1723 "TagTable.c" +#line 1765 "TagTable.c" } } #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1730,14 +1772,14 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) { _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1732 "TagTable.c" +#line 1774 "TagTable.c" } void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error) { - TagID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + TagID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1761,7 +1803,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1763 "TagTable.c" +#line 1805 "TagTable.c" } else { #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1769,7 +1811,7 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1771 "TagTable.c" +#line 1813 "TagTable.c" } } } @@ -1778,24 +1820,24 @@ void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GEr void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* source_ids, GError** error) { sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; + sqlite3* _tmp0_; sqlite3_stmt* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - TagID _tmp11_ = {0}; - gint64 _tmp12_ = 0LL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + GeeCollection* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + TagID _tmp11_; + gint64 _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + gint _tmp16_; + gint _tmp17_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_if_fail (IS_TAG_TABLE (self)); @@ -1857,8 +1899,8 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* _tmp17_ = res; #line 202 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp17_ != SQLITE_DONE) { -#line 1859 "TagTable.c" - gint _tmp18_ = 0; +#line 1901 "TagTable.c" + gint _tmp18_; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp18_ = res; #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1873,7 +1915,7 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* _sqlite3_finalize0 (stmt); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1875 "TagTable.c" +#line 1917 "TagTable.c" } else { #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); @@ -1883,25 +1925,25 @@ void tag_table_set_tagged_sources (TagTable* self, TagID* tag_id, GeeCollection* g_clear_error (&_inner_error_); #line 203 "/home/jens/Source/shotwell/src/db/TagTable.vala" return; -#line 1885 "TagTable.c" +#line 1927 "TagTable.c" } } } #line 191 "/home/jens/Source/shotwell/src/db/TagTable.vala" _sqlite3_finalize0 (stmt); -#line 1891 "TagTable.c" +#line 1933 "TagTable.c" } static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* source_ids) { gchar* result = NULL; - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; GString* _result_ = NULL; - GString* _tmp1_ = NULL; + GString* _tmp1_; const gchar* _tmp11_ = NULL; - GString* _tmp12_ = NULL; - gssize _tmp13_ = 0L; - gchar* _tmp16_ = NULL; + GString* _tmp12_; + gssize _tmp13_; + gchar* _tmp16_; #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 206 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1914,17 +1956,17 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou result = NULL; #line 208 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 1916 "TagTable.c" +#line 1958 "TagTable.c" } #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp1_ = g_string_new (""); #line 210 "/home/jens/Source/shotwell/src/db/TagTable.vala" _result_ = _tmp1_; -#line 1922 "TagTable.c" +#line 1964 "TagTable.c" { GeeIterator* _source_id_it = NULL; - GeeCollection* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp2_ = source_ids; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1933,15 +1975,15 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou _source_id_it = _tmp3_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" while (TRUE) { -#line 1935 "TagTable.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 1977 "TagTable.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; gchar* source_id = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - GString* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GString* _tmp10_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GString* _tmp8_; + const gchar* _tmp9_; + GString* _tmp10_; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp4_ = _source_id_it; #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -1950,7 +1992,7 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou if (!_tmp5_) { #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" break; -#line 1952 "TagTable.c" +#line 1994 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = _source_id_it; @@ -1970,11 +2012,11 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou g_string_append (_tmp10_, ","); #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (source_id); -#line 1972 "TagTable.c" +#line 2014 "TagTable.c" } #line 212 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_object_unref0 (_source_id_it); -#line 1976 "TagTable.c" +#line 2018 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp12_ = _result_; @@ -1982,20 +2024,20 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou _tmp13_ = _tmp12_->len; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp13_ != ((gssize) 0)) { -#line 1984 "TagTable.c" - GString* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; +#line 2026 "TagTable.c" + GString* _tmp14_; + const gchar* _tmp15_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp14_ = _result_; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp15_ = _tmp14_->str; #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp11_ = _tmp15_; -#line 1993 "TagTable.c" +#line 2035 "TagTable.c" } else { #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp11_ = NULL; -#line 1997 "TagTable.c" +#line 2039 "TagTable.c" } #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp16_ = g_strdup (_tmp11_); @@ -2005,41 +2047,41 @@ static gchar* tag_table_serialize_source_ids (TagTable* self, GeeCollection* sou _g_string_free0 (_result_); #line 217 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2007 "TagTable.c" +#line 2049 "TagTable.c" } static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; - glong _tmp0_ = 0L; - gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar _tmp1_; +#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2025 "TagTable.c" +#line 2067 "TagTable.c" } static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* text_list) { GeeSet* result = NULL; GeeSet* _result_ = NULL; - GeeHashSet* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + const gchar* _tmp1_; gchar** split = NULL; - const gchar* _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gint split_length1 = 0; - gint _split_size_ = 0; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + const gchar* _tmp2_; + gchar** _tmp3_; + gchar** _tmp4_; + gint split_length1; + gint _split_size_; + gchar** _tmp5_; + gint _tmp5__length1; #line 220 "/home/jens/Source/shotwell/src/db/TagTable.vala" g_return_val_if_fail (IS_TAG_TABLE (self), NULL); #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2054,7 +2096,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te result = _result_; #line 224 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2056 "TagTable.c" +#line 2098 "TagTable.c" } #line 226 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp2_ = text_list; @@ -2070,7 +2112,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te _tmp5_ = split; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp5__length1 = split_length1; -#line 2072 "TagTable.c" +#line 2114 "TagTable.c" { gchar** token_collection = NULL; gint token_collection_length1 = 0; @@ -2082,20 +2124,20 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te token_collection_length1 = _tmp5__length1; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" for (token_it = 0; token_it < _tmp5__length1; token_it = token_it + 1) { -#line 2084 "TagTable.c" - gchar* _tmp6_ = NULL; +#line 2126 "TagTable.c" + gchar* _tmp6_; gchar* token = NULL; #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp6_ = g_strdup (token_collection[token_it]); #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" token = _tmp6_; -#line 2091 "TagTable.c" +#line 2133 "TagTable.c" { - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - const gchar* _tmp9_ = NULL; - gchar _tmp10_ = '\0'; - gboolean _tmp11_ = FALSE; + const gchar* _tmp7_; + gboolean _tmp8_; + const gchar* _tmp9_; + gchar _tmp10_; + gboolean _tmp11_; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp7_ = token; #line 228 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2106,7 +2148,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te _g_free0 (token); #line 229 "/home/jens/Source/shotwell/src/db/TagTable.vala" continue; -#line 2108 "TagTable.c" +#line 2150 "TagTable.c" } #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp9_ = token; @@ -2116,13 +2158,13 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te _tmp11_ = g_ascii_isdigit (_tmp10_); #line 236 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp11_) { -#line 2118 "TagTable.c" - GeeSet* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; +#line 2160 "TagTable.c" + GeeSet* _tmp12_; + const gchar* _tmp13_; + gint64 _tmp14_; PhotoID _tmp15_ = {0}; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + gchar* _tmp16_; + gchar* _tmp17_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp12_ = _result_; #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2139,11 +2181,11 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); #line 238 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (_tmp17_); -#line 2141 "TagTable.c" +#line 2183 "TagTable.c" } else { - const gchar* _tmp18_ = NULL; - gchar _tmp19_ = '\0'; - gboolean _tmp20_ = FALSE; + const gchar* _tmp18_; + gchar _tmp19_; + gboolean _tmp20_; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp18_ = token; #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" @@ -2152,21 +2194,21 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te _tmp20_ = g_ascii_isalpha (_tmp19_); #line 239 "/home/jens/Source/shotwell/src/db/TagTable.vala" if (_tmp20_) { -#line 2154 "TagTable.c" - GeeSet* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; +#line 2196 "TagTable.c" + GeeSet* _tmp21_; + const gchar* _tmp22_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp21_ = _result_; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" _tmp22_ = token; #line 241 "/home/jens/Source/shotwell/src/db/TagTable.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); -#line 2163 "TagTable.c" +#line 2205 "TagTable.c" } } #line 227 "/home/jens/Source/shotwell/src/db/TagTable.vala" _g_free0 (token); -#line 2168 "TagTable.c" +#line 2210 "TagTable.c" } } } @@ -2176,7 +2218,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL); #line 245 "/home/jens/Source/shotwell/src/db/TagTable.vala" return result; -#line 2178 "TagTable.c" +#line 2220 "TagTable.c" } @@ -2185,7 +2227,7 @@ static void tag_table_class_init (TagTableClass * klass) { tag_table_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" ((DatabaseTableClass *) klass)->finalize = tag_table_finalize; -#line 2187 "TagTable.c" +#line 2229 "TagTable.c" } @@ -2193,13 +2235,13 @@ static void tag_table_instance_init (TagTable * self) { } -static void tag_table_finalize (DatabaseTable* obj) { +static void tag_table_finalize (DatabaseTable * obj) { TagTable * self; #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_TABLE, TagTable); #line 32 "/home/jens/Source/shotwell/src/db/TagTable.vala" DATABASE_TABLE_CLASS (tag_table_parent_class)->finalize (obj); -#line 2201 "TagTable.c" +#line 2243 "TagTable.c" } -- cgit v1.2.3