diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
| commit | f6140ff1c9ec493d947da5b346508846e7a1a06f (patch) | |
| tree | c01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/db/DatabaseTable.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | 2492891f112caac6076ce49721d9d5d78a152c3a (diff) | |
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/db/DatabaseTable.c')
| -rw-r--r-- | src/db/DatabaseTable.c | 1102 |
1 files changed, 545 insertions, 557 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" } } |