Manual merge 79a60b9

admin/Admin.h

@@ -24,7 +24,7 @@
 #include "util/UniqueName.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("admin/Admin.c");
+Linker_require("admin/Admin.c")
 
 #include <stdbool.h>
 

admin/AdminLog.h

@@ -21,7 +21,7 @@
 #include "util/log/Log.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("admin/AdminLog.c");
+Linker_require("admin/AdminLog.c")
 
 struct Log* AdminLog_registerNew(struct Admin* admin,
                                  struct Allocator* alloc,

admin/AuthorizedPasswords.h

@@ -19,7 +19,7 @@
 #include "crypto/CryptoAuth.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("admin/AuthorizedPasswords.c");
+Linker_require("admin/AuthorizedPasswords.c")
 
 /**
  * Init the AuthorizedPasswords admin function.

admin/angel/Core.h

@@ -22,7 +22,7 @@
 #include "tunnel/IpTunnel.h"
 #include "util/events/FakeNetwork.h"
 #include "util/Linker.h"
-Linker_require("admin/angel/Core.c");
+Linker_require("admin/angel/Core.c")
 
 void Core_initTunnel(String* desiredDeviceName,
                      struct Sockaddr* addr,

admin/angel/InterfaceWaiter.h

@@ -20,7 +20,7 @@
 #include "interface/Iface.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("admin/angel/InterfaceWaiter.c");
+Linker_require("admin/angel/InterfaceWaiter.c")
 
 /**
  * Wait for incoming data on an interface.

benc/Dict.h

@@ -18,7 +18,7 @@
 #include "memory/Allocator.h"
 #include "benc/Object.h"
 #include "util/Linker.h"
-Linker_require("benc/Dict.c");
+Linker_require("benc/Dict.c")
 
 struct Dict_Entry;
 struct Dict_Entry {

benc/List.h

@@ -18,7 +18,7 @@
 #include "memory/Allocator.h"
 #include "benc/Object.h"
 #include "util/Linker.h"
-Linker_require("benc/List.c");
+Linker_require("benc/List.c")
 
 struct List_Item;
 struct List_Item {

benc/String.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/CString.h"
 #include "util/Linker.h"
-Linker_require("benc/String.c");
+Linker_require("benc/String.c")
 
 #include <stdbool.h>
 #include <stddef.h> // NULL

benc/serialization/cloner/Cloner.h

@@ -20,7 +20,7 @@
 #include "benc/Dict.h"
 #include "benc/String.h"
 #include "util/Linker.h"
-Linker_require("benc/serialization/cloner/Cloner.c");
+Linker_require("benc/serialization/cloner/Cloner.c")
 
 Dict* Cloner_cloneDict(Dict* orig, struct Allocator* alloc);
 

benc/serialization/json/JsonBencMessageReader.h

@@ -20,7 +20,7 @@
 #include "memory/Allocator.h"
 #include "wire/Message.h"
 #include "util/Linker.h"
-Linker_require("benc/serialization/json/JsonBencMessageReader.c");
+Linker_require("benc/serialization/json/JsonBencMessageReader.c")
 
 #include <stdbool.h>
 

benc/serialization/json/JsonBencSerializer.h

@@ -17,7 +17,7 @@
 
 #include "benc/serialization/BencSerializer.h"
 #include "util/Linker.h"
-Linker_require("benc/serialization/json/JsonBencSerializer.c");
+Linker_require("benc/serialization/json/JsonBencSerializer.c")
 
 const struct BencSerializer* JsonBencSerializer_get(void);
 #endif

benc/serialization/standard/BencMessageReader.h

@@ -20,7 +20,7 @@
 #include "memory/Allocator.h"
 #include "wire/Message.h"
 #include "util/Linker.h"
-Linker_require("benc/serialization/standard/BencMessageReader.c");
+Linker_require("benc/serialization/standard/BencMessageReader.c")
 
 Er_DEFUN(Dict* BencMessageReader_read(struct Message* msg, struct Allocator* alloc));
 

benc/serialization/standard/BencMessageWriter.h

@@ -19,7 +19,7 @@
 #include "exception/Except.h"
 #include "wire/Message.h"
 #include "util/Linker.h"
-Linker_require("benc/serialization/standard/BencMessageWriter.c");
+Linker_require("benc/serialization/standard/BencMessageWriter.c")
 
 Er_DEFUN(void BencMessageWriter_write(Dict* toWrite, struct Message* msg));
 

client/AdminClient.h

@@ -23,7 +23,7 @@
 #include "util/events/EventBase.h"
 #include "util/platform/Sockaddr.h"
 #include "util/Linker.h"
-Linker_require("client/AdminClient.c");
+Linker_require("client/AdminClient.c")
 
 enum AdminClient_Error
 {

client/Configurator.h

@@ -22,7 +22,7 @@
 #include "util/events/EventBase.h"
 #include "util/platform/Sockaddr.h"
 #include "util/Linker.h"
-Linker_require("client/Configurator.c");
+Linker_require("client/Configurator.c")
 
 #include <stdint.h>
 

crypto/AddressCalc.h

@@ -16,7 +16,7 @@
 #define AddressCalc_H
 
 #include "util/Linker.h"
-Linker_require("crypto/AddressCalc.c");
+Linker_require("crypto/AddressCalc.c")
 
 #include <stdint.h>
 #include <stdbool.h>

crypto/CryptoAuth.h

@@ -24,7 +24,7 @@
 #include "util/events/EventBase.h"
 #include "wire/Message.h"
 #include "util/Linker.h"
-Linker_require("crypto/CryptoAuth.c");
+Linker_require("crypto/CryptoAuth.c")
 
 #include <stdint.h>
 #include <stdbool.h>

crypto/Key.h

@@ -19,7 +19,7 @@
 #include "crypto/random/Random.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("crypto/Key.c");
+Linker_require("crypto/Key.c")
 
 #include <stdint.h>
 

crypto/Sign.c

@@ -20,43 +20,43 @@
 #include "crypto/sign/crypto_sign_ed25519.h"
 #include "crypto/sign/ge.h"
 #include "crypto/sign/sc.h"
-Linker_require("./crypto/sign/fe_0.c");
-Linker_require("./crypto/sign/fe_1.c");
-Linker_require("./crypto/sign/fe_add.c");
-Linker_require("./crypto/sign/fe_cmov.c");
-Linker_require("./crypto/sign/fe_copy.c");
-Linker_require("./crypto/sign/fe_frombytes.c");
-Linker_require("./crypto/sign/fe_invert.c");
-Linker_require("./crypto/sign/fe_isnegative.c");
-Linker_require("./crypto/sign/fe_isnonzero.c");
-Linker_require("./crypto/sign/fe_mul.c");
-Linker_require("./crypto/sign/fe_neg.c");
-Linker_require("./crypto/sign/fe_pow22523.c");
-Linker_require("./crypto/sign/fe_sq.c");
-Linker_require("./crypto/sign/fe_sq2.c");
-Linker_require("./crypto/sign/fe_sub.c");
-Linker_require("./crypto/sign/fe_tobytes.c");
-Linker_require("./crypto/sign/ge_add.c");
-Linker_require("./crypto/sign/ge_double_scalarmult.c");
-Linker_require("./crypto/sign/ge_frombytes.c");
-Linker_require("./crypto/sign/ge_madd.c");
-Linker_require("./crypto/sign/ge_msub.c");
-Linker_require("./crypto/sign/ge_p1p1_to_p2.c");
-Linker_require("./crypto/sign/ge_p1p1_to_p3.c");
-Linker_require("./crypto/sign/ge_p2_0.c");
-Linker_require("./crypto/sign/ge_p2_dbl.c");
-Linker_require("./crypto/sign/ge_p3_0.c");
-Linker_require("./crypto/sign/ge_p3_dbl.c");
-Linker_require("./crypto/sign/ge_p3_to_cached.c");
-Linker_require("./crypto/sign/ge_p3_to_p2.c");
-Linker_require("./crypto/sign/ge_p3_tobytes.c");
-Linker_require("./crypto/sign/ge_precomp_0.c");
-Linker_require("./crypto/sign/ge_scalarmult_base.c");
-Linker_require("./crypto/sign/ge_sub.c");
-Linker_require("./crypto/sign/ge_tobytes.c");
-Linker_require("./crypto/sign/sc_muladd.c");
-Linker_require("./crypto/sign/sc_reduce.c");
-Linker_require("./crypto/sign/open.c");
+Linker_require("./crypto/sign/fe_0.c")
+Linker_require("./crypto/sign/fe_1.c")
+Linker_require("./crypto/sign/fe_add.c")
+Linker_require("./crypto/sign/fe_cmov.c")
+Linker_require("./crypto/sign/fe_copy.c")
+Linker_require("./crypto/sign/fe_frombytes.c")
+Linker_require("./crypto/sign/fe_invert.c")
+Linker_require("./crypto/sign/fe_isnegative.c")
+Linker_require("./crypto/sign/fe_isnonzero.c")
+Linker_require("./crypto/sign/fe_mul.c")
+Linker_require("./crypto/sign/fe_neg.c")
+Linker_require("./crypto/sign/fe_pow22523.c")
+Linker_require("./crypto/sign/fe_sq.c")
+Linker_require("./crypto/sign/fe_sq2.c")
+Linker_require("./crypto/sign/fe_sub.c")
+Linker_require("./crypto/sign/fe_tobytes.c")
+Linker_require("./crypto/sign/ge_add.c")
+Linker_require("./crypto/sign/ge_double_scalarmult.c")
+Linker_require("./crypto/sign/ge_frombytes.c")
+Linker_require("./crypto/sign/ge_madd.c")
+Linker_require("./crypto/sign/ge_msub.c")
+Linker_require("./crypto/sign/ge_p1p1_to_p2.c")
+Linker_require("./crypto/sign/ge_p1p1_to_p3.c")
+Linker_require("./crypto/sign/ge_p2_0.c")
+Linker_require("./crypto/sign/ge_p2_dbl.c")
+Linker_require("./crypto/sign/ge_p3_0.c")
+Linker_require("./crypto/sign/ge_p3_dbl.c")
+Linker_require("./crypto/sign/ge_p3_to_cached.c")
+Linker_require("./crypto/sign/ge_p3_to_p2.c")
+Linker_require("./crypto/sign/ge_p3_tobytes.c")
+Linker_require("./crypto/sign/ge_precomp_0.c")
+Linker_require("./crypto/sign/ge_scalarmult_base.c")
+Linker_require("./crypto/sign/ge_sub.c")
+Linker_require("./crypto/sign/ge_tobytes.c")
+Linker_require("./crypto/sign/sc_muladd.c")
+Linker_require("./crypto/sign/sc_reduce.c")
+Linker_require("./crypto/sign/open.c")
 
 // This is fairly streight forward, we're taking a curve25519 private key and
 // interpreting it as an ed25519 key. This works in conjunction with the public

crypto/Sign.h

@@ -18,7 +18,7 @@
 #include "crypto/random/Random.h"
 #include "wire/Message.h"
 #include "util/Linker.h"
-Linker_require("crypto/Sign.c");
+Linker_require("crypto/Sign.c")
 
 void Sign_signingKeyPairFromCurve25519(uint8_t keypairOut[64], uint8_t secretCryptoKey[32]);
 

crypto/Sign_admin.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "crypto/random/Random.h"
 #include "util/Linker.h"
-Linker_require("crypto/Sign_admin.c");
+Linker_require("crypto/Sign_admin.c")
 
 void Sign_admin_register(uint8_t* privateKey,
                          struct Admin* admin,

crypto/random/Random.h

@@ -20,7 +20,7 @@
 #include "util/log/Log.h"
 #include "crypto/random/seed/RandomSeed.h"
 #include "util/Linker.h"
-Linker_require("crypto/random/Random.c");
+Linker_require("crypto/random/Random.c")
 
 #include <stdint.h>
 

crypto/random/nanotime/NanotimeEntropyProvider.h

@@ -20,8 +20,7 @@
 #include "util/events/EventBase.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("crypto/random/nanotime/NanotimeEntropyProvider.c");
-
+Linker_require("crypto/random/nanotime/NanotimeEntropyProvider.c")
 struct NanotimeEntropyProvider;
 
 void NanotimeEntropyProvider_start(struct Random* provideTo,

crypto/random/seed/BsdKernArndSysctlRandomSeed.h

@@ -21,7 +21,7 @@
 #include "util/Linker.h"
 
 #if defined(freebsd)
-    Linker_require("crypto/random/seed/BsdKernArndSysctlRandomSeed.c");
+    Linker_require("crypto/random/seed/BsdKernArndSysctlRandomSeed.c")
     struct RandomSeed* BsdKernArndSysctlRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(BsdKernArndSysctlRandomSeed_new)
 #endif

crypto/random/seed/DevUrandomRandomSeed.h

@@ -21,7 +21,7 @@
 #include "util/Linker.h"
 
 #ifndef win32
-    Linker_require("crypto/random/seed/DevUrandomRandomSeed.c");
+    Linker_require("crypto/random/seed/DevUrandomRandomSeed.c")
     struct RandomSeed* DevUrandomRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(DevUrandomRandomSeed_new)
 #endif

crypto/random/seed/GetEntropyRandomSeed.h

@@ -34,7 +34,7 @@
 #endif
 
 #ifdef GetEntropyRandomSeed_USEIT
-    Linker_require("crypto/random/seed/GetEntropyRandomSeed.c");
+    Linker_require("crypto/random/seed/GetEntropyRandomSeed.c")
     struct RandomSeed* GetEntropyRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(GetEntropyRandomSeed_new)
 #endif

crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.h

@@ -21,7 +21,7 @@
 #include "util/Linker.h"
 
 #if defined(linux) && !defined(__ILP32__) && !defined(__aarch64__) && defined(__GLIBC__)
-    Linker_require("crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c");
+    Linker_require("crypto/random/seed/LinuxRandomUuidSysctlRandomSeed.c")
     struct RandomSeed* LinuxRandomUuidSysctlRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(LinuxRandomUuidSysctlRandomSeed_new)
 #endif

crypto/random/seed/ProcSysKernelRandomUuidRandomSeed.h

@@ -21,7 +21,7 @@
 #include "util/Linker.h"
 
 #ifdef linux
-    Linker_require("crypto/random/seed/ProcSysKernelRandomUuidRandomSeed.c");
+    Linker_require("crypto/random/seed/ProcSysKernelRandomUuidRandomSeed.c")
     struct RandomSeed* ProcSysKernelRandomUuidRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(ProcSysKernelRandomUuidRandomSeed_new)
 #endif

crypto/random/seed/RandomSeed.h

@@ -18,7 +18,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("crypto/random/seed/RandomSeed.c");
+Linker_require("crypto/random/seed/RandomSeed.c")
 
 #include <stdint.h>
 

crypto/random/seed/RtlGenRandomSeed.h

@@ -21,7 +21,7 @@
 #include "util/Linker.h"
 
 #ifdef win32
-    Linker_require("crypto/random/seed/RtlGenRandomSeed.c");
+    Linker_require("crypto/random/seed/RtlGenRandomSeed.c")
     struct RandomSeed* RtlGenRandomSeed_new(struct Allocator* alloc);
     RandomSeedProvider_register(RtlGenRandomSeed_new)
 #endif

crypto/random/seed/SystemRandomSeed.h

@@ -18,7 +18,7 @@
 #include "crypto/random/seed/RandomSeed.h"
 #include "crypto/random/seed/SystemRandomSeed.h"
 #include "util/Linker.h"
-Linker_require("crypto/random/seed/SystemRandomSeed.c");
+Linker_require("crypto/random/seed/SystemRandomSeed.c")
 
 /**
  * Create a new randomseed with the default system providers as well as optionally more providers

crypto/random/test/DeterminentRandomSeed.h

@@ -18,7 +18,7 @@
 #include "crypto/random/seed/RandomSeed.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("crypto/random/test/DeterminentRandomSeed.c");
+Linker_require("crypto/random/test/DeterminentRandomSeed.c")
 
 struct RandomSeed* DeterminentRandomSeed_new(struct Allocator* alloc, uint8_t buff[64]);
 

dht/Address.h

@@ -18,7 +18,7 @@
 #include "benc/String.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/Address.c");
+Linker_require("dht/Address.c")
 
 #include <stdint.h>
 #include <stdbool.h>

dht/DHTModuleRegistry.h

@@ -27,7 +27,7 @@
 #include "benc/Object.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("dht/DHTModuleRegistry.c");
+Linker_require("dht/DHTModuleRegistry.c")
 
 
 /** State of the registry. */

dht/EncodingSchemeModule.h

@@ -23,7 +23,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("dht/EncodingSchemeModule.c");
+Linker_require("dht/EncodingSchemeModule.c")
 
 void EncodingSchemeModule_register(struct DHTModuleRegistry* reg,
                                    struct Log* logger,

dht/Pathfinder.h

@@ -25,7 +25,7 @@
 #include "crypto/random/Random.h"
 #include "admin/Admin.h"
 #include "util/Linker.h"
-Linker_require("dht/Pathfinder.c");
+Linker_require("dht/Pathfinder.c")
 
 struct Pathfinder
 {

dht/ReplyModule.h

@@ -21,7 +21,7 @@
 
 #include "dht/DHTModuleRegistry.h"
 #include "util/Linker.h"
-Linker_require("dht/ReplyModule.c");
+Linker_require("dht/ReplyModule.c")
 
 /**
  * The reply module replies to all incoming queries.

dht/SerializationModule.h

@@ -22,7 +22,7 @@
 #include "util/log/Log.h"
 #include "dht/DHTModuleRegistry.h"
 #include "util/Linker.h"
-Linker_require("dht/SerializationModule.c");
+Linker_require("dht/SerializationModule.c")
 
 /**
  * Register a new SerializationModule.

dht/dhtcore/Janitor.h

@@ -29,7 +29,7 @@
 #include "util/events/EventBase.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/Janitor.c");
+Linker_require("dht/dhtcore/Janitor.c")
 
 #include <stdint.h>
 

dht/dhtcore/Janitor_admin.h

@@ -23,7 +23,7 @@
 #include "admin/Admin.h"
 #include "dht/dhtcore/Janitor.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/Janitor_admin.c");
+Linker_require("dht/dhtcore/Janitor_admin.c")
 
 void Janitor_admin_register(struct Janitor* janitor, struct Admin* admin, struct Allocator* alloc);
 

dht/dhtcore/Node.h

@@ -24,7 +24,7 @@
 #include "memory/Allocator.h"
 #include "util/Identity.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/Node.c");
+Linker_require("dht/dhtcore/Node.c")
 
 struct Node_Link;
 

dht/dhtcore/NodeStore.h

@@ -27,7 +27,7 @@
 #include "switch/EncodingScheme.h"
 #include "util/Linker.h"
 #include "util/events/EventBase.h"
-Linker_require("dht/dhtcore/NodeStore.c");
+Linker_require("dht/dhtcore/NodeStore.c")
 
 #include <stdint.h>
 #include <stdbool.h>

dht/dhtcore/NodeStore_admin.h

@@ -23,7 +23,7 @@
 #include "dht/dhtcore/NodeStore.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/NodeStore_admin.c");
+Linker_require("dht/dhtcore/NodeStore_admin.c")
 
 void NodeStore_admin_register(struct NodeStore* module,
                               struct Admin* admin,

dht/dhtcore/ReplySerializer.h

@@ -20,7 +20,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/ReplySerializer.c");
+Linker_require("dht/dhtcore/ReplySerializer.c")
 
 /**
  * For serializing and parsing responses to getPeers and search requests.

dht/dhtcore/Router.h

@@ -23,7 +23,7 @@
 #include "memory/Allocator.h"
 #include "dht/dhtcore/Node.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/Router.c");
+Linker_require("dht/dhtcore/Router.c")
 
 /**
  * This is a facad around the other internals of dht/dhtcore.

dht/dhtcore/RouterModule.h

@@ -28,7 +28,7 @@
 #include "util/log/Log.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/RouterModule.c");
+Linker_require("dht/dhtcore/RouterModule.c")
 
 #include <stdint.h>
 #include <stdbool.h>

dht/dhtcore/RouterModule_admin.h

@@ -24,7 +24,7 @@
 #include "dht/dhtcore/Router.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/RouterModule_admin.c");
+Linker_require("dht/dhtcore/RouterModule_admin.c")
 
 void RouterModule_admin_register(struct RouterModule* module,
                                  struct Router* router,

dht/dhtcore/RumorMill.h

@@ -24,7 +24,7 @@
 #include "util/log/Log.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/RumorMill.c");
+Linker_require("dht/dhtcore/RumorMill.c")
 
 /**
  * The rumor mill is for new nodes which have been discovered by search and getPeers requests

dht/dhtcore/RumorMill_admin.h

@@ -24,7 +24,7 @@
 #include "util/log/Log.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/RumorMill.c");
+Linker_require("dht/dhtcore/RumorMill.c")
 
 struct RumorMill_admin
 {

dht/dhtcore/SearchRunner.h

@@ -27,7 +27,7 @@
 #include "util/Bits.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/SearchRunner.c");
+Linker_require("dht/dhtcore/SearchRunner.c")
 
 struct SearchRunner_SearchData
 {

dht/dhtcore/SearchRunner_admin.h

@@ -23,7 +23,7 @@
 #include "dht/dhtcore/SearchRunner.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/SearchRunner_admin.c");
+Linker_require("dht/dhtcore/SearchRunner_admin.c")
 
 void SearchRunner_admin_register(struct SearchRunner* runner,
                                  struct Admin* admin,

dht/dhtcore/SearchStore.h

@@ -24,7 +24,7 @@
 #include "benc/Object.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/SearchStore.c");
+Linker_require("dht/dhtcore/SearchStore.c")
 
 #include <stdint.h>
 

dht/dhtcore/VersionList.h

@@ -18,7 +18,7 @@
 #include "benc/String.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("dht/dhtcore/VersionList.c");
+Linker_require("dht/dhtcore/VersionList.c")
 
 #include <stdint.h>
 

exception/Er.h

@@ -20,7 +20,7 @@
 #include "util/Js.h"
 
 #include "util/Linker.h"
-Linker_require("exception/Er.c");
+Linker_require("exception/Er.c")
 
 struct Er_Ret
 {

exception/Except.h

@@ -18,7 +18,7 @@
 #include "exception/Er.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("exception/Except.c");
+Linker_require("exception/Except.c")
 
 #define Except_BUFFER_SZ 1024
 

exception/WinEr.h

@@ -17,7 +17,7 @@
 
 #include "exception/Er.h"
 #include "util/Gcc.h"
-Linker_require("exception/WinEr.c");
+Linker_require("exception/WinEr.c")
 
 char* WinEr_strerror(long status);
 

exception/WinFail.h

@@ -0,0 +1,48 @@
+/* vim: set expandtab ts=4 sw=4: */
+/*
+ * You may redistribute this program and/or modify it under the terms of
+ * the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef WinFail_H
+#define WinFail_H
+
+#include "exception/Except.h"
+#include "util/Gcc.h"
+#include "util/Linker.h"
+Linker_require("exception/WinFail.c")
+
+Gcc_NORETURN
+void WinFail_fail(struct Except* eh, const char* msg, long status);
+
+Gcc_NORETURN
+void WinFail_failWithLastError(struct Except* eh, const char* msg);
+
+char* WinFail_strerror(long status);
+
+#define WinFail_check(eh, expr) \
+    do {                                              \
+        long status = (expr);                         \
+        if (status != ERROR_SUCCESS) {                \
+            WinFail_fail(eh, #expr, status);          \
+        }                                             \
+    } while (0)
+// CHECKFILES_IGNORE expected ;
+
+#define WinFail_assert(eh, expr) \
+    do {                                              \
+        if (!(expr)) {                                \
+            WinFail_failWithLastError(eh, #expr);     \
+        }                                             \
+    } while (0)
+// CHECKFILES_IGNORE expected ;
+
+#endif

interface/ASynchronizer.h

@@ -20,7 +20,7 @@
 #include "util/log/Log.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/ASynchronizer.c");
+Linker_require("interface/ASynchronizer.c")
 
 struct ASynchronizer
 {

interface/ETHInterface.h

@@ -24,7 +24,7 @@
 #include "util/log/Log.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/ETHInterface_" + builder.config.systemName + ".c");
+Linker_require("interface/ETHInterface_" + builder.config.systemName + ".c")
 
 struct ETHInterface_Header
 {

interface/ETHInterface_admin.h

@@ -21,7 +21,7 @@
 #include "util/log/Log.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("interface/ETHInterface_admin.c");
+Linker_require("interface/ETHInterface_admin.c")
 
 void ETHInterface_admin_register(struct EventBase* base,
                                  struct Allocator* alloc,

interface/FramingIface.h

@@ -18,7 +18,7 @@
 #include "interface/Iface.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/FramingIface.c");
+Linker_require("interface/FramingIface.c")
 
 /**
  * Framed message format:

interface/UDPInterface.h

@@ -27,7 +27,7 @@
 #include "memory/Allocator.h"
 #include "util/events/UDPAddrIface.h"
 #include "util/Linker.h"
-Linker_require("interface/UDPInterface.c");
+Linker_require("interface/UDPInterface.c")
 
 struct UDPInterface_BroadcastHeader
 {

interface/UDPInterface_admin.h

@@ -23,7 +23,7 @@
 #include "util/events/FakeNetwork.h"
 #include "util/GlobalConfig.h"
 #include "util/Linker.h"
-Linker_require("interface/UDPInterface_admin.c");
+Linker_require("interface/UDPInterface_admin.c")
 
 void UDPInterface_admin_register(struct EventBase* base,
                                  struct Allocator* allocator,

interface/addressable/AddrIfaceAdapter.h

@@ -18,7 +18,7 @@
 #include "interface/addressable/AddrIface.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/addressable/AddrIfaceAdapter.c");
+Linker_require("interface/addressable/AddrIfaceAdapter.c")
 
 struct AddrIfaceAdapter
 {

interface/addressable/AddrIfaceMuxer.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("interface/addressable/AddrIfaceMuxer.c");
+Linker_require("interface/addressable/AddrIfaceMuxer.c")
 
 struct AddrIfaceMuxer
 {

interface/addressable/PacketHeaderToUDPAddrIface.h

@@ -20,7 +20,7 @@
 #include "memory/Allocator.h"
 #include "util/platform/Sockaddr.h"
 #include "util/Linker.h"
-Linker_require("interface/addressable/PacketHeaderToUDPAddrIface.c");
+Linker_require("interface/addressable/PacketHeaderToUDPAddrIface.c")
 
 struct PacketHeaderToUDPAddrIface
 {

interface/tuntap/ARPServer.h

@@ -20,7 +20,7 @@
 #include "util/log/Log.h"
 #include "wire/Ethernet.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/ARPServer.c");
+Linker_require("interface/tuntap/ARPServer.c")
 
 struct ARPServer
 {

interface/tuntap/AndroidWrapper.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/AndroidWrapper.c");
+Linker_require("interface/tuntap/AndroidWrapper.c")
 
 struct AndroidWrapper
 {

interface/tuntap/BSDMessageTypeWrapper.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/BSDMessageTypeWrapper.c");
+Linker_require("interface/tuntap/BSDMessageTypeWrapper.c")
 
 struct BSDMessageTypeWrapper
 {

interface/tuntap/NDPServer.h

@@ -20,7 +20,7 @@
 #include "util/log/Log.h"
 #include "wire/Ethernet.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/NDPServer.c");
+Linker_require("interface/tuntap/NDPServer.c")
 
 struct NDPServer
 {

interface/tuntap/SocketInterface.h

@@ -21,7 +21,7 @@
 #include "interface/Iface.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/SocketInterface.c");
+Linker_require("interface/tuntap/SocketInterface.c")
 
 #include <stdbool.h>
 

interface/tuntap/SocketWrapper.h

@@ -24,7 +24,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/SocketWrapper.c");
+Linker_require("interface/tuntap/SocketWrapper.c")
 
 struct SocketWrapper
 {

interface/tuntap/TAPWrapper.h

@@ -20,7 +20,7 @@
 #include "util/log/Log.h"
 #include "wire/Ethernet.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/TAPWrapper.c");
+Linker_require("interface/tuntap/TAPWrapper.c")
 
 struct TAPWrapper
 {

interface/tuntap/TUNInterface.h

@@ -21,7 +21,7 @@
 #include "util/events/EventBase.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/TUNInterface_" + builder.config.systemName + ".c");
+Linker_require("interface/tuntap/TUNInterface_" + builder.config.systemName + ".c")
 
 /**
  * This is the maximum size that will be accepted as an interface name.

interface/tuntap/test/TUNTools.h

@@ -21,7 +21,7 @@
 #include "util/platform/Sockaddr.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/test/TUNTools.c");
+Linker_require("interface/tuntap/test/TUNTools.c")
 
 struct TUNTools;
 

interface/tuntap/windows/TAPDevice.h

@@ -18,7 +18,7 @@
 #include "exception/Er.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/windows/TAPDevice.c");
+Linker_require("interface/tuntap/windows/TAPDevice.c")
 
 struct TAPDevice
 {

interface/tuntap/windows/TAPInterface.h

@@ -21,7 +21,7 @@
 #include "util/log/Log.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("interface/tuntap/windows/TAPInterface.c");
+Linker_require("interface/tuntap/windows/TAPInterface.c")
 
 struct TAPInterface
 {

io/ArrayReader.h

@@ -18,7 +18,7 @@
 #include "io/Reader.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("io/ArrayReader.c");
+Linker_require("io/ArrayReader.c")
 
 /**
  * Create a new Reader which reads a user supplied buffer.

io/ArrayWriter.h

@@ -18,7 +18,7 @@
 #include "io/Writer.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("io/ArrayWriter.c");
+Linker_require("io/ArrayWriter.c")
 
 /**
  * Create a new Writer which writes to a user supplied buffer.

io/FileReader.h

@@ -18,7 +18,7 @@
 #include "io/Reader.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("io/FileReader.c");
+Linker_require("io/FileReader.c")
 
 #include <stdio.h>
 

io/FileWriter.h

@@ -18,7 +18,7 @@
 #include "io/Writer.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("io/FileWriter.c");
+Linker_require("io/FileWriter.c")
 #include <stdio.h>
 
 /**

memory/Allocator.h

@@ -18,7 +18,7 @@
 #include "util/Identity.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("memory/Allocator.c");
+Linker_require("memory/Allocator.c")
 
 #include <stdint.h>
 

memory/Allocator_admin.h

@@ -17,7 +17,7 @@
 #include "admin/Admin.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("memory/Allocator_admin.c");
+Linker_require("memory/Allocator_admin.c")
 
 void Allocator_admin_register(struct Allocator* alloc, struct Admin* admin);
 

memory/BufferAllocator.h

@@ -19,7 +19,7 @@
 #include "util/UniqueName.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("memory/BufferAllocator.c");
+Linker_require("memory/BufferAllocator.c")
 
 /**
  * Create a new Allocator which allocates from to a user supplied buffer.

memory/MallocAllocator.h

@@ -18,7 +18,7 @@
 #include "memory/Allocator.h"
 #include "util/Gcc.h"
 #include "util/Linker.h"
-Linker_require("memory/MallocAllocator.c");
+Linker_require("memory/MallocAllocator.c")
 
 /**
  * Create a new Allocator which is a wrapper around malloc().

net/Benchmark.h

@@ -16,7 +16,7 @@
 #define Benchmark_H
 
 #include "util/Linker.h"
-Linker_require("net/Benchmark.c");
+Linker_require("net/Benchmark.c")
 
 void Benchmark_runAll(void);
 #endif

net/ControlHandler.h

@@ -19,7 +19,7 @@
 #include "util/log/Log.h"
 #include "net/EventEmitter.h"
 #include "util/Linker.h"
-Linker_require("net/ControlHandler.c");
+Linker_require("net/ControlHandler.c")
 
 struct ControlHandler
 {

net/EventEmitter.h

@@ -20,7 +20,7 @@
 #include "wire/PFChan.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("net/EventEmitter.c");
+Linker_require("net/EventEmitter.c")
 
 struct EventEmitter
 {

net/InterfaceController.h

@@ -26,7 +26,7 @@
 #include "util/platform/Sockaddr.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("net/InterfaceController.c");
+Linker_require("net/InterfaceController.c")
 
 #include <stdint.h>
 #include <stdbool.h>

net/InterfaceController_admin.h

@@ -19,7 +19,7 @@
 #include "net/InterfaceController.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("net/InterfaceController_admin.c");
+Linker_require("net/InterfaceController_admin.c")
 
 void InterfaceController_admin_register(struct InterfaceController* ic,
                                         struct Admin* admin,

net/NetCore.h

@@ -31,7 +31,7 @@
 #include "net/UpperDistributor.h"
 #include "net/TUNAdapter.h"
 #include "util/Linker.h"
-Linker_require("net/NetCore.c");
+Linker_require("net/NetCore.c")
 
 struct NetCore
 {

net/PeerLink.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/events/EventBase.h"
 #include "util/Linker.h"
-Linker_require("net/PeerLink.c");
+Linker_require("net/PeerLink.c")
 
 #include <stdbool.h>
 

net/SessionManager.h

@@ -23,7 +23,7 @@
 #include "wire/SwitchHeader.h"
 #include "wire/CryptoHeader.h"
 #include "util/Linker.h"
-Linker_require("net/SessionManager.c");
+Linker_require("net/SessionManager.c")
 
 /**
  * Purpose of this module is to take packets from "the inside" which contain ipv6 address and

net/SessionManager_admin.h

@@ -19,7 +19,7 @@
 #include "net/SessionManager.h"
 #include "memory/Allocator.h"
 #include "util/Linker.h"
-Linker_require("net/SessionManager_admin.c");
+Linker_require("net/SessionManager_admin.c")
 
 void SessionManager_admin_register(struct SessionManager* sm,
                                    struct Admin* admin,

net/SwitchPinger.h

@@ -22,7 +22,7 @@
 #include "util/events/EventBase.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("net/SwitchPinger.c");
+Linker_require("net/SwitchPinger.c")
 
 #include <stdint.h>
 

net/SwitchPinger_admin.h

@@ -23,7 +23,7 @@
 #include "net/SwitchPinger.h"
 #include "util/Endian.h"
 #include "util/Linker.h"
-Linker_require("net/SwitchPinger_admin.c");
+Linker_require("net/SwitchPinger_admin.c")
 
 void SwitchPinger_admin_register(struct SwitchPinger* sp,
                                  struct Admin* admin,

net/TUNAdapter.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("net/TUNAdapter.c");
+Linker_require("net/TUNAdapter.c")
 
 struct TUNAdapter
 {

net/UpperDistributor.h

@@ -20,7 +20,7 @@
 #include "net/EventEmitter.h"
 #include "util/log/Log.h"
 #include "util/Linker.h"
-Linker_require("net/UpperDistributor.c");
+Linker_require("net/UpperDistributor.c")
 
 /**
  * Connects the TUN, DHT and IpTunnel (and other?) handlers to the SessionManager.

net/UpperDistributor_admin.h

@@ -19,7 +19,7 @@
 #include "memory/Allocator.h"
 #include "net/UpperDistributor.h"
 #include "util/Linker.h"
-Linker_require("net/UpperDistributor_admin.c");
+Linker_require("net/UpperDistributor_admin.c")
 
 void UpperDistributor_admin_register(struct UpperDistributor* ud,
                                      struct Admin* admin,

subnode/AddrSet.h

@@ -18,7 +18,7 @@
 #include "memory/Allocator.h"
 #include "dht/Address.h"
 #include "util/Linker.h"
-Linker_require("subnode/AddrSet.c");
+Linker_require("subnode/AddrSet.c")
 
 struct AddrSet
 {