summaryrefslogtreecommitdiff
path: root/src/db/TombstoneTable.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/db/TombstoneTable.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/db/TombstoneTable.c')
-rw-r--r--src/db/TombstoneTable.c254
1 files changed, 127 insertions, 127 deletions
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);