From 12390c2c363a504362a93746766b0cd672e0461d Mon Sep 17 00:00:00 2001
From: Jonathan Michalon <jonathan@michalon.eu>
Date: Sat, 18 May 2019 14:33:08 +0200
Subject: [PATCH] Few enhancements reading infos from valac

---
 libovcc/src/network/ovcc-network-message.vala | 48 +------------------
 libovcc/src/ovcc-game.vala                    |  1 +
 libovcc/src/ovcc-player.vala                  |  4 +-
 libovcc/src/ovcc-sig-queue.vala               |  1 -
 libovccclient/src/ovccclient-server.vala      |  4 +-
 server/src/server.vala                        |  4 +-
 6 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/libovcc/src/network/ovcc-network-message.vala b/libovcc/src/network/ovcc-network-message.vala
index 7de6326..33636d2 100644
--- a/libovcc/src/network/ovcc-network-message.vala
+++ b/libovcc/src/network/ovcc-network-message.vala
@@ -95,27 +95,6 @@ namespace OVCC.Network
       return message;
     }
     
-    public static async Message receive_async (DataInputStream  stream,
-                                               Cancellable?     cancel = null)
-      throws Error
-    {
-      Message result  = null;
-      Error?  err     = null;
-      Thread.create<void> (() => {
-        try {
-          result = Message.receive (stream, cancel);
-        } catch (Error e) {
-          err = e;
-        }
-        Idle.add (receive_async.callback);
-      }, false);
-      yield;
-      if (err != null) {
-        throw err;
-      }
-      return result;
-    }
-    
     public bool send (DataOutputStream  stream,
                       Cancellable?      cancel = null)
       throws Error
@@ -124,27 +103,6 @@ namespace OVCC.Network
       this.serialize (stream, cancel);
       return true;
     }
-    
-    public async bool send_async (DataOutputStream  stream,
-                                  Cancellable?      cancel = null)
-      throws Error
-    {
-      bool    result  = true;
-      Error?  err     = null;
-      Thread.create<void> (() => {
-        try {
-          result = this.send (stream, cancel);
-        } catch (Error e) {
-          err = e;
-        }
-        Idle.add (send_async.callback);
-      }, false);
-      yield;
-      if (err != null) {
-        throw err;
-      }
-      return result;
-    }
 
     protected uint8[] read_buffer (DataInputStream  stream,
                                    Cancellable?     cancel = null)
@@ -156,13 +114,11 @@ namespace OVCC.Network
                                                   len);
       }
 
+      var buf = new uint8[len];
       if (len > 0) {
-        var buf = new uint8[len];
         stream.read (buf, cancel);
-        return buf;
-      } else {
-        return null;
       }
+      return buf;
     }
 
     protected bool write_buffer (DataOutputStream  stream,
diff --git a/libovcc/src/ovcc-game.vala b/libovcc/src/ovcc-game.vala
index f335d45..ca83752 100644
--- a/libovcc/src/ovcc-game.vala
+++ b/libovcc/src/ovcc-game.vala
@@ -73,6 +73,7 @@ namespace OVCC
    * A class providing the description of a Game.
    * This is a stripped-down group of data typically to descibe a Game over network.
    */
+  [Compact]
   public class GameDescription : Object
   {
     public string     name          { get; construct; }
diff --git a/libovcc/src/ovcc-player.vala b/libovcc/src/ovcc-player.vala
index 8f55392..c536713 100644
--- a/libovcc/src/ovcc-player.vala
+++ b/libovcc/src/ovcc-player.vala
@@ -19,8 +19,8 @@
  */
 
 
-static const int N_NORMAL = 7;
-static const int N_DOUBLE = 1;
+const int N_NORMAL = 7;
+const int N_DOUBLE = 1;
 
 
 namespace OVCC
diff --git a/libovcc/src/ovcc-sig-queue.vala b/libovcc/src/ovcc-sig-queue.vala
index 5f01ccb..0897a24 100644
--- a/libovcc/src/ovcc-sig-queue.vala
+++ b/libovcc/src/ovcc-sig-queue.vala
@@ -18,7 +18,6 @@
  * 
  */
 
-[compact]
 public class OVCC.SigQueue
 {
   private struct Entry {
diff --git a/libovccclient/src/ovccclient-server.vala b/libovccclient/src/ovccclient-server.vala
index 951de01..5825e68 100644
--- a/libovccclient/src/ovccclient-server.vala
+++ b/libovccclient/src/ovccclient-server.vala
@@ -318,9 +318,9 @@ namespace OVCCClient
         output = new DataOutputStream (connection.output_stream);
         listen_loop_cancel = new Cancellable ();
         send_loop_cancel = new Cancellable ();
-        listen_loop_thread = Thread.create<bool> (listen_loop, true);
+        listen_loop_thread = new Thread<bool>.try ("listen loop", listen_loop);
         send_loop_running = 1;
-        send_loop_thread = Thread.create<bool> (send_loop, true);
+        send_loop_thread = new Thread<bool>.try ("send loop", send_loop);
       } catch (IOError.CANCELLED c) {
         throw c;
       } catch (Error e) {
diff --git a/server/src/server.vala b/server/src/server.vala
index 4bc55a9..46bde0b 100644
--- a/server/src/server.vala
+++ b/server/src/server.vala
@@ -21,8 +21,8 @@
 using OVCC;
 using OVCC.Network;
 
-static const string TILES_FILE   = "tiles.xml";
-static const string TILESET_FILE = "tileset.xml";
+const string TILES_FILE   = "tiles.xml";
+const string TILESET_FILE = "tileset.xml";
 
 /* TODO: add a Source to be notified of incoming messages asynchronously */
 
-- 
GitLab