From 4a9c05ea372e8f1279644ad6dc519ca407aec88a Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 21 Jan 2020 21:53:43 +0100
Subject: Enabling display of more compiler warnings and fix some of them

Most of these are caused by various issues is the Vala compiler,
but it doesn't hurt to display them and report them upstream.
---
 plugins/signal-protocol/src/store.vala | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'plugins/signal-protocol/src')

diff --git a/plugins/signal-protocol/src/store.vala b/plugins/signal-protocol/src/store.vala
index 632ff8cc..b440d838 100644
--- a/plugins/signal-protocol/src/store.vala
+++ b/plugins/signal-protocol/src/store.vala
@@ -138,12 +138,12 @@ public class Store : Object {
         });
     }
 
-    static int iks_destroy_func(void* user_data) {
-        return 0;
+    static void iks_destroy_func(void* user_data) {
     }
 
     static int ss_load_session_func(out Buffer? record, out Buffer? user_record, Address address, void* user_data) {
         Store store = (Store) user_data;
+        user_record = null; // No support for user_record
         uint8[]? res = null;
         try {
             res = store.session_store.load_session(address);
@@ -156,7 +156,6 @@ public class Store : Object {
             return 0;
         }
         record = new Buffer.from((!)res);
-        user_record = null; // No support for user_record
         if (record == null) return ErrorCode.NOMEM;
         return 1;
     }
@@ -204,8 +203,7 @@ public class Store : Object {
         });
     }
 
-    static int ss_destroy_func(void* user_data) {
-        return 0;
+    static void ss_destroy_func(void* user_data) {
     }
 
     static int pks_load_pre_key(out Buffer? record, uint32 pre_key_id, void* user_data) {
@@ -249,8 +247,7 @@ public class Store : Object {
         });
     }
 
-    static int pks_destroy_func(void* user_data) {
-        return 0;
+    static void pks_destroy_func(void* user_data) {
     }
 
     static int spks_load_signed_pre_key(out Buffer? record, uint32 pre_key_id, void* user_data) {
@@ -294,8 +291,7 @@ public class Store : Object {
         });
     }
 
-    static int spks_destroy_func(void* user_data) {
-        return 0;
+    static void spks_destroy_func(void* user_data) {
     }
 
     internal Store(Context context) {
-- 
cgit v1.2.3-54-g00ecf