From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/db/DatabaseTable.c | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'src/db/DatabaseTable.c') diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index d1df4f4..790a6df 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler +/* DatabaseTable.c generated by valac 0.34.4, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -208,7 +208,7 @@ static void database_table_prepare_db (const gchar* filename) { #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (file_db); #line 211 "DatabaseTable.c" - goto __catch13_g_error; + goto __catch15_g_error; } #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp14_ = info; @@ -241,8 +241,8 @@ static void database_table_prepare_db (const gchar* filename) { _g_object_unref0 (file_db); #line 243 "DatabaseTable.c" } - goto __finally13; - __catch13_g_error: + goto __finally15; + __catch15_g_error: { GError* e = NULL; const gchar* _tmp20_ = NULL; @@ -275,7 +275,7 @@ static void database_table_prepare_db (const gchar* filename) { _g_error_free0 (e); #line 277 "DatabaseTable.c" } - __finally13: + __finally15: #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" @@ -343,54 +343,54 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; const gchar* _tmp6_ = NULL; -#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" g_return_val_if_fail (self != NULL, 0); -#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi" g_return_val_if_fail (sql != NULL, 0); -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp0_ = sql; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp1_ = callback; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp1__target = callback_target; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_)); -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" sqlite_errmsg = _tmp2_; -#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi" ec = _tmp3_; -#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi" if ((&_vala_errmsg) != NULL) { #line 365 "DatabaseTable.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp4_ = sqlite_errmsg; -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp5_ = g_strdup (_tmp4_); -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); -#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _vala_errmsg = _tmp5_; #line 376 "DatabaseTable.c" } -#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _tmp6_ = sqlite_errmsg; -#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi" sqlite3_free ((void*) _tmp6_); -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" result = ec; -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" if (errmsg) { -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" *errmsg = _vala_errmsg; #line 388 "DatabaseTable.c" } else { -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" _g_free0 (_vala_errmsg); #line 392 "DatabaseTable.c" } -#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi" +#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi" return result; #line 396 "DatabaseTable.c" } @@ -478,7 +478,7 @@ void database_table_init (const gchar* filename) { #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _g_object_unref0 (src); #line 481 "DatabaseTable.c" - goto __catch14_g_error; + goto __catch16_g_error; } #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" _tmp13_ = filename; @@ -490,8 +490,8 @@ void database_table_init (const gchar* filename) { _g_object_unref0 (src); #line 492 "DatabaseTable.c" } - goto __finally14; - __catch14_g_error: + goto __finally16; + __catch16_g_error: { GError* _error_ = NULL; const gchar* _tmp14_ = NULL; @@ -521,7 +521,7 @@ void database_table_init (const gchar* filename) { _g_error_free0 (_error_); #line 523 "DatabaseTable.c" } - __finally14: + __finally16: #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala" -- cgit v1.2.3