diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/db | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/DatabaseTable.c | 1102 | ||||
| -rw-r--r-- | src/db/Db.c | 150 | ||||
| -rw-r--r-- | src/db/EventTable.c | 442 | ||||
| -rw-r--r-- | src/db/PhotoTable.c | 3020 | ||||
| -rw-r--r-- | src/db/SavedSearchDBTable.c | 1316 | ||||
| -rw-r--r-- | src/db/TagTable.c | 798 | ||||
| -rw-r--r-- | src/db/TombstoneTable.c | 254 | ||||
| -rw-r--r-- | src/db/VersionTable.c | 162 | ||||
| -rw-r--r-- | src/db/VideoTable.c | 928 |
9 files changed, 4101 insertions, 4071 deletions
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index cd0a93e..8d595f0 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.34.7, the Vala compiler +/* DatabaseTable.c generated by valac 0.36.6, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -94,8 +94,8 @@ void database_table_fatal (const gchar* op, gint res); void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); void database_table_throw_error (const gchar* method, gint res, GError** error); gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id); -gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt** stmt); -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt** stmt); +gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt); +static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt); static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt); gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); @@ -112,7 +112,7 @@ gint database_table_get_row_count (DatabaseTable* self); void database_table_begin_transaction (void); void database_table_commit_transaction (GError** error); DatabaseTable* database_table_construct (GType object_type); -static void database_table_finalize (DatabaseTable* obj); +static void database_table_finalize (DatabaseTable * obj); GQuark database_error_quark (void) { @@ -129,15 +129,15 @@ static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const static void database_table_prepare_db (const gchar* filename) { gint res = 0; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; sqlite3* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - const gchar* _tmp9_ = NULL; + gint _tmp2_; + gint _tmp3_; + const gchar* _tmp8_; const gchar* sql_debug = NULL; - const gchar* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - const gchar* _tmp28_ = NULL; + const gchar* _tmp23_; + gboolean _tmp24_ = FALSE; + const gchar* _tmp25_; GError * _inner_error_ = NULL; #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); @@ -156,124 +156,115 @@ static void database_table_prepare_db (const gchar* filename) { #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp3_ != SQLITE_OK) { #line 159 "DatabaseTable.c" - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gint _tmp6_ = 0; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + const gchar* _tmp4_; + gint _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp4_ = _ ("Unable to open/create photo database %s: error code %d"); + _tmp4_ = filename; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp5_ = filename; -#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp7_ = g_strdup_printf (_tmp4_, _tmp5_, _tmp6_); + _tmp6_ = g_strdup_printf (_ ("Unable to open/create photo database %s: error code %d"), _tmp4_, _tmp5_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp8_); + app_window_panic (_tmp7_); #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp8_); -#line 179 "DatabaseTable.c" + _g_free0 (_tmp7_); +#line 176 "DatabaseTable.c" } #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp9_ = filename; + _tmp8_ = filename; #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (g_strcmp0 (_tmp9_, DB_IN_MEMORY_NAME) != 0) { -#line 185 "DatabaseTable.c" + if (g_strcmp0 (_tmp8_, DB_IN_MEMORY_NAME) != 0) { +#line 182 "DatabaseTable.c" { GFile* file_db = NULL; - const gchar* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; + const gchar* _tmp9_; + GFile* _tmp10_; GFileInfo* info = NULL; - GFile* _tmp12_ = NULL; - GFileInfo* _tmp13_ = NULL; - GFileInfo* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GFile* _tmp11_; + GFileInfo* _tmp12_; + GFileInfo* _tmp13_; + gboolean _tmp14_; #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp10_ = filename; + _tmp9_ = filename; #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp11_ = g_file_new_for_path (_tmp10_); + _tmp10_ = g_file_new_for_path (_tmp9_); #line 43 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - file_db = _tmp11_; + file_db = _tmp10_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp12_ = file_db; + _tmp11_ = file_db; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp13_ = g_file_query_info (_tmp12_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); + _tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - info = _tmp13_; + info = _tmp12_; #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); -#line 211 "DatabaseTable.c" +#line 208 "DatabaseTable.c" goto __catch15_g_error; } #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = info; + _tmp13_ = info; #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = g_file_info_get_attribute_boolean (_tmp14_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); + _tmp14_ = g_file_info_get_attribute_boolean (_tmp13_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE); #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (!_tmp15_) { -#line 220 "DatabaseTable.c" - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; -#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = _ ("Unable to write to photo database file:\n %s"); + if (!_tmp14_) { +#line 217 "DatabaseTable.c" + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = filename; + _tmp15_ = filename; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = g_strdup_printf (_tmp16_, _tmp17_); + _tmp16_ = g_strdup_printf (_ ("Unable to write to photo database file:\n %s"), _tmp15_); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp19_); + app_window_panic (_tmp17_); #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp19_); -#line 237 "DatabaseTable.c" + _g_free0 (_tmp17_); +#line 231 "DatabaseTable.c" } #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (info); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); -#line 243 "DatabaseTable.c" +#line 237 "DatabaseTable.c" } goto __finally15; __catch15_g_error: { GError* e = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GError* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + const gchar* _tmp18_; + GError* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" e = _inner_error_; #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = _ ("Error accessing database file:\n %s\n\nError was: \n%s"); + _tmp18_ = filename; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = filename; + _tmp19_ = e; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = e; + _tmp20_ = _tmp19_->message; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp23_ = _tmp22_->message; + _tmp21_ = g_strdup_printf (_ ("Error accessing database file:\n %s\n\nError was: \n%s"), _tmp18_, _tmp20_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp24_ = g_strdup_printf (_tmp20_, _tmp21_, _tmp23_); + _tmp22_ = _tmp21_; #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp25_ = _tmp24_; + app_window_panic (_tmp22_); #line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp25_); -#line 48 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (e); -#line 277 "DatabaseTable.c" +#line 268 "DatabaseTable.c" } __finally15: #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -284,129 +275,129 @@ static void database_table_prepare_db (const gchar* filename) { g_clear_error (&_inner_error_); #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 288 "DatabaseTable.c" +#line 279 "DatabaseTable.c" } } #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp26_ = g_getenv ("SHOTWELL_SQL_DEBUG"); + _tmp23_ = g_getenv ("SHOTWELL_SQL_DEBUG"); #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sql_debug = _tmp26_; + sql_debug = _tmp23_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp28_ = sql_debug; + _tmp25_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp28_ != NULL) { -#line 299 "DatabaseTable.c" - const gchar* _tmp29_ = NULL; + if (_tmp25_ != NULL) { +#line 290 "DatabaseTable.c" + const gchar* _tmp26_; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp29_ = sql_debug; + _tmp26_ = sql_debug; #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp27_ = g_strcmp0 (_tmp29_, "") != 0; -#line 305 "DatabaseTable.c" + _tmp24_ = g_strcmp0 (_tmp26_, "") != 0; +#line 296 "DatabaseTable.c" } else { #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp27_ = FALSE; -#line 309 "DatabaseTable.c" + _tmp24_ = FALSE; +#line 300 "DatabaseTable.c" } #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp27_) { -#line 313 "DatabaseTable.c" - sqlite3* _tmp30_ = NULL; + if (_tmp24_) { +#line 304 "DatabaseTable.c" + sqlite3* _tmp27_; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp30_ = database_table_db; + _tmp27_ = database_table_db; #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - sqlite3_trace (_tmp30_, _database_table_on_trace_sqlite_trace_callback, NULL); -#line 319 "DatabaseTable.c" + sqlite3_trace (_tmp27_, _database_table_on_trace_sqlite_trace_callback, NULL); +#line 310 "DatabaseTable.c" } } void database_table_on_trace (const gchar* message) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (message != NULL); #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = message; #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_); -#line 332 "DatabaseTable.c" +#line 323 "DatabaseTable.c" } -static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar** errmsg) { +static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar* * errmsg) { gchar* _vala_errmsg = NULL; gint result = 0; const gchar* sqlite_errmsg = NULL; gint ec = 0; - const gchar* _tmp0_ = NULL; - sqlite3_callback _tmp1_ = NULL; - void* _tmp1__target = NULL; + const gchar* _tmp0_; + sqlite3_callback _tmp1_; + void* _tmp1__target; const gchar* _tmp2_ = NULL; - gint _tmp3_ = 0; - const gchar* _tmp6_ = NULL; -#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" + gint _tmp3_; + const gchar* _tmp6_; +#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" g_return_val_if_fail (self != NULL, 0); -#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.36/vapi/sqlite3.vapi" g_return_val_if_fail (sql != NULL, 0); -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp0_ = sql; -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp1_ = callback; -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp1__target = callback_target; -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_)); -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" sqlite_errmsg = _tmp2_; -#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.36/vapi/sqlite3.vapi" ec = _tmp3_; -#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 37 "/usr/share/vala-0.36/vapi/sqlite3.vapi" if ((&_vala_errmsg) != NULL) { -#line 365 "DatabaseTable.c" - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; -#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 356 "DatabaseTable.c" + const gchar* _tmp4_; + gchar* _tmp5_; +#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp4_ = sqlite_errmsg; -#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp5_ = g_strdup (_tmp4_); -#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _vala_errmsg = _tmp5_; -#line 376 "DatabaseTable.c" +#line 367 "DatabaseTable.c" } -#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _tmp6_ = sqlite_errmsg; -#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.36/vapi/sqlite3.vapi" sqlite3_free ((void*) _tmp6_); -#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" result = ec; -#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" if (errmsg) { -#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" *errmsg = _vala_errmsg; -#line 388 "DatabaseTable.c" +#line 379 "DatabaseTable.c" } else { -#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 392 "DatabaseTable.c" +#line 383 "DatabaseTable.c" } -#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.36/vapi/sqlite3.vapi" return result; -#line 396 "DatabaseTable.c" +#line 387 "DatabaseTable.c" } void database_table_init (const gchar* filename) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp1_ = NULL; + sqlite3* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - sqlite3* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + gint _tmp3_; + gint _tmp4_; + sqlite3* _tmp18_; + gint _tmp19_; + gint _tmp20_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (filename != NULL); @@ -428,10 +419,10 @@ void database_table_init (const gchar* filename) { _tmp4_ = res; #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp4_ != SQLITE_OK) { -#line 432 "DatabaseTable.c" +#line 423 "DatabaseTable.c" gchar* backup_path = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_close0 (database_table_db); #line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -442,17 +433,17 @@ void database_table_init (const gchar* filename) { _tmp6_ = g_strconcat (_tmp5_, ".bak", NULL); #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" backup_path = _tmp6_; -#line 446 "DatabaseTable.c" +#line 437 "DatabaseTable.c" { GFile* src = NULL; - const gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + const gchar* _tmp7_; + GFile* _tmp8_; GFile* dest = NULL; - const gchar* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + const gchar* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + const gchar* _tmp13_; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp7_ = backup_path; #line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -477,7 +468,7 @@ void database_table_init (const gchar* filename) { _g_object_unref0 (dest); #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 481 "DatabaseTable.c" +#line 472 "DatabaseTable.c" goto __catch16_g_error; } #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -488,38 +479,35 @@ void database_table_init (const gchar* filename) { _g_object_unref0 (dest); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); -#line 492 "DatabaseTable.c" +#line 483 "DatabaseTable.c" } goto __finally16; __catch16_g_error: { GError* _error_ = NULL; - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + GError* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _error_ = _inner_error_; #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _inner_error_ = NULL; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp14_ = _ ("Unable to restore photo database %s"); + _tmp14_ = _error_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp15_ = _error_; + _tmp15_ = _tmp14_->message; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp16_ = _tmp15_->message; + _tmp16_ = g_strdup_printf (_ ("Unable to restore photo database %s"), _tmp15_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp17_ = g_strdup_printf (_tmp14_, _tmp16_); + _tmp17_ = _tmp16_; #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp18_ = _tmp17_; + app_window_panic (_tmp17_); #line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - app_window_panic (_tmp18_); -#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_error_free0 (_error_); -#line 523 "DatabaseTable.c" +#line 511 "DatabaseTable.c" } __finally16: #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -534,33 +522,33 @@ void database_table_init (const gchar* filename) { g_clear_error (&_inner_error_); #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 538 "DatabaseTable.c" +#line 526 "DatabaseTable.c" } #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (backup_path); -#line 542 "DatabaseTable.c" +#line 530 "DatabaseTable.c" } #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp19_ = database_table_db; + _tmp18_ = database_table_db; #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp20_ = _sqlite3_exec (_tmp19_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); + _tmp19_ = _sqlite3_exec (_tmp18_, "PRAGMA synchronous=OFF", NULL, NULL, NULL); #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - res = _tmp20_; + res = _tmp19_; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp21_ = res; + _tmp20_ = res; #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - if (_tmp21_ != SQLITE_OK) { -#line 554 "DatabaseTable.c" - gint _tmp22_ = 0; + if (_tmp20_ != SQLITE_OK) { +#line 542 "DatabaseTable.c" + gint _tmp21_; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - _tmp22_ = res; + _tmp21_ = res; #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" - database_table_warning ("Unable to disable synchronous mode", _tmp22_); -#line 560 "DatabaseTable.c" + database_table_warning ("Unable to disable synchronous mode", _tmp21_); +#line 548 "DatabaseTable.c" } #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 564 "DatabaseTable.c" +#line 552 "DatabaseTable.c" } @@ -569,15 +557,15 @@ void database_table_terminate (void) { _sqlite3_close0 (database_table_db); #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_db = NULL; -#line 573 "DatabaseTable.c" +#line 561 "DatabaseTable.c" } void database_table_fatal (const gchar* op, gint res) { - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - sqlite3* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gint _tmp1_; + sqlite3* _tmp2_; + const gchar* _tmp3_; #line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -590,15 +578,15 @@ void database_table_fatal (const gchar* op, gint res) { _tmp3_ = sqlite3_errmsg (_tmp2_); #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 594 "DatabaseTable.c" +#line 582 "DatabaseTable.c" } void database_table_warning (const gchar* op, gint res) { - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - sqlite3* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gint _tmp1_; + sqlite3* _tmp2_; + const gchar* _tmp3_; #line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (op != NULL); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -611,13 +599,13 @@ void database_table_warning (const gchar* op, gint res) { _tmp3_ = sqlite3_errmsg (_tmp2_); #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_); -#line 615 "DatabaseTable.c" +#line 603 "DatabaseTable.c" } void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -630,18 +618,18 @@ void database_table_set_table_name (DatabaseTable* self, const gchar* table_name _g_free0 (self->table_name); #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->table_name = _tmp1_; -#line 634 "DatabaseTable.c" +#line 622 "DatabaseTable.c" } void database_table_throw_error (const gchar* method, gint res, GError** error) { gchar* msg = NULL; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - sqlite3* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; + const gchar* _tmp0_; + gint _tmp1_; + sqlite3* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gint _tmp5_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (method != NULL); @@ -667,13 +655,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_DONE: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_ROW: -#line 671 "DatabaseTable.c" +#line 659 "DatabaseTable.c" { #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 677 "DatabaseTable.c" +#line 665 "DatabaseTable.c" } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_PERM: @@ -695,10 +683,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_FORMAT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOTADB: -#line 699 "DatabaseTable.c" +#line 687 "DatabaseTable.c" { - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; + const gchar* _tmp6_; + GError* _tmp7_; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp6_ = msg; #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -713,7 +701,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 717 "DatabaseTable.c" +#line 705 "DatabaseTable.c" } else { #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -723,15 +711,15 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 727 "DatabaseTable.c" +#line 715 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_NOMEM: -#line 732 "DatabaseTable.c" +#line 720 "DatabaseTable.c" { - const gchar* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + const gchar* _tmp8_; + GError* _tmp9_; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = msg; #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -746,7 +734,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 750 "DatabaseTable.c" +#line 738 "DatabaseTable.c" } else { #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -756,7 +744,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 760 "DatabaseTable.c" +#line 748 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -765,10 +753,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_LOCKED: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_INTERRUPT: -#line 769 "DatabaseTable.c" +#line 757 "DatabaseTable.c" { - const gchar* _tmp10_ = NULL; - GError* _tmp11_ = NULL; + const gchar* _tmp10_; + GError* _tmp11_; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp10_ = msg; #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -783,7 +771,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 787 "DatabaseTable.c" +#line 775 "DatabaseTable.c" } else { #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -793,7 +781,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 797 "DatabaseTable.c" +#line 785 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -806,10 +794,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_CONSTRAINT: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_RANGE: -#line 810 "DatabaseTable.c" +#line 798 "DatabaseTable.c" { - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + const gchar* _tmp12_; + GError* _tmp13_; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp12_ = msg; #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -824,7 +812,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 828 "DatabaseTable.c" +#line 816 "DatabaseTable.c" } else { #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -834,17 +822,17 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 838 "DatabaseTable.c" +#line 826 "DatabaseTable.c" } } #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_SCHEMA: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISMATCH: -#line 845 "DatabaseTable.c" +#line 833 "DatabaseTable.c" { - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + const gchar* _tmp14_; + GError* _tmp15_; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = msg; #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -859,7 +847,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 863 "DatabaseTable.c" +#line 851 "DatabaseTable.c" } else { #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -869,7 +857,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 873 "DatabaseTable.c" +#line 861 "DatabaseTable.c" } } default: @@ -879,10 +867,10 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) case SQLITE_INTERNAL: #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" case SQLITE_MISUSE: -#line 883 "DatabaseTable.c" +#line 871 "DatabaseTable.c" { - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; + const gchar* _tmp16_; + GError* _tmp17_; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp16_ = msg; #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -897,7 +885,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) _g_free0 (msg); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 901 "DatabaseTable.c" +#line 889 "DatabaseTable.c" } else { #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); @@ -907,13 +895,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error) g_clear_error (&_inner_error_); #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 911 "DatabaseTable.c" +#line 899 "DatabaseTable.c" } } } #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (msg); -#line 917 "DatabaseTable.c" +#line 905 "DatabaseTable.c" } @@ -921,23 +909,23 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; gboolean _tmp14_ = FALSE; - gint _tmp15_ = 0; - gint _tmp24_ = 0; + gint _tmp15_; + gint _tmp24_; #line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -986,28 +974,28 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { _tmp15_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp15_ != SQLITE_ROW) { -#line 990 "DatabaseTable.c" - gint _tmp16_ = 0; +#line 978 "DatabaseTable.c" + gint _tmp16_; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp16_ = res; #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 996 "DatabaseTable.c" +#line 984 "DatabaseTable.c" } else { #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = FALSE; -#line 1000 "DatabaseTable.c" +#line 988 "DatabaseTable.c" } #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp14_) { -#line 1004 "DatabaseTable.c" - gint64 _tmp17_ = 0LL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; +#line 992 "DatabaseTable.c" + gint64 _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gint _tmp23_; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp17_ = id; #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1028,7 +1016,7 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { _g_free0 (_tmp22_); #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (_tmp19_); -#line 1032 "DatabaseTable.c" +#line 1020 "DatabaseTable.c" } #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp24_ = res; @@ -1038,32 +1026,32 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) { _sqlite3_finalize0 (stmt); #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1042 "DatabaseTable.c" +#line 1030 "DatabaseTable.c" } -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) { sqlite3_stmt* _vala_stmt = NULL; gboolean result = FALSE; gchar* sql = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gint res = 0; - sqlite3* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + sqlite3* _tmp3_; + const gchar* _tmp4_; sqlite3_stmt* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; gboolean _tmp14_ = FALSE; - gint _tmp15_ = 0; - gint _tmp25_ = 0; + gint _tmp15_; + gint _tmp25_; #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1114,29 +1102,29 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha _tmp15_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp15_ != SQLITE_ROW) { -#line 1118 "DatabaseTable.c" - gint _tmp16_ = 0; +#line 1106 "DatabaseTable.c" + gint _tmp16_; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp16_ = res; #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = _tmp16_ != SQLITE_DONE; -#line 1124 "DatabaseTable.c" +#line 1112 "DatabaseTable.c" } else { #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = FALSE; -#line 1128 "DatabaseTable.c" +#line 1116 "DatabaseTable.c" } #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp14_) { -#line 1132 "DatabaseTable.c" - gint64 _tmp17_ = 0LL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gint _tmp24_ = 0; +#line 1120 "DatabaseTable.c" + gint64 _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gint _tmp24_; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp17_ = id; #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1159,7 +1147,7 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha _g_free0 (_tmp23_); #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (_tmp19_); -#line 1163 "DatabaseTable.c" +#line 1151 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp25_ = res; @@ -1171,32 +1159,32 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha if (stmt) { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1175 "DatabaseTable.c" +#line 1163 "DatabaseTable.c" } else { #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1179 "DatabaseTable.c" +#line 1167 "DatabaseTable.c" } #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1183 "DatabaseTable.c" +#line 1171 "DatabaseTable.c" } -static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt** stmt) { +static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, const gchar* column, sqlite3_stmt* * stmt) { sqlite3_stmt* _vala_stmt = NULL; gchar* sql = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gint res = 0; - sqlite3* _tmp3_ = NULL; + sqlite3* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint64 _tmp7_ = 0LL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + gint _tmp5_; + gint _tmp6_; + gint64 _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1239,11 +1227,11 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, if (stmt) { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *stmt = _vala_stmt; -#line 1243 "DatabaseTable.c" +#line 1231 "DatabaseTable.c" } else { #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (_vala_stmt); -#line 1247 "DatabaseTable.c" +#line 1235 "DatabaseTable.c" } } @@ -1251,9 +1239,9 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id, static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite3_stmt* stmt) { gboolean result = FALSE; gint res = 0; - sqlite3_stmt* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + sqlite3_stmt* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1268,8 +1256,8 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite _tmp2_ = res; #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp2_ != SQLITE_DONE) { -#line 1272 "DatabaseTable.c" - gint _tmp3_ = 0; +#line 1260 "DatabaseTable.c" + gint _tmp3_; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp3_ = res; #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1278,28 +1266,28 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite result = FALSE; #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1282 "DatabaseTable.c" +#line 1270 "DatabaseTable.c" } #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1288 "DatabaseTable.c" +#line 1276 "DatabaseTable.c" } gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GDestroyNotify _tmp5_ = NULL; - gint _tmp6_ = 0; - gboolean _tmp7_ = FALSE; + const gchar* _tmp3_; + gchar* _tmp4_; + GDestroyNotify _tmp5_; + gint _tmp6_; + gboolean _tmp7_; #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1336,25 +1324,25 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const _sqlite3_finalize0 (stmt); #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1340 "DatabaseTable.c" +#line 1328 "DatabaseTable.c" } void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error) { sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - sqlite3_stmt* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GDestroyNotify _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + sqlite3_stmt* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; GError * _inner_error_ = NULL; #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1398,12 +1386,12 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g _tmp11_ = res; #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp11_ != SQLITE_DONE) { -#line 1402 "DatabaseTable.c" - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; +#line 1390 "DatabaseTable.c" + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gint _tmp16_; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp12_ = self->table_name; #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1428,7 +1416,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g _sqlite3_finalize0 (stmt); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1432 "DatabaseTable.c" +#line 1420 "DatabaseTable.c" } else { #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1438,26 +1426,26 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g g_clear_error (&_inner_error_); #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1442 "DatabaseTable.c" +#line 1430 "DatabaseTable.c" } } } #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1448 "DatabaseTable.c" +#line 1436 "DatabaseTable.c" } gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint value) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; + gint _tmp3_; + gint _tmp4_; + gboolean _tmp5_; #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1488,23 +1476,23 @@ gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const _sqlite3_finalize0 (stmt); #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1492 "DatabaseTable.c" +#line 1480 "DatabaseTable.c" } void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error) { sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - sqlite3_stmt* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - sqlite3_stmt* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + sqlite3_stmt* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + gint _tmp8_; + gint _tmp9_; GError * _inner_error_ = NULL; #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1542,12 +1530,12 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc _tmp9_ = res; #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp9_ != SQLITE_DONE) { -#line 1546 "DatabaseTable.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gint _tmp14_ = 0; +#line 1534 "DatabaseTable.c" + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gint _tmp14_; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp10_ = self->table_name; #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1572,7 +1560,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc _sqlite3_finalize0 (stmt); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1576 "DatabaseTable.c" +#line 1564 "DatabaseTable.c" } else { #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1582,26 +1570,26 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc g_clear_error (&_inner_error_); #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1586 "DatabaseTable.c" +#line 1574 "DatabaseTable.c" } } } #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1592 "DatabaseTable.c" +#line 1580 "DatabaseTable.c" } gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, const gchar* column, gint64 value) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - gint64 _tmp3_ = 0LL; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; + gint64 _tmp3_; + gint _tmp4_; + gboolean _tmp5_; #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE); #line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1632,23 +1620,23 @@ gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, cons _sqlite3_finalize0 (stmt); #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1636 "DatabaseTable.c" +#line 1624 "DatabaseTable.c" } void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint64 value, GError** error) { sqlite3_stmt* stmt = NULL; - gint64 _tmp0_ = 0LL; - const gchar* _tmp1_ = NULL; + gint64 _tmp0_; + const gchar* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; gint res = 0; - sqlite3_stmt* _tmp3_ = NULL; - gint64 _tmp4_ = 0LL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - sqlite3_stmt* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + sqlite3_stmt* _tmp3_; + gint64 _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + gint _tmp8_; + gint _tmp9_; GError * _inner_error_ = NULL; #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1686,12 +1674,12 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const _tmp9_ = res; #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp9_ != SQLITE_DONE) { -#line 1690 "DatabaseTable.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gint _tmp14_ = 0; +#line 1678 "DatabaseTable.c" + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gint _tmp14_; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp10_ = self->table_name; #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1716,7 +1704,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const _sqlite3_finalize0 (stmt); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1720 "DatabaseTable.c" +#line 1708 "DatabaseTable.c" } else { #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1726,34 +1714,34 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const g_clear_error (&_inner_error_); #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1730 "DatabaseTable.c" +#line 1718 "DatabaseTable.c" } } } #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1736 "DatabaseTable.c" +#line 1724 "DatabaseTable.c" } void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error) { sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; GError * _inner_error_ = NULL; #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (IS_DATABASE_TABLE (self)); @@ -1803,11 +1791,11 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error _tmp14_ = res; #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp14_ != SQLITE_DONE) { -#line 1807 "DatabaseTable.c" - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gint _tmp18_ = 0; +#line 1795 "DatabaseTable.c" + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp15_ = self->table_name; #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1830,7 +1818,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error _sqlite3_finalize0 (stmt); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1834 "DatabaseTable.c" +#line 1822 "DatabaseTable.c" } else { #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); @@ -1840,13 +1828,13 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error g_clear_error (&_inner_error_); #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 1844 "DatabaseTable.c" +#line 1832 "DatabaseTable.c" } } } #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _sqlite3_finalize0 (stmt); -#line 1850 "DatabaseTable.c" +#line 1838 "DatabaseTable.c" } @@ -1854,14 +1842,14 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1890,20 +1878,20 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _tmp7_ = res; #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); -#line 1894 "DatabaseTable.c" +#line 1882 "DatabaseTable.c" { gboolean _tmp8_ = FALSE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = TRUE; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" while (TRUE) { -#line 1901 "DatabaseTable.c" - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 1889 "DatabaseTable.c" + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (!_tmp8_) { -#line 1907 "DatabaseTable.c" +#line 1895 "DatabaseTable.c" } #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp8_ = FALSE; @@ -1919,18 +1907,18 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column if (_tmp11_ == SQLITE_DONE) { #line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1923 "DatabaseTable.c" +#line 1911 "DatabaseTable.c" } else { - gint _tmp12_ = 0; + gint _tmp12_; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp12_ = res; #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp12_ != SQLITE_ROW) { -#line 1930 "DatabaseTable.c" - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; +#line 1918 "DatabaseTable.c" + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gint _tmp16_; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp13_ = table_name; #line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1945,14 +1933,14 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _g_free0 (_tmp15_); #line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" break; -#line 1949 "DatabaseTable.c" +#line 1937 "DatabaseTable.c" } else { gchar* column = NULL; - sqlite3_stmt* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + sqlite3_stmt* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; gboolean _tmp20_ = FALSE; - const gchar* _tmp21_ = NULL; + const gchar* _tmp21_; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp17_ = stmt; #line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -1965,20 +1953,20 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _tmp21_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp21_ != NULL) { -#line 1969 "DatabaseTable.c" - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; +#line 1957 "DatabaseTable.c" + const gchar* _tmp22_; + const gchar* _tmp23_; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp22_ = column; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp23_ = column_name; #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0; -#line 1978 "DatabaseTable.c" +#line 1966 "DatabaseTable.c" } else { #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp20_ = FALSE; -#line 1982 "DatabaseTable.c" +#line 1970 "DatabaseTable.c" } #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp20_) { @@ -1990,11 +1978,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 1994 "DatabaseTable.c" +#line 1982 "DatabaseTable.c" } #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (column); -#line 1998 "DatabaseTable.c" +#line 1986 "DatabaseTable.c" } } } @@ -2005,7 +1993,7 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2009 "DatabaseTable.c" +#line 1997 "DatabaseTable.c" } @@ -2013,16 +2001,16 @@ gboolean database_table_has_table (const gchar* table_name) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2061,7 +2049,7 @@ gboolean database_table_has_table (const gchar* table_name) { _sqlite3_finalize0 (stmt); #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2065 "DatabaseTable.c" +#line 2053 "DatabaseTable.c" } @@ -2069,19 +2057,19 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column gboolean result = FALSE; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2126,13 +2114,13 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column _tmp12_ = res; #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp12_ != SQLITE_DONE) { -#line 2130 "DatabaseTable.c" - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - sqlite3* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; +#line 2118 "DatabaseTable.c" + const gchar* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + gint _tmp16_; + sqlite3* _tmp17_; + const gchar* _tmp18_; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp13_ = table_name; #line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2153,7 +2141,7 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2157 "DatabaseTable.c" +#line 2145 "DatabaseTable.c" } #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" result = TRUE; @@ -2161,20 +2149,20 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column _sqlite3_finalize0 (stmt); #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2165 "DatabaseTable.c" +#line 2153 "DatabaseTable.c" } gboolean database_table_ensure_column (const gchar* table_name, const gchar* column_name, const gchar* column_constraints, const gchar* upgrade_msg) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + const gchar* _tmp1_; + gboolean _tmp2_; + const gchar* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (table_name != NULL, FALSE); #line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2191,11 +2179,11 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col if (!_tmp2_) { #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = TRUE; -#line 2195 "DatabaseTable.c" +#line 2183 "DatabaseTable.c" } else { - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp3_ = table_name; #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2204,7 +2192,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col _tmp5_ = database_table_has_column (_tmp3_, _tmp4_); #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = _tmp5_; -#line 2208 "DatabaseTable.c" +#line 2196 "DatabaseTable.c" } #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp0_) { @@ -2212,7 +2200,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col result = TRUE; #line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2216 "DatabaseTable.c" +#line 2204 "DatabaseTable.c" } #line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp6_ = upgrade_msg; @@ -2230,7 +2218,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col result = _tmp10_; #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2234 "DatabaseTable.c" +#line 2222 "DatabaseTable.c" } @@ -2238,19 +2226,19 @@ gint database_table_get_row_count (DatabaseTable* self) { gint result = 0; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp15_; + gint _tmp16_; #line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_val_if_fail (IS_DATABASE_TABLE (self), 0); #line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2287,11 +2275,11 @@ gint database_table_get_row_count (DatabaseTable* self) { _tmp10_ = res; #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp10_ != SQLITE_ROW) { -#line 2291 "DatabaseTable.c" - const gchar* _tmp11_ = NULL; - gint _tmp12_ = 0; - sqlite3* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; +#line 2279 "DatabaseTable.c" + const gchar* _tmp11_; + gint _tmp12_; + sqlite3* _tmp13_; + const gchar* _tmp14_; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp11_ = self->table_name; #line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2308,7 +2296,7 @@ gint database_table_get_row_count (DatabaseTable* self) { _sqlite3_finalize0 (stmt); #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2312 "DatabaseTable.c" +#line 2300 "DatabaseTable.c" } #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp15_ = stmt; @@ -2320,16 +2308,16 @@ gint database_table_get_row_count (DatabaseTable* self) { _sqlite3_finalize0 (stmt); #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return result; -#line 2324 "DatabaseTable.c" +#line 2312 "DatabaseTable.c" } void database_table_begin_transaction (void) { - gint _tmp0_ = 0; + gint _tmp0_; gint res = 0; - sqlite3* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + sqlite3* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_in_transaction; #line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2338,7 +2326,7 @@ void database_table_begin_transaction (void) { if (_tmp0_ != 0) { #line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2342 "DatabaseTable.c" +#line 2330 "DatabaseTable.c" } #line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp1_ = database_table_db; @@ -2350,18 +2338,18 @@ void database_table_begin_transaction (void) { _tmp3_ = res; #line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK"); -#line 2354 "DatabaseTable.c" +#line 2342 "DatabaseTable.c" } void database_table_commit_transaction (GError** error) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; gint res = 0; - sqlite3* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + sqlite3* _tmp3_; + gint _tmp4_; + gint _tmp5_; GError * _inner_error_ = NULL; #line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp0_ = database_table_in_transaction; @@ -2377,7 +2365,7 @@ void database_table_commit_transaction (GError** error) { if (_tmp2_ != 0) { #line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2381 "DatabaseTable.c" +#line 2369 "DatabaseTable.c" } #line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp3_ = database_table_db; @@ -2389,8 +2377,8 @@ void database_table_commit_transaction (GError** error) { _tmp5_ = res; #line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (_tmp5_ != SQLITE_DONE) { -#line 2393 "DatabaseTable.c" - gint _tmp6_ = 0; +#line 2381 "DatabaseTable.c" + gint _tmp6_; #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp6_ = res; #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2403,7 +2391,7 @@ void database_table_commit_transaction (GError** error) { g_propagate_error (error, _inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2407 "DatabaseTable.c" +#line 2395 "DatabaseTable.c" } else { #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.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); @@ -2411,7 +2399,7 @@ void database_table_commit_transaction (GError** error) { g_clear_error (&_inner_error_); #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return; -#line 2415 "DatabaseTable.c" +#line 2403 "DatabaseTable.c" } } } @@ -2424,14 +2412,14 @@ DatabaseTable* database_table_construct (GType object_type) { self = (DatabaseTable*) g_type_create_instance (object_type); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return self; -#line 2428 "DatabaseTable.c" +#line 2416 "DatabaseTable.c" } static void value_database_table_init (GValue* value) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2435 "DatabaseTable.c" +#line 2423 "DatabaseTable.c" } @@ -2440,7 +2428,7 @@ static void value_database_table_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (value->data[0].v_pointer); -#line 2444 "DatabaseTable.c" +#line 2432 "DatabaseTable.c" } } @@ -2450,11 +2438,11 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de if (src_value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer); -#line 2454 "DatabaseTable.c" +#line 2442 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" dest_value->data[0].v_pointer = NULL; -#line 2458 "DatabaseTable.c" +#line 2446 "DatabaseTable.c" } } @@ -2462,66 +2450,66 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de static gpointer value_database_table_peek_pointer (const GValue* value) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return value->data[0].v_pointer; -#line 2466 "DatabaseTable.c" +#line 2454 "DatabaseTable.c" } static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (collect_values[0].v_pointer) { -#line 2473 "DatabaseTable.c" - DatabaseTable* object; +#line 2461 "DatabaseTable.c" + DatabaseTable * object; object = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (object->parent_instance.g_class == NULL) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2480 "DatabaseTable.c" +#line 2468 "DatabaseTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2484 "DatabaseTable.c" +#line 2472 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = database_table_ref (object); -#line 2488 "DatabaseTable.c" +#line 2476 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2492 "DatabaseTable.c" +#line 2480 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2496 "DatabaseTable.c" +#line 2484 "DatabaseTable.c" } static gchar* value_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DatabaseTable** object_p; + DatabaseTable ** object_p; object_p = collect_values[0].v_pointer; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (!object_p) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2507 "DatabaseTable.c" +#line 2495 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (!value->data[0].v_pointer) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = NULL; -#line 2513 "DatabaseTable.c" +#line 2501 "DatabaseTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = value->data[0].v_pointer; -#line 2517 "DatabaseTable.c" +#line 2505 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" *object_p = database_table_ref (value->data[0].v_pointer); -#line 2521 "DatabaseTable.c" +#line 2509 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return NULL; -#line 2525 "DatabaseTable.c" +#line 2513 "DatabaseTable.c" } @@ -2535,7 +2523,7 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return G_PARAM_SPEC (spec); -#line 2539 "DatabaseTable.c" +#line 2527 "DatabaseTable.c" } @@ -2544,12 +2532,12 @@ gpointer value_get_database_table (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return value->data[0].v_pointer; -#line 2548 "DatabaseTable.c" +#line 2536 "DatabaseTable.c" } void value_set_database_table (GValue* value, gpointer v_object) { - DatabaseTable* old; + DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2564,23 +2552,23 @@ void value_set_database_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_ref (value->data[0].v_pointer); -#line 2568 "DatabaseTable.c" +#line 2556 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2572 "DatabaseTable.c" +#line 2560 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (old) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (old); -#line 2578 "DatabaseTable.c" +#line 2566 "DatabaseTable.c" } } void value_take_database_table (GValue* value, gpointer v_object) { - DatabaseTable* old; + DatabaseTable * old; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE)); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -2593,17 +2581,17 @@ void value_take_database_table (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = v_object; -#line 2597 "DatabaseTable.c" +#line 2585 "DatabaseTable.c" } else { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" value->data[0].v_pointer = NULL; -#line 2601 "DatabaseTable.c" +#line 2589 "DatabaseTable.c" } #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (old) { #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" database_table_unref (old); -#line 2607 "DatabaseTable.c" +#line 2595 "DatabaseTable.c" } } @@ -2613,7 +2601,7 @@ static void database_table_class_init (DatabaseTableClass * klass) { database_table_parent_class = g_type_class_peek_parent (klass); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" ((DatabaseTableClass *) klass)->finalize = database_table_finalize; -#line 2617 "DatabaseTable.c" +#line 2605 "DatabaseTable.c" } @@ -2622,11 +2610,11 @@ static void database_table_instance_init (DatabaseTable * self) { self->table_name = NULL; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self->ref_count = 1; -#line 2626 "DatabaseTable.c" +#line 2614 "DatabaseTable.c" } -static void database_table_finalize (DatabaseTable* obj) { +static void database_table_finalize (DatabaseTable * obj) { DatabaseTable * self; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_TABLE, DatabaseTable); @@ -2634,7 +2622,7 @@ static void database_table_finalize (DatabaseTable* obj) { g_signal_handlers_destroy (self); #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_free0 (self->table_name); -#line 2638 "DatabaseTable.c" +#line 2626 "DatabaseTable.c" } @@ -2653,18 +2641,18 @@ GType database_table_get_type (void) { gpointer database_table_ref (gpointer instance) { - DatabaseTable* self; + DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_atomic_int_inc (&self->ref_count); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" return instance; -#line 2663 "DatabaseTable.c" +#line 2651 "DatabaseTable.c" } void database_table_unref (gpointer instance) { - DatabaseTable* self; + DatabaseTable * self; self = instance; #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2672,7 +2660,7 @@ void database_table_unref (gpointer instance) { DATABASE_TABLE_GET_CLASS (self)->finalize (self); #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2676 "DatabaseTable.c" +#line 2664 "DatabaseTable.c" } } diff --git a/src/db/Db.c b/src/db/Db.c index eeaf220..0695500 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.34.7, the Vala compiler +/* Db.c generated by valac 0.36.6, the Vala compiler * generated from Db.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -71,7 +71,7 @@ void database_table_init (const gchar* filename); void db_terminate (void); void database_table_terminate (void); GType db_verify_result_get_type (void) G_GNUC_CONST; -DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version); +DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version); 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); @@ -81,7 +81,7 @@ gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType version_table_get_type (void) G_GNUC_CONST; VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar** app_version); +gint version_table_get_version (VersionTable* self, gchar* * app_version); #define DATABASE_TABLE_SCHEMA_VERSION 20 #define RESOURCES_APP_VERSION _VERSION void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); @@ -106,8 +106,8 @@ void version_table_update_version (VersionTable* self, gint version, const gchar void db_preconfigure (GFile* db_file) { gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp5_ = NULL; + GFile* _tmp1_; + gchar* _tmp5_; #line 14 "/home/jens/Source/shotwell/src/db/Db.vala" g_return_if_fail ((db_file == NULL) || G_IS_FILE (db_file)); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -115,8 +115,8 @@ void db_preconfigure (GFile* db_file) { #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp1_ != NULL) { #line 118 "Db.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GFile* _tmp2_; + gchar* _tmp3_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp2_ = db_file; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -127,7 +127,7 @@ void db_preconfigure (GFile* db_file) { _tmp0_ = _tmp3_; #line 129 "Db.c" } else { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp4_ = g_strdup (DB_IN_MEMORY_NAME); #line 15 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -149,8 +149,8 @@ void db_preconfigure (GFile* db_file) { void db_init (GError** error) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 19 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp0_ = db_filename; #line 19 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -182,17 +182,17 @@ GType db_verify_result_get_type (void) { } -DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { +DbVerifyResult db_verify_database (gchar* * app_version, gint* schema_version) { gchar* _vala_app_version = NULL; gint _vala_schema_version = 0; DbVerifyResult result = 0; VersionTable* version_table = NULL; - VersionTable* _tmp0_ = NULL; - VersionTable* _tmp1_ = NULL; + VersionTable* _tmp0_; + VersionTable* _tmp1_; gchar* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp7_ = 0; + gint _tmp3_; + gint _tmp4_; + gint _tmp7_; #line 36 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp0_ = version_table_get_instance (); #line 36 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -212,8 +212,8 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { #line 39 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp4_ >= 0) { #line 215 "Db.c" - gint _tmp5_ = 0; - const gchar* _tmp6_ = NULL; + gint _tmp5_; + const gchar* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp5_ = _vala_schema_version; #line 40 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -227,8 +227,8 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { #line 42 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp7_ == -1) { #line 230 "Db.c" - VersionTable* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + VersionTable* _tmp8_; + gchar* _tmp9_; #line 44 "/home/jens/Source/shotwell/src/db/Db.vala" g_debug ("Db.vala:44: Creating database schema version %d for app version %s", DATABASE_TABLE_SCHEMA_VERSION, RESOURCES_APP_VERSION); #line 46 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -245,7 +245,7 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { _vala_schema_version = DATABASE_TABLE_SCHEMA_VERSION; #line 247 "Db.c" } else { - gint _tmp10_ = 0; + gint _tmp10_; #line 49 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp10_ = _vala_schema_version; #line 49 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -274,16 +274,16 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { return result; #line 276 "Db.c" } else { - gint _tmp11_ = 0; + gint _tmp11_; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp11_ = _vala_schema_version; #line 52 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp11_ < DATABASE_TABLE_SCHEMA_VERSION) { #line 283 "Db.c" DbVerifyResult _result_ = 0; - gint _tmp12_ = 0; - DbVerifyResult _tmp13_ = 0; - DbVerifyResult _tmp14_ = 0; + gint _tmp12_; + DbVerifyResult _tmp13_; + DbVerifyResult _tmp14_; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp12_ = _vala_schema_version; #line 54 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -349,38 +349,38 @@ DbVerifyResult db_verify_database (gchar** app_version, gint* schema_version) { DbVerifyResult db_upgrade_database (gint input_version) { DbVerifyResult result = 0; - gint _tmp0_ = 0; + gint _tmp0_; gint version = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp10_ = FALSE; - gboolean _tmp12_ = FALSE; - gboolean _tmp14_ = FALSE; - gboolean _tmp16_ = FALSE; - gboolean _tmp18_ = FALSE; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gboolean _tmp4_; + gboolean _tmp6_; + gboolean _tmp8_; + gboolean _tmp10_; + gboolean _tmp12_; + gboolean _tmp14_; + gboolean _tmp16_; + gboolean _tmp18_; gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp24_ = FALSE; - gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - gboolean _tmp29_ = FALSE; - gboolean _tmp31_ = FALSE; - gboolean _tmp33_ = FALSE; - gint _tmp35_ = 0; - gint _tmp36_ = 0; - gboolean _tmp37_ = FALSE; - gboolean _tmp39_ = FALSE; - gboolean _tmp41_ = FALSE; - gint _tmp43_ = 0; - gint _tmp46_ = 0; - VersionTable* _tmp47_ = NULL; - VersionTable* _tmp48_ = NULL; - gint _tmp49_ = 0; - gint _tmp50_ = 0; + gboolean _tmp21_; + gboolean _tmp24_; + gboolean _tmp26_; + gboolean _tmp27_; + gboolean _tmp29_; + gboolean _tmp31_; + gboolean _tmp33_; + gint _tmp35_; + gint _tmp36_; + gboolean _tmp37_; + gboolean _tmp39_; + gboolean _tmp41_; + gint _tmp43_; + gint _tmp46_; + VersionTable* _tmp47_; + VersionTable* _tmp48_; + gint _tmp49_; + gint _tmp50_; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp0_ = input_version; #line 63 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -408,7 +408,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 83 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp4_) { #line 411 "Db.c" - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; #line 84 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable"); #line 85 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -429,7 +429,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 100 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp6_) { #line 432 "Db.c" - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; #line 101 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable"); #line 102 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -450,7 +450,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 113 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp8_) { #line 453 "Db.c" - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; #line 114 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable"); #line 115 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -471,7 +471,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 126 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp10_) { #line 474 "Db.c" - gboolean _tmp11_ = FALSE; + gboolean _tmp11_; #line 127 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable"); #line 128 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -492,7 +492,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 146 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp12_) { #line 495 "Db.c" - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; #line 147 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \ "able"); @@ -512,7 +512,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 152 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp14_) { #line 514 "Db.c" - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; #line 153 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable"); #line 154 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -533,7 +533,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 170 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp16_) { #line 535 "Db.c" - gboolean _tmp17_ = FALSE; + gboolean _tmp17_; #line 171 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable"); #line 172 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -552,7 +552,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 182 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp18_) { #line 554 "Db.c" - gboolean _tmp19_ = FALSE; + gboolean _tmp19_; #line 183 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \ "ble"); @@ -574,7 +574,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp21_) { #line 575 "Db.c" - gboolean _tmp22_ = FALSE; + gboolean _tmp22_; #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp22_ = database_table_has_column ("VideoTable", "flags"); #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -588,7 +588,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 195 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp20_) { #line 589 "Db.c" - gboolean _tmp23_ = FALSE; + gboolean _tmp23_; #line 196 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable"); #line 197 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -609,7 +609,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 208 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp24_) { #line 610 "Db.c" - gboolean _tmp25_ = FALSE; + gboolean _tmp25_; #line 209 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \ "tTable"); @@ -643,7 +643,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 233 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp27_) { #line 643 "Db.c" - gboolean _tmp28_ = FALSE; + gboolean _tmp28_; #line 234 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable"); #line 235 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -662,7 +662,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 239 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp29_) { #line 662 "Db.c" - gboolean _tmp30_ = FALSE; + gboolean _tmp30_; #line 240 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \ "otoTable"); @@ -682,7 +682,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 245 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp31_) { #line 681 "Db.c" - gboolean _tmp32_ = FALSE; + gboolean _tmp32_; #line 246 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \ "oTable"); @@ -702,7 +702,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 251 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp33_) { #line 700 "Db.c" - gboolean _tmp34_ = FALSE; + gboolean _tmp34_; #line 252 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \ "otoTable"); @@ -746,7 +746,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 302 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp37_) { #line 743 "Db.c" - gboolean _tmp38_ = FALSE; + gboolean _tmp38_; #line 303 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable"); #line 304 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -765,7 +765,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 307 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp39_) { #line 762 "Db.c" - gboolean _tmp40_ = FALSE; + gboolean _tmp40_; #line 308 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable"); #line 309 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -786,7 +786,7 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 320 "/home/jens/Source/shotwell/src/db/Db.vala" if (!_tmp41_) { #line 783 "Db.c" - gboolean _tmp42_ = FALSE; + gboolean _tmp42_; #line 321 "/home/jens/Source/shotwell/src/db/Db.vala" g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable"); #line 322 "/home/jens/Source/shotwell/src/db/Db.vala" @@ -807,8 +807,8 @@ DbVerifyResult db_upgrade_database (gint input_version) { #line 337 "/home/jens/Source/shotwell/src/db/Db.vala" if (_tmp43_ < 19) { #line 804 "Db.c" - Application* _tmp44_ = NULL; - Application* _tmp45_ = NULL; + Application* _tmp44_; + Application* _tmp45_; #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" _tmp44_ = application_get_instance (); #line 338 "/home/jens/Source/shotwell/src/db/Db.vala" diff --git a/src/db/EventTable.c b/src/db/EventTable.c index 65a2508..462ebc8 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.34.7, the Vala compiler +/* EventTable.c generated by valac 0.36.6, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -161,7 +161,7 @@ enum { }; EventRow* event_row_new (void); EventRow* event_row_construct (GType object_type); -static void event_row_finalize (EventRow* obj); +static void event_row_finalize (EventRow * 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); @@ -207,16 +207,16 @@ GeeArrayList* event_table_get_events (EventTable* self); gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name); gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text); gchar* event_table_get_name (EventTable* self, EventID* event_id); -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); gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id); gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id); time_t event_table_get_time_created (EventTable* self, EventID* event_id); gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment); -static void event_table_finalize (DatabaseTable* obj); +static void event_table_finalize (DatabaseTable * obj); void event_id_init (EventID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/EventTable.vala" memset (self, 0, sizeof (EventID)); #line 13 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -229,7 +229,7 @@ void event_id_init (EventID *self, gint64 id) { gboolean event_id_is_invalid (EventID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -242,7 +242,7 @@ gboolean event_id_is_invalid (EventID *self) { gboolean event_id_is_valid (EventID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -342,7 +342,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (collect_values[0].v_pointer) { #line 345 "EventTable.c" - EventRow* object; + EventRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (object->parent_instance.g_class == NULL) { @@ -369,7 +369,7 @@ static gchar* value_event_row_collect_value (GValue* value, guint n_collect_valu static gchar* value_event_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - EventRow** object_p; + EventRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!object_p) { @@ -421,7 +421,7 @@ gpointer value_get_event_row (const GValue* value) { void value_set_event_row (GValue* value, gpointer v_object) { - EventRow* old; + EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -452,7 +452,7 @@ void value_set_event_row (GValue* value, gpointer v_object) { void value_take_event_row (GValue* value, gpointer v_object) { - EventRow* old; + EventRow * old; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_EVENT_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -496,7 +496,7 @@ static void event_row_instance_init (EventRow * self) { } -static void event_row_finalize (EventRow* obj) { +static void event_row_finalize (EventRow * obj) { EventRow * self; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_ROW, EventRow); @@ -527,7 +527,7 @@ GType event_row_get_type (void) { gpointer event_row_ref (gpointer instance) { - EventRow* self; + EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_atomic_int_inc (&self->ref_count); @@ -538,7 +538,7 @@ gpointer event_row_ref (gpointer instance) { void event_row_unref (gpointer instance) { - EventRow* self; + EventRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -555,13 +555,13 @@ static EventTable* event_table_construct (GType object_type) { EventTable* 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 36 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = (EventTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -589,7 +589,7 @@ static EventTable* event_table_construct (GType object_type) { #line 49 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 592 "EventTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp7_ = res; #line 50 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -622,15 +622,15 @@ static gpointer _database_table_ref0 (gpointer self) { EventTable* event_table_get_instance (void) { EventTable* result = NULL; - EventTable* _tmp0_ = NULL; - EventTable* _tmp2_ = NULL; - EventTable* _tmp3_ = NULL; + EventTable* _tmp0_; + EventTable* _tmp2_; + EventTable* _tmp3_; #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp0_ = event_table_instance; #line 56 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp0_ == NULL) { #line 633 "EventTable.c" - EventTable* _tmp1_ = NULL; + EventTable* _tmp1_; #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp1_ = event_table_new (); #line 57 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -653,12 +653,12 @@ EventTable* event_table_get_instance (void) { static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_photo_id, const gchar* primary_source_id) { gchar* result = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gint64 _tmp7_ = 0LL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + gint64 _tmp7_; #line 63 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -676,8 +676,8 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph #line 64 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp4_) { #line 679 "EventTable.c" - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp5_ = primary_source_id; #line 65 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -693,9 +693,9 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph #line 67 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp7_ != PHOTO_ID_INVALID) { #line 696 "EventTable.c" - gint64 _tmp8_ = 0LL; + gint64 _tmp8_; PhotoID _tmp9_ = {0}; - gchar* _tmp10_ = NULL; + gchar* _tmp10_; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp8_ = primary_photo_id; #line 69 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -719,48 +719,48 @@ static gchar* event_table_source_id_upgrade (EventTable* self, gint64 primary_ph EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error) { EventRow* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_ = NULL; + sqlite3* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp5_; + gint _tmp6_; time_t time_created = 0; - gulong _tmp7_ = 0UL; - sqlite3_stmt* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GDestroyNotify _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - time_t _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - GDestroyNotify _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - sqlite3_stmt* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; + gulong _tmp7_; + sqlite3_stmt* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + GDestroyNotify _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + time_t _tmp15_; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + GDestroyNotify _tmp21_; + gint _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; + gint _tmp25_; + gint _tmp26_; EventRow* row = NULL; - EventRow* _tmp28_ = NULL; - EventRow* _tmp29_ = NULL; - sqlite3* _tmp30_ = NULL; - gint64 _tmp31_ = 0LL; - EventRow* _tmp32_ = NULL; - EventRow* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - EventRow* _tmp36_ = NULL; - time_t _tmp37_ = 0; - EventRow* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; + EventRow* _tmp28_; + EventRow* _tmp29_; + sqlite3* _tmp30_; + gint64 _tmp31_; + EventRow* _tmp32_; + EventRow* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + EventRow* _tmp36_; + time_t _tmp37_; + EventRow* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); @@ -769,7 +769,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp1_ != NULL) { #line 772 "EventTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp2_ = primary_source_id; #line 75 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -856,7 +856,7 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, #line 93 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp26_ != SQLITE_DONE) { #line 858 "EventTable.c" - gint _tmp27_ = 0; + gint _tmp27_; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp27_ = res; #line 94 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -942,44 +942,44 @@ EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result) { 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; - EventRow* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GDestroyNotify _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - EventRow* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GDestroyNotify _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - sqlite3_stmt* _tmp21_ = NULL; - EventRow* _tmp22_ = NULL; - time_t _tmp23_ = 0; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - sqlite3_stmt* _tmp26_ = NULL; - EventRow* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - GDestroyNotify _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3* _tmp38_ = NULL; - gint64 _tmp39_ = 0LL; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + EventRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + EventRow* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; + gint _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + EventRow* _tmp22_; + time_t _tmp23_; + gint _tmp24_; + gint _tmp25_; + sqlite3_stmt* _tmp26_; + EventRow* _tmp27_; + const gchar* _tmp28_; + gchar* _tmp29_; + GDestroyNotify _tmp30_; + gint _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + gint _tmp34_; + gint _tmp35_; + sqlite3* _tmp38_; + gint64 _tmp39_; EventID _tmp40_ = {0}; #line 109 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (IS_EVENT_TABLE (self)); @@ -1089,7 +1089,7 @@ void event_table_create_from_row (EventTable* self, EventRow* row, EventID* resu #line 127 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp35_ != SQLITE_DONE) { #line 1090 "EventTable.c" - gint _tmp36_ = 0; + gint _tmp36_; EventID _tmp37_ = {0}; #line 128 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp36_ = res; @@ -1125,41 +1125,41 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { EventRow* 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; - EventID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + EventID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; EventRow* row = NULL; - EventRow* _tmp11_ = NULL; - EventRow* _tmp12_ = NULL; - EventID _tmp13_ = {0}; - EventRow* _tmp14_ = NULL; - sqlite3_stmt* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + EventRow* _tmp11_; + EventRow* _tmp12_; + EventID _tmp13_; + EventRow* _tmp14_; + sqlite3_stmt* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; gboolean _tmp18_ = FALSE; - EventRow* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - EventRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint64 _tmp28_ = 0LL; - sqlite3_stmt* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - EventRow* _tmp32_ = NULL; - sqlite3_stmt* _tmp33_ = NULL; - gint64 _tmp34_ = 0LL; - EventRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + EventRow* _tmp19_; + const gchar* _tmp20_; + EventRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint64 _tmp28_; + sqlite3_stmt* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + EventRow* _tmp32_; + sqlite3_stmt* _tmp33_; + gint64 _tmp34_; + EventRow* _tmp35_; + sqlite3_stmt* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 136 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1236,10 +1236,10 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp20_ != NULL) { #line 1236 "EventTable.c" - EventRow* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; + EventRow* _tmp21_; + const gchar* _tmp22_; + gint _tmp23_; + gint _tmp24_; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp21_ = row; #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1259,7 +1259,7 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { #line 151 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp18_) { #line 1259 "EventTable.c" - EventRow* _tmp25_ = NULL; + EventRow* _tmp25_; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp25_ = row; #line 152 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1315,8 +1315,8 @@ EventRow* event_table_get_row (EventTable* self, EventID* event_id) { void event_table_remove (EventTable* self, EventID* event_id, GError** error) { - EventID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + EventID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 160 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_if_fail (IS_EVENT_TABLE (self)); @@ -1354,12 +1354,12 @@ GeeArrayList* event_table_get_events (EventTable* self) { GeeArrayList* 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_; GeeArrayList* event_rows = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; #line 164 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 166 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1389,33 +1389,33 @@ GeeArrayList* event_table_get_events (EventTable* self) { #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" while (TRUE) { #line 1388 "EventTable.c" - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint _tmp8_; EventRow* row = NULL; - EventRow* _tmp11_ = NULL; - EventRow* _tmp12_ = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - EventRow* _tmp15_ = NULL; - sqlite3_stmt* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - EventRow* _tmp19_ = NULL; - sqlite3_stmt* _tmp20_ = NULL; - gint64 _tmp21_ = 0LL; - sqlite3_stmt* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - EventRow* _tmp25_ = NULL; - sqlite3_stmt* _tmp26_ = NULL; - gint64 _tmp27_ = 0LL; - EventRow* _tmp28_ = NULL; - sqlite3_stmt* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - GeeArrayList* _tmp32_ = NULL; - EventRow* _tmp33_ = NULL; + EventRow* _tmp11_; + EventRow* _tmp12_; + sqlite3_stmt* _tmp13_; + gint64 _tmp14_; + EventRow* _tmp15_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + EventRow* _tmp19_; + sqlite3_stmt* _tmp20_; + gint64 _tmp21_; + sqlite3_stmt* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; + EventRow* _tmp25_; + sqlite3_stmt* _tmp26_; + gint64 _tmp27_; + EventRow* _tmp28_; + sqlite3_stmt* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + GeeArrayList* _tmp32_; + EventRow* _tmp33_; #line 171 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (!_tmp5_) { #line 1418 "EventTable.c" @@ -1436,13 +1436,13 @@ GeeArrayList* event_table_get_events (EventTable* self) { break; #line 1434 "EventTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp9_ = res; #line 175 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp9_ != SQLITE_ROW) { #line 1441 "EventTable.c" - gint _tmp10_ = 0; + gint _tmp10_; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp10_ = res; #line 176 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1536,10 +1536,10 @@ GeeArrayList* event_table_get_events (EventTable* self) { gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - EventID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp1_; + EventID _tmp3_; + gint64 _tmp4_; + gboolean _tmp5_; #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 195 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1549,7 +1549,7 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp1_ != NULL) { #line 1548 "EventTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp2_ = name; #line 196 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1577,18 +1577,18 @@ gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* n gchar* event_table_get_name (EventTable* self, EventID* event_id) { gchar* result = NULL; sqlite3_stmt* stmt = NULL; - EventID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + EventID _tmp0_; + gint64 _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; gchar* name = NULL; - sqlite3_stmt* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; - const gchar* _tmp9_ = NULL; - gchar* _tmp14_ = NULL; + const gchar* _tmp9_; + gchar* _tmp14_; #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 199 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1626,9 +1626,9 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp9_ != NULL) { #line 1625 "EventTable.c" - const gchar* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + const gchar* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp10_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1646,7 +1646,7 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp8_) { #line 1645 "EventTable.c" - const gchar* _tmp13_ = NULL; + const gchar* _tmp13_; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp13_ = name; #line 206 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1674,13 +1674,13 @@ gchar* event_table_get_name (EventTable* self, EventID* event_id) { gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { gchar* result = NULL; sqlite3_stmt* stmt = NULL; - EventID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + EventID _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 209 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), NULL); #line 209 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1723,10 +1723,10 @@ gchar* event_table_get_primary_source_id (EventTable* self, EventID* event_id) { gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id) { gboolean result = FALSE; - EventID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + EventID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 217 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1752,12 +1752,12 @@ gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, time_t event_table_get_time_created (EventTable* self, EventID* event_id) { time_t result = 0; sqlite3_stmt* stmt = NULL; - EventID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + EventID _tmp0_; + gint64 _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - sqlite3_stmt* _tmp4_ = NULL; - gint64 _tmp5_ = 0LL; + gboolean _tmp3_; + sqlite3_stmt* _tmp4_; + gint64 _tmp5_; #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), 0); #line 221 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1799,10 +1799,10 @@ time_t event_table_get_time_created (EventTable* self, EventID* event_id) { gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - EventID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp1_; + EventID _tmp3_; + gint64 _tmp4_; + gboolean _tmp5_; #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" g_return_val_if_fail (IS_EVENT_TABLE (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1814,7 +1814,7 @@ gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gch #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" if (_tmp1_ != NULL) { #line 1813 "EventTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" _tmp2_ = new_comment; #line 230 "/home/jens/Source/shotwell/src/db/EventTable.vala" @@ -1852,7 +1852,7 @@ static void event_table_instance_init (EventTable * self) { } -static void event_table_finalize (DatabaseTable* obj) { +static void event_table_finalize (DatabaseTable * obj) { EventTable * self; #line 33 "/home/jens/Source/shotwell/src/db/EventTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_TABLE, EventTable); diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index da28230..45e2254 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.34.7, the Vala compiler +/* PhotoTable.c generated by valac 0.36.6, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -352,7 +352,7 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type); #define BACKING_PHOTO_ID_INVALID ((gint64) -1) void backing_photo_id_init (BackingPhotoID *self, gint64 id); RawDeveloper* raw_developer_as_array (int* result_length1); -static void photo_row_finalize (PhotoRow* obj); +static void photo_row_finalize (PhotoRow * 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); @@ -420,7 +420,7 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id); gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id); static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id); -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); static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans); gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations); KeyValueMap* key_value_map_new (const gchar* group); @@ -435,7 +435,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format); PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1); -static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value); +static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value); void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error); void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error); void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error); @@ -443,7 +443,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, gint value, GError** error); void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error); void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error); -static void photo_table_finalize (DatabaseTable* obj); +static void photo_table_finalize (DatabaseTable * obj); gboolean backing_photo_id_is_invalid (BackingPhotoID *self); gboolean backing_photo_id_is_valid (BackingPhotoID *self); enum { @@ -452,7 +452,7 @@ enum { gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info); gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info); void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from); -static void backing_photo_row_finalize (BackingPhotoRow* obj); +static void backing_photo_row_finalize (BackingPhotoRow * obj); GType backing_photo_table_get_type (void) G_GNUC_CONST; enum { BACKING_PHOTO_TABLE_DUMMY_PROPERTY @@ -467,13 +467,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error); void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error); void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error); -static void backing_photo_table_finalize (DatabaseTable* obj); +static void backing_photo_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); void photo_id_init (PhotoID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (PhotoID)); #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -486,7 +486,7 @@ void photo_id_init (PhotoID *self, gint64 id) { gboolean photo_id_is_invalid (PhotoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -499,7 +499,7 @@ gboolean photo_id_is_invalid (PhotoID *self) { gboolean photo_id_is_valid (PhotoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -512,8 +512,8 @@ gboolean photo_id_is_valid (PhotoID *self) { guint photo_id_hash (PhotoID *self) { guint result = 0U; - gint64 _tmp0_ = 0LL; - guint _tmp1_ = 0U; + gint64 _tmp0_; + guint _tmp1_; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -528,10 +528,10 @@ guint photo_id_hash (PhotoID *self) { gboolean photo_id_equal (void* a, void* b) { gboolean result = FALSE; - void* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - void* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + void* _tmp0_; + gint64 _tmp1_; + void* _tmp2_; + gint64 _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = a; #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -550,9 +550,9 @@ gboolean photo_id_equal (void* a, void* b) { gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) { gchar* result = NULL; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - gchar* _tmp2_ = NULL; + PhotoID _tmp0_; + gint64 _tmp1_; + gchar* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (photo_id != NULL, NULL); #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -600,7 +600,7 @@ GType photo_id_get_type (void) { void import_id_init (ImportID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 42 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (ImportID)); #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -614,8 +614,8 @@ void import_id_init (ImportID *self, gint64 id) { void import_id_generate (ImportID* result) { GTimeVal timestamp = {0}; gint64 id = 0LL; - GTimeVal _tmp0_ = {0}; - glong _tmp1_ = 0L; + GTimeVal _tmp0_; + glong _tmp1_; ImportID _tmp2_ = {0}; #line 47 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_get_current_time (×tamp); @@ -639,7 +639,7 @@ void import_id_generate (ImportID* result) { gboolean import_id_is_invalid (ImportID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -652,7 +652,7 @@ gboolean import_id_is_invalid (ImportID *self) { gboolean import_id_is_valid (ImportID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -666,17 +666,17 @@ gboolean import_id_is_valid (ImportID *self) { gint import_id_compare_func (ImportID* a, ImportID* b) { gint result = 0; gboolean _tmp0_ = FALSE; - ImportID* _tmp1_ = NULL; - ImportID* _tmp3_ = NULL; - gint64 _tmp4_ = 0LL; - ImportID* _tmp5_ = NULL; - gint64 _tmp6_ = 0LL; + ImportID* _tmp1_; + ImportID* _tmp3_; + gint64 _tmp4_; + ImportID* _tmp5_; + gint64 _tmp6_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = a; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { #line 679 "PhotoTable.c" - ImportID* _tmp2_ = NULL; + ImportID* _tmp2_; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = b; #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -707,10 +707,10 @@ gint import_id_compare_func (ImportID* a, ImportID* b) { gint64 import_id_comparator (void* a, void* b) { gint64 result = 0LL; - void* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - void* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + void* _tmp0_; + gint64 _tmp1_; + void* _tmp2_; + gint64 _tmp3_; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = a; #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -759,14 +759,14 @@ GType import_id_get_type (void) { PhotoRow* photo_row_construct (GType object_type) { PhotoRow* self = NULL; - BackingPhotoRow* _tmp0_ = NULL; - gint _tmp1_ = 0; - RawDeveloper* _tmp2_ = NULL; - RawDeveloper* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - BackingPhotoID* _tmp4_ = NULL; - gint _tmp5_ = 0; - RawDeveloper* _tmp6_ = NULL; + BackingPhotoRow* _tmp0_; + gint _tmp1_; + RawDeveloper* _tmp2_; + RawDeveloper* _tmp3_; + gint _tmp3__length1; + BackingPhotoID* _tmp4_; + gint _tmp5_; + RawDeveloper* _tmp6_; #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (PhotoRow*) g_type_create_instance (object_type); #line 101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -813,11 +813,11 @@ PhotoRow* photo_row_construct (GType object_type) { d = d_collection[d_it]; #line 815 "PhotoTable.c" { - BackingPhotoID* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - RawDeveloper _tmp8_ = 0; + BackingPhotoID* _tmp7_; + gint _tmp7__length1; + RawDeveloper _tmp8_; BackingPhotoID _tmp9_ = {0}; - BackingPhotoID _tmp10_ = {0}; + BackingPhotoID _tmp10_; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = self->development_ids; #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -892,7 +892,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { #line 895 "PhotoTable.c" - PhotoRow* object; + PhotoRow * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { @@ -919,7 +919,7 @@ static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_valu static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoRow** object_p; + PhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { @@ -971,7 +971,7 @@ gpointer value_get_photo_row (const GValue* value) { void value_set_photo_row (GValue* value, gpointer v_object) { - PhotoRow* old; + PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1002,7 +1002,7 @@ void value_set_photo_row (GValue* value, gpointer v_object) { void value_take_photo_row (GValue* value, gpointer v_object) { - PhotoRow* old; + PhotoRow * old; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW)); #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1046,7 +1046,7 @@ static void photo_row_instance_init (PhotoRow * self) { } -static void photo_row_finalize (PhotoRow* obj) { +static void photo_row_finalize (PhotoRow * obj) { PhotoRow * self; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_ROW, PhotoRow); @@ -1089,7 +1089,7 @@ GType photo_row_get_type (void) { gpointer photo_row_ref (gpointer instance) { - PhotoRow* self; + PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); @@ -1100,7 +1100,7 @@ gpointer photo_row_ref (gpointer instance) { void photo_row_unref (gpointer instance) { - PhotoRow* self; + PhotoRow * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1117,50 +1117,50 @@ static PhotoTable* photo_table_construct (GType object_type) { PhotoTable* 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_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_ = NULL; + sqlite3* _tmp8_; sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - sqlite3* _tmp16_ = NULL; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3* _tmp16_; sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - sqlite3* _tmp24_ = NULL; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + gint _tmp21_; + gint _tmp22_; + sqlite3* _tmp24_; sqlite3_stmt* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - sqlite3* _tmp32_ = NULL; + gint _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gint _tmp30_; + sqlite3* _tmp32_; sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - sqlite3* _tmp40_ = NULL; + gint _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint _tmp38_; + sqlite3* _tmp40_; sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_ = 0; - gint _tmp46_ = 0; + gint _tmp42_; + gint _tmp43_; + sqlite3_stmt* _tmp44_; + gint _tmp45_; + gint _tmp46_; #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (PhotoTable*) database_table_construct (object_type); #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1188,7 +1188,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 1191 "PhotoTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1220,7 +1220,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_DONE) { #line 1223 "PhotoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res2; #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1252,7 +1252,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp22_ != SQLITE_DONE) { #line 1255 "PhotoTable.c" - gint _tmp23_ = 0; + gint _tmp23_; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp23_ = res; #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1285,7 +1285,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp30_ != SQLITE_DONE) { #line 1287 "PhotoTable.c" - gint _tmp31_ = 0; + gint _tmp31_; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp31_ = res; #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1318,7 +1318,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != SQLITE_DONE) { #line 1319 "PhotoTable.c" - gint _tmp39_ = 0; + gint _tmp39_; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = res; #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1351,7 +1351,7 @@ static PhotoTable* photo_table_construct (GType object_type) { #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp46_ != SQLITE_DONE) { #line 1351 "PhotoTable.c" - gint _tmp47_ = 0; + gint _tmp47_; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp47_ = res; #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1386,15 +1386,15 @@ static gpointer _database_table_ref0 (gpointer self) { PhotoTable* photo_table_get_instance (void) { PhotoTable* result = NULL; - PhotoTable* _tmp0_ = NULL; - PhotoTable* _tmp2_ = NULL; - PhotoTable* _tmp3_ = NULL; + PhotoTable* _tmp0_; + PhotoTable* _tmp2_; + PhotoTable* _tmp3_; #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = photo_table_instance; #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { #line 1394 "PhotoTable.c" - PhotoTable* _tmp1_ = NULL; + PhotoTable* _tmp1_; #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = photo_table_new (); #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1418,150 +1418,150 @@ PhotoTable* photo_table_get_instance (void) { void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { 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_; gulong time_created = 0UL; - gulong _tmp4_ = 0UL; - sqlite3_stmt* _tmp5_ = NULL; - PhotoRow* _tmp6_ = NULL; - BackingPhotoRow* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - GDestroyNotify _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - PhotoRow* _tmp14_ = NULL; - BackingPhotoRow* _tmp15_ = NULL; - Dimensions _tmp16_ = {0}; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - PhotoRow* _tmp21_ = NULL; - BackingPhotoRow* _tmp22_ = NULL; - Dimensions _tmp23_ = {0}; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - sqlite3_stmt* _tmp27_ = NULL; - PhotoRow* _tmp28_ = NULL; - BackingPhotoRow* _tmp29_ = NULL; - gint64 _tmp30_ = 0LL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - sqlite3_stmt* _tmp33_ = NULL; - PhotoRow* _tmp34_ = NULL; - BackingPhotoRow* _tmp35_ = NULL; - time_t _tmp36_ = 0; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - sqlite3_stmt* _tmp39_ = NULL; - PhotoRow* _tmp40_ = NULL; - time_t _tmp41_ = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - sqlite3_stmt* _tmp44_ = NULL; - PhotoRow* _tmp45_ = NULL; - BackingPhotoRow* _tmp46_ = NULL; - Orientation _tmp47_ = 0; - gint _tmp48_ = 0; - gint _tmp49_ = 0; - sqlite3_stmt* _tmp50_ = NULL; - PhotoRow* _tmp51_ = NULL; - BackingPhotoRow* _tmp52_ = NULL; - Orientation _tmp53_ = 0; - gint _tmp54_ = 0; - gint _tmp55_ = 0; - sqlite3_stmt* _tmp56_ = NULL; - PhotoRow* _tmp57_ = NULL; - ImportID _tmp58_ = {0}; - gint64 _tmp59_ = 0LL; - gint _tmp60_ = 0; - gint _tmp61_ = 0; - sqlite3_stmt* _tmp62_ = NULL; - gint _tmp63_ = 0; - gint _tmp64_ = 0; - sqlite3_stmt* _tmp65_ = NULL; - PhotoRow* _tmp66_ = NULL; - const gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - GDestroyNotify _tmp69_ = NULL; - gint _tmp70_ = 0; - gint _tmp71_ = 0; - sqlite3_stmt* _tmp72_ = NULL; - PhotoRow* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - GDestroyNotify _tmp76_ = NULL; - gint _tmp77_ = 0; - gint _tmp78_ = 0; - sqlite3_stmt* _tmp79_ = NULL; - PhotoRow* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - GDestroyNotify _tmp83_ = NULL; - gint _tmp84_ = 0; - gint _tmp85_ = 0; - sqlite3_stmt* _tmp86_ = NULL; - gulong _tmp87_ = 0UL; - gint _tmp88_ = 0; - gint _tmp89_ = 0; - sqlite3_stmt* _tmp90_ = NULL; - PhotoRow* _tmp91_ = NULL; - BackingPhotoRow* _tmp92_ = NULL; - PhotoFileFormat _tmp93_ = 0; - gint _tmp94_ = 0; - gint _tmp95_ = 0; - gint _tmp96_ = 0; - sqlite3_stmt* _tmp97_ = NULL; - PhotoRow* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; - gchar* _tmp100_ = NULL; - GDestroyNotify _tmp101_ = NULL; - gint _tmp102_ = 0; - gint _tmp103_ = 0; - sqlite3_stmt* _tmp104_ = NULL; - PhotoRow* _tmp105_ = NULL; - Rating _tmp106_ = 0; - gint _tmp107_ = 0; - gint _tmp108_ = 0; - gint _tmp109_ = 0; - sqlite3_stmt* _tmp110_ = NULL; - gint _tmp111_ = 0; - gint _tmp112_ = 0; - sqlite3_stmt* _tmp113_ = NULL; - PhotoRow* _tmp114_ = NULL; - RawDeveloper _tmp115_ = 0; - gchar* _tmp116_ = NULL; - GDestroyNotify _tmp117_ = NULL; - gint _tmp118_ = 0; - gint _tmp119_ = 0; - sqlite3_stmt* _tmp120_ = NULL; - PhotoRow* _tmp121_ = NULL; - const gchar* _tmp122_ = NULL; - gchar* _tmp123_ = NULL; - GDestroyNotify _tmp124_ = NULL; - gint _tmp125_ = 0; - gint _tmp126_ = 0; - sqlite3_stmt* _tmp127_ = NULL; - gint _tmp128_ = 0; - gint _tmp129_ = 0; - PhotoRow* _tmp133_ = NULL; - sqlite3* _tmp134_ = NULL; - gint64 _tmp135_ = 0LL; - PhotoRow* _tmp136_ = NULL; - PhotoRow* _tmp137_ = NULL; - BackingPhotoRow* _tmp138_ = NULL; - Orientation _tmp139_ = 0; - PhotoRow* _tmp140_ = NULL; - PhotoRow* _tmp141_ = NULL; - gulong _tmp142_ = 0UL; - PhotoRow* _tmp143_ = NULL; - PhotoRow* _tmp144_ = NULL; - PhotoID _tmp145_ = {0}; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + PhotoRow* _tmp6_; + BackingPhotoRow* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; + gint _tmp11_; + gint _tmp12_; + sqlite3_stmt* _tmp13_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + PhotoRow* _tmp21_; + BackingPhotoRow* _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; + gint _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + PhotoRow* _tmp28_; + BackingPhotoRow* _tmp29_; + gint64 _tmp30_; + gint _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + PhotoRow* _tmp34_; + BackingPhotoRow* _tmp35_; + time_t _tmp36_; + gint _tmp37_; + gint _tmp38_; + sqlite3_stmt* _tmp39_; + PhotoRow* _tmp40_; + time_t _tmp41_; + gint _tmp42_; + gint _tmp43_; + sqlite3_stmt* _tmp44_; + PhotoRow* _tmp45_; + BackingPhotoRow* _tmp46_; + Orientation _tmp47_; + gint _tmp48_; + gint _tmp49_; + sqlite3_stmt* _tmp50_; + PhotoRow* _tmp51_; + BackingPhotoRow* _tmp52_; + Orientation _tmp53_; + gint _tmp54_; + gint _tmp55_; + sqlite3_stmt* _tmp56_; + PhotoRow* _tmp57_; + ImportID _tmp58_; + gint64 _tmp59_; + gint _tmp60_; + gint _tmp61_; + sqlite3_stmt* _tmp62_; + gint _tmp63_; + gint _tmp64_; + sqlite3_stmt* _tmp65_; + PhotoRow* _tmp66_; + const gchar* _tmp67_; + gchar* _tmp68_; + GDestroyNotify _tmp69_; + gint _tmp70_; + gint _tmp71_; + sqlite3_stmt* _tmp72_; + PhotoRow* _tmp73_; + const gchar* _tmp74_; + gchar* _tmp75_; + GDestroyNotify _tmp76_; + gint _tmp77_; + gint _tmp78_; + sqlite3_stmt* _tmp79_; + PhotoRow* _tmp80_; + const gchar* _tmp81_; + gchar* _tmp82_; + GDestroyNotify _tmp83_; + gint _tmp84_; + gint _tmp85_; + sqlite3_stmt* _tmp86_; + gulong _tmp87_; + gint _tmp88_; + gint _tmp89_; + sqlite3_stmt* _tmp90_; + PhotoRow* _tmp91_; + BackingPhotoRow* _tmp92_; + PhotoFileFormat _tmp93_; + gint _tmp94_; + gint _tmp95_; + gint _tmp96_; + sqlite3_stmt* _tmp97_; + PhotoRow* _tmp98_; + const gchar* _tmp99_; + gchar* _tmp100_; + GDestroyNotify _tmp101_; + gint _tmp102_; + gint _tmp103_; + sqlite3_stmt* _tmp104_; + PhotoRow* _tmp105_; + Rating _tmp106_; + gint _tmp107_; + gint _tmp108_; + gint _tmp109_; + sqlite3_stmt* _tmp110_; + gint _tmp111_; + gint _tmp112_; + sqlite3_stmt* _tmp113_; + PhotoRow* _tmp114_; + RawDeveloper _tmp115_; + gchar* _tmp116_; + GDestroyNotify _tmp117_; + gint _tmp118_; + gint _tmp119_; + sqlite3_stmt* _tmp120_; + PhotoRow* _tmp121_; + const gchar* _tmp122_; + gchar* _tmp123_; + GDestroyNotify _tmp124_; + gint _tmp125_; + gint _tmp126_; + sqlite3_stmt* _tmp127_; + gint _tmp128_; + gint _tmp129_; + PhotoRow* _tmp133_; + sqlite3* _tmp134_; + gint64 _tmp135_; + PhotoRow* _tmp136_; + PhotoRow* _tmp137_; + BackingPhotoRow* _tmp138_; + Orientation _tmp139_; + PhotoRow* _tmp140_; + PhotoRow* _tmp141_; + gulong _tmp142_; + PhotoRow* _tmp143_; + PhotoRow* _tmp144_; + PhotoID _tmp145_; #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1922,14 +1922,14 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp129_ != SQLITE_DONE) { #line 1919 "PhotoTable.c" - gint _tmp130_ = 0; + gint _tmp130_; PhotoID _tmp132_ = {0}; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp130_ = res; #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp130_ != SQLITE_CONSTRAINT) { #line 1926 "PhotoTable.c" - gint _tmp131_ = 0; + gint _tmp131_; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp131_ = res; #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -1995,109 +1995,109 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) { void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { 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_reimported = 0; - gulong _tmp4_ = 0UL; - sqlite3_stmt* _tmp5_ = NULL; - PhotoRow* _tmp6_ = NULL; - BackingPhotoRow* _tmp7_ = NULL; - Dimensions _tmp8_ = {0}; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - PhotoRow* _tmp13_ = NULL; - BackingPhotoRow* _tmp14_ = NULL; - Dimensions _tmp15_ = {0}; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - sqlite3_stmt* _tmp19_ = NULL; - PhotoRow* _tmp20_ = NULL; - BackingPhotoRow* _tmp21_ = NULL; - gint64 _tmp22_ = 0LL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - sqlite3_stmt* _tmp25_ = NULL; - PhotoRow* _tmp26_ = NULL; - BackingPhotoRow* _tmp27_ = NULL; - time_t _tmp28_ = 0; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - sqlite3_stmt* _tmp31_ = NULL; - PhotoRow* _tmp32_ = NULL; - time_t _tmp33_ = 0; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3_stmt* _tmp36_ = NULL; - PhotoRow* _tmp37_ = NULL; - BackingPhotoRow* _tmp38_ = NULL; - Orientation _tmp39_ = 0; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - sqlite3_stmt* _tmp42_ = NULL; - PhotoRow* _tmp43_ = NULL; - BackingPhotoRow* _tmp44_ = NULL; - Orientation _tmp45_ = 0; - gint _tmp46_ = 0; - gint _tmp47_ = 0; - sqlite3_stmt* _tmp48_ = NULL; - PhotoRow* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - GDestroyNotify _tmp52_ = NULL; - gint _tmp53_ = 0; - gint _tmp54_ = 0; - sqlite3_stmt* _tmp55_ = NULL; - PhotoRow* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GDestroyNotify _tmp59_ = NULL; - gint _tmp60_ = 0; - gint _tmp61_ = 0; - sqlite3_stmt* _tmp62_ = NULL; - PhotoRow* _tmp63_ = NULL; - const gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - GDestroyNotify _tmp66_ = NULL; - gint _tmp67_ = 0; - gint _tmp68_ = 0; - sqlite3_stmt* _tmp69_ = NULL; - PhotoRow* _tmp70_ = NULL; - BackingPhotoRow* _tmp71_ = NULL; - PhotoFileFormat _tmp72_ = 0; - gint _tmp73_ = 0; - gint _tmp74_ = 0; - gint _tmp75_ = 0; - sqlite3_stmt* _tmp76_ = NULL; - PhotoRow* _tmp77_ = NULL; - const gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - GDestroyNotify _tmp80_ = NULL; - gint _tmp81_ = 0; - gint _tmp82_ = 0; - sqlite3_stmt* _tmp83_ = NULL; - time_t _tmp84_ = 0; - gint _tmp85_ = 0; - gint _tmp86_ = 0; - sqlite3_stmt* _tmp87_ = NULL; - PhotoRow* _tmp88_ = NULL; - PhotoID _tmp89_ = {0}; - gint64 _tmp90_ = 0LL; - gint _tmp91_ = 0; - gint _tmp92_ = 0; - sqlite3_stmt* _tmp93_ = NULL; - gint _tmp94_ = 0; - gint _tmp95_ = 0; - PhotoRow* _tmp97_ = NULL; - time_t _tmp98_ = 0; - PhotoRow* _tmp99_ = NULL; - PhotoRow* _tmp100_ = NULL; - BackingPhotoRow* _tmp101_ = NULL; - Orientation _tmp102_ = 0; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + PhotoRow* _tmp6_; + BackingPhotoRow* _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + PhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + Dimensions _tmp15_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + PhotoRow* _tmp20_; + BackingPhotoRow* _tmp21_; + gint64 _tmp22_; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; + PhotoRow* _tmp26_; + BackingPhotoRow* _tmp27_; + time_t _tmp28_; + gint _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + PhotoRow* _tmp32_; + time_t _tmp33_; + gint _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + PhotoRow* _tmp37_; + BackingPhotoRow* _tmp38_; + Orientation _tmp39_; + gint _tmp40_; + gint _tmp41_; + sqlite3_stmt* _tmp42_; + PhotoRow* _tmp43_; + BackingPhotoRow* _tmp44_; + Orientation _tmp45_; + gint _tmp46_; + gint _tmp47_; + sqlite3_stmt* _tmp48_; + PhotoRow* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; + GDestroyNotify _tmp52_; + gint _tmp53_; + gint _tmp54_; + sqlite3_stmt* _tmp55_; + PhotoRow* _tmp56_; + const gchar* _tmp57_; + gchar* _tmp58_; + GDestroyNotify _tmp59_; + gint _tmp60_; + gint _tmp61_; + sqlite3_stmt* _tmp62_; + PhotoRow* _tmp63_; + const gchar* _tmp64_; + gchar* _tmp65_; + GDestroyNotify _tmp66_; + gint _tmp67_; + gint _tmp68_; + sqlite3_stmt* _tmp69_; + PhotoRow* _tmp70_; + BackingPhotoRow* _tmp71_; + PhotoFileFormat _tmp72_; + gint _tmp73_; + gint _tmp74_; + gint _tmp75_; + sqlite3_stmt* _tmp76_; + PhotoRow* _tmp77_; + const gchar* _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + gint _tmp82_; + sqlite3_stmt* _tmp83_; + time_t _tmp84_; + gint _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; + PhotoRow* _tmp88_; + PhotoID _tmp89_; + gint64 _tmp90_; + gint _tmp91_; + gint _tmp92_; + sqlite3_stmt* _tmp93_; + gint _tmp94_; + gint _tmp95_; + PhotoRow* _tmp97_; + time_t _tmp98_; + PhotoRow* _tmp99_; + PhotoRow* _tmp100_; + BackingPhotoRow* _tmp101_; + Orientation _tmp102_; GError * _inner_error_ = NULL; #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -2367,7 +2367,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) { #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp95_ != SQLITE_DONE) { #line 2361 "PhotoTable.c" - gint _tmp96_ = 0; + gint _tmp96_; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp96_ = res; #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2422,59 +2422,59 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi gboolean result = FALSE; 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; - gint64 _tmp5_ = 0LL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - glong _tmp9_ = 0L; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - GDestroyNotify _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - GDestroyNotify _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - sqlite3_stmt* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - GDestroyNotify _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - sqlite3_stmt* _tmp30_ = NULL; - PhotoID _tmp31_ = {0}; - gint64 _tmp32_ = 0LL; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_ = 0; - gint _tmp37_ = 0; - PhotoRow* _tmp40_ = NULL; - BackingPhotoRow* _tmp41_ = NULL; - gint64 _tmp42_ = 0LL; - PhotoRow* _tmp43_ = NULL; - BackingPhotoRow* _tmp44_ = NULL; - glong _tmp45_ = 0L; - PhotoRow* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - PhotoRow* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - PhotoRow* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint64 _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + glong _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + GDestroyNotify _tmp15_; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + GDestroyNotify _tmp21_; + gint _tmp22_; + gint _tmp23_; + sqlite3_stmt* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + GDestroyNotify _tmp27_; + gint _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + PhotoID _tmp31_; + gint64 _tmp32_; + gint _tmp33_; + gint _tmp34_; + sqlite3_stmt* _tmp35_; + gint _tmp36_; + gint _tmp37_; + PhotoRow* _tmp40_; + BackingPhotoRow* _tmp41_; + gint64 _tmp42_; + PhotoRow* _tmp43_; + BackingPhotoRow* _tmp44_; + glong _tmp45_; + PhotoRow* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; + PhotoRow* _tmp49_; + const gchar* _tmp50_; + gchar* _tmp51_; + PhotoRow* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2595,13 +2595,13 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp37_ != SQLITE_DONE) { #line 2588 "PhotoTable.c" - gint _tmp38_ = 0; + gint _tmp38_; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp38_ = res; #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != SQLITE_CONSTRAINT) { #line 2594 "PhotoTable.c" - gint _tmp39_ = 0; + gint _tmp39_; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = res; #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2674,8 +2674,8 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { gboolean _tmp0_ = FALSE; - PhotoRow* _tmp1_ = NULL; - Orientation _tmp2_ = 0; + PhotoRow* _tmp1_; + Orientation _tmp2_; #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); #line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2690,8 +2690,8 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { _tmp0_ = TRUE; #line 2682 "PhotoTable.c" } else { - PhotoRow* _tmp3_ = NULL; - Orientation _tmp4_ = 0; + PhotoRow* _tmp3_; + Orientation _tmp4_; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = row; #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2703,9 +2703,9 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) { #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_) { #line 2696 "PhotoTable.c" - PhotoRow* _tmp5_ = NULL; - PhotoID _tmp6_ = {0}; - PhotoRow* _tmp7_ = NULL; + PhotoRow* _tmp5_; + PhotoID _tmp6_; + PhotoRow* _tmp7_; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = row; #line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -2725,133 +2725,133 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { PhotoRow* 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; - PhotoID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + PhotoID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; PhotoRow* row = NULL; - PhotoRow* _tmp11_ = NULL; - PhotoRow* _tmp12_ = NULL; - PhotoID _tmp13_ = {0}; - PhotoRow* _tmp14_ = NULL; - BackingPhotoRow* _tmp15_ = NULL; - sqlite3_stmt* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - PhotoRow* _tmp19_ = NULL; - BackingPhotoRow* _tmp20_ = NULL; - sqlite3_stmt* _tmp21_ = NULL; - gint _tmp22_ = 0; - sqlite3_stmt* _tmp23_ = NULL; - gint _tmp24_ = 0; - PhotoRow* _tmp25_ = NULL; - BackingPhotoRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - gint64 _tmp28_ = 0LL; - PhotoRow* _tmp29_ = NULL; - BackingPhotoRow* _tmp30_ = NULL; - sqlite3_stmt* _tmp31_ = NULL; - gint64 _tmp32_ = 0LL; - PhotoRow* _tmp33_ = NULL; - sqlite3_stmt* _tmp34_ = NULL; - gint64 _tmp35_ = 0LL; - PhotoRow* _tmp36_ = NULL; - sqlite3_stmt* _tmp37_ = NULL; - gint _tmp38_ = 0; - PhotoRow* _tmp39_ = NULL; - BackingPhotoRow* _tmp40_ = NULL; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_ = 0; - PhotoRow* _tmp43_ = NULL; - sqlite3_stmt* _tmp44_ = NULL; - gint64 _tmp45_ = 0LL; - PhotoRow* _tmp46_ = NULL; - sqlite3_stmt* _tmp47_ = NULL; - gint64 _tmp48_ = 0LL; - PhotoRow* _tmp49_ = NULL; - sqlite3_stmt* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - GeeHashMap* _tmp52_ = NULL; - PhotoRow* _tmp53_ = NULL; - sqlite3_stmt* _tmp54_ = NULL; - const gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - PhotoRow* _tmp57_ = NULL; - sqlite3_stmt* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - PhotoRow* _tmp61_ = NULL; - sqlite3_stmt* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - PhotoRow* _tmp65_ = NULL; - sqlite3_stmt* _tmp66_ = NULL; - gint64 _tmp67_ = 0LL; - PhotoRow* _tmp68_ = NULL; - sqlite3_stmt* _tmp69_ = NULL; - gint64 _tmp70_ = 0LL; - PhotoRow* _tmp71_ = NULL; - sqlite3_stmt* _tmp72_ = NULL; - gint _tmp73_ = 0; - Rating _tmp74_ = 0; - PhotoRow* _tmp75_ = NULL; - BackingPhotoRow* _tmp76_ = NULL; - sqlite3_stmt* _tmp77_ = NULL; - gint _tmp78_ = 0; - PhotoFileFormat _tmp79_ = 0; - PhotoRow* _tmp80_ = NULL; - sqlite3_stmt* _tmp81_ = NULL; - const gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - PhotoRow* _tmp84_ = NULL; - sqlite3_stmt* _tmp85_ = NULL; - const gchar* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - PhotoRow* _tmp88_ = NULL; - sqlite3_stmt* _tmp89_ = NULL; - gint64 _tmp90_ = 0LL; - PhotoRow* _tmp91_ = NULL; - sqlite3_stmt* _tmp92_ = NULL; - gint64 _tmp93_ = 0LL; - PhotoRow* _tmp94_ = NULL; - sqlite3_stmt* _tmp95_ = NULL; - gint _tmp96_ = 0; + PhotoRow* _tmp11_; + PhotoRow* _tmp12_; + PhotoID _tmp13_; + PhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + PhotoRow* _tmp19_; + BackingPhotoRow* _tmp20_; + sqlite3_stmt* _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + gint _tmp24_; + PhotoRow* _tmp25_; + BackingPhotoRow* _tmp26_; + sqlite3_stmt* _tmp27_; + gint64 _tmp28_; + PhotoRow* _tmp29_; + BackingPhotoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + gint64 _tmp32_; + PhotoRow* _tmp33_; + sqlite3_stmt* _tmp34_; + gint64 _tmp35_; + PhotoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + gint _tmp38_; + PhotoRow* _tmp39_; + BackingPhotoRow* _tmp40_; + sqlite3_stmt* _tmp41_; + gint _tmp42_; + PhotoRow* _tmp43_; + sqlite3_stmt* _tmp44_; + gint64 _tmp45_; + PhotoRow* _tmp46_; + sqlite3_stmt* _tmp47_; + gint64 _tmp48_; + PhotoRow* _tmp49_; + sqlite3_stmt* _tmp50_; + const gchar* _tmp51_; + GeeHashMap* _tmp52_; + PhotoRow* _tmp53_; + sqlite3_stmt* _tmp54_; + const gchar* _tmp55_; + gchar* _tmp56_; + PhotoRow* _tmp57_; + sqlite3_stmt* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + PhotoRow* _tmp61_; + sqlite3_stmt* _tmp62_; + const gchar* _tmp63_; + gchar* _tmp64_; + PhotoRow* _tmp65_; + sqlite3_stmt* _tmp66_; + gint64 _tmp67_; + PhotoRow* _tmp68_; + sqlite3_stmt* _tmp69_; + gint64 _tmp70_; + PhotoRow* _tmp71_; + sqlite3_stmt* _tmp72_; + gint _tmp73_; + Rating _tmp74_; + PhotoRow* _tmp75_; + BackingPhotoRow* _tmp76_; + sqlite3_stmt* _tmp77_; + gint _tmp78_; + PhotoFileFormat _tmp79_; + PhotoRow* _tmp80_; + sqlite3_stmt* _tmp81_; + const gchar* _tmp82_; + gchar* _tmp83_; + PhotoRow* _tmp84_; + sqlite3_stmt* _tmp85_; + const gchar* _tmp86_; + gchar* _tmp87_; + PhotoRow* _tmp88_; + sqlite3_stmt* _tmp89_; + gint64 _tmp90_; + PhotoRow* _tmp91_; + sqlite3_stmt* _tmp92_; + gint64 _tmp93_; + PhotoRow* _tmp94_; + sqlite3_stmt* _tmp95_; + gint _tmp96_; RawDeveloper _tmp97_ = 0; - sqlite3_stmt* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; - PhotoRow* _tmp103_ = NULL; - PhotoRow* _tmp104_ = NULL; - BackingPhotoID* _tmp105_ = NULL; - gint _tmp105__length1 = 0; - sqlite3_stmt* _tmp106_ = NULL; - gint64 _tmp107_ = 0LL; + sqlite3_stmt* _tmp98_; + const gchar* _tmp99_; + PhotoRow* _tmp103_; + PhotoRow* _tmp104_; + BackingPhotoID* _tmp105_; + gint _tmp105__length1; + sqlite3_stmt* _tmp106_; + gint64 _tmp107_; BackingPhotoID _tmp108_ = {0}; - BackingPhotoID _tmp109_ = {0}; - PhotoRow* _tmp110_ = NULL; - BackingPhotoID* _tmp111_ = NULL; - gint _tmp111__length1 = 0; - sqlite3_stmt* _tmp112_ = NULL; - gint64 _tmp113_ = 0LL; + BackingPhotoID _tmp109_; + PhotoRow* _tmp110_; + BackingPhotoID* _tmp111_; + gint _tmp111__length1; + sqlite3_stmt* _tmp112_; + gint64 _tmp113_; BackingPhotoID _tmp114_ = {0}; - BackingPhotoID _tmp115_ = {0}; - PhotoRow* _tmp116_ = NULL; - BackingPhotoID* _tmp117_ = NULL; - gint _tmp117__length1 = 0; - sqlite3_stmt* _tmp118_ = NULL; - gint64 _tmp119_ = 0LL; + BackingPhotoID _tmp115_; + PhotoRow* _tmp116_; + BackingPhotoID* _tmp117_; + gint _tmp117__length1; + sqlite3_stmt* _tmp118_; + gint64 _tmp119_; BackingPhotoID _tmp120_ = {0}; - BackingPhotoID _tmp121_ = {0}; - PhotoRow* _tmp122_ = NULL; - sqlite3_stmt* _tmp123_ = NULL; - const gchar* _tmp124_ = NULL; - gchar* _tmp125_ = NULL; + BackingPhotoID _tmp121_; + PhotoRow* _tmp122_; + sqlite3_stmt* _tmp123_; + const gchar* _tmp124_; + gchar* _tmp125_; #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3142,9 +3142,9 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) { #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp99_ != NULL) { #line 3132 "PhotoTable.c" - sqlite3_stmt* _tmp100_ = NULL; - const gchar* _tmp101_ = NULL; - RawDeveloper _tmp102_ = 0; + sqlite3_stmt* _tmp100_; + const gchar* _tmp101_; + RawDeveloper _tmp102_; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp100_ = stmt; #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3237,12 +3237,12 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { GeeArrayList* 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_; GeeArrayList* all = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; #line 438 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3270,129 +3270,129 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 3256 "PhotoTable.c" - sqlite3_stmt* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + sqlite3_stmt* _tmp5_; + gint _tmp6_; + gint _tmp7_; PhotoRow* row = NULL; - PhotoRow* _tmp8_ = NULL; - PhotoRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint64 _tmp11_ = 0LL; - PhotoRow* _tmp12_ = NULL; - BackingPhotoRow* _tmp13_ = NULL; - sqlite3_stmt* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - PhotoRow* _tmp17_ = NULL; - BackingPhotoRow* _tmp18_ = NULL; - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; - sqlite3_stmt* _tmp21_ = NULL; - gint _tmp22_ = 0; - PhotoRow* _tmp23_ = NULL; - BackingPhotoRow* _tmp24_ = NULL; - sqlite3_stmt* _tmp25_ = NULL; - gint64 _tmp26_ = 0LL; - PhotoRow* _tmp27_ = NULL; - BackingPhotoRow* _tmp28_ = NULL; - sqlite3_stmt* _tmp29_ = NULL; - gint64 _tmp30_ = 0LL; - PhotoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint64 _tmp33_ = 0LL; - PhotoRow* _tmp34_ = NULL; - sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_ = 0; - PhotoRow* _tmp37_ = NULL; - BackingPhotoRow* _tmp38_ = NULL; - sqlite3_stmt* _tmp39_ = NULL; - gint _tmp40_ = 0; - PhotoRow* _tmp41_ = NULL; - sqlite3_stmt* _tmp42_ = NULL; - gint64 _tmp43_ = 0LL; - PhotoRow* _tmp44_ = NULL; - sqlite3_stmt* _tmp45_ = NULL; - gint64 _tmp46_ = 0LL; - PhotoRow* _tmp47_ = NULL; - sqlite3_stmt* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - GeeHashMap* _tmp50_ = NULL; - PhotoRow* _tmp51_ = NULL; - sqlite3_stmt* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - PhotoRow* _tmp55_ = NULL; - sqlite3_stmt* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - PhotoRow* _tmp59_ = NULL; - sqlite3_stmt* _tmp60_ = NULL; - const gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - PhotoRow* _tmp63_ = NULL; - sqlite3_stmt* _tmp64_ = NULL; - gint64 _tmp65_ = 0LL; - PhotoRow* _tmp66_ = NULL; - sqlite3_stmt* _tmp67_ = NULL; - gint64 _tmp68_ = 0LL; - PhotoRow* _tmp69_ = NULL; - sqlite3_stmt* _tmp70_ = NULL; - gint _tmp71_ = 0; - Rating _tmp72_ = 0; - PhotoRow* _tmp73_ = NULL; - BackingPhotoRow* _tmp74_ = NULL; - sqlite3_stmt* _tmp75_ = NULL; - gint _tmp76_ = 0; - PhotoFileFormat _tmp77_ = 0; - PhotoRow* _tmp78_ = NULL; - sqlite3_stmt* _tmp79_ = NULL; - const gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - PhotoRow* _tmp82_ = NULL; - sqlite3_stmt* _tmp83_ = NULL; - const gchar* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; - PhotoRow* _tmp86_ = NULL; - sqlite3_stmt* _tmp87_ = NULL; - gint64 _tmp88_ = 0LL; - PhotoRow* _tmp89_ = NULL; - sqlite3_stmt* _tmp90_ = NULL; - gint64 _tmp91_ = 0LL; - PhotoRow* _tmp92_ = NULL; - sqlite3_stmt* _tmp93_ = NULL; - gint _tmp94_ = 0; + PhotoRow* _tmp8_; + PhotoRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint64 _tmp11_; + PhotoRow* _tmp12_; + BackingPhotoRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + PhotoRow* _tmp17_; + BackingPhotoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + gint _tmp22_; + PhotoRow* _tmp23_; + BackingPhotoRow* _tmp24_; + sqlite3_stmt* _tmp25_; + gint64 _tmp26_; + PhotoRow* _tmp27_; + BackingPhotoRow* _tmp28_; + sqlite3_stmt* _tmp29_; + gint64 _tmp30_; + PhotoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint64 _tmp33_; + PhotoRow* _tmp34_; + sqlite3_stmt* _tmp35_; + gint _tmp36_; + PhotoRow* _tmp37_; + BackingPhotoRow* _tmp38_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; + PhotoRow* _tmp41_; + sqlite3_stmt* _tmp42_; + gint64 _tmp43_; + PhotoRow* _tmp44_; + sqlite3_stmt* _tmp45_; + gint64 _tmp46_; + PhotoRow* _tmp47_; + sqlite3_stmt* _tmp48_; + const gchar* _tmp49_; + GeeHashMap* _tmp50_; + PhotoRow* _tmp51_; + sqlite3_stmt* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + PhotoRow* _tmp55_; + sqlite3_stmt* _tmp56_; + const gchar* _tmp57_; + gchar* _tmp58_; + PhotoRow* _tmp59_; + sqlite3_stmt* _tmp60_; + const gchar* _tmp61_; + gchar* _tmp62_; + PhotoRow* _tmp63_; + sqlite3_stmt* _tmp64_; + gint64 _tmp65_; + PhotoRow* _tmp66_; + sqlite3_stmt* _tmp67_; + gint64 _tmp68_; + PhotoRow* _tmp69_; + sqlite3_stmt* _tmp70_; + gint _tmp71_; + Rating _tmp72_; + PhotoRow* _tmp73_; + BackingPhotoRow* _tmp74_; + sqlite3_stmt* _tmp75_; + gint _tmp76_; + PhotoFileFormat _tmp77_; + PhotoRow* _tmp78_; + sqlite3_stmt* _tmp79_; + const gchar* _tmp80_; + gchar* _tmp81_; + PhotoRow* _tmp82_; + sqlite3_stmt* _tmp83_; + const gchar* _tmp84_; + gchar* _tmp85_; + PhotoRow* _tmp86_; + sqlite3_stmt* _tmp87_; + gint64 _tmp88_; + PhotoRow* _tmp89_; + sqlite3_stmt* _tmp90_; + gint64 _tmp91_; + PhotoRow* _tmp92_; + sqlite3_stmt* _tmp93_; + gint _tmp94_; RawDeveloper _tmp95_ = 0; - sqlite3_stmt* _tmp96_ = NULL; - const gchar* _tmp97_ = NULL; - PhotoRow* _tmp101_ = NULL; - PhotoRow* _tmp102_ = NULL; - BackingPhotoID* _tmp103_ = NULL; - gint _tmp103__length1 = 0; - sqlite3_stmt* _tmp104_ = NULL; - gint64 _tmp105_ = 0LL; + sqlite3_stmt* _tmp96_; + const gchar* _tmp97_; + PhotoRow* _tmp101_; + PhotoRow* _tmp102_; + BackingPhotoID* _tmp103_; + gint _tmp103__length1; + sqlite3_stmt* _tmp104_; + gint64 _tmp105_; BackingPhotoID _tmp106_ = {0}; - BackingPhotoID _tmp107_ = {0}; - PhotoRow* _tmp108_ = NULL; - BackingPhotoID* _tmp109_ = NULL; - gint _tmp109__length1 = 0; - sqlite3_stmt* _tmp110_ = NULL; - gint64 _tmp111_ = 0LL; + BackingPhotoID _tmp107_; + PhotoRow* _tmp108_; + BackingPhotoID* _tmp109_; + gint _tmp109__length1; + sqlite3_stmt* _tmp110_; + gint64 _tmp111_; BackingPhotoID _tmp112_ = {0}; - BackingPhotoID _tmp113_ = {0}; - PhotoRow* _tmp114_ = NULL; - BackingPhotoID* _tmp115_ = NULL; - gint _tmp115__length1 = 0; - sqlite3_stmt* _tmp116_ = NULL; - gint64 _tmp117_ = 0LL; + BackingPhotoID _tmp113_; + PhotoRow* _tmp114_; + BackingPhotoID* _tmp115_; + gint _tmp115__length1; + sqlite3_stmt* _tmp116_; + gint64 _tmp117_; BackingPhotoID _tmp118_ = {0}; - BackingPhotoID _tmp119_ = {0}; - PhotoRow* _tmp120_ = NULL; - sqlite3_stmt* _tmp121_ = NULL; - const gchar* _tmp122_ = NULL; - gchar* _tmp123_ = NULL; - PhotoRow* _tmp124_ = NULL; - GeeArrayList* _tmp125_ = NULL; - PhotoRow* _tmp126_ = NULL; + BackingPhotoID _tmp119_; + PhotoRow* _tmp120_; + sqlite3_stmt* _tmp121_; + const gchar* _tmp122_; + gchar* _tmp123_; + PhotoRow* _tmp124_; + GeeArrayList* _tmp125_; + PhotoRow* _tmp126_; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3650,9 +3650,9 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp97_ != NULL) { #line 3636 "PhotoTable.c" - sqlite3_stmt* _tmp98_ = NULL; - const gchar* _tmp99_ = NULL; - RawDeveloper _tmp100_ = 0; + sqlite3_stmt* _tmp98_; + const gchar* _tmp99_; + RawDeveloper _tmp100_; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp98_ = stmt; #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -3757,170 +3757,170 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) { void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* new_filename, BackingPhotoID* editable_id, BackingPhotoID* develop_shotwell, BackingPhotoID* develop_camera_id, BackingPhotoID* develop_embedded_id, PhotoID* result) { PhotoRow* original = NULL; - PhotoID _tmp0_ = {0}; - PhotoRow* _tmp1_ = NULL; + PhotoID _tmp0_; + PhotoRow* _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp2_ = NULL; + sqlite3* _tmp2_; sqlite3_stmt* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - sqlite3_stmt* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GDestroyNotify _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - PhotoRow* _tmp13_ = NULL; - BackingPhotoRow* _tmp14_ = NULL; - Dimensions _tmp15_ = {0}; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - sqlite3_stmt* _tmp19_ = NULL; - PhotoRow* _tmp20_ = NULL; - BackingPhotoRow* _tmp21_ = NULL; - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - sqlite3_stmt* _tmp26_ = NULL; - PhotoRow* _tmp27_ = NULL; - BackingPhotoRow* _tmp28_ = NULL; - gint64 _tmp29_ = 0LL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; - sqlite3_stmt* _tmp32_ = NULL; - PhotoRow* _tmp33_ = NULL; - BackingPhotoRow* _tmp34_ = NULL; - time_t _tmp35_ = 0; - gint _tmp36_ = 0; - gint _tmp37_ = 0; - sqlite3_stmt* _tmp38_ = NULL; - PhotoRow* _tmp39_ = NULL; - time_t _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - sqlite3_stmt* _tmp43_ = NULL; - PhotoRow* _tmp44_ = NULL; - Orientation _tmp45_ = 0; - gint _tmp46_ = 0; - gint _tmp47_ = 0; - sqlite3_stmt* _tmp48_ = NULL; - PhotoRow* _tmp49_ = NULL; - BackingPhotoRow* _tmp50_ = NULL; - Orientation _tmp51_ = 0; - gint _tmp52_ = 0; - gint _tmp53_ = 0; - sqlite3_stmt* _tmp54_ = NULL; - PhotoRow* _tmp55_ = NULL; - ImportID _tmp56_ = {0}; - gint64 _tmp57_ = 0LL; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - sqlite3_stmt* _tmp60_ = NULL; - PhotoRow* _tmp61_ = NULL; - EventID _tmp62_ = {0}; - gint64 _tmp63_ = 0LL; - gint _tmp64_ = 0; - gint _tmp65_ = 0; - sqlite3_stmt* _tmp66_ = NULL; - PhotoRow* _tmp67_ = NULL; - GeeHashMap* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - GDestroyNotify _tmp70_ = NULL; - gint _tmp71_ = 0; - gint _tmp72_ = 0; - sqlite3_stmt* _tmp73_ = NULL; - PhotoRow* _tmp74_ = NULL; - const gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - GDestroyNotify _tmp77_ = NULL; - gint _tmp78_ = 0; - gint _tmp79_ = 0; - sqlite3_stmt* _tmp80_ = NULL; - PhotoRow* _tmp81_ = NULL; - const gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - GDestroyNotify _tmp84_ = NULL; - gint _tmp85_ = 0; - gint _tmp86_ = 0; - sqlite3_stmt* _tmp87_ = NULL; - PhotoRow* _tmp88_ = NULL; - const gchar* _tmp89_ = NULL; - gchar* _tmp90_ = NULL; - GDestroyNotify _tmp91_ = NULL; - gint _tmp92_ = 0; - gint _tmp93_ = 0; - sqlite3_stmt* _tmp94_ = NULL; - gulong _tmp95_ = 0UL; - gint _tmp96_ = 0; - gint _tmp97_ = 0; - sqlite3_stmt* _tmp98_ = NULL; - PhotoRow* _tmp99_ = NULL; - guint64 _tmp100_ = 0ULL; - gint _tmp101_ = 0; - gint _tmp102_ = 0; - sqlite3_stmt* _tmp103_ = NULL; - PhotoRow* _tmp104_ = NULL; - Rating _tmp105_ = 0; - gint _tmp106_ = 0; - gint _tmp107_ = 0; - gint _tmp108_ = 0; - sqlite3_stmt* _tmp109_ = NULL; - PhotoRow* _tmp110_ = NULL; - BackingPhotoRow* _tmp111_ = NULL; - PhotoFileFormat _tmp112_ = 0; - gint _tmp113_ = 0; - gint _tmp114_ = 0; - gint _tmp115_ = 0; - sqlite3_stmt* _tmp116_ = NULL; - PhotoRow* _tmp117_ = NULL; - const gchar* _tmp118_ = NULL; - gchar* _tmp119_ = NULL; - GDestroyNotify _tmp120_ = NULL; - gint _tmp121_ = 0; - gint _tmp122_ = 0; - sqlite3_stmt* _tmp123_ = NULL; - BackingPhotoID _tmp124_ = {0}; - gint64 _tmp125_ = 0LL; - gint _tmp126_ = 0; - gint _tmp127_ = 0; - sqlite3_stmt* _tmp128_ = NULL; - PhotoRow* _tmp129_ = NULL; - RawDeveloper _tmp130_ = 0; - gchar* _tmp131_ = NULL; - GDestroyNotify _tmp132_ = NULL; - gint _tmp133_ = 0; - gint _tmp134_ = 0; - sqlite3_stmt* _tmp135_ = NULL; - BackingPhotoID _tmp136_ = {0}; - gint64 _tmp137_ = 0LL; - gint _tmp138_ = 0; - gint _tmp139_ = 0; - sqlite3_stmt* _tmp140_ = NULL; - BackingPhotoID _tmp141_ = {0}; - gint64 _tmp142_ = 0LL; - gint _tmp143_ = 0; - gint _tmp144_ = 0; - sqlite3_stmt* _tmp145_ = NULL; - BackingPhotoID _tmp146_ = {0}; - gint64 _tmp147_ = 0LL; - gint _tmp148_ = 0; - gint _tmp149_ = 0; - sqlite3_stmt* _tmp150_ = NULL; - PhotoRow* _tmp151_ = NULL; - const gchar* _tmp152_ = NULL; - gchar* _tmp153_ = NULL; - GDestroyNotify _tmp154_ = NULL; - gint _tmp155_ = 0; - gint _tmp156_ = 0; - sqlite3_stmt* _tmp157_ = NULL; - gint _tmp158_ = 0; - gint _tmp159_ = 0; - sqlite3* _tmp163_ = NULL; - gint64 _tmp164_ = 0LL; + gint _tmp4_; + gint _tmp5_; + sqlite3_stmt* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + GDestroyNotify _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + PhotoRow* _tmp13_; + BackingPhotoRow* _tmp14_; + Dimensions _tmp15_; + gint _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + PhotoRow* _tmp20_; + BackingPhotoRow* _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; + sqlite3_stmt* _tmp26_; + PhotoRow* _tmp27_; + BackingPhotoRow* _tmp28_; + gint64 _tmp29_; + gint _tmp30_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + PhotoRow* _tmp33_; + BackingPhotoRow* _tmp34_; + time_t _tmp35_; + gint _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + PhotoRow* _tmp39_; + time_t _tmp40_; + gint _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + PhotoRow* _tmp44_; + Orientation _tmp45_; + gint _tmp46_; + gint _tmp47_; + sqlite3_stmt* _tmp48_; + PhotoRow* _tmp49_; + BackingPhotoRow* _tmp50_; + Orientation _tmp51_; + gint _tmp52_; + gint _tmp53_; + sqlite3_stmt* _tmp54_; + PhotoRow* _tmp55_; + ImportID _tmp56_; + gint64 _tmp57_; + gint _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + PhotoRow* _tmp61_; + EventID _tmp62_; + gint64 _tmp63_; + gint _tmp64_; + gint _tmp65_; + sqlite3_stmt* _tmp66_; + PhotoRow* _tmp67_; + GeeHashMap* _tmp68_; + gchar* _tmp69_; + GDestroyNotify _tmp70_; + gint _tmp71_; + gint _tmp72_; + sqlite3_stmt* _tmp73_; + PhotoRow* _tmp74_; + const gchar* _tmp75_; + gchar* _tmp76_; + GDestroyNotify _tmp77_; + gint _tmp78_; + gint _tmp79_; + sqlite3_stmt* _tmp80_; + PhotoRow* _tmp81_; + const gchar* _tmp82_; + gchar* _tmp83_; + GDestroyNotify _tmp84_; + gint _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; + PhotoRow* _tmp88_; + const gchar* _tmp89_; + gchar* _tmp90_; + GDestroyNotify _tmp91_; + gint _tmp92_; + gint _tmp93_; + sqlite3_stmt* _tmp94_; + gulong _tmp95_; + gint _tmp96_; + gint _tmp97_; + sqlite3_stmt* _tmp98_; + PhotoRow* _tmp99_; + guint64 _tmp100_; + gint _tmp101_; + gint _tmp102_; + sqlite3_stmt* _tmp103_; + PhotoRow* _tmp104_; + Rating _tmp105_; + gint _tmp106_; + gint _tmp107_; + gint _tmp108_; + sqlite3_stmt* _tmp109_; + PhotoRow* _tmp110_; + BackingPhotoRow* _tmp111_; + PhotoFileFormat _tmp112_; + gint _tmp113_; + gint _tmp114_; + gint _tmp115_; + sqlite3_stmt* _tmp116_; + PhotoRow* _tmp117_; + const gchar* _tmp118_; + gchar* _tmp119_; + GDestroyNotify _tmp120_; + gint _tmp121_; + gint _tmp122_; + sqlite3_stmt* _tmp123_; + BackingPhotoID _tmp124_; + gint64 _tmp125_; + gint _tmp126_; + gint _tmp127_; + sqlite3_stmt* _tmp128_; + PhotoRow* _tmp129_; + RawDeveloper _tmp130_; + gchar* _tmp131_; + GDestroyNotify _tmp132_; + gint _tmp133_; + gint _tmp134_; + sqlite3_stmt* _tmp135_; + BackingPhotoID _tmp136_; + gint64 _tmp137_; + gint _tmp138_; + gint _tmp139_; + sqlite3_stmt* _tmp140_; + BackingPhotoID _tmp141_; + gint64 _tmp142_; + gint _tmp143_; + gint _tmp144_; + sqlite3_stmt* _tmp145_; + BackingPhotoID _tmp146_; + gint64 _tmp147_; + gint _tmp148_; + gint _tmp149_; + sqlite3_stmt* _tmp150_; + PhotoRow* _tmp151_; + const gchar* _tmp152_; + gchar* _tmp153_; + GDestroyNotify _tmp154_; + gint _tmp155_; + gint _tmp156_; + sqlite3_stmt* _tmp157_; + gint _tmp158_; + gint _tmp159_; + sqlite3* _tmp163_; + gint64 _tmp164_; PhotoID _tmp165_ = {0}; #line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4373,14 +4373,14 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp159_ != SQLITE_DONE) { #line 4355 "PhotoTable.c" - gint _tmp160_ = 0; + gint _tmp160_; PhotoID _tmp162_ = {0}; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp160_ = res; #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp160_ != SQLITE_CONSTRAINT) { #line 4362 "PhotoTable.c" - gint _tmp161_ = 0; + gint _tmp161_; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp161_ = res; #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4420,10 +4420,10 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar* new_title) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PhotoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp1_; + PhotoID _tmp3_; + gint64 _tmp4_; + gboolean _tmp5_; #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4433,7 +4433,7 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { #line 4415 "PhotoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = new_title; #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4461,10 +4461,10 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gchar* new_comment) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PhotoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp1_; + PhotoID _tmp3_; + gint64 _tmp4_; + gboolean _tmp5_; #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4474,7 +4474,7 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { #line 4456 "PhotoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = new_comment; #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4500,9 +4500,9 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error) { - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + PhotoID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4541,9 +4541,9 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t timestamp, GError** error) { - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - time_t _tmp2_ = 0; + PhotoID _tmp0_; + gint64 _tmp1_; + time_t _tmp2_; GError * _inner_error_ = NULL; #line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4581,10 +4581,10 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - time_t _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + time_t _tmp2_; + gboolean _tmp3_; #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4606,10 +4606,10 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* import_id, GError** error) { - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - ImportID _tmp2_ = {0}; - gint64 _tmp3_ = 0LL; + PhotoID _tmp0_; + gint64 _tmp1_; + ImportID _tmp2_; + gint64 _tmp3_; GError * _inner_error_ = NULL; #line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4653,19 +4653,19 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { gboolean result = FALSE; 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; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4711,7 +4711,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_DONE) { #line 4693 "PhotoTable.c" - gint _tmp13_ = 0; + gint _tmp13_; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4735,8 +4735,8 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) { void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) { - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + PhotoID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -4774,12 +4774,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { GeeArrayList* 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_; GeeArrayList* photo_ids = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; #line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4808,12 +4808,12 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 4790 "PhotoTable.c" - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GeeArrayList* _tmp11_ = NULL; - sqlite3_stmt* _tmp12_ = NULL; - gint64 _tmp13_ = 0LL; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GeeArrayList* _tmp11_; + sqlite3_stmt* _tmp12_; + gint64 _tmp13_; PhotoID _tmp14_ = {0}; #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp5_) { @@ -4835,13 +4835,13 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { break; #line 4816 "PhotoTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = res; #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp9_ != SQLITE_ROW) { #line 4823 "PhotoTable.c" - gint _tmp10_ = 0; + gint _tmp10_; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp10_ = res; #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4876,10 +4876,10 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) { gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orientation orientation) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - Orientation _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + Orientation _tmp2_; + gboolean _tmp3_; #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4902,10 +4902,10 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 flags) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - guint64 _tmp2_ = 0ULL; - gboolean _tmp3_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + guint64 _tmp2_; + gboolean _tmp3_; #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4928,11 +4928,11 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64 gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rating) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - Rating _tmp2_ = 0; - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + Rating _tmp2_; + gint _tmp3_; + gboolean _tmp4_; #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -4959,15 +4959,15 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { gint result = 0; 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; - EventID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + EventID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; gint count = 0; #line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), 0); @@ -5011,10 +5011,10 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 4993 "PhotoTable.c" - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint _tmp15_ = 0; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; + gint _tmp15_; #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp9_) { #line 5000 "PhotoTable.c" @@ -5035,13 +5035,13 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) { break; #line 5016 "PhotoTable.c" } else { - gint _tmp13_ = 0; + gint _tmp13_; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp13_ != SQLITE_ROW) { #line 5023 "PhotoTable.c" - gint _tmp14_ = 0; + gint _tmp14_; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = res; #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5072,17 +5072,17 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event GeeArrayList* 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; - EventID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + EventID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_ = NULL; + GeeArrayList* _tmp9_; #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5127,15 +5127,15 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 5109 "PhotoTable.c" - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - GeeArrayList* _tmp16_ = NULL; - sqlite3_stmt* _tmp17_ = NULL; - gint64 _tmp18_ = 0LL; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + gint _tmp13_; + GeeArrayList* _tmp16_; + sqlite3_stmt* _tmp17_; + gint64 _tmp18_; PhotoID _tmp19_ = {0}; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + gchar* _tmp20_; + gchar* _tmp21_; #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp10_) { #line 5121 "PhotoTable.c" @@ -5156,13 +5156,13 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event break; #line 5137 "PhotoTable.c" } else { - gint _tmp14_ = 0; + gint _tmp14_; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp14_ = res; #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_ROW) { #line 5144 "PhotoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res; #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5205,18 +5205,18 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { gboolean result = FALSE; 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; - EventID _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_; + EventID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5267,13 +5267,13 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) { return result; #line 5248 "PhotoTable.c" } else { - gint _tmp12_ = 0; + gint _tmp12_; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { #line 5255 "PhotoTable.c" - gint _tmp13_ = 0; + gint _tmp13_; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5301,21 +5301,21 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { gboolean result = FALSE; 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; - sqlite3_stmt* _tmp7_ = NULL; - EventID _tmp8_ = {0}; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + EventID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5369,7 +5369,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp14_ != SQLITE_DONE) { #line 5351 "PhotoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = res; #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5394,11 +5394,11 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) { gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* event_id) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - EventID _tmp2_ = {0}; - gint64 _tmp3_ = 0LL; - gboolean _tmp4_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + EventID _tmp2_; + gint64 _tmp3_; + gboolean _tmp4_; #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5426,16 +5426,16 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* photo_id) { gchar* result = NULL; sqlite3_stmt* stmt = NULL; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + PhotoID _tmp0_; + gint64 _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; gchar* trans = NULL; - sqlite3_stmt* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; #line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5476,9 +5476,9 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph _tmp7_ = TRUE; #line 5457 "PhotoTable.c" } else { - const gchar* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + const gchar* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = trans; #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5513,10 +5513,10 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + PhotoID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5543,28 +5543,28 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ gboolean result = FALSE; 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; - Orientation _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - GeeHashMap* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GDestroyNotify _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - PhotoID _tmp15_ = {0}; - gint64 _tmp16_ = 0LL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + Orientation _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + GeeHashMap* _tmp9_; + gchar* _tmp10_; + GDestroyNotify _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + PhotoID _tmp15_; + gint64 _tmp16_; + gint _tmp17_; + gint _tmp18_; + sqlite3_stmt* _tmp19_; + gint _tmp20_; + gint _tmp21_; #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5639,7 +5639,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp21_ != SQLITE_DONE) { #line 5620 "PhotoTable.c" - gint _tmp22_ = 0; + gint _tmp22_; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = res; #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5665,7 +5665,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { GeeHashMap* result = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = trans; @@ -5675,9 +5675,9 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp0_ = TRUE; #line 5655 "PhotoTable.c" } else { - const gchar* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + const gchar* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = trans; #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5698,24 +5698,24 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { } { GKeyFile* keyfile = NULL; - GKeyFile* _tmp5_ = NULL; + GKeyFile* _tmp5_; gboolean _tmp6_ = FALSE; - GKeyFile* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - gboolean _tmp12_ = FALSE; + GKeyFile* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + gint _tmp10_; + gint _tmp11_; + gboolean _tmp12_; GeeHashMap* map = NULL; - GeeHashMap* _tmp13_ = NULL; + GeeHashMap* _tmp13_; gchar** objects = NULL; - GKeyFile* _tmp14_ = NULL; + GKeyFile* _tmp14_; gsize _tmp15_; - gchar** _tmp16_ = NULL; - gint objects_length1 = 0; - gint _objects_size_ = 0; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + gchar** _tmp16_; + gint objects_length1; + gint _objects_size_; + gchar** _tmp17_; + gint _tmp17__length1; #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = g_key_file_new (); #line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5782,7 +5782,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) { #line 5763 "PhotoTable.c" - gchar* _tmp18_ = NULL; + gchar* _tmp18_; gchar* object = NULL; #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = g_strdup (object_collection[object_it]); @@ -5791,21 +5791,21 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 5770 "PhotoTable.c" { gchar** keys = NULL; - GKeyFile* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + GKeyFile* _tmp19_; + const gchar* _tmp20_; gsize _tmp21_; - gchar** _tmp22_ = NULL; - gint keys_length1 = 0; - gint _keys_size_ = 0; + gchar** _tmp22_; + gint keys_length1; + gint _keys_size_; gboolean _tmp23_ = FALSE; - gchar** _tmp24_ = NULL; - gint _tmp24__length1 = 0; + gchar** _tmp24_; + gint _tmp24__length1; KeyValueMap* key_map = NULL; - const gchar* _tmp26_ = NULL; - KeyValueMap* _tmp27_ = NULL; - GeeHashMap* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - KeyValueMap* _tmp45_ = NULL; + const gchar* _tmp26_; + KeyValueMap* _tmp27_; + GeeHashMap* _tmp43_; + const gchar* _tmp44_; + KeyValueMap* _tmp45_; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp19_ = keyfile; #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5841,8 +5841,8 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { _tmp23_ = TRUE; #line 5821 "PhotoTable.c" } else { - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; + gchar** _tmp25_; + gint _tmp25__length1; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp25_ = keys; #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -5880,26 +5880,26 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 5861 "PhotoTable.c" - gint _tmp30_ = 0; - gchar** _tmp31_ = NULL; - gint _tmp31__length1 = 0; + gint _tmp30_; + gchar** _tmp31_; + gint _tmp31__length1; gchar* _tmp32_ = NULL; - GKeyFile* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar** _tmp35_ = NULL; - gint _tmp35__length1 = 0; - gint _tmp36_ = 0; - const gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - KeyValueMap* _tmp39_ = NULL; - gchar** _tmp40_ = NULL; - gint _tmp40__length1 = 0; - gint _tmp41_ = 0; - const gchar* _tmp42_ = NULL; + GKeyFile* _tmp33_; + const gchar* _tmp34_; + gchar** _tmp35_; + gint _tmp35__length1; + gint _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + KeyValueMap* _tmp39_; + gchar** _tmp40_; + gint _tmp40__length1; + gint _tmp41_; + const gchar* _tmp42_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!_tmp28_) { #line 5880 "PhotoTable.c" - gint _tmp29_ = 0; + gint _tmp29_; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = ctr; #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6003,7 +6003,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { __catch17_g_error: { GError* err = NULL; - const gchar* _tmp46_ = NULL; + const gchar* _tmp46_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6030,18 +6030,18 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) { gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) { gchar* result = NULL; gboolean _tmp0_ = FALSE; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp1_; GKeyFile* keyfile = NULL; - GKeyFile* _tmp8_ = NULL; + GKeyFile* _tmp8_; gsize length = 0UL; gchar* unmarshalled = NULL; - GKeyFile* _tmp39_ = NULL; + GKeyFile* _tmp39_; gsize _tmp40_ = 0UL; - gchar* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + gchar* _tmp41_; + const gchar* _tmp42_; + const gchar* _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL); #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6052,12 +6052,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) _tmp0_ = TRUE; #line 6032 "PhotoTable.c" } else { - GeeHashMap* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeSet* _tmp4_ = NULL; - GeeSet* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeHashMap* _tmp2_; + GeeSet* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = transformations; #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6091,12 +6091,12 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 6070 "PhotoTable.c" { GeeIterator* _object_it = NULL; - GeeHashMap* _tmp9_ = NULL; - GeeSet* _tmp10_ = NULL; - GeeSet* _tmp11_ = NULL; - GeeSet* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeHashMap* _tmp9_; + GeeSet* _tmp10_; + GeeSet* _tmp11_; + GeeSet* _tmp12_; + GeeIterator* _tmp13_; + GeeIterator* _tmp14_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = transformations; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6116,15 +6116,15 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 6097 "PhotoTable.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeIterator* _tmp15_; + gboolean _tmp16_; gchar* object = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeIterator* _tmp17_; + gpointer _tmp18_; KeyValueMap* map = NULL; - GeeHashMap* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gpointer _tmp21_ = NULL; + GeeHashMap* _tmp19_; + const gchar* _tmp20_; + gpointer _tmp21_; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = _object_it; #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6152,11 +6152,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 6131 "PhotoTable.c" { GeeIterator* _key_it = NULL; - KeyValueMap* _tmp22_ = NULL; - GeeSet* _tmp23_ = NULL; - GeeSet* _tmp24_ = NULL; - GeeIterator* _tmp25_ = NULL; - GeeIterator* _tmp26_ = NULL; + KeyValueMap* _tmp22_; + GeeSet* _tmp23_; + GeeSet* _tmp24_; + GeeIterator* _tmp25_; + GeeIterator* _tmp26_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = map; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6174,20 +6174,20 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 6155 "PhotoTable.c" - GeeIterator* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; + GeeIterator* _tmp27_; + gboolean _tmp28_; gchar* key = NULL; - GeeIterator* _tmp29_ = NULL; - gpointer _tmp30_ = NULL; + GeeIterator* _tmp29_; + gpointer _tmp30_; gchar* value = NULL; - KeyValueMap* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - GKeyFile* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; + KeyValueMap* _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + const gchar* _tmp34_; + GKeyFile* _tmp35_; + const gchar* _tmp36_; + const gchar* _tmp37_; + const gchar* _tmp38_; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp27_ = _key_it; #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6279,11 +6279,11 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations) gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map) { gboolean result = FALSE; gchar* trans = NULL; - PhotoID _tmp0_ = {0}; - gchar* _tmp1_ = NULL; - PhotoID _tmp38_ = {0}; - const gchar* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; + PhotoID _tmp0_; + gchar* _tmp1_; + PhotoID _tmp38_; + const gchar* _tmp39_; + gboolean _tmp40_; GError * _inner_error_ = NULL; #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6300,19 +6300,19 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 6279 "PhotoTable.c" { GKeyFile* keyfile = NULL; - GKeyFile* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + GKeyFile* _tmp2_; + const gchar* _tmp3_; GeeSet* keys = NULL; - KeyValueMap* _tmp11_ = NULL; - GeeSet* _tmp12_ = NULL; + KeyValueMap* _tmp11_; + GeeSet* _tmp12_; gsize length = 0UL; - GKeyFile* _tmp29_ = NULL; + GKeyFile* _tmp29_; gsize _tmp30_ = 0UL; - gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + gchar* _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_key_file_new (); #line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6323,12 +6323,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke if (_tmp3_ != NULL) { #line 6303 "PhotoTable.c" gboolean _tmp4_ = FALSE; - GKeyFile* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gboolean _tmp10_ = FALSE; + GKeyFile* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; + gboolean _tmp10_; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp5_ = keyfile; #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6372,8 +6372,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 6351 "PhotoTable.c" { GeeIterator* _key_it = NULL; - GeeSet* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeSet* _tmp13_; + GeeIterator* _tmp14_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = keys; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6383,22 +6383,22 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 6364 "PhotoTable.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeIterator* _tmp15_; + gboolean _tmp16_; gchar* key = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeIterator* _tmp17_; + gpointer _tmp18_; gchar* value = NULL; - KeyValueMap* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GKeyFile* _tmp23_ = NULL; - KeyValueMap* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + KeyValueMap* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + const gchar* _tmp22_; + GKeyFile* _tmp23_; + KeyValueMap* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = _key_it; #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6485,7 +6485,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke __catch18_g_error: { GError* err = NULL; - const gchar* _tmp36_ = NULL; + const gchar* _tmp36_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6532,12 +6532,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object) { gboolean result = FALSE; gchar* trans = NULL; - PhotoID _tmp0_ = {0}; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoID _tmp22_ = {0}; - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + PhotoID _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + PhotoID _tmp22_; + const gchar* _tmp23_; + gboolean _tmp24_; GError * _inner_error_ = NULL; #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); @@ -6565,24 +6565,24 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, } { GKeyFile* keyfile = NULL; - GKeyFile* _tmp3_ = NULL; + GKeyFile* _tmp3_; gboolean _tmp4_ = FALSE; - GKeyFile* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gboolean _tmp10_ = FALSE; - GKeyFile* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GKeyFile* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; + GKeyFile* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; + gboolean _tmp10_; + GKeyFile* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; + GKeyFile* _tmp14_; + const gchar* _tmp15_; gsize length = 0UL; - GKeyFile* _tmp16_ = NULL; + GKeyFile* _tmp16_; gsize _tmp17_ = 0UL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + gchar* _tmp18_; + const gchar* _tmp19_; #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_key_file_new (); #line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6673,7 +6673,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, __catch19_g_error: { GError* err = NULL; - const gchar* _tmp20_ = NULL; + const gchar* _tmp20_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" err = _inner_error_; #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6719,13 +6719,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id) { gboolean result = FALSE; - PhotoID _tmp0_ = {0}; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - PhotoID _tmp4_ = {0}; - gint64 _tmp5_ = 0LL; - gboolean _tmp6_ = FALSE; + PhotoID _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + PhotoID _tmp4_; + gint64 _tmp5_; + gboolean _tmp6_; #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6766,27 +6766,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; + GFile* _tmp2_; gchar* sql = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp5_; gboolean first = FALSE; - GFile* _tmp6_ = NULL; + GFile* _tmp6_; gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; + sqlite3* _tmp33_; + const gchar* _tmp34_; sqlite3_stmt* _tmp35_ = NULL; - gint _tmp36_ = 0; - gint _tmp37_ = 0; + gint _tmp36_; + gint _tmp37_; gint col = 0; - GFile* _tmp38_ = NULL; - const gchar* _tmp46_ = NULL; - const gchar* _tmp54_ = NULL; + GFile* _tmp38_; + const gchar* _tmp46_; + const gchar* _tmp54_; gboolean _tmp62_ = FALSE; gboolean _tmp63_ = FALSE; - const gchar* _tmp64_ = NULL; + const gchar* _tmp64_; #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6799,7 +6799,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp1_ = TRUE; #line 6779 "PhotoTable.c" } else { - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = thumbnail_md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6812,7 +6812,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp0_ = TRUE; #line 6792 "PhotoTable.c" } else { - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp4_ = md5; #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6832,8 +6832,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != NULL) { #line 6813 "PhotoTable.c" - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + const gchar* _tmp7_; + gchar* _tmp8_; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = sql; #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6854,7 +6854,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp9_ = TRUE; #line 6834 "PhotoTable.c" } else { - const gchar* _tmp11_ = NULL; + const gchar* _tmp11_; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp11_ = md5; #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6864,21 +6864,21 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp9_) { #line 6845 "PhotoTable.c" - gboolean _tmp12_ = FALSE; - const gchar* _tmp17_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - PhotoFileFormat _tmp28_ = 0; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + gboolean _tmp12_; + const gchar* _tmp17_; + const gchar* _tmp20_; + const gchar* _tmp26_; + gchar* _tmp27_; + PhotoFileFormat _tmp28_; + const gchar* _tmp31_; + gchar* _tmp32_; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = first; #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_) { #line 6858 "PhotoTable.c" - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + const gchar* _tmp13_; + gchar* _tmp14_; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = sql; #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6889,8 +6889,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi sql = _tmp14_; #line 6869 "PhotoTable.c" } else { - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + const gchar* _tmp15_; + gchar* _tmp16_; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp15_ = sql; #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6908,8 +6908,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp17_ != NULL) { #line 6889 "PhotoTable.c" - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + const gchar* _tmp18_; + gchar* _tmp19_; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp18_ = sql; #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6925,14 +6925,14 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp20_ != NULL) { #line 6906 "PhotoTable.c" - const gchar* _tmp21_ = NULL; + const gchar* _tmp21_; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp21_ = md5; #line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp21_ == NULL) { #line 6912 "PhotoTable.c" - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + const gchar* _tmp22_; + gchar* _tmp23_; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp22_ = sql; #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6943,8 +6943,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi sql = _tmp23_; #line 6923 "PhotoTable.c" } else { - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; + const gchar* _tmp24_; + gchar* _tmp25_; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp24_ = sql; #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -6969,8 +6969,8 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) { #line 6950 "PhotoTable.c" - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + const gchar* _tmp29_; + gchar* _tmp30_; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp29_ = sql; #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7014,13 +7014,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp38_ != NULL) { #line 6995 "PhotoTable.c" - sqlite3_stmt* _tmp39_ = NULL; - gint _tmp40_ = 0; - GFile* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - GDestroyNotify _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + sqlite3_stmt* _tmp39_; + gint _tmp40_; + GFile* _tmp41_; + gchar* _tmp42_; + GDestroyNotify _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp39_ = stmt; #line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7048,13 +7048,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp46_ != NULL) { #line 7029 "PhotoTable.c" - sqlite3_stmt* _tmp47_ = NULL; - gint _tmp48_ = 0; - const gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - GDestroyNotify _tmp51_ = NULL; - gint _tmp52_ = 0; - gint _tmp53_ = 0; + sqlite3_stmt* _tmp47_; + gint _tmp48_; + const gchar* _tmp49_; + gchar* _tmp50_; + GDestroyNotify _tmp51_; + gint _tmp52_; + gint _tmp53_; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp47_ = stmt; #line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7082,13 +7082,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp54_ != NULL) { #line 7063 "PhotoTable.c" - sqlite3_stmt* _tmp55_ = NULL; - gint _tmp56_ = 0; - const gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GDestroyNotify _tmp59_ = NULL; - gint _tmp60_ = 0; - gint _tmp61_ = 0; + sqlite3_stmt* _tmp55_; + gint _tmp56_; + const gchar* _tmp57_; + gchar* _tmp58_; + GDestroyNotify _tmp59_; + gint _tmp60_; + gint _tmp61_; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp55_ = stmt; #line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7119,7 +7119,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi _tmp63_ = TRUE; #line 7099 "PhotoTable.c" } else { - const gchar* _tmp65_ = NULL; + const gchar* _tmp65_; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp65_ = md5; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7129,7 +7129,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp63_) { #line 7110 "PhotoTable.c" - PhotoFileFormat _tmp66_ = 0; + PhotoFileFormat _tmp66_; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp66_ = file_format; #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7143,12 +7143,12 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp62_) { #line 7124 "PhotoTable.c" - sqlite3_stmt* _tmp67_ = NULL; - gint _tmp68_ = 0; - PhotoFileFormat _tmp69_ = 0; - gint _tmp70_ = 0; - gint _tmp71_ = 0; - gint _tmp72_ = 0; + sqlite3_stmt* _tmp67_; + gint _tmp68_; + PhotoFileFormat _tmp69_; + gint _tmp70_; + gint _tmp71_; + gint _tmp72_; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp67_ = stmt; #line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7182,15 +7182,15 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; + GFile* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + PhotoFileFormat _tmp3_; + sqlite3_stmt* _tmp4_; gint res = 0; - sqlite3_stmt* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + sqlite3_stmt* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE); #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7225,7 +7225,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* return result; #line 7205 "PhotoTable.c" } else { - gint _tmp8_ = 0; + gint _tmp8_; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7238,7 +7238,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* return result; #line 7218 "PhotoTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp9_ = res; #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7258,7 +7258,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* } -static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) { +static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const PhotoID* value) { #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if ((*length) == (*size)) { #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7276,20 +7276,20 @@ static void _vala_array_add2 (PhotoID** array, int* length, int* size, const Pho PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1) { PhotoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - sqlite3_stmt* _tmp4_ = NULL; + GFile* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + PhotoFileFormat _tmp3_; + sqlite3_stmt* _tmp4_; PhotoID* ids = NULL; - PhotoID* _tmp5_ = NULL; - gint ids_length1 = 0; - gint _ids_size_ = 0; + PhotoID* _tmp5_; + gint ids_length1; + gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - PhotoID* _tmp15_ = NULL; - gint _tmp15__length1 = 0; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + PhotoID* _tmp15_; + gint _tmp15__length1; #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL); #line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7323,14 +7323,14 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" while (TRUE) { #line 7304 "PhotoTable.c" - gint _tmp8_ = 0; - PhotoID* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint64 _tmp11_ = 0LL; + gint _tmp8_; + PhotoID* _tmp9_; + gint _tmp9__length1; + sqlite3_stmt* _tmp10_; + gint64 _tmp11_; PhotoID _tmp12_ = {0}; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; + sqlite3_stmt* _tmp13_; + gint _tmp14_; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp8_ = res; #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7381,9 +7381,9 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gchar* backlinks, GError** error) { const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PhotoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + const gchar* _tmp1_; + PhotoID _tmp3_; + gint64 _tmp4_; GError * _inner_error_ = NULL; #line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7394,7 +7394,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp1_ != NULL) { #line 7375 "PhotoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = backlinks; #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7434,13 +7434,13 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error) { - PhotoRow* _tmp0_ = NULL; - PhotoID _tmp1_ = {0}; - gint64 _tmp2_ = 0LL; - BackingPhotoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; - PhotoRow* _tmp5_ = NULL; - BackingPhotoID _tmp6_ = {0}; + PhotoRow* _tmp0_; + PhotoID _tmp1_; + gint64 _tmp2_; + BackingPhotoID _tmp3_; + gint64 _tmp4_; + PhotoRow* _tmp5_; + BackingPhotoID _tmp6_; GError * _inner_error_ = NULL; #line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7490,10 +7490,10 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** error) { - PhotoRow* _tmp0_ = NULL; - PhotoID _tmp1_ = {0}; - gint64 _tmp2_ = 0LL; - PhotoRow* _tmp3_ = NULL; + PhotoRow* _tmp0_; + PhotoID _tmp1_; + gint64 _tmp2_; + PhotoRow* _tmp3_; GError * _inner_error_ = NULL; #line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7536,9 +7536,9 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboolean dirty, GError** error) { gint _tmp0_ = 0; - gboolean _tmp1_ = FALSE; - PhotoID _tmp2_ = {0}; - gint64 _tmp3_ = 0LL; + gboolean _tmp1_; + PhotoID _tmp2_; + gint64 _tmp3_; GError * _inner_error_ = NULL; #line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7586,21 +7586,21 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error) { gchar* col = NULL; - RawDeveloper _tmp0_ = 0; - PhotoRow* _tmp4_ = NULL; - BackingPhotoID* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - RawDeveloper _tmp6_ = 0; - BackingPhotoID _tmp7_ = {0}; - BackingPhotoID _tmp8_ = {0}; - PhotoRow* _tmp9_ = NULL; - PhotoID _tmp10_ = {0}; - gint64 _tmp11_ = 0LL; - const gchar* _tmp12_ = NULL; - BackingPhotoID _tmp13_ = {0}; - gint64 _tmp14_ = 0LL; - BackingPhotoID _tmp15_ = {0}; - gint64 _tmp16_ = 0LL; + RawDeveloper _tmp0_; + PhotoRow* _tmp4_; + BackingPhotoID* _tmp5_; + gint _tmp5__length1; + RawDeveloper _tmp6_; + BackingPhotoID _tmp7_; + BackingPhotoID _tmp8_; + PhotoRow* _tmp9_; + PhotoID _tmp10_; + gint64 _tmp11_; + const gchar* _tmp12_; + BackingPhotoID _tmp13_; + gint64 _tmp14_; + BackingPhotoID _tmp15_; + gint64 _tmp16_; GError * _inner_error_ = NULL; #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_PHOTO_TABLE (self)); @@ -7616,7 +7616,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev case RAW_DEVELOPER_SHOTWELL: #line 7596 "PhotoTable.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = g_strdup ("develop_shotwell_id"); #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7631,7 +7631,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev case RAW_DEVELOPER_CAMERA: #line 7611 "PhotoTable.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp2_ = g_strdup ("develop_camera_id"); #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7646,7 +7646,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev case RAW_DEVELOPER_EMBEDDED: #line 7626 "PhotoTable.c" { - gchar* _tmp3_ = NULL; + gchar* _tmp3_; #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp3_ = g_strdup ("develop_embedded_id"); #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7722,12 +7722,12 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp16_ != BACKING_PHOTO_ID_INVALID) { #line 7703 "PhotoTable.c" - PhotoRow* _tmp17_ = NULL; - PhotoID _tmp18_ = {0}; - gint64 _tmp19_ = 0LL; - RawDeveloper _tmp20_ = 0; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + PhotoRow* _tmp17_; + PhotoID _tmp18_; + gint64 _tmp19_; + RawDeveloper _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp17_ = row; #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7775,8 +7775,8 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, GError** error) { - PhotoRow* _tmp0_ = NULL; - RawDeveloper _tmp1_ = 0; + PhotoRow* _tmp0_; + RawDeveloper _tmp1_; BackingPhotoID _tmp2_ = {0}; GError * _inner_error_ = NULL; #line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7826,7 +7826,7 @@ static void photo_table_instance_init (PhotoTable * self) { } -static void photo_table_finalize (DatabaseTable* obj) { +static void photo_table_finalize (DatabaseTable * obj) { PhotoTable * self; #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable); @@ -7849,7 +7849,7 @@ GType photo_table_get_type (void) { void backing_photo_id_init (BackingPhotoID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" memset (self, 0, sizeof (BackingPhotoID)); #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7862,7 +7862,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) { gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7875,7 +7875,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) { gboolean backing_photo_id_is_valid (BackingPhotoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = (*self).id; #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7918,13 +7918,13 @@ GType backing_photo_id_get_type (void) { gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* info) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; - GFileInfo* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - time_t _tmp3_ = 0; - GFileInfo* _tmp4_ = NULL; + gint64 _tmp0_; + GFileInfo* _tmp1_; + gint64 _tmp2_; + time_t _tmp3_; + GFileInfo* _tmp4_; GTimeVal _tmp5_ = {0}; - glong _tmp6_ = 0L; + glong _tmp6_; #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -7961,13 +7961,13 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo* gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; - GFileInfo* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - time_t _tmp3_ = 0; - GFileInfo* _tmp4_ = NULL; + gint64 _tmp0_; + GFileInfo* _tmp1_; + gint64 _tmp2_; + time_t _tmp3_; + GFileInfo* _tmp4_; GTimeVal _tmp5_ = {0}; - glong _tmp6_ = 0L; + glong _tmp6_; #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE); #line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8003,23 +8003,23 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) { void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from) { - BackingPhotoRow* _tmp0_ = NULL; - BackingPhotoID _tmp1_ = {0}; - BackingPhotoRow* _tmp2_ = NULL; - time_t _tmp3_ = 0; - BackingPhotoRow* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - BackingPhotoRow* _tmp7_ = NULL; - gint64 _tmp8_ = 0LL; - BackingPhotoRow* _tmp9_ = NULL; - time_t _tmp10_ = 0; - BackingPhotoRow* _tmp11_ = NULL; - PhotoFileFormat _tmp12_ = 0; - BackingPhotoRow* _tmp13_ = NULL; - Dimensions _tmp14_ = {0}; - BackingPhotoRow* _tmp15_ = NULL; - Orientation _tmp16_ = 0; + BackingPhotoRow* _tmp0_; + BackingPhotoID _tmp1_; + BackingPhotoRow* _tmp2_; + time_t _tmp3_; + BackingPhotoRow* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + BackingPhotoRow* _tmp7_; + gint64 _tmp8_; + BackingPhotoRow* _tmp9_; + time_t _tmp10_; + BackingPhotoRow* _tmp11_; + PhotoFileFormat _tmp12_; + BackingPhotoRow* _tmp13_; + Dimensions _tmp14_; + BackingPhotoRow* _tmp15_; + Orientation _tmp16_; #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_ROW (self)); #line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8139,7 +8139,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (collect_values[0].v_pointer) { #line 8120 "PhotoTable.c" - BackingPhotoRow* object; + BackingPhotoRow * object; object = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (object->parent_instance.g_class == NULL) { @@ -8166,7 +8166,7 @@ static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_coll static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - BackingPhotoRow** object_p; + BackingPhotoRow ** object_p; object_p = collect_values[0].v_pointer; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (!object_p) { @@ -8218,7 +8218,7 @@ gpointer value_get_backing_photo_row (const GValue* value) { void value_set_backing_photo_row (GValue* value, gpointer v_object) { - BackingPhotoRow* old; + BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8249,7 +8249,7 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) { void value_take_backing_photo_row (GValue* value, gpointer v_object) { - BackingPhotoRow* old; + BackingPhotoRow * old; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW)); #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8295,7 +8295,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) { } -static void backing_photo_row_finalize (BackingPhotoRow* obj) { +static void backing_photo_row_finalize (BackingPhotoRow * obj) { BackingPhotoRow * self; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow); @@ -8322,7 +8322,7 @@ GType backing_photo_row_get_type (void) { gpointer backing_photo_row_ref (gpointer instance) { - BackingPhotoRow* self; + BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_atomic_int_inc (&self->ref_count); @@ -8333,7 +8333,7 @@ gpointer backing_photo_row_ref (gpointer instance) { void backing_photo_row_unref (gpointer instance) { - BackingPhotoRow* self; + BackingPhotoRow * self; self = instance; #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8350,13 +8350,13 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { BackingPhotoTable* 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 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = (BackingPhotoTable*) database_table_construct (object_type); #line 1126 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8386,7 +8386,7 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) { #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 8367 "PhotoTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp7_ = res; #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8410,15 +8410,15 @@ static BackingPhotoTable* backing_photo_table_new (void) { BackingPhotoTable* backing_photo_table_get_instance (void) { BackingPhotoTable* result = NULL; - BackingPhotoTable* _tmp0_ = NULL; - BackingPhotoTable* _tmp2_ = NULL; - BackingPhotoTable* _tmp3_ = NULL; + BackingPhotoTable* _tmp0_; + BackingPhotoTable* _tmp2_; + BackingPhotoTable* _tmp3_; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp0_ = backing_photo_table_instance; #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp0_ == NULL) { #line 8399 "PhotoTable.c" - BackingPhotoTable* _tmp1_ = NULL; + BackingPhotoTable* _tmp1_; #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp1_ = backing_photo_table_new (); #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8442,64 +8442,64 @@ BackingPhotoTable* backing_photo_table_get_instance (void) { void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error) { 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; - BackingPhotoRow* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GDestroyNotify _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - BackingPhotoRow* _tmp13_ = NULL; - time_t _tmp14_ = 0; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - sqlite3_stmt* _tmp17_ = NULL; - BackingPhotoRow* _tmp18_ = NULL; - gint64 _tmp19_ = 0LL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; - sqlite3_stmt* _tmp22_ = NULL; - BackingPhotoRow* _tmp23_ = NULL; - Dimensions _tmp24_ = {0}; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - sqlite3_stmt* _tmp28_ = NULL; - BackingPhotoRow* _tmp29_ = NULL; - Dimensions _tmp30_ = {0}; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - gint _tmp33_ = 0; - sqlite3_stmt* _tmp34_ = NULL; - BackingPhotoRow* _tmp35_ = NULL; - Orientation _tmp36_ = 0; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - sqlite3_stmt* _tmp39_ = NULL; - BackingPhotoRow* _tmp40_ = NULL; - PhotoFileFormat _tmp41_ = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - gint _tmp44_ = 0; - sqlite3_stmt* _tmp45_ = NULL; - time_t _tmp46_ = 0; - gint _tmp47_ = 0; - gint _tmp48_ = 0; - sqlite3_stmt* _tmp49_ = NULL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - BackingPhotoRow* _tmp53_ = NULL; - sqlite3* _tmp54_ = NULL; - gint64 _tmp55_ = 0LL; - BackingPhotoRow* _tmp56_ = NULL; - time_t _tmp57_ = 0; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + BackingPhotoRow* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + GDestroyNotify _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + BackingPhotoRow* _tmp13_; + time_t _tmp14_; + gint _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + BackingPhotoRow* _tmp18_; + gint64 _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + BackingPhotoRow* _tmp23_; + Dimensions _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + BackingPhotoRow* _tmp29_; + Dimensions _tmp30_; + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; + sqlite3_stmt* _tmp34_; + BackingPhotoRow* _tmp35_; + Orientation _tmp36_; + gint _tmp37_; + gint _tmp38_; + sqlite3_stmt* _tmp39_; + BackingPhotoRow* _tmp40_; + PhotoFileFormat _tmp41_; + gint _tmp42_; + gint _tmp43_; + gint _tmp44_; + sqlite3_stmt* _tmp45_; + time_t _tmp46_; + gint _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + gint _tmp50_; + gint _tmp51_; + BackingPhotoRow* _tmp53_; + sqlite3* _tmp54_; + gint64 _tmp55_; + BackingPhotoRow* _tmp56_; + time_t _tmp57_; GError * _inner_error_ = NULL; #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -8654,7 +8654,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp51_ != SQLITE_DONE) { #line 8635 "PhotoTable.c" - gint _tmp52_ = 0; + gint _tmp52_; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp52_ = res; #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8707,47 +8707,47 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot BackingPhotoRow* 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; - BackingPhotoID _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_; + BackingPhotoID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; BackingPhotoRow* row = NULL; - BackingPhotoRow* _tmp14_ = NULL; - BackingPhotoRow* _tmp15_ = NULL; - BackingPhotoID _tmp16_ = {0}; - BackingPhotoRow* _tmp17_ = NULL; - sqlite3_stmt* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - BackingPhotoRow* _tmp21_ = NULL; - sqlite3_stmt* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; - BackingPhotoRow* _tmp24_ = NULL; - sqlite3_stmt* _tmp25_ = NULL; - gint64 _tmp26_ = 0LL; - BackingPhotoRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - sqlite3_stmt* _tmp30_ = NULL; - gint _tmp31_ = 0; - BackingPhotoRow* _tmp32_ = NULL; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - BackingPhotoRow* _tmp35_ = NULL; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - PhotoFileFormat _tmp38_ = 0; - BackingPhotoRow* _tmp39_ = NULL; - sqlite3_stmt* _tmp40_ = NULL; - gint64 _tmp41_ = 0LL; + BackingPhotoRow* _tmp14_; + BackingPhotoRow* _tmp15_; + BackingPhotoID _tmp16_; + BackingPhotoRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + BackingPhotoRow* _tmp21_; + sqlite3_stmt* _tmp22_; + gint64 _tmp23_; + BackingPhotoRow* _tmp24_; + sqlite3_stmt* _tmp25_; + gint64 _tmp26_; + BackingPhotoRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; + BackingPhotoRow* _tmp32_; + sqlite3_stmt* _tmp33_; + gint _tmp34_; + BackingPhotoRow* _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + PhotoFileFormat _tmp38_; + BackingPhotoRow* _tmp39_; + sqlite3_stmt* _tmp40_; + gint64 _tmp41_; GError * _inner_error_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL); @@ -8800,13 +8800,13 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot return result; #line 8779 "PhotoTable.c" } else { - gint _tmp12_ = 0; + gint _tmp12_; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp12_ = res; #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp12_ != SQLITE_ROW) { #line 8786 "PhotoTable.c" - gint _tmp13_ = 0; + gint _tmp13_; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp13_ = res; #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -8925,52 +8925,52 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, 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; - BackingPhotoRow* _tmp5_ = NULL; - time_t _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - BackingPhotoRow* _tmp10_ = NULL; - gint64 _tmp11_ = 0LL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - BackingPhotoRow* _tmp15_ = NULL; - Dimensions _tmp16_ = {0}; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - BackingPhotoRow* _tmp21_ = NULL; - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - sqlite3_stmt* _tmp26_ = NULL; - BackingPhotoRow* _tmp27_ = NULL; - Orientation _tmp28_ = 0; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - sqlite3_stmt* _tmp31_ = NULL; - BackingPhotoRow* _tmp32_ = NULL; - PhotoFileFormat _tmp33_ = 0; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - gint _tmp36_ = 0; - sqlite3_stmt* _tmp37_ = NULL; - BackingPhotoRow* _tmp38_ = NULL; - BackingPhotoID _tmp39_ = {0}; - gint64 _tmp40_ = 0LL; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - sqlite3_stmt* _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + BackingPhotoRow* _tmp5_; + time_t _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + BackingPhotoRow* _tmp10_; + gint64 _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + BackingPhotoRow* _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + BackingPhotoRow* _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; + sqlite3_stmt* _tmp26_; + BackingPhotoRow* _tmp27_; + Orientation _tmp28_; + gint _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + BackingPhotoRow* _tmp32_; + PhotoFileFormat _tmp33_; + gint _tmp34_; + gint _tmp35_; + gint _tmp36_; + sqlite3_stmt* _tmp37_; + BackingPhotoRow* _tmp38_; + BackingPhotoID _tmp39_; + gint64 _tmp40_; + gint _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + gint _tmp44_; + gint _tmp45_; GError * _inner_error_ = NULL; #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9107,7 +9107,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp45_ != SQLITE_DONE) { #line 9087 "PhotoTable.c" - gint _tmp46_ = 0; + gint _tmp46_; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp46_ = res; #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9145,26 +9145,26 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row, void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, 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; - time_t _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - BackingPhotoID _tmp13_ = {0}; - gint64 _tmp14_ = 0LL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + time_t _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + BackingPhotoID _tmp13_; + gint64 _tmp14_; + gint _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + gint _tmp19_; GError * _inner_error_ = NULL; #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9233,7 +9233,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" if (_tmp19_ != SQLITE_DONE) { #line 9213 "PhotoTable.c" - gint _tmp20_ = 0; + gint _tmp20_; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" _tmp20_ = res; #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" @@ -9269,8 +9269,8 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backing_id, GError** error) { - BackingPhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + BackingPhotoID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9305,9 +9305,9 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error) { - BackingPhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + BackingPhotoID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9346,9 +9346,9 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, GError** error) { - BackingPhotoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - time_t _tmp2_ = 0; + BackingPhotoID _tmp0_; + gint64 _tmp1_; + time_t _tmp2_; GError * _inner_error_ = NULL; #line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" g_return_if_fail (IS_BACKING_PHOTO_TABLE (self)); @@ -9397,7 +9397,7 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) { } -static void backing_photo_table_finalize (DatabaseTable* obj) { +static void backing_photo_table_finalize (DatabaseTable * obj) { BackingPhotoTable * self; #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable); diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index 14f8c4c..bedc8f4 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.34.7, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -324,7 +324,7 @@ enum { }; SavedSearchRow* saved_search_row_new (void); SavedSearchRow* saved_search_row_construct (GType object_type); -static void saved_search_row_finalize (SavedSearchRow* obj); +static void saved_search_row_finalize (SavedSearchRow * 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); @@ -419,11 +419,11 @@ SearchOperator search_operator_from_string (const gchar* str); GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error); void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error); void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); -static void saved_search_db_table_finalize (DatabaseTable* obj); +static void saved_search_db_table_finalize (DatabaseTable * obj); void saved_search_id_init (SavedSearchID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" memset (self, 0, sizeof (SavedSearchID)); #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -436,7 +436,7 @@ void saved_search_id_init (SavedSearchID *self, gint64 id) { gboolean saved_search_id_is_invalid (SavedSearchID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -449,7 +449,7 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) { gboolean saved_search_id_is_valid (SavedSearchID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -549,7 +549,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (collect_values[0].v_pointer) { #line 552 "SavedSearchDBTable.c" - SavedSearchRow* object; + SavedSearchRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (object->parent_instance.g_class == NULL) { @@ -576,7 +576,7 @@ static gchar* value_saved_search_row_collect_value (GValue* value, guint n_colle static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchRow** object_p; + SavedSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!object_p) { @@ -628,7 +628,7 @@ gpointer value_get_saved_search_row (const GValue* value) { void value_set_saved_search_row (GValue* value, gpointer v_object) { - SavedSearchRow* old; + SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -659,7 +659,7 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) { void value_take_saved_search_row (GValue* value, gpointer v_object) { - SavedSearchRow* old; + SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -703,7 +703,7 @@ static void saved_search_row_instance_init (SavedSearchRow * self) { } -static void saved_search_row_finalize (SavedSearchRow* obj) { +static void saved_search_row_finalize (SavedSearchRow * obj) { SavedSearchRow * self; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow); @@ -732,7 +732,7 @@ GType saved_search_row_get_type (void) { gpointer saved_search_row_ref (gpointer instance) { - SavedSearchRow* self; + SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_atomic_int_inc (&self->ref_count); @@ -743,7 +743,7 @@ gpointer saved_search_row_ref (gpointer instance) { void saved_search_row_unref (gpointer instance) { - SavedSearchRow* self; + SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -760,97 +760,97 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { SavedSearchDBTable* 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; - sqlite3* _tmp8_ = NULL; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3* _tmp8_; sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - sqlite3* _tmp16_ = NULL; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3* _tmp16_; sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - sqlite3* _tmp24_ = NULL; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + gint _tmp21_; + gint _tmp22_; + sqlite3* _tmp24_; sqlite3_stmt* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - sqlite3* _tmp32_ = NULL; + gint _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + gint _tmp30_; + sqlite3* _tmp32_; sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - sqlite3* _tmp40_ = NULL; + gint _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint _tmp38_; + sqlite3* _tmp40_; sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_ = 0; - gint _tmp46_ = 0; - sqlite3* _tmp48_ = NULL; + gint _tmp42_; + gint _tmp43_; + sqlite3_stmt* _tmp44_; + gint _tmp45_; + gint _tmp46_; + sqlite3* _tmp48_; sqlite3_stmt* _tmp49_ = NULL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - sqlite3_stmt* _tmp52_ = NULL; - gint _tmp53_ = 0; - gint _tmp54_ = 0; - sqlite3* _tmp56_ = NULL; + gint _tmp50_; + gint _tmp51_; + sqlite3_stmt* _tmp52_; + gint _tmp53_; + gint _tmp54_; + sqlite3* _tmp56_; sqlite3_stmt* _tmp57_ = NULL; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - sqlite3_stmt* _tmp60_ = NULL; - gint _tmp61_ = 0; - gint _tmp62_ = 0; - sqlite3* _tmp64_ = NULL; + gint _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + gint _tmp61_; + gint _tmp62_; + sqlite3* _tmp64_; sqlite3_stmt* _tmp65_ = NULL; - gint _tmp66_ = 0; - gint _tmp67_ = 0; - sqlite3_stmt* _tmp68_ = NULL; - gint _tmp69_ = 0; - gint _tmp70_ = 0; - sqlite3* _tmp72_ = NULL; + gint _tmp66_; + gint _tmp67_; + sqlite3_stmt* _tmp68_; + gint _tmp69_; + gint _tmp70_; + sqlite3* _tmp72_; sqlite3_stmt* _tmp73_ = NULL; - gint _tmp74_ = 0; - gint _tmp75_ = 0; - sqlite3_stmt* _tmp76_ = NULL; - gint _tmp77_ = 0; - gint _tmp78_ = 0; - sqlite3* _tmp80_ = NULL; + gint _tmp74_; + gint _tmp75_; + sqlite3_stmt* _tmp76_; + gint _tmp77_; + gint _tmp78_; + sqlite3* _tmp80_; sqlite3_stmt* _tmp81_ = NULL; - gint _tmp82_ = 0; - gint _tmp83_ = 0; - sqlite3_stmt* _tmp84_ = NULL; - gint _tmp85_ = 0; - gint _tmp86_ = 0; - sqlite3* _tmp88_ = NULL; + gint _tmp82_; + gint _tmp83_; + sqlite3_stmt* _tmp84_; + gint _tmp85_; + gint _tmp86_; + sqlite3* _tmp88_; sqlite3_stmt* _tmp89_ = NULL; - gint _tmp90_ = 0; - gint _tmp91_ = 0; - sqlite3_stmt* _tmp92_ = NULL; - gint _tmp93_ = 0; - gint _tmp94_ = 0; - sqlite3* _tmp96_ = NULL; + gint _tmp90_; + gint _tmp91_; + sqlite3_stmt* _tmp92_; + gint _tmp93_; + gint _tmp94_; + sqlite3* _tmp96_; sqlite3_stmt* _tmp97_ = NULL; - gint _tmp98_ = 0; - gint _tmp99_ = 0; - sqlite3_stmt* _tmp100_ = NULL; - gint _tmp101_ = 0; - gint _tmp102_ = 0; + gint _tmp98_; + gint _tmp99_; + sqlite3_stmt* _tmp100_; + gint _tmp101_; + gint _tmp102_; #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchDBTable*) database_table_construct (object_type); #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -880,7 +880,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 883 "SavedSearchDBTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp7_ = res; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -912,7 +912,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp14_ != SQLITE_DONE) { #line 915 "SavedSearchDBTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp15_ = res; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -944,7 +944,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp22_ != SQLITE_DONE) { #line 947 "SavedSearchDBTable.c" - gint _tmp23_ = 0; + gint _tmp23_; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp23_ = res; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -976,7 +976,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp30_ != SQLITE_DONE) { #line 979 "SavedSearchDBTable.c" - gint _tmp31_ = 0; + gint _tmp31_; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp31_ = res; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1008,7 +1008,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp38_ != SQLITE_DONE) { #line 1011 "SavedSearchDBTable.c" - gint _tmp39_ = 0; + gint _tmp39_; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp39_ = res; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1040,7 +1040,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp46_ != SQLITE_DONE) { #line 1043 "SavedSearchDBTable.c" - gint _tmp47_ = 0; + gint _tmp47_; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp47_ = res; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1072,7 +1072,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp54_ != SQLITE_DONE) { #line 1075 "SavedSearchDBTable.c" - gint _tmp55_ = 0; + gint _tmp55_; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp55_ = res; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1104,7 +1104,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp62_ != SQLITE_DONE) { #line 1107 "SavedSearchDBTable.c" - gint _tmp63_ = 0; + gint _tmp63_; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp63_ = res; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1136,7 +1136,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp70_ != SQLITE_DONE) { #line 1139 "SavedSearchDBTable.c" - gint _tmp71_ = 0; + gint _tmp71_; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp71_ = res; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1168,7 +1168,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp78_ != SQLITE_DONE) { #line 1171 "SavedSearchDBTable.c" - gint _tmp79_ = 0; + gint _tmp79_; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp79_ = res; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1200,7 +1200,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp86_ != SQLITE_DONE) { #line 1203 "SavedSearchDBTable.c" - gint _tmp87_ = 0; + gint _tmp87_; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp87_ = res; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1232,7 +1232,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp94_ != SQLITE_DONE) { #line 1235 "SavedSearchDBTable.c" - gint _tmp95_ = 0; + gint _tmp95_; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp95_ = res; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1264,7 +1264,7 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp102_ != SQLITE_DONE) { #line 1267 "SavedSearchDBTable.c" - gint _tmp103_ = 0; + gint _tmp103_; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp103_ = res; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1295,15 +1295,15 @@ static gpointer _database_table_ref0 (gpointer self) { SavedSearchDBTable* saved_search_db_table_get_instance (void) { SavedSearchDBTable* result = NULL; - SavedSearchDBTable* _tmp0_ = NULL; - SavedSearchDBTable* _tmp2_ = NULL; - SavedSearchDBTable* _tmp3_ = NULL; + SavedSearchDBTable* _tmp0_; + SavedSearchDBTable* _tmp2_; + SavedSearchDBTable* _tmp3_; #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = saved_search_db_table_instance; #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp0_ == NULL) { #line 1306 "SavedSearchDBTable.c" - SavedSearchDBTable* _tmp1_ = NULL; + SavedSearchDBTable* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = saved_search_db_table_new (); #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1335,38 +1335,38 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar SavedSearchRow* 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; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - SearchOperator _tmp11_ = 0; - gchar* _tmp12_ = NULL; - GDestroyNotify _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - sqlite3_stmt* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + SearchOperator _tmp11_; + gchar* _tmp12_; + GDestroyNotify _tmp13_; + gint _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + gint _tmp17_; + gint _tmp18_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp20_ = NULL; - SavedSearchRow* _tmp21_ = NULL; - sqlite3* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; - SavedSearchRow* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - SavedSearchRow* _tmp27_ = NULL; - SearchOperator _tmp28_ = 0; - SavedSearchRow* _tmp29_ = NULL; - GeeArrayList* _tmp30_ = NULL; - GeeList* _tmp31_ = NULL; + SavedSearchRow* _tmp20_; + SavedSearchRow* _tmp21_; + sqlite3* _tmp22_; + gint64 _tmp23_; + SavedSearchRow* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + SavedSearchRow* _tmp27_; + SearchOperator _tmp28_; + SavedSearchRow* _tmp29_; + GeeArrayList* _tmp30_; + GeeList* _tmp31_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -1431,7 +1431,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp18_ != SQLITE_DONE) { #line 1434 "SavedSearchDBTable.c" - gint _tmp19_ = 0; + gint _tmp19_; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp19_ = res; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1501,12 +1501,12 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 1502 "SavedSearchDBTable.c" { GeeArrayList* _sc_list = NULL; - GeeArrayList* _tmp32_ = NULL; - GeeArrayList* _tmp33_ = NULL; + GeeArrayList* _tmp32_; + GeeArrayList* _tmp33_; gint _sc_size = 0; - GeeArrayList* _tmp34_ = NULL; - gint _tmp35_ = 0; - gint _tmp36_ = 0; + GeeArrayList* _tmp34_; + gint _tmp35_; + gint _tmp36_; gint _sc_index = 0; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp32_ = conditions; @@ -1527,16 +1527,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 1530 "SavedSearchDBTable.c" - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; SearchCondition* sc = NULL; - GeeArrayList* _tmp40_ = NULL; - gint _tmp41_ = 0; - gpointer _tmp42_ = NULL; - SavedSearchRow* _tmp43_ = NULL; - SavedSearchID _tmp44_ = {0}; - SearchCondition* _tmp45_ = NULL; + GeeArrayList* _tmp40_; + gint _tmp41_; + gpointer _tmp42_; + SavedSearchRow* _tmp43_; + SavedSearchID _tmp44_; + SearchCondition* _tmp45_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp37_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1628,7 +1628,7 @@ static gpointer _search_condition_ref0 (gpointer self) { static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) { - SearchCondition* _tmp0_ = NULL; + SearchCondition* _tmp0_; GError * _inner_error_ = NULL; #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -1642,46 +1642,46 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) { #line 1644 "SavedSearchDBTable.c" SearchConditionText* text = NULL; - SearchCondition* _tmp1_ = NULL; - SearchConditionText* _tmp2_ = NULL; + SearchCondition* _tmp1_; + SearchConditionText* _tmp2_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_ = NULL; + sqlite3* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - sqlite3_stmt* _tmp7_ = NULL; - SavedSearchID _tmp8_ = {0}; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - SearchConditionText* _tmp13_ = NULL; - SearchConditionSearchType _tmp14_ = 0; - SearchConditionSearchType _tmp15_ = 0; - gchar* _tmp16_ = NULL; - GDestroyNotify _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - SearchConditionText* _tmp21_ = NULL; - SearchConditionTextContext _tmp22_ = 0; - SearchConditionTextContext _tmp23_ = 0; - gchar* _tmp24_ = NULL; - GDestroyNotify _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - sqlite3_stmt* _tmp28_ = NULL; - SearchConditionText* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - GDestroyNotify _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3_stmt* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + SavedSearchID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + SearchConditionText* _tmp13_; + SearchConditionSearchType _tmp14_; + SearchConditionSearchType _tmp15_; + gchar* _tmp16_; + GDestroyNotify _tmp17_; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + SearchConditionText* _tmp21_; + SearchConditionTextContext _tmp22_; + SearchConditionTextContext _tmp23_; + gchar* _tmp24_; + GDestroyNotify _tmp25_; + gint _tmp26_; + gint _tmp27_; + sqlite3_stmt* _tmp28_; + SearchConditionText* _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; + GDestroyNotify _tmp33_; + gint _tmp34_; + gint _tmp35_; + sqlite3_stmt* _tmp36_; + gint _tmp37_; + gint _tmp38_; #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = condition; #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1787,7 +1787,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp38_ != SQLITE_DONE) { #line 1790 "SavedSearchDBTable.c" - gint _tmp39_ = 0; + gint _tmp39_; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp39_ = res; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1826,53 +1826,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (text); #line 1828 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp40_ = NULL; + SearchCondition* _tmp40_; #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp40_ = condition; #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { #line 1835 "SavedSearchDBTable.c" SearchConditionMediaType* media_type = NULL; - SearchCondition* _tmp41_ = NULL; - SearchConditionMediaType* _tmp42_ = NULL; + SearchCondition* _tmp41_; + SearchConditionMediaType* _tmp42_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp43_ = NULL; + sqlite3* _tmp43_; sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_ = 0; - gint _tmp46_ = 0; - sqlite3_stmt* _tmp47_ = NULL; - SavedSearchID _tmp48_ = {0}; - gint64 _tmp49_ = 0LL; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - sqlite3_stmt* _tmp52_ = NULL; - SearchConditionMediaType* _tmp53_ = NULL; - SearchConditionSearchType _tmp54_ = 0; - SearchConditionSearchType _tmp55_ = 0; - gchar* _tmp56_ = NULL; - GDestroyNotify _tmp57_ = NULL; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - sqlite3_stmt* _tmp60_ = NULL; - SearchConditionMediaType* _tmp61_ = NULL; - SearchConditionMediaTypeContext _tmp62_ = 0; - SearchConditionMediaTypeContext _tmp63_ = 0; - gchar* _tmp64_ = NULL; - GDestroyNotify _tmp65_ = NULL; - gint _tmp66_ = 0; - gint _tmp67_ = 0; - sqlite3_stmt* _tmp68_ = NULL; - SearchConditionMediaType* _tmp69_ = NULL; - SearchConditionMediaTypeMediaType _tmp70_ = 0; - SearchConditionMediaTypeMediaType _tmp71_ = 0; - gchar* _tmp72_ = NULL; - GDestroyNotify _tmp73_ = NULL; - gint _tmp74_ = 0; - gint _tmp75_ = 0; - sqlite3_stmt* _tmp76_ = NULL; - gint _tmp77_ = 0; - gint _tmp78_ = 0; + gint _tmp45_; + gint _tmp46_; + sqlite3_stmt* _tmp47_; + SavedSearchID _tmp48_; + gint64 _tmp49_; + gint _tmp50_; + gint _tmp51_; + sqlite3_stmt* _tmp52_; + SearchConditionMediaType* _tmp53_; + SearchConditionSearchType _tmp54_; + SearchConditionSearchType _tmp55_; + gchar* _tmp56_; + GDestroyNotify _tmp57_; + gint _tmp58_; + gint _tmp59_; + sqlite3_stmt* _tmp60_; + SearchConditionMediaType* _tmp61_; + SearchConditionMediaTypeContext _tmp62_; + SearchConditionMediaTypeContext _tmp63_; + gchar* _tmp64_; + GDestroyNotify _tmp65_; + gint _tmp66_; + gint _tmp67_; + sqlite3_stmt* _tmp68_; + SearchConditionMediaType* _tmp69_; + SearchConditionMediaTypeMediaType _tmp70_; + SearchConditionMediaTypeMediaType _tmp71_; + gchar* _tmp72_; + GDestroyNotify _tmp73_; + gint _tmp74_; + gint _tmp75_; + sqlite3_stmt* _tmp76_; + gint _tmp77_; + gint _tmp78_; #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp41_ = condition; #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1979,7 +1979,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp78_ != SQLITE_DONE) { #line 1981 "SavedSearchDBTable.c" - gint _tmp79_ = 0; + gint _tmp79_; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp79_ = res; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2018,45 +2018,45 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (media_type); #line 2019 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp80_ = NULL; + SearchCondition* _tmp80_; #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp80_ = condition; #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) { #line 2026 "SavedSearchDBTable.c" SearchConditionFlagged* flag_state = NULL; - SearchCondition* _tmp81_ = NULL; - SearchConditionFlagged* _tmp82_ = NULL; + SearchCondition* _tmp81_; + SearchConditionFlagged* _tmp82_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp83_ = NULL; + sqlite3* _tmp83_; sqlite3_stmt* _tmp84_ = NULL; - gint _tmp85_ = 0; - gint _tmp86_ = 0; - sqlite3_stmt* _tmp87_ = NULL; - SavedSearchID _tmp88_ = {0}; - gint64 _tmp89_ = 0LL; - gint _tmp90_ = 0; - gint _tmp91_ = 0; - sqlite3_stmt* _tmp92_ = NULL; - SearchConditionFlagged* _tmp93_ = NULL; - SearchConditionSearchType _tmp94_ = 0; - SearchConditionSearchType _tmp95_ = 0; - gchar* _tmp96_ = NULL; - GDestroyNotify _tmp97_ = NULL; - gint _tmp98_ = 0; - gint _tmp99_ = 0; - sqlite3_stmt* _tmp100_ = NULL; - SearchConditionFlagged* _tmp101_ = NULL; - SearchConditionFlaggedState _tmp102_ = 0; - SearchConditionFlaggedState _tmp103_ = 0; - gchar* _tmp104_ = NULL; - GDestroyNotify _tmp105_ = NULL; - gint _tmp106_ = 0; - gint _tmp107_ = 0; - sqlite3_stmt* _tmp108_ = NULL; - gint _tmp109_ = 0; - gint _tmp110_ = 0; + gint _tmp85_; + gint _tmp86_; + sqlite3_stmt* _tmp87_; + SavedSearchID _tmp88_; + gint64 _tmp89_; + gint _tmp90_; + gint _tmp91_; + sqlite3_stmt* _tmp92_; + SearchConditionFlagged* _tmp93_; + SearchConditionSearchType _tmp94_; + SearchConditionSearchType _tmp95_; + gchar* _tmp96_; + GDestroyNotify _tmp97_; + gint _tmp98_; + gint _tmp99_; + sqlite3_stmt* _tmp100_; + SearchConditionFlagged* _tmp101_; + SearchConditionFlaggedState _tmp102_; + SearchConditionFlaggedState _tmp103_; + gchar* _tmp104_; + GDestroyNotify _tmp105_; + gint _tmp106_; + gint _tmp107_; + sqlite3_stmt* _tmp108_; + gint _tmp109_; + gint _tmp110_; #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp81_ = condition; #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2142,7 +2142,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp110_ != SQLITE_DONE) { #line 2144 "SavedSearchDBTable.c" - gint _tmp111_ = 0; + gint _tmp111_; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp111_ = res; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2181,53 +2181,53 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (flag_state); #line 2182 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp112_ = NULL; + SearchCondition* _tmp112_; #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp112_ = condition; #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) { #line 2189 "SavedSearchDBTable.c" SearchConditionModified* modified_state = NULL; - SearchCondition* _tmp113_ = NULL; - SearchConditionModified* _tmp114_ = NULL; + SearchCondition* _tmp113_; + SearchConditionModified* _tmp114_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp115_ = NULL; + sqlite3* _tmp115_; sqlite3_stmt* _tmp116_ = NULL; - gint _tmp117_ = 0; - gint _tmp118_ = 0; - sqlite3_stmt* _tmp119_ = NULL; - SavedSearchID _tmp120_ = {0}; - gint64 _tmp121_ = 0LL; - gint _tmp122_ = 0; - gint _tmp123_ = 0; - sqlite3_stmt* _tmp124_ = NULL; - SearchConditionModified* _tmp125_ = NULL; - SearchConditionSearchType _tmp126_ = 0; - SearchConditionSearchType _tmp127_ = 0; - gchar* _tmp128_ = NULL; - GDestroyNotify _tmp129_ = NULL; - gint _tmp130_ = 0; - gint _tmp131_ = 0; - sqlite3_stmt* _tmp132_ = NULL; - SearchConditionModified* _tmp133_ = NULL; - SearchConditionModifiedContext _tmp134_ = 0; - SearchConditionModifiedContext _tmp135_ = 0; - gchar* _tmp136_ = NULL; - GDestroyNotify _tmp137_ = NULL; - gint _tmp138_ = 0; - gint _tmp139_ = 0; - sqlite3_stmt* _tmp140_ = NULL; - SearchConditionModified* _tmp141_ = NULL; - SearchConditionModifiedState _tmp142_ = 0; - SearchConditionModifiedState _tmp143_ = 0; - gchar* _tmp144_ = NULL; - GDestroyNotify _tmp145_ = NULL; - gint _tmp146_ = 0; - gint _tmp147_ = 0; - sqlite3_stmt* _tmp148_ = NULL; - gint _tmp149_ = 0; - gint _tmp150_ = 0; + gint _tmp117_; + gint _tmp118_; + sqlite3_stmt* _tmp119_; + SavedSearchID _tmp120_; + gint64 _tmp121_; + gint _tmp122_; + gint _tmp123_; + sqlite3_stmt* _tmp124_; + SearchConditionModified* _tmp125_; + SearchConditionSearchType _tmp126_; + SearchConditionSearchType _tmp127_; + gchar* _tmp128_; + GDestroyNotify _tmp129_; + gint _tmp130_; + gint _tmp131_; + sqlite3_stmt* _tmp132_; + SearchConditionModified* _tmp133_; + SearchConditionModifiedContext _tmp134_; + SearchConditionModifiedContext _tmp135_; + gchar* _tmp136_; + GDestroyNotify _tmp137_; + gint _tmp138_; + gint _tmp139_; + sqlite3_stmt* _tmp140_; + SearchConditionModified* _tmp141_; + SearchConditionModifiedState _tmp142_; + SearchConditionModifiedState _tmp143_; + gchar* _tmp144_; + GDestroyNotify _tmp145_; + gint _tmp146_; + gint _tmp147_; + sqlite3_stmt* _tmp148_; + gint _tmp149_; + gint _tmp150_; #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp113_ = condition; #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2334,7 +2334,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp150_ != SQLITE_DONE) { #line 2335 "SavedSearchDBTable.c" - gint _tmp151_ = 0; + gint _tmp151_; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp151_ = res; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2373,52 +2373,52 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (modified_state); #line 2373 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp152_ = NULL; + SearchCondition* _tmp152_; #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp152_ = condition; #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) { #line 2380 "SavedSearchDBTable.c" SearchConditionRating* rating = NULL; - SearchCondition* _tmp153_ = NULL; - SearchConditionRating* _tmp154_ = NULL; + SearchCondition* _tmp153_; + SearchConditionRating* _tmp154_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp155_ = NULL; + sqlite3* _tmp155_; sqlite3_stmt* _tmp156_ = NULL; - gint _tmp157_ = 0; - gint _tmp158_ = 0; - sqlite3_stmt* _tmp159_ = NULL; - SavedSearchID _tmp160_ = {0}; - gint64 _tmp161_ = 0LL; - gint _tmp162_ = 0; - gint _tmp163_ = 0; - sqlite3_stmt* _tmp164_ = NULL; - SearchConditionRating* _tmp165_ = NULL; - SearchConditionSearchType _tmp166_ = 0; - SearchConditionSearchType _tmp167_ = 0; - gchar* _tmp168_ = NULL; - GDestroyNotify _tmp169_ = NULL; - gint _tmp170_ = 0; - gint _tmp171_ = 0; - sqlite3_stmt* _tmp172_ = NULL; - SearchConditionRating* _tmp173_ = NULL; - Rating _tmp174_ = 0; - Rating _tmp175_ = 0; - gint _tmp176_ = 0; - gint _tmp177_ = 0; - gint _tmp178_ = 0; - sqlite3_stmt* _tmp179_ = NULL; - SearchConditionRating* _tmp180_ = NULL; - SearchConditionRatingContext _tmp181_ = 0; - SearchConditionRatingContext _tmp182_ = 0; - gchar* _tmp183_ = NULL; - GDestroyNotify _tmp184_ = NULL; - gint _tmp185_ = 0; - gint _tmp186_ = 0; - sqlite3_stmt* _tmp187_ = NULL; - gint _tmp188_ = 0; - gint _tmp189_ = 0; + gint _tmp157_; + gint _tmp158_; + sqlite3_stmt* _tmp159_; + SavedSearchID _tmp160_; + gint64 _tmp161_; + gint _tmp162_; + gint _tmp163_; + sqlite3_stmt* _tmp164_; + SearchConditionRating* _tmp165_; + SearchConditionSearchType _tmp166_; + SearchConditionSearchType _tmp167_; + gchar* _tmp168_; + GDestroyNotify _tmp169_; + gint _tmp170_; + gint _tmp171_; + sqlite3_stmt* _tmp172_; + SearchConditionRating* _tmp173_; + Rating _tmp174_; + Rating _tmp175_; + gint _tmp176_; + gint _tmp177_; + gint _tmp178_; + sqlite3_stmt* _tmp179_; + SearchConditionRating* _tmp180_; + SearchConditionRatingContext _tmp181_; + SearchConditionRatingContext _tmp182_; + gchar* _tmp183_; + GDestroyNotify _tmp184_; + gint _tmp185_; + gint _tmp186_; + sqlite3_stmt* _tmp187_; + gint _tmp188_; + gint _tmp189_; #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp153_ = condition; #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2523,7 +2523,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp189_ != SQLITE_DONE) { #line 2523 "SavedSearchDBTable.c" - gint _tmp190_ = 0; + gint _tmp190_; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp190_ = res; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2562,59 +2562,59 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (rating); #line 2561 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp191_ = NULL; + SearchCondition* _tmp191_; #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp191_ = condition; #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) { #line 2568 "SavedSearchDBTable.c" SearchConditionDate* date = NULL; - SearchCondition* _tmp192_ = NULL; - SearchConditionDate* _tmp193_ = NULL; + SearchCondition* _tmp192_; + SearchConditionDate* _tmp193_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp194_ = NULL; + sqlite3* _tmp194_; sqlite3_stmt* _tmp195_ = NULL; - gint _tmp196_ = 0; - gint _tmp197_ = 0; - sqlite3_stmt* _tmp198_ = NULL; - SavedSearchID _tmp199_ = {0}; - gint64 _tmp200_ = 0LL; - gint _tmp201_ = 0; - gint _tmp202_ = 0; - sqlite3_stmt* _tmp203_ = NULL; - SearchConditionDate* _tmp204_ = NULL; - SearchConditionSearchType _tmp205_ = 0; - SearchConditionSearchType _tmp206_ = 0; - gchar* _tmp207_ = NULL; - GDestroyNotify _tmp208_ = NULL; - gint _tmp209_ = 0; - gint _tmp210_ = 0; - sqlite3_stmt* _tmp211_ = NULL; - SearchConditionDate* _tmp212_ = NULL; - SearchConditionDateContext _tmp213_ = 0; - SearchConditionDateContext _tmp214_ = 0; - gchar* _tmp215_ = NULL; - GDestroyNotify _tmp216_ = NULL; - gint _tmp217_ = 0; - gint _tmp218_ = 0; - sqlite3_stmt* _tmp219_ = NULL; - SearchConditionDate* _tmp220_ = NULL; - GDateTime* _tmp221_ = NULL; - GDateTime* _tmp222_ = NULL; - gint64 _tmp223_ = 0LL; - gint _tmp224_ = 0; - gint _tmp225_ = 0; - sqlite3_stmt* _tmp226_ = NULL; - SearchConditionDate* _tmp227_ = NULL; - GDateTime* _tmp228_ = NULL; - GDateTime* _tmp229_ = NULL; - gint64 _tmp230_ = 0LL; - gint _tmp231_ = 0; - gint _tmp232_ = 0; - sqlite3_stmt* _tmp233_ = NULL; - gint _tmp234_ = 0; - gint _tmp235_ = 0; + gint _tmp196_; + gint _tmp197_; + sqlite3_stmt* _tmp198_; + SavedSearchID _tmp199_; + gint64 _tmp200_; + gint _tmp201_; + gint _tmp202_; + sqlite3_stmt* _tmp203_; + SearchConditionDate* _tmp204_; + SearchConditionSearchType _tmp205_; + SearchConditionSearchType _tmp206_; + gchar* _tmp207_; + GDestroyNotify _tmp208_; + gint _tmp209_; + gint _tmp210_; + sqlite3_stmt* _tmp211_; + SearchConditionDate* _tmp212_; + SearchConditionDateContext _tmp213_; + SearchConditionDateContext _tmp214_; + gchar* _tmp215_; + GDestroyNotify _tmp216_; + gint _tmp217_; + gint _tmp218_; + sqlite3_stmt* _tmp219_; + SearchConditionDate* _tmp220_; + GDateTime* _tmp221_; + GDateTime* _tmp222_; + gint64 _tmp223_; + gint _tmp224_; + gint _tmp225_; + sqlite3_stmt* _tmp226_; + SearchConditionDate* _tmp227_; + GDateTime* _tmp228_; + GDateTime* _tmp229_; + gint64 _tmp230_; + gint _tmp231_; + gint _tmp232_; + sqlite3_stmt* _tmp233_; + gint _tmp234_; + gint _tmp235_; #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp192_ = condition; #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2736,7 +2736,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp235_ != SQLITE_DONE) { #line 2736 "SavedSearchDBTable.c" - gint _tmp236_ = 0; + gint _tmp236_; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp236_ = res; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2788,12 +2788,12 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { - SavedSearchID _tmp0_ = {0}; - SavedSearchID _tmp1_ = {0}; - SavedSearchID _tmp2_ = {0}; - SavedSearchID _tmp3_ = {0}; - SavedSearchID _tmp4_ = {0}; - SavedSearchID _tmp5_ = {0}; + SavedSearchID _tmp0_; + SavedSearchID _tmp1_; + SavedSearchID _tmp2_; + SavedSearchID _tmp3_; + SavedSearchID _tmp4_; + SavedSearchID _tmp5_; GError * _inner_error_ = NULL; #line 381 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -2943,22 +2943,22 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) { sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + sqlite3* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - SavedSearchID _tmp9_ = {0}; - gint64 _tmp10_ = 0LL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - sqlite3_stmt* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + SavedSearchID _tmp9_; + gint64 _tmp10_; + gint _tmp11_; + gint _tmp12_; + sqlite3_stmt* _tmp13_; + gint _tmp14_; + gint _tmp15_; GError * _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -3015,10 +3015,10 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp15_ != SQLITE_DONE) { #line 3015 "SavedSearchDBTable.c" - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gint _tmp19_ = 0; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gint _tmp19_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp16_ = table_name; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3064,63 +3064,63 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { GeeList* result = NULL; GeeList* list = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp1_ = NULL; + sqlite3* _tmp1_; sqlite3_stmt* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - sqlite3_stmt* _tmp5_ = NULL; - SavedSearchID _tmp6_ = {0}; - gint64 _tmp7_ = 0LL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3* _tmp27_ = NULL; + gint _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + SavedSearchID _tmp6_; + gint64 _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3* _tmp27_; sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - sqlite3_stmt* _tmp31_ = NULL; - SavedSearchID _tmp32_ = {0}; - gint64 _tmp33_ = 0LL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - sqlite3* _tmp54_ = NULL; + gint _tmp29_; + gint _tmp30_; + sqlite3_stmt* _tmp31_; + SavedSearchID _tmp32_; + gint64 _tmp33_; + gint _tmp34_; + gint _tmp35_; + sqlite3* _tmp54_; sqlite3_stmt* _tmp55_ = NULL; - gint _tmp56_ = 0; - gint _tmp57_ = 0; - sqlite3_stmt* _tmp58_ = NULL; - SavedSearchID _tmp59_ = {0}; - gint64 _tmp60_ = 0LL; - gint _tmp61_ = 0; - gint _tmp62_ = 0; - sqlite3* _tmp78_ = NULL; + gint _tmp56_; + gint _tmp57_; + sqlite3_stmt* _tmp58_; + SavedSearchID _tmp59_; + gint64 _tmp60_; + gint _tmp61_; + gint _tmp62_; + sqlite3* _tmp78_; sqlite3_stmt* _tmp79_ = NULL; - gint _tmp80_ = 0; - gint _tmp81_ = 0; - sqlite3_stmt* _tmp82_ = NULL; - SavedSearchID _tmp83_ = {0}; - gint64 _tmp84_ = 0LL; - gint _tmp85_ = 0; - gint _tmp86_ = 0; - sqlite3* _tmp105_ = NULL; + gint _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + SavedSearchID _tmp83_; + gint64 _tmp84_; + gint _tmp85_; + gint _tmp86_; + sqlite3* _tmp105_; sqlite3_stmt* _tmp106_ = NULL; - gint _tmp107_ = 0; - gint _tmp108_ = 0; - sqlite3_stmt* _tmp109_ = NULL; - SavedSearchID _tmp110_ = {0}; - gint64 _tmp111_ = 0LL; - gint _tmp112_ = 0; - gint _tmp113_ = 0; - sqlite3* _tmp132_ = NULL; + gint _tmp107_; + gint _tmp108_; + sqlite3_stmt* _tmp109_; + SavedSearchID _tmp110_; + gint64 _tmp111_; + gint _tmp112_; + gint _tmp113_; + sqlite3* _tmp132_; sqlite3_stmt* _tmp133_ = NULL; - gint _tmp134_ = 0; - gint _tmp135_ = 0; - sqlite3_stmt* _tmp136_ = NULL; - SavedSearchID _tmp137_ = {0}; - gint64 _tmp138_ = 0LL; - gint _tmp139_ = 0; - gint _tmp140_ = 0; + gint _tmp134_; + gint _tmp135_; + sqlite3_stmt* _tmp136_; + SavedSearchID _tmp137_; + gint64 _tmp138_; + gint _tmp139_; + gint _tmp140_; GError * _inner_error_ = NULL; #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -3166,21 +3166,21 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3166 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + gint _tmp13_; SearchConditionText* condition = NULL; - sqlite3_stmt* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - SearchConditionSearchType _tmp18_ = 0; - sqlite3_stmt* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - sqlite3_stmt* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - SearchConditionTextContext _tmp23_ = 0; - SearchConditionText* _tmp24_ = NULL; - GeeList* _tmp25_ = NULL; - SearchConditionText* _tmp26_ = NULL; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + SearchConditionSearchType _tmp18_; + sqlite3_stmt* _tmp19_; + const gchar* _tmp20_; + sqlite3_stmt* _tmp21_; + const gchar* _tmp22_; + SearchConditionTextContext _tmp23_; + SearchConditionText* _tmp24_; + GeeList* _tmp25_; + SearchConditionText* _tmp26_; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp10_) { #line 3184 "SavedSearchDBTable.c" @@ -3201,13 +3201,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3200 "SavedSearchDBTable.c" } else { - gint _tmp14_ = 0; + gint _tmp14_; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp14_ = res; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp14_ != SQLITE_ROW) { #line 3207 "SavedSearchDBTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp15_ = res; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3308,22 +3308,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3308 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + sqlite3_stmt* _tmp37_; + gint _tmp38_; + gint _tmp39_; SearchConditionMediaType* condition = NULL; - sqlite3_stmt* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - SearchConditionSearchType _tmp44_ = 0; - sqlite3_stmt* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; - SearchConditionMediaTypeContext _tmp47_ = 0; - sqlite3_stmt* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - SearchConditionMediaTypeMediaType _tmp50_ = 0; - SearchConditionMediaType* _tmp51_ = NULL; - GeeList* _tmp52_ = NULL; - SearchConditionMediaType* _tmp53_ = NULL; + sqlite3_stmt* _tmp42_; + const gchar* _tmp43_; + SearchConditionSearchType _tmp44_; + sqlite3_stmt* _tmp45_; + const gchar* _tmp46_; + SearchConditionMediaTypeContext _tmp47_; + sqlite3_stmt* _tmp48_; + const gchar* _tmp49_; + SearchConditionMediaTypeMediaType _tmp50_; + SearchConditionMediaType* _tmp51_; + GeeList* _tmp52_; + SearchConditionMediaType* _tmp53_; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp36_) { #line 3327 "SavedSearchDBTable.c" @@ -3344,13 +3344,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3343 "SavedSearchDBTable.c" } else { - gint _tmp40_ = 0; + gint _tmp40_; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp40_ = res; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp40_ != SQLITE_ROW) { #line 3350 "SavedSearchDBTable.c" - gint _tmp41_ = 0; + gint _tmp41_; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp41_ = res; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3453,19 +3453,19 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3453 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp64_ = NULL; - gint _tmp65_ = 0; - gint _tmp66_ = 0; + sqlite3_stmt* _tmp64_; + gint _tmp65_; + gint _tmp66_; SearchConditionFlagged* condition = NULL; - sqlite3_stmt* _tmp69_ = NULL; - const gchar* _tmp70_ = NULL; - SearchConditionSearchType _tmp71_ = 0; - sqlite3_stmt* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; - SearchConditionFlaggedState _tmp74_ = 0; - SearchConditionFlagged* _tmp75_ = NULL; - GeeList* _tmp76_ = NULL; - SearchConditionFlagged* _tmp77_ = NULL; + sqlite3_stmt* _tmp69_; + const gchar* _tmp70_; + SearchConditionSearchType _tmp71_; + sqlite3_stmt* _tmp72_; + const gchar* _tmp73_; + SearchConditionFlaggedState _tmp74_; + SearchConditionFlagged* _tmp75_; + GeeList* _tmp76_; + SearchConditionFlagged* _tmp77_; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp63_) { #line 3469 "SavedSearchDBTable.c" @@ -3486,13 +3486,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3485 "SavedSearchDBTable.c" } else { - gint _tmp67_ = 0; + gint _tmp67_; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp67_ = res; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp67_ != SQLITE_ROW) { #line 3492 "SavedSearchDBTable.c" - gint _tmp68_ = 0; + gint _tmp68_; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp68_ = res; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3590,22 +3590,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3589 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp88_ = NULL; - gint _tmp89_ = 0; - gint _tmp90_ = 0; + sqlite3_stmt* _tmp88_; + gint _tmp89_; + gint _tmp90_; SearchConditionModified* condition = NULL; - sqlite3_stmt* _tmp93_ = NULL; - const gchar* _tmp94_ = NULL; - SearchConditionSearchType _tmp95_ = 0; - sqlite3_stmt* _tmp96_ = NULL; - const gchar* _tmp97_ = NULL; - SearchConditionModifiedContext _tmp98_ = 0; - sqlite3_stmt* _tmp99_ = NULL; - const gchar* _tmp100_ = NULL; - SearchConditionModifiedState _tmp101_ = 0; - SearchConditionModified* _tmp102_ = NULL; - GeeList* _tmp103_ = NULL; - SearchConditionModified* _tmp104_ = NULL; + sqlite3_stmt* _tmp93_; + const gchar* _tmp94_; + SearchConditionSearchType _tmp95_; + sqlite3_stmt* _tmp96_; + const gchar* _tmp97_; + SearchConditionModifiedContext _tmp98_; + sqlite3_stmt* _tmp99_; + const gchar* _tmp100_; + SearchConditionModifiedState _tmp101_; + SearchConditionModified* _tmp102_; + GeeList* _tmp103_; + SearchConditionModified* _tmp104_; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp87_) { #line 3608 "SavedSearchDBTable.c" @@ -3626,13 +3626,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3624 "SavedSearchDBTable.c" } else { - gint _tmp91_ = 0; + gint _tmp91_; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp91_ = res; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp91_ != SQLITE_ROW) { #line 3631 "SavedSearchDBTable.c" - gint _tmp92_ = 0; + gint _tmp92_; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp92_ = res; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3735,22 +3735,22 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3734 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp115_ = NULL; - gint _tmp116_ = 0; - gint _tmp117_ = 0; + sqlite3_stmt* _tmp115_; + gint _tmp116_; + gint _tmp117_; SearchConditionRating* condition = NULL; - sqlite3_stmt* _tmp120_ = NULL; - const gchar* _tmp121_ = NULL; - SearchConditionSearchType _tmp122_ = 0; - sqlite3_stmt* _tmp123_ = NULL; - gint _tmp124_ = 0; - Rating _tmp125_ = 0; - sqlite3_stmt* _tmp126_ = NULL; - const gchar* _tmp127_ = NULL; - SearchConditionRatingContext _tmp128_ = 0; - SearchConditionRating* _tmp129_ = NULL; - GeeList* _tmp130_ = NULL; - SearchConditionRating* _tmp131_ = NULL; + sqlite3_stmt* _tmp120_; + const gchar* _tmp121_; + SearchConditionSearchType _tmp122_; + sqlite3_stmt* _tmp123_; + gint _tmp124_; + Rating _tmp125_; + sqlite3_stmt* _tmp126_; + const gchar* _tmp127_; + SearchConditionRatingContext _tmp128_; + SearchConditionRating* _tmp129_; + GeeList* _tmp130_; + SearchConditionRating* _tmp131_; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp114_) { #line 3753 "SavedSearchDBTable.c" @@ -3771,13 +3771,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3769 "SavedSearchDBTable.c" } else { - gint _tmp118_ = 0; + gint _tmp118_; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp118_ = res; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp118_ != SQLITE_ROW) { #line 3776 "SavedSearchDBTable.c" - gint _tmp119_ = 0; + gint _tmp119_; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp119_ = res; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3881,28 +3881,28 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 3879 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp142_ = NULL; - gint _tmp143_ = 0; - gint _tmp144_ = 0; + sqlite3_stmt* _tmp142_; + gint _tmp143_; + gint _tmp144_; SearchConditionDate* condition = NULL; - sqlite3_stmt* _tmp147_ = NULL; - const gchar* _tmp148_ = NULL; - SearchConditionSearchType _tmp149_ = 0; - sqlite3_stmt* _tmp150_ = NULL; - const gchar* _tmp151_ = NULL; - SearchConditionDateContext _tmp152_ = 0; - sqlite3_stmt* _tmp153_ = NULL; - gint64 _tmp154_ = 0LL; - GDateTime* _tmp155_ = NULL; - GDateTime* _tmp156_ = NULL; - sqlite3_stmt* _tmp157_ = NULL; - gint64 _tmp158_ = 0LL; - GDateTime* _tmp159_ = NULL; - GDateTime* _tmp160_ = NULL; - SearchConditionDate* _tmp161_ = NULL; - SearchConditionDate* _tmp162_ = NULL; - GeeList* _tmp163_ = NULL; - SearchConditionDate* _tmp164_ = NULL; + sqlite3_stmt* _tmp147_; + const gchar* _tmp148_; + SearchConditionSearchType _tmp149_; + sqlite3_stmt* _tmp150_; + const gchar* _tmp151_; + SearchConditionDateContext _tmp152_; + sqlite3_stmt* _tmp153_; + gint64 _tmp154_; + GDateTime* _tmp155_; + GDateTime* _tmp156_; + sqlite3_stmt* _tmp157_; + gint64 _tmp158_; + GDateTime* _tmp159_; + GDateTime* _tmp160_; + SearchConditionDate* _tmp161_; + SearchConditionDate* _tmp162_; + GeeList* _tmp163_; + SearchConditionDate* _tmp164_; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp141_) { #line 3904 "SavedSearchDBTable.c" @@ -3923,13 +3923,13 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* break; #line 3920 "SavedSearchDBTable.c" } else { - gint _tmp145_ = 0; + gint _tmp145_; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp145_ = res; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp145_ != SQLITE_ROW) { #line 3927 "SavedSearchDBTable.c" - gint _tmp146_ = 0; + gint _tmp146_; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp146_ = res; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4025,30 +4025,30 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* 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; - SavedSearchRow* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GDestroyNotify _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; - sqlite3_stmt* _tmp11_ = NULL; - SavedSearchRow* _tmp12_ = NULL; - SearchOperator _tmp13_ = 0; - gchar* _tmp14_ = NULL; - GDestroyNotify _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - sqlite3_stmt* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + SavedSearchRow* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; + SavedSearchRow* _tmp12_; + SearchOperator _tmp13_; + gchar* _tmp14_; + GDestroyNotify _tmp15_; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; + gint _tmp19_; + gint _tmp20_; SavedSearchID search_id = {0}; - sqlite3* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; + sqlite3* _tmp22_; + gint64 _tmp23_; GError * _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4115,7 +4115,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp20_ != SQLITE_DONE) { #line 4113 "SavedSearchDBTable.c" - gint _tmp21_ = 0; + gint _tmp21_; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp21_ = res; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4153,13 +4153,13 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 4149 "SavedSearchDBTable.c" { GeeList* _sc_list = NULL; - SavedSearchRow* _tmp24_ = NULL; - GeeList* _tmp25_ = NULL; - GeeList* _tmp26_ = NULL; + SavedSearchRow* _tmp24_; + GeeList* _tmp25_; + GeeList* _tmp26_; gint _sc_size = 0; - GeeList* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; + GeeList* _tmp27_; + gint _tmp28_; + gint _tmp29_; gint _sc_index = 0; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp24_ = row; @@ -4182,15 +4182,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 4180 "SavedSearchDBTable.c" - gint _tmp30_ = 0; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + gint _tmp30_; + gint _tmp31_; + gint _tmp32_; SearchCondition* sc = NULL; - GeeList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gpointer _tmp35_ = NULL; - SavedSearchID _tmp36_ = {0}; - SearchCondition* _tmp37_ = NULL; + GeeList* _tmp33_; + gint _tmp34_; + gpointer _tmp35_; + SavedSearchID _tmp36_; + SearchCondition* _tmp37_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp30_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4269,9 +4269,9 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { - SavedSearchID _tmp0_ = {0}; - SavedSearchID _tmp1_ = {0}; - gint64 _tmp2_ = 0LL; + SavedSearchID _tmp0_; + SavedSearchID _tmp1_; + gint64 _tmp2_; GError * _inner_error_ = NULL; #line 582 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4332,30 +4332,30 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe SavedSearchRow* 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; - SavedSearchID _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_; + SavedSearchID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp14_ = NULL; - SavedSearchRow* _tmp15_ = NULL; - SavedSearchID _tmp16_ = {0}; - SavedSearchRow* _tmp17_ = NULL; - sqlite3_stmt* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - SavedSearchRow* _tmp21_ = NULL; - sqlite3_stmt* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - SearchOperator _tmp24_ = 0; + SavedSearchRow* _tmp14_; + SavedSearchRow* _tmp15_; + SavedSearchID _tmp16_; + SavedSearchRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + SavedSearchRow* _tmp21_; + sqlite3_stmt* _tmp22_; + const gchar* _tmp23_; + SearchOperator _tmp24_; GError * _inner_error_ = NULL; #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -4407,13 +4407,13 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe return result; #line 4404 "SavedSearchDBTable.c" } else { - gint _tmp12_ = 0; + gint _tmp12_; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp12_ = res; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp12_ != SQLITE_ROW) { #line 4411 "SavedSearchDBTable.c" - gint _tmp13_ = 0; + gint _tmp13_; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp13_ = res; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4489,12 +4489,12 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** 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 610 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -4524,30 +4524,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { #line 4522 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint _tmp8_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp11_ = NULL; - SavedSearchRow* _tmp12_ = NULL; - sqlite3_stmt* _tmp13_ = NULL; - gint64 _tmp14_ = 0LL; - SavedSearchRow* _tmp15_ = NULL; - sqlite3_stmt* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - SavedSearchRow* _tmp19_ = NULL; - sqlite3_stmt* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - SearchOperator _tmp22_ = 0; + SavedSearchRow* _tmp11_; + SavedSearchRow* _tmp12_; + sqlite3_stmt* _tmp13_; + gint64 _tmp14_; + SavedSearchRow* _tmp15_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + SavedSearchRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + SearchOperator _tmp22_; GeeList* _tmp23_ = NULL; - SavedSearchRow* _tmp24_ = NULL; - SavedSearchID _tmp25_ = {0}; - GeeList* _tmp26_ = NULL; - SavedSearchRow* _tmp27_ = NULL; - GeeList* _tmp28_ = NULL; - GeeList* _tmp29_ = NULL; - SavedSearchRow* _tmp30_ = NULL; + SavedSearchRow* _tmp24_; + SavedSearchID _tmp25_; + GeeList* _tmp26_; + SavedSearchRow* _tmp27_; + GeeList* _tmp28_; + GeeList* _tmp29_; + SavedSearchRow* _tmp30_; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp5_) { #line 4549 "SavedSearchDBTable.c" @@ -4568,13 +4568,13 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** break; #line 4565 "SavedSearchDBTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp9_ = res; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp9_ != SQLITE_ROW) { #line 4572 "SavedSearchDBTable.c" - gint _tmp10_ = 0; + gint _tmp10_; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp10_ = res; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4715,9 +4715,9 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) { - SavedSearchID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + SavedSearchID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4768,7 +4768,7 @@ static void saved_search_db_table_instance_init (SavedSearchDBTable * self) { } -static void saved_search_db_table_finalize (DatabaseTable* obj) { +static void saved_search_db_table_finalize (DatabaseTable * obj) { SavedSearchDBTable * self; #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable); 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" } diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index 5897398..8c9400e 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.34.7, the Vala compiler +/* TombstoneTable.c generated by valac 0.36.6, the Vala compiler * generated from TombstoneTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -150,7 +150,7 @@ enum { }; TombstoneRow* tombstone_row_new (void); TombstoneRow* tombstone_row_construct (GType object_type); -static void tombstone_row_finalize (TombstoneRow* obj); +static void tombstone_row_finalize (TombstoneRow * 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); @@ -180,13 +180,13 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error); void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -static void tombstone_table_finalize (DatabaseTable* obj); +static void tombstone_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); void tombstone_id_init (TombstoneID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" memset (self, 0, sizeof (TombstoneID)); #line 13 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -199,7 +199,7 @@ void tombstone_id_init (TombstoneID *self, gint64 id) { gboolean tombstone_id_is_invalid (TombstoneID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -212,7 +212,7 @@ gboolean tombstone_id_is_invalid (TombstoneID *self) { gboolean tombstone_id_is_valid (TombstoneID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -312,7 +312,7 @@ static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_ #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (collect_values[0].v_pointer) { #line 315 "TombstoneTable.c" - TombstoneRow* object; + TombstoneRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (object->parent_instance.g_class == NULL) { @@ -339,7 +339,7 @@ static gchar* value_tombstone_row_collect_value (GValue* value, guint n_collect_ static gchar* value_tombstone_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TombstoneRow** object_p; + TombstoneRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!object_p) { @@ -391,7 +391,7 @@ gpointer value_get_tombstone_row (const GValue* value) { void value_set_tombstone_row (GValue* value, gpointer v_object) { - TombstoneRow* old; + TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -422,7 +422,7 @@ void value_set_tombstone_row (GValue* value, gpointer v_object) { void value_take_tombstone_row (GValue* value, gpointer v_object) { - TombstoneRow* old; + TombstoneRow * old; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TOMBSTONE_ROW)); #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -466,7 +466,7 @@ static void tombstone_row_instance_init (TombstoneRow * self) { } -static void tombstone_row_finalize (TombstoneRow* obj) { +static void tombstone_row_finalize (TombstoneRow * obj) { TombstoneRow * self; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_ROW, TombstoneRow); @@ -495,7 +495,7 @@ GType tombstone_row_get_type (void) { gpointer tombstone_row_ref (gpointer instance) { - TombstoneRow* self; + TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_atomic_int_inc (&self->ref_count); @@ -506,7 +506,7 @@ gpointer tombstone_row_ref (gpointer instance) { void tombstone_row_unref (gpointer instance) { - TombstoneRow* self; + TombstoneRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -523,13 +523,13 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { TombstoneTable* 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 37 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = (TombstoneTable*) database_table_construct (object_type); #line 38 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -559,7 +559,7 @@ static TombstoneTable* tombstone_table_construct (GType object_type) { #line 54 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 562 "TombstoneTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp7_ = res; #line 55 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -590,15 +590,15 @@ static gpointer _database_table_ref0 (gpointer self) { TombstoneTable* tombstone_table_get_instance (void) { TombstoneTable* result = NULL; - TombstoneTable* _tmp0_ = NULL; - TombstoneTable* _tmp2_ = NULL; - TombstoneTable* _tmp3_ = NULL; + TombstoneTable* _tmp0_; + TombstoneTable* _tmp2_; + TombstoneTable* _tmp3_; #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp0_ = tombstone_table_instance; #line 59 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp0_ == NULL) { #line 601 "TombstoneTable.c" - TombstoneTable* _tmp1_ = NULL; + TombstoneTable* _tmp1_; #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp1_ = tombstone_table_new (); #line 60 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -623,57 +623,57 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, TombstoneRow* 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; - gint64 _tmp12_ = 0LL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - sqlite3_stmt* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GDestroyNotify _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - sqlite3_stmt* _tmp21_ = NULL; - time_t _tmp22_ = 0; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - sqlite3_stmt* _tmp25_ = NULL; - TombstoneReason _tmp26_ = 0; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - sqlite3_stmt* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + GDestroyNotify _tmp8_; + gint _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; + gint64 _tmp12_; + gint _tmp13_; + gint _tmp14_; + sqlite3_stmt* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + GDestroyNotify _tmp18_; + gint _tmp19_; + gint _tmp20_; + sqlite3_stmt* _tmp21_; + time_t _tmp22_; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; + TombstoneReason _tmp26_; + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; + gint _tmp32_; TombstoneRow* row = NULL; - TombstoneRow* _tmp34_ = NULL; - TombstoneRow* _tmp35_ = NULL; - sqlite3* _tmp36_ = NULL; - gint64 _tmp37_ = 0LL; - TombstoneRow* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - TombstoneRow* _tmp41_ = NULL; - gint64 _tmp42_ = 0LL; - TombstoneRow* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - TombstoneRow* _tmp46_ = NULL; - time_t _tmp47_ = 0; - TombstoneRow* _tmp48_ = NULL; - TombstoneReason _tmp49_ = 0; + TombstoneRow* _tmp34_; + TombstoneRow* _tmp35_; + sqlite3* _tmp36_; + gint64 _tmp37_; + TombstoneRow* _tmp38_; + const gchar* _tmp39_; + gchar* _tmp40_; + TombstoneRow* _tmp41_; + gint64 _tmp42_; + TombstoneRow* _tmp43_; + const gchar* _tmp44_; + gchar* _tmp45_; + TombstoneRow* _tmp46_; + time_t _tmp47_; + TombstoneRow* _tmp48_; + TombstoneReason _tmp49_; GError * _inner_error_ = NULL; #line 65 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); @@ -778,7 +778,7 @@ TombstoneRow* tombstone_table_add (TombstoneTable* self, const gchar* filepath, #line 88 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp32_ != SQLITE_DONE) { #line 781 "TombstoneTable.c" - gint _tmp33_ = 0; + gint _tmp33_; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp33_ = res; #line 89 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -877,24 +877,24 @@ static gpointer _tombstone_row_ref0 (gpointer self) { TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_length1, GError** error) { TombstoneRow** result = NULL; gint row_count = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_ = NULL; + sqlite3* _tmp3_; sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp5_; + gint _tmp6_; TombstoneRow** rows = NULL; - gint _tmp7_ = 0; - TombstoneRow** _tmp8_ = NULL; - gint rows_length1 = 0; - gint _rows_size_ = 0; + gint _tmp7_; + TombstoneRow** _tmp8_; + gint rows_length1; + gint _rows_size_; gint index = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - TombstoneRow** _tmp44_ = NULL; - gint _tmp44__length1 = 0; + gint _tmp42_; + gint _tmp43_; + TombstoneRow** _tmp44_; + gint _tmp44__length1; GError * _inner_error_ = NULL; #line 102 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_val_if_fail (IS_TOMBSTONE_TABLE (self), NULL); @@ -907,8 +907,8 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng #line 104 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp1_ == 0) { #line 910 "TombstoneTable.c" - TombstoneRow** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + TombstoneRow** _tmp2_; + gint _tmp2__length1; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp2_ = NULL; #line 105 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -959,38 +959,38 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" while (TRUE) { #line 962 "TombstoneTable.c" - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; TombstoneRow* row = NULL; - TombstoneRow* _tmp15_ = NULL; - TombstoneRow* _tmp16_ = NULL; - sqlite3_stmt* _tmp17_ = NULL; - gint64 _tmp18_ = 0LL; - TombstoneRow* _tmp19_ = NULL; - sqlite3_stmt* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - TombstoneRow* _tmp23_ = NULL; - sqlite3_stmt* _tmp24_ = NULL; - gint64 _tmp25_ = 0LL; - TombstoneRow* _tmp26_ = NULL; - sqlite3_stmt* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - TombstoneRow* _tmp30_ = NULL; - sqlite3_stmt* _tmp31_ = NULL; - gint64 _tmp32_ = 0LL; - TombstoneRow* _tmp33_ = NULL; - sqlite3_stmt* _tmp34_ = NULL; - gint _tmp35_ = 0; - TombstoneReason _tmp36_ = 0; - TombstoneRow** _tmp37_ = NULL; - gint _tmp37__length1 = 0; - gint _tmp38_ = 0; - TombstoneRow* _tmp39_ = NULL; - TombstoneRow* _tmp40_ = NULL; - TombstoneRow* _tmp41_ = NULL; + TombstoneRow* _tmp15_; + TombstoneRow* _tmp16_; + sqlite3_stmt* _tmp17_; + gint64 _tmp18_; + TombstoneRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + TombstoneRow* _tmp23_; + sqlite3_stmt* _tmp24_; + gint64 _tmp25_; + TombstoneRow* _tmp26_; + sqlite3_stmt* _tmp27_; + const gchar* _tmp28_; + gchar* _tmp29_; + TombstoneRow* _tmp30_; + sqlite3_stmt* _tmp31_; + gint64 _tmp32_; + TombstoneRow* _tmp33_; + sqlite3_stmt* _tmp34_; + gint _tmp35_; + TombstoneReason _tmp36_; + TombstoneRow** _tmp37_; + gint _tmp37__length1; + gint _tmp38_; + TombstoneRow* _tmp39_; + TombstoneRow* _tmp40_; + TombstoneRow* _tmp41_; #line 115 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (!_tmp9_) { #line 997 "TombstoneTable.c" @@ -1011,13 +1011,13 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng break; #line 1013 "TombstoneTable.c" } else { - gint _tmp13_ = 0; + gint _tmp13_; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp13_ = res; #line 119 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" if (_tmp13_ != SQLITE_ROW) { #line 1020 "TombstoneTable.c" - gint _tmp14_ = 0; + gint _tmp14_; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" _tmp14_ = res; #line 120 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" @@ -1163,9 +1163,9 @@ TombstoneRow** tombstone_table_fetch_all (TombstoneTable* self, int* result_leng void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_id, const gchar* filepath, GError** error) { - TombstoneID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + TombstoneID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (IS_TOMBSTONE_TABLE (self)); @@ -1204,8 +1204,8 @@ void tombstone_table_update_file (TombstoneTable* self, TombstoneID* tombstone_i void tombstone_table_remove (TombstoneTable* self, TombstoneID* tombstone_id, GError** error) { - TombstoneID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; + TombstoneID _tmp0_; + gint64 _tmp1_; GError * _inner_error_ = NULL; #line 142 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" g_return_if_fail (IS_TOMBSTONE_TABLE (self)); @@ -1252,7 +1252,7 @@ static void tombstone_table_instance_init (TombstoneTable * self) { } -static void tombstone_table_finalize (DatabaseTable* obj) { +static void tombstone_table_finalize (DatabaseTable * obj) { TombstoneTable * self; #line 34 "/home/jens/Source/shotwell/src/db/TombstoneTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TOMBSTONE_TABLE, TombstoneTable); diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c index e678847..4505a6f 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.34.7, the Vala compiler +/* VersionTable.c generated by valac 0.36.6, the Vala compiler * generated from VersionTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -87,23 +87,23 @@ DatabaseTable* database_table_construct (GType object_type); void database_table_fatal (const gchar* op, gint res); void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); VersionTable* version_table_get_instance (void); -gint version_table_get_version (VersionTable* self, gchar** app_version); +gint version_table_get_version (VersionTable* self, gchar* * app_version); void version_table_set_version (VersionTable* self, gint version, const gchar* app_version, const gchar* user_data); void version_table_update_version (VersionTable* self, gint version, const gchar* app_version); -static void version_table_finalize (DatabaseTable* obj); +static void version_table_finalize (DatabaseTable * obj); static VersionTable* version_table_construct (GType object_type) { VersionTable* 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 10 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = (VersionTable*) database_table_construct (object_type); #line 12 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -131,7 +131,7 @@ static VersionTable* version_table_construct (GType object_type) { #line 21 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 134 "VersionTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp7_ = res; #line 22 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -164,15 +164,15 @@ static gpointer _database_table_ref0 (gpointer self) { VersionTable* version_table_get_instance (void) { VersionTable* result = NULL; - VersionTable* _tmp0_ = NULL; - VersionTable* _tmp2_ = NULL; - VersionTable* _tmp3_ = NULL; + VersionTable* _tmp0_; + VersionTable* _tmp2_; + VersionTable* _tmp3_; #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp0_ = version_table_instance; #line 28 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp0_ == NULL) { #line 175 "VersionTable.c" - VersionTable* _tmp1_ = NULL; + VersionTable* _tmp1_; #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp1_ = version_table_new (); #line 29 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -193,23 +193,23 @@ VersionTable* version_table_get_instance (void) { } -gint version_table_get_version (VersionTable* self, gchar** app_version) { +gint version_table_get_version (VersionTable* self, gchar* * app_version) { gchar* _vala_app_version = NULL; gint result = 0; 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; - sqlite3_stmt* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; #line 34 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_val_if_fail (IS_VERSION_TABLE (self), 0); #line 36 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -238,13 +238,13 @@ gint version_table_get_version (VersionTable* self, gchar** app_version) { #line 41 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp6_ != SQLITE_ROW) { #line 240 "VersionTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp7_ = res; #line 42 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp7_ != SQLITE_DONE) { #line 246 "VersionTable.c" - gint _tmp8_ = 0; + gint _tmp8_; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp8_ = res; #line 43 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -311,27 +311,27 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a sqlite3_stmt* stmt = NULL; gchar* bitbucket = NULL; gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; + gint _tmp1_; gint res = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - GDestroyNotify _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - sqlite3_stmt* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - GDestroyNotify _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - sqlite3_stmt* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + GDestroyNotify _tmp17_; + gint _tmp18_; + gint _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + GDestroyNotify _tmp23_; + gint _tmp24_; + gint _tmp25_; + sqlite3_stmt* _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 55 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -346,10 +346,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a if (_tmp1_ != -1) { #line 347 "VersionTable.c" gint res = 0; - sqlite3* _tmp2_ = NULL; + sqlite3* _tmp2_; sqlite3_stmt* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp4_; + gint _tmp5_; #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp2_ = database_table_db; #line 61 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -367,10 +367,10 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a #line 367 "VersionTable.c" } else { gint res = 0; - sqlite3* _tmp6_ = NULL; + sqlite3* _tmp6_; sqlite3_stmt* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + gint _tmp8_; + gint _tmp9_; #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp6_ = database_table_db; #line 66 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -443,12 +443,12 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a #line 79 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp28_ != SQLITE_DONE) { #line 444 "VersionTable.c" - gint _tmp29_ = 0; - const gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gint _tmp34_ = 0; + gint _tmp29_; + const gchar* _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gint _tmp34_; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp29_ = version; #line 80 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -478,23 +478,23 @@ void version_table_set_version (VersionTable* self, gint version, const gchar* a void version_table_update_version (VersionTable* self, gint version, const gchar* app_version) { 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 _tmp7_ = 0; - sqlite3_stmt* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GDestroyNotify _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - sqlite3_stmt* _tmp14_ = NULL; - gint _tmp15_ = 0; - gint _tmp16_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + GDestroyNotify _tmp11_; + gint _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + gint _tmp15_; + gint _tmp16_; #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" g_return_if_fail (IS_VERSION_TABLE (self)); #line 83 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -552,10 +552,10 @@ void version_table_update_version (VersionTable* self, gint version, const gchar #line 94 "/home/jens/Source/shotwell/src/db/VersionTable.vala" if (_tmp16_ != SQLITE_DONE) { #line 553 "VersionTable.c" - gint _tmp17_ = 0; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gint _tmp20_ = 0; + gint _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gint _tmp20_; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" _tmp17_ = version; #line 95 "/home/jens/Source/shotwell/src/db/VersionTable.vala" @@ -589,7 +589,7 @@ static void version_table_instance_init (VersionTable * self) { } -static void version_table_finalize (DatabaseTable* obj) { +static void version_table_finalize (DatabaseTable * obj) { VersionTable * self; #line 7 "/home/jens/Source/shotwell/src/db/VersionTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VERSION_TABLE, VersionTable); diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c index da6cbc7..69ca2ca 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.34.7, the Vala compiler +/* VideoTable.c generated by valac 0.36.6, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -198,7 +198,7 @@ enum { }; VideoRow* video_row_new (void); VideoRow* video_row_construct (GType object_type); -static void video_row_finalize (VideoRow* obj); +static void video_row_finalize (VideoRow * 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); @@ -248,14 +248,14 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error); static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5); gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5); VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1); -static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value); +static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value); GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event_id); void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error); -static void video_table_finalize (DatabaseTable* obj); +static void video_table_finalize (DatabaseTable * obj); void video_id_init (VideoID *self, gint64 id) { - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 12 "/home/jens/Source/shotwell/src/db/VideoTable.vala" memset (self, 0, sizeof (VideoID)); #line 13 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -268,7 +268,7 @@ void video_id_init (VideoID *self, gint64 id) { gboolean video_id_is_invalid (VideoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = (*self).id; #line 17 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -281,7 +281,7 @@ gboolean video_id_is_invalid (VideoID *self) { gboolean video_id_is_valid (VideoID *self) { gboolean result = FALSE; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = (*self).id; #line 21 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -294,9 +294,9 @@ gboolean video_id_is_valid (VideoID *self) { guint video_id_hash (VideoID* a) { guint result = 0U; - VideoID* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - guint _tmp2_ = 0U; + VideoID* _tmp0_; + gint64 _tmp1_; + guint _tmp2_; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = a; #line 25 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -313,10 +313,10 @@ guint video_id_hash (VideoID* a) { gboolean video_id_equal (void* a, void* b) { gboolean result = FALSE; - void* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; - void* _tmp2_ = NULL; - gint64 _tmp3_ = 0LL; + void* _tmp0_; + gint64 _tmp1_; + void* _tmp2_; + gint64 _tmp3_; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = a; #line 29 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -335,9 +335,9 @@ gboolean video_id_equal (void* a, void* b) { gchar* video_id_upgrade_video_id_to_source_id (VideoID* video_id) { gchar* result = NULL; - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - gchar* _tmp2_ = NULL; + VideoID _tmp0_; + gint64 _tmp1_; + gchar* _tmp2_; #line 32 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (video_id != NULL, NULL); #line 33 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -443,7 +443,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (collect_values[0].v_pointer) { #line 446 "VideoTable.c" - VideoRow* object; + VideoRow * object; object = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (object->parent_instance.g_class == NULL) { @@ -470,7 +470,7 @@ static gchar* value_video_row_collect_value (GValue* value, guint n_collect_valu static gchar* value_video_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - VideoRow** object_p; + VideoRow ** object_p; object_p = collect_values[0].v_pointer; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!object_p) { @@ -522,7 +522,7 @@ gpointer value_get_video_row (const GValue* value) { void value_set_video_row (GValue* value, gpointer v_object) { - VideoRow* old; + VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -553,7 +553,7 @@ void value_set_video_row (GValue* value, gpointer v_object) { void value_take_video_row (GValue* value, gpointer v_object) { - VideoRow* old; + VideoRow * old; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_ROW)); #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -597,7 +597,7 @@ static void video_row_instance_init (VideoRow * self) { } -static void video_row_finalize (VideoRow* obj) { +static void video_row_finalize (VideoRow * obj) { VideoRow * self; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_ROW, VideoRow); @@ -632,7 +632,7 @@ GType video_row_get_type (void) { gpointer video_row_ref (gpointer instance) { - VideoRow* self; + VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_atomic_int_inc (&self->ref_count); @@ -643,7 +643,7 @@ gpointer video_row_ref (gpointer instance) { void video_row_unref (gpointer instance) { - VideoRow* self; + VideoRow * self; self = instance; #line 37 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -660,22 +660,22 @@ static VideoTable* video_table_construct (GType object_type) { VideoTable* 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_; sqlite3_stmt* stmt2 = NULL; gint res2 = 0; - sqlite3* _tmp8_ = NULL; + sqlite3* _tmp8_; sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 62 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = (VideoTable*) database_table_construct (object_type); #line 64 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -703,7 +703,7 @@ static VideoTable* video_table_construct (GType object_type) { #line 88 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp6_ != SQLITE_DONE) { #line 706 "VideoTable.c" - gint _tmp7_ = 0; + gint _tmp7_; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp7_ = res; #line 89 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -735,7 +735,7 @@ static VideoTable* video_table_construct (GType object_type) { #line 98 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp14_ != SQLITE_DONE) { #line 738 "VideoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp15_ = res2; #line 99 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -770,15 +770,15 @@ static gpointer _database_table_ref0 (gpointer self) { VideoTable* video_table_get_instance (void) { VideoTable* result = NULL; - VideoTable* _tmp0_ = NULL; - VideoTable* _tmp2_ = NULL; - VideoTable* _tmp3_ = NULL; + VideoTable* _tmp0_; + VideoTable* _tmp2_; + VideoTable* _tmp3_; #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp0_ = video_table_instance; #line 105 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp0_ == NULL) { #line 781 "VideoTable.c" - VideoTable* _tmp1_ = NULL; + VideoTable* _tmp1_; #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp1_ = video_table_new (); #line 106 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -802,101 +802,101 @@ VideoTable* video_table_get_instance (void) { void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* 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; + gint _tmp2_; + gint _tmp3_; gulong time_created = 0UL; - gulong _tmp4_ = 0UL; - sqlite3_stmt* _tmp5_ = NULL; - VideoRow* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GDestroyNotify _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - VideoRow* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - sqlite3_stmt* _tmp17_ = NULL; - VideoRow* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - gint _tmp21_ = 0; - sqlite3_stmt* _tmp22_ = NULL; - VideoRow* _tmp23_ = NULL; - gdouble _tmp24_ = 0.0; - gint _tmp25_ = 0; - gint _tmp26_ = 0; + gulong _tmp4_; + sqlite3_stmt* _tmp5_; + VideoRow* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + GDestroyNotify _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + VideoRow* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + sqlite3_stmt* _tmp17_; + VideoRow* _tmp18_; + gint _tmp19_; + gint _tmp20_; + gint _tmp21_; + sqlite3_stmt* _tmp22_; + VideoRow* _tmp23_; + gdouble _tmp24_; + gint _tmp25_; + gint _tmp26_; gint _tmp27_ = 0; - VideoRow* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; - sqlite3_stmt* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - sqlite3_stmt* _tmp33_ = NULL; - VideoRow* _tmp34_ = NULL; - gint64 _tmp35_ = 0LL; - gint _tmp36_ = 0; - gint _tmp37_ = 0; - sqlite3_stmt* _tmp38_ = NULL; - VideoRow* _tmp39_ = NULL; - time_t _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - sqlite3_stmt* _tmp43_ = NULL; - VideoRow* _tmp44_ = NULL; - time_t _tmp45_ = 0; - gint _tmp46_ = 0; - gint _tmp47_ = 0; - sqlite3_stmt* _tmp48_ = NULL; - VideoRow* _tmp49_ = NULL; - ImportID _tmp50_ = {0}; - gint64 _tmp51_ = 0LL; - gint _tmp52_ = 0; - gint _tmp53_ = 0; - sqlite3_stmt* _tmp54_ = NULL; - gint _tmp55_ = 0; - gint _tmp56_ = 0; - sqlite3_stmt* _tmp57_ = NULL; - VideoRow* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - GDestroyNotify _tmp61_ = NULL; - gint _tmp62_ = 0; - gint _tmp63_ = 0; - sqlite3_stmt* _tmp64_ = NULL; - gulong _tmp65_ = 0UL; - gint _tmp66_ = 0; - gint _tmp67_ = 0; - sqlite3_stmt* _tmp68_ = NULL; - VideoRow* _tmp69_ = NULL; - const gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - GDestroyNotify _tmp72_ = NULL; - gint _tmp73_ = 0; - gint _tmp74_ = 0; - sqlite3_stmt* _tmp75_ = NULL; - VideoRow* _tmp76_ = NULL; - const gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - GDestroyNotify _tmp79_ = NULL; - gint _tmp80_ = 0; - gint _tmp81_ = 0; - sqlite3_stmt* _tmp82_ = NULL; - gint _tmp83_ = 0; - gint _tmp84_ = 0; - VideoRow* _tmp87_ = NULL; - sqlite3* _tmp88_ = NULL; - gint64 _tmp89_ = 0LL; - VideoRow* _tmp90_ = NULL; - VideoRow* _tmp91_ = NULL; - gulong _tmp92_ = 0UL; - VideoRow* _tmp93_ = NULL; - VideoRow* _tmp94_ = NULL; - VideoID _tmp95_ = {0}; + VideoRow* _tmp28_; + gboolean _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; + gint _tmp32_; + sqlite3_stmt* _tmp33_; + VideoRow* _tmp34_; + gint64 _tmp35_; + gint _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + VideoRow* _tmp39_; + time_t _tmp40_; + gint _tmp41_; + gint _tmp42_; + sqlite3_stmt* _tmp43_; + VideoRow* _tmp44_; + time_t _tmp45_; + gint _tmp46_; + gint _tmp47_; + sqlite3_stmt* _tmp48_; + VideoRow* _tmp49_; + ImportID _tmp50_; + gint64 _tmp51_; + gint _tmp52_; + gint _tmp53_; + sqlite3_stmt* _tmp54_; + gint _tmp55_; + gint _tmp56_; + sqlite3_stmt* _tmp57_; + VideoRow* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; + GDestroyNotify _tmp61_; + gint _tmp62_; + gint _tmp63_; + sqlite3_stmt* _tmp64_; + gulong _tmp65_; + gint _tmp66_; + gint _tmp67_; + sqlite3_stmt* _tmp68_; + VideoRow* _tmp69_; + const gchar* _tmp70_; + gchar* _tmp71_; + GDestroyNotify _tmp72_; + gint _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + VideoRow* _tmp76_; + const gchar* _tmp77_; + gchar* _tmp78_; + GDestroyNotify _tmp79_; + gint _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + gint _tmp83_; + gint _tmp84_; + VideoRow* _tmp87_; + sqlite3* _tmp88_; + gint64 _tmp89_; + VideoRow* _tmp90_; + VideoRow* _tmp91_; + gulong _tmp92_; + VideoRow* _tmp93_; + VideoRow* _tmp94_; + VideoID _tmp95_; GError * _inner_error_ = NULL; #line 113 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -1151,13 +1151,13 @@ void video_table_add (VideoTable* self, VideoRow* video_row, VideoID* result, GE #line 154 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp84_ != SQLITE_DONE) { #line 1152 "VideoTable.c" - gint _tmp85_ = 0; + gint _tmp85_; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp85_ = res; #line 155 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp85_ != SQLITE_CONSTRAINT) { #line 1158 "VideoTable.c" - gint _tmp86_ = 0; + gint _tmp86_; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp86_ = res; #line 156 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1227,21 +1227,21 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { gboolean result = FALSE; 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; - sqlite3_stmt* _tmp7_ = NULL; - EventID _tmp8_ = {0}; - gint64 _tmp9_ = 0LL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - sqlite3_stmt* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + gint _tmp6_; + sqlite3_stmt* _tmp7_; + EventID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; + gint _tmp14_; #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 168 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1295,7 +1295,7 @@ gboolean video_table_drop_event (VideoTable* self, EventID* event_id) { #line 179 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp14_ != SQLITE_DONE) { #line 1296 "VideoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp15_ = res; #line 180 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1322,81 +1322,81 @@ VideoRow* video_table_get_row (VideoTable* self, VideoID* video_id) { VideoRow* 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; - VideoID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - sqlite3_stmt* _tmp9_ = NULL; - gint _tmp10_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + VideoID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; VideoRow* row = NULL; - VideoRow* _tmp11_ = NULL; - VideoRow* _tmp12_ = NULL; - VideoID _tmp13_ = {0}; - VideoRow* _tmp14_ = NULL; - sqlite3_stmt* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - VideoRow* _tmp18_ = NULL; - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; - VideoRow* _tmp21_ = NULL; - sqlite3_stmt* _tmp22_ = NULL; - gint _tmp23_ = 0; - VideoRow* _tmp24_ = NULL; - sqlite3_stmt* _tmp25_ = NULL; - gdouble _tmp26_ = 0.0; - VideoRow* _tmp27_ = NULL; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_ = 0; - VideoRow* _tmp30_ = NULL; - sqlite3_stmt* _tmp31_ = NULL; - gint64 _tmp32_ = 0LL; - VideoRow* _tmp33_ = NULL; - sqlite3_stmt* _tmp34_ = NULL; - gint64 _tmp35_ = 0LL; - VideoRow* _tmp36_ = NULL; - sqlite3_stmt* _tmp37_ = NULL; - gint64 _tmp38_ = 0LL; - VideoRow* _tmp39_ = NULL; - sqlite3_stmt* _tmp40_ = NULL; - gint64 _tmp41_ = 0LL; - VideoRow* _tmp42_ = NULL; - sqlite3_stmt* _tmp43_ = NULL; - gint64 _tmp44_ = 0LL; - VideoRow* _tmp45_ = NULL; - sqlite3_stmt* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - VideoRow* _tmp49_ = NULL; - sqlite3_stmt* _tmp50_ = NULL; - gint64 _tmp51_ = 0LL; - VideoRow* _tmp52_ = NULL; - sqlite3_stmt* _tmp53_ = NULL; - gint _tmp54_ = 0; - Rating _tmp55_ = 0; - VideoRow* _tmp56_ = NULL; - sqlite3_stmt* _tmp57_ = NULL; - const gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - VideoRow* _tmp60_ = NULL; - sqlite3_stmt* _tmp61_ = NULL; - const gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - VideoRow* _tmp64_ = NULL; - sqlite3_stmt* _tmp65_ = NULL; - gint64 _tmp66_ = 0LL; - VideoRow* _tmp67_ = NULL; - sqlite3_stmt* _tmp68_ = NULL; - gint64 _tmp69_ = 0LL; - VideoRow* _tmp70_ = NULL; - sqlite3_stmt* _tmp71_ = NULL; - const gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; + VideoRow* _tmp11_; + VideoRow* _tmp12_; + VideoID _tmp13_; + VideoRow* _tmp14_; + sqlite3_stmt* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + VideoRow* _tmp18_; + sqlite3_stmt* _tmp19_; + gint _tmp20_; + VideoRow* _tmp21_; + sqlite3_stmt* _tmp22_; + gint _tmp23_; + VideoRow* _tmp24_; + sqlite3_stmt* _tmp25_; + gdouble _tmp26_; + VideoRow* _tmp27_; + sqlite3_stmt* _tmp28_; + gint _tmp29_; + VideoRow* _tmp30_; + sqlite3_stmt* _tmp31_; + gint64 _tmp32_; + VideoRow* _tmp33_; + sqlite3_stmt* _tmp34_; + gint64 _tmp35_; + VideoRow* _tmp36_; + sqlite3_stmt* _tmp37_; + gint64 _tmp38_; + VideoRow* _tmp39_; + sqlite3_stmt* _tmp40_; + gint64 _tmp41_; + VideoRow* _tmp42_; + sqlite3_stmt* _tmp43_; + gint64 _tmp44_; + VideoRow* _tmp45_; + sqlite3_stmt* _tmp46_; + const gchar* _tmp47_; + gchar* _tmp48_; + VideoRow* _tmp49_; + sqlite3_stmt* _tmp50_; + gint64 _tmp51_; + VideoRow* _tmp52_; + sqlite3_stmt* _tmp53_; + gint _tmp54_; + Rating _tmp55_; + VideoRow* _tmp56_; + sqlite3_stmt* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; + VideoRow* _tmp60_; + sqlite3_stmt* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_; + VideoRow* _tmp64_; + sqlite3_stmt* _tmp65_; + gint64 _tmp66_; + VideoRow* _tmp67_; + sqlite3_stmt* _tmp68_; + gint64 _tmp69_; + VideoRow* _tmp70_; + sqlite3_stmt* _tmp71_; + const gchar* _tmp72_; + gchar* _tmp73_; #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 188 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1635,12 +1635,12 @@ GeeArrayList* video_table_get_all (VideoTable* self) { GeeArrayList* 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_; GeeArrayList* all = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; #line 227 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 229 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1666,76 +1666,76 @@ GeeArrayList* video_table_get_all (VideoTable* self) { #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { #line 1663 "VideoTable.c" - sqlite3_stmt* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + sqlite3_stmt* _tmp5_; + gint _tmp6_; + gint _tmp7_; VideoRow* row = NULL; - VideoRow* _tmp8_ = NULL; - VideoRow* _tmp9_ = NULL; - sqlite3_stmt* _tmp10_ = NULL; - gint64 _tmp11_ = 0LL; - VideoRow* _tmp12_ = NULL; - sqlite3_stmt* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - VideoRow* _tmp16_ = NULL; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_ = 0; - VideoRow* _tmp19_ = NULL; - sqlite3_stmt* _tmp20_ = NULL; - gint _tmp21_ = 0; - VideoRow* _tmp22_ = NULL; - sqlite3_stmt* _tmp23_ = NULL; - gdouble _tmp24_ = 0.0; - VideoRow* _tmp25_ = NULL; - sqlite3_stmt* _tmp26_ = NULL; - gint _tmp27_ = 0; - VideoRow* _tmp28_ = NULL; - sqlite3_stmt* _tmp29_ = NULL; - gint64 _tmp30_ = 0LL; - VideoRow* _tmp31_ = NULL; - sqlite3_stmt* _tmp32_ = NULL; - gint64 _tmp33_ = 0LL; - VideoRow* _tmp34_ = NULL; - sqlite3_stmt* _tmp35_ = NULL; - gint64 _tmp36_ = 0LL; - VideoRow* _tmp37_ = NULL; - sqlite3_stmt* _tmp38_ = NULL; - gint64 _tmp39_ = 0LL; - VideoRow* _tmp40_ = NULL; - sqlite3_stmt* _tmp41_ = NULL; - gint64 _tmp42_ = 0LL; - VideoRow* _tmp43_ = NULL; - sqlite3_stmt* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - VideoRow* _tmp47_ = NULL; - sqlite3_stmt* _tmp48_ = NULL; - gint64 _tmp49_ = 0LL; - VideoRow* _tmp50_ = NULL; - sqlite3_stmt* _tmp51_ = NULL; - gint _tmp52_ = 0; - Rating _tmp53_ = 0; - VideoRow* _tmp54_ = NULL; - sqlite3_stmt* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - VideoRow* _tmp58_ = NULL; - sqlite3_stmt* _tmp59_ = NULL; - const gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - VideoRow* _tmp62_ = NULL; - sqlite3_stmt* _tmp63_ = NULL; - gint64 _tmp64_ = 0LL; - VideoRow* _tmp65_ = NULL; - sqlite3_stmt* _tmp66_ = NULL; - gint64 _tmp67_ = 0LL; - VideoRow* _tmp68_ = NULL; - sqlite3_stmt* _tmp69_ = NULL; - const gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - GeeArrayList* _tmp72_ = NULL; - VideoRow* _tmp73_ = NULL; + VideoRow* _tmp8_; + VideoRow* _tmp9_; + sqlite3_stmt* _tmp10_; + gint64 _tmp11_; + VideoRow* _tmp12_; + sqlite3_stmt* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + VideoRow* _tmp16_; + sqlite3_stmt* _tmp17_; + gint _tmp18_; + VideoRow* _tmp19_; + sqlite3_stmt* _tmp20_; + gint _tmp21_; + VideoRow* _tmp22_; + sqlite3_stmt* _tmp23_; + gdouble _tmp24_; + VideoRow* _tmp25_; + sqlite3_stmt* _tmp26_; + gint _tmp27_; + VideoRow* _tmp28_; + sqlite3_stmt* _tmp29_; + gint64 _tmp30_; + VideoRow* _tmp31_; + sqlite3_stmt* _tmp32_; + gint64 _tmp33_; + VideoRow* _tmp34_; + sqlite3_stmt* _tmp35_; + gint64 _tmp36_; + VideoRow* _tmp37_; + sqlite3_stmt* _tmp38_; + gint64 _tmp39_; + VideoRow* _tmp40_; + sqlite3_stmt* _tmp41_; + gint64 _tmp42_; + VideoRow* _tmp43_; + sqlite3_stmt* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; + VideoRow* _tmp47_; + sqlite3_stmt* _tmp48_; + gint64 _tmp49_; + VideoRow* _tmp50_; + sqlite3_stmt* _tmp51_; + gint _tmp52_; + Rating _tmp53_; + VideoRow* _tmp54_; + sqlite3_stmt* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + VideoRow* _tmp58_; + sqlite3_stmt* _tmp59_; + const gchar* _tmp60_; + gchar* _tmp61_; + VideoRow* _tmp62_; + sqlite3_stmt* _tmp63_; + gint64 _tmp64_; + VideoRow* _tmp65_; + sqlite3_stmt* _tmp66_; + gint64 _tmp67_; + VideoRow* _tmp68_; + sqlite3_stmt* _tmp69_; + const gchar* _tmp70_; + gchar* _tmp71_; + GeeArrayList* _tmp72_; + VideoRow* _tmp73_; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = stmt; #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -1949,9 +1949,9 @@ GeeArrayList* video_table_get_all (VideoTable* self) { void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* filepath, GError** error) { - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - const gchar* _tmp2_ = NULL; + VideoID _tmp0_; + gint64 _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -1991,9 +1991,9 @@ void video_table_set_filepath (VideoTable* self, VideoID* video_id, const gchar* void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* new_title, GError** error) { const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - VideoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + const gchar* _tmp1_; + VideoID _tmp3_; + gint64 _tmp4_; GError * _inner_error_ = NULL; #line 270 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2004,7 +2004,7 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp1_ != NULL) { #line 2001 "VideoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = new_title; #line 271 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2045,9 +2045,9 @@ void video_table_set_title (VideoTable* self, VideoID* video_id, const gchar* ne void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* new_comment, GError** error) { const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - VideoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + const gchar* _tmp1_; + VideoID _tmp3_; + gint64 _tmp4_; GError * _inner_error_ = NULL; #line 274 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2058,7 +2058,7 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp1_ != NULL) { #line 2055 "VideoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = new_comment; #line 275 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2098,9 +2098,9 @@ void video_table_set_comment (VideoTable* self, VideoID* video_id, const gchar* void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t time, GError** error) { - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - time_t _tmp2_ = 0; + VideoID _tmp0_; + gint64 _tmp1_; + time_t _tmp2_; GError * _inner_error_ = NULL; #line 278 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2137,10 +2137,10 @@ void video_table_set_exposure_time (VideoTable* self, VideoID* video_id, time_t void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, GError** error) { - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - Rating _tmp2_ = 0; - gint _tmp3_ = 0; + VideoID _tmp0_; + gint64 _tmp1_; + Rating _tmp2_; + gint _tmp3_; GError * _inner_error_ = NULL; #line 282 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2179,9 +2179,9 @@ void video_table_set_rating (VideoTable* self, VideoID* video_id, Rating rating, void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, GError** error) { - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - guint64 _tmp2_ = 0ULL; + VideoID _tmp0_; + gint64 _tmp1_; + guint64 _tmp2_; GError * _inner_error_ = NULL; #line 286 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2219,9 +2219,9 @@ void video_table_set_flags (VideoTable* self, VideoID* video_id, guint64 flags, void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gchar* backlinks, GError** error) { const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - VideoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + const gchar* _tmp1_; + VideoID _tmp3_; + gint64 _tmp4_; GError * _inner_error_ = NULL; #line 290 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2232,7 +2232,7 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp1_ != NULL) { #line 2229 "VideoTable.c" - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = backlinks; #line 291 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2273,9 +2273,9 @@ void video_table_update_backlinks (VideoTable* self, VideoID* video_id, const gc void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, gboolean is_interpretable, GError** error) { gint _tmp0_ = 0; - gboolean _tmp1_ = FALSE; - VideoID _tmp2_ = {0}; - gint64 _tmp3_ = 0LL; + gboolean _tmp1_; + VideoID _tmp2_; + gint64 _tmp3_; GError * _inner_error_ = NULL; #line 294 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2323,11 +2323,11 @@ void video_table_update_is_interpretable (VideoTable* self, VideoID* video_id, g gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* event_id) { gboolean result = FALSE; - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - EventID _tmp2_ = {0}; - gint64 _tmp3_ = 0LL; - gboolean _tmp4_ = FALSE; + VideoID _tmp0_; + gint64 _tmp1_; + EventID _tmp2_; + gint64 _tmp3_; + gboolean _tmp4_; #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 298 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2355,19 +2355,19 @@ gboolean video_table_set_event (VideoTable* self, VideoID* video_id, EventID* ev void video_table_remove_by_file (VideoTable* self, GFile* file, 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; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; + gint _tmp12_; GError * _inner_error_ = NULL; #line 302 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2414,7 +2414,7 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) #line 311 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp12_ != SQLITE_DONE) { #line 2411 "VideoTable.c" - gint _tmp13_ = 0; + gint _tmp13_; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp13_ = res; #line 312 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2452,18 +2452,18 @@ void video_table_remove_by_file (VideoTable* self, GFile* file, GError** error) void video_table_remove (VideoTable* self, VideoID* videoID, 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; - VideoID _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_; + VideoID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + gint _tmp10_; + gint _tmp11_; GError * _inner_error_ = NULL; #line 315 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -2508,7 +2508,7 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { #line 324 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp11_ != SQLITE_DONE) { #line 2505 "VideoTable.c" - gint _tmp12_ = 0; + gint _tmp12_; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp12_ = res; #line 325 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2545,9 +2545,9 @@ void video_table_remove (VideoTable* self, VideoID* videoID, GError** error) { gboolean video_table_is_video_stored (VideoTable* self, GFile* file) { gboolean result = FALSE; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; VideoID _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 328 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2569,20 +2569,20 @@ gboolean video_table_is_video_stored (VideoTable* self, GFile* file) { void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { 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; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - sqlite3_stmt* _tmp10_ = NULL; - gint _tmp11_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + gint _tmp9_; + sqlite3_stmt* _tmp10_; + gint _tmp11_; VideoID _tmp12_ = {0}; - gint _tmp13_ = 0; + gint _tmp13_; #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); #line 332 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2628,8 +2628,8 @@ void video_table_get_id (VideoTable* self, GFile* file, VideoID* result) { #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp13_ == SQLITE_ROW) { #line 2625 "VideoTable.c" - sqlite3_stmt* _tmp14_ = NULL; - gint64 _tmp15_ = 0LL; + sqlite3_stmt* _tmp14_; + gint64 _tmp15_; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp14_ = stmt; #line 342 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2656,12 +2656,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { GeeArrayList* 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_; GeeArrayList* video_ids = NULL; - GeeArrayList* _tmp4_ = NULL; + GeeArrayList* _tmp4_; GError * _inner_error_ = NULL; #line 345 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); @@ -2691,12 +2691,12 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { #line 2688 "VideoTable.c" - sqlite3_stmt* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GeeArrayList* _tmp11_ = NULL; - sqlite3_stmt* _tmp12_ = NULL; - gint64 _tmp13_ = 0LL; + sqlite3_stmt* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GeeArrayList* _tmp11_; + sqlite3_stmt* _tmp12_; + gint64 _tmp13_; VideoID _tmp14_ = {0}; #line 351 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!_tmp5_) { @@ -2718,13 +2718,13 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { break; #line 2714 "VideoTable.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp9_ = res; #line 355 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp9_ != SQLITE_ROW) { #line 2721 "VideoTable.c" - gint _tmp10_ = 0; + gint _tmp10_; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp10_ = res; #line 356 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2784,22 +2784,22 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) { static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* file, const gchar* md5) { sqlite3_stmt* result = NULL; gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; + GFile* _tmp1_; gchar* sql = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp3_; gboolean first = FALSE; - GFile* _tmp4_ = NULL; - const gchar* _tmp7_ = NULL; + GFile* _tmp4_; + const gchar* _tmp7_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + sqlite3* _tmp13_; + const gchar* _tmp14_; sqlite3_stmt* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; + gint _tmp16_; + gint _tmp17_; gint col = 0; - GFile* _tmp18_ = NULL; - const gchar* _tmp26_ = NULL; + GFile* _tmp18_; + const gchar* _tmp26_; #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 365 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2812,7 +2812,7 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi _tmp0_ = TRUE; #line 2808 "VideoTable.c" } else { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp2_ = md5; #line 366 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2832,8 +2832,8 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi #line 371 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp4_ != NULL) { #line 2829 "VideoTable.c" - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp5_ = sql; #line 372 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2851,16 +2851,16 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi #line 376 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp7_ != NULL) { #line 2848 "VideoTable.c" - gboolean _tmp8_ = FALSE; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + gboolean _tmp8_; + const gchar* _tmp11_; + gchar* _tmp12_; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp8_ = first; #line 377 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!_tmp8_) { #line 2856 "VideoTable.c" - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + const gchar* _tmp9_; + gchar* _tmp10_; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp9_ = sql; #line 378 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2904,13 +2904,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi #line 389 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp18_ != NULL) { #line 2901 "VideoTable.c" - sqlite3_stmt* _tmp19_ = NULL; - gint _tmp20_ = 0; - GFile* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - GDestroyNotify _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; + sqlite3_stmt* _tmp19_; + gint _tmp20_; + GFile* _tmp21_; + gchar* _tmp22_; + GDestroyNotify _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp19_ = stmt; #line 390 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2938,13 +2938,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi #line 394 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp26_ != NULL) { #line 2935 "VideoTable.c" - sqlite3_stmt* _tmp27_ = NULL; - gint _tmp28_ = 0; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - GDestroyNotify _tmp31_ = NULL; - gint _tmp32_ = 0; - gint _tmp33_ = 0; + sqlite3_stmt* _tmp27_; + gint _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + GDestroyNotify _tmp31_; + gint _tmp32_; + gint _tmp33_; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp27_ = stmt; #line 395 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -2980,13 +2980,13 @@ static sqlite3_stmt* video_table_get_duplicate_stmt (VideoTable* self, GFile* fi gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* md5) { gboolean result = FALSE; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; + GFile* _tmp0_; + const gchar* _tmp1_; + sqlite3_stmt* _tmp2_; gint res = 0; - sqlite3_stmt* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + sqlite3_stmt* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), FALSE); #line 402 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3017,7 +3017,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* return result; #line 3013 "VideoTable.c" } else { - gint _tmp6_ = 0; + gint _tmp6_; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = res; #line 409 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3030,7 +3030,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* return result; #line 3026 "VideoTable.c" } else { - gint _tmp7_ = 0; + gint _tmp7_; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp7_ = res; #line 413 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3048,7 +3048,7 @@ gboolean video_table_has_duplicate (VideoTable* self, GFile* file, const gchar* } -static void _vala_array_add3 (VideoID** array, int* length, int* size, const VideoID* value) { +static void _vala_array_add3 (VideoID* * array, int* length, int* size, const VideoID* value) { #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if ((*length) == (*size)) { #line 426 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3066,18 +3066,18 @@ static void _vala_array_add3 (VideoID** array, int* length, int* size, const Vid VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1) { VideoID* result = NULL; sqlite3_stmt* stmt = NULL; - GFile* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - sqlite3_stmt* _tmp2_ = NULL; + GFile* _tmp0_; + const gchar* _tmp1_; + sqlite3_stmt* _tmp2_; VideoID* ids = NULL; - VideoID* _tmp3_ = NULL; - gint ids_length1 = 0; - gint _ids_size_ = 0; + VideoID* _tmp3_; + gint ids_length1; + gint _ids_size_; gint res = 0; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_ = 0; - VideoID* _tmp13_ = NULL; - gint _tmp13__length1 = 0; + sqlite3_stmt* _tmp4_; + gint _tmp5_; + VideoID* _tmp13_; + gint _tmp13__length1; #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 419 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3107,14 +3107,14 @@ VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gch #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { #line 3104 "VideoTable.c" - gint _tmp6_ = 0; - VideoID* _tmp7_ = NULL; - gint _tmp7__length1 = 0; - sqlite3_stmt* _tmp8_ = NULL; - gint64 _tmp9_ = 0LL; + gint _tmp6_; + VideoID* _tmp7_; + gint _tmp7__length1; + sqlite3_stmt* _tmp8_; + gint64 _tmp9_; VideoID _tmp10_ = {0}; - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; + sqlite3_stmt* _tmp11_; + gint _tmp12_; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp6_ = res; #line 425 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3167,17 +3167,17 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event GeeArrayList* 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; - EventID _tmp5_ = {0}; - gint64 _tmp6_ = 0LL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gint _tmp2_; + gint _tmp3_; + sqlite3_stmt* _tmp4_; + EventID _tmp5_; + gint64 _tmp6_; + gint _tmp7_; + gint _tmp8_; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp9_ = NULL; + GeeArrayList* _tmp9_; #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_val_if_fail (IS_VIDEO_TABLE (self), NULL); #line 433 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3222,15 +3222,15 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" while (TRUE) { #line 3219 "VideoTable.c" - sqlite3_stmt* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - GeeArrayList* _tmp16_ = NULL; - sqlite3_stmt* _tmp17_ = NULL; - gint64 _tmp18_ = 0LL; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + gint _tmp13_; + GeeArrayList* _tmp16_; + sqlite3_stmt* _tmp17_; + gint64 _tmp18_; VideoID _tmp19_ = {0}; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + gchar* _tmp20_; + gchar* _tmp21_; #line 442 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (!_tmp10_) { #line 3231 "VideoTable.c" @@ -3251,13 +3251,13 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event break; #line 3247 "VideoTable.c" } else { - gint _tmp14_ = 0; + gint _tmp14_; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp14_ = res; #line 446 "/home/jens/Source/shotwell/src/db/VideoTable.vala" if (_tmp14_ != SQLITE_ROW) { #line 3254 "VideoTable.c" - gint _tmp15_ = 0; + gint _tmp15_; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" _tmp15_ = res; #line 447 "/home/jens/Source/shotwell/src/db/VideoTable.vala" @@ -3297,9 +3297,9 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event void video_table_set_timestamp (VideoTable* self, VideoID* video_id, time_t timestamp, GError** error) { - VideoID _tmp0_ = {0}; - gint64 _tmp1_ = 0LL; - time_t _tmp2_ = 0; + VideoID _tmp0_; + gint64 _tmp1_; + time_t _tmp2_; GError * _inner_error_ = NULL; #line 458 "/home/jens/Source/shotwell/src/db/VideoTable.vala" g_return_if_fail (IS_VIDEO_TABLE (self)); @@ -3348,7 +3348,7 @@ static void video_table_instance_init (VideoTable * self) { } -static void video_table_finalize (DatabaseTable* obj) { +static void video_table_finalize (DatabaseTable * obj) { VideoTable * self; #line 59 "/home/jens/Source/shotwell/src/db/VideoTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_TABLE, VideoTable); |