msys2 + fix logging

1 files changed, 172 insertions, 172 deletions

diff --git a/src/crypto.h b/src/crypto.h
index 886aeeb..3fb0e58 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -1,172 +1,172 @@
-#include "lua.h"
-#include "util.h"
-#include "hash/md5.h"
-#include "hash/sha01.h"
-#include "hash/sha2xx.h"
-#include "hash/pearson.h"
-#include "hash/xxh.h"
-#include "hash/adler.h"
-#include "hash/bsdchecksum.h"
-#include "hash/crc.h"
-#include "hash/fletcher.h"
-#include "hash/sysvchecksum.h"
-#include "hash/xor.h"
-#include "hash/buzhash.h"
-#include "hash/cityhash.h"
-#include "hash/djb2.h"
-#include "hash/farmhash.h"
-#include "hash/fasthash.h"
-#include "hash/fnv.h"
-#include "hash/jenkins.h"
-#include "hash/loselose.h"
-#include "hash/metrohash.h"
-#include "hash/murmur.h"
-#include "hash/pjw.h"
-#include "hash/sdbm.h"
-#include "hash/sha2-256.h"
-#include "hash/spookyhash.h"
-#include "hash/blake2.h"
-#include "hash/blake.h"
-
-#include "encode/uuencode.h"
-#include "encode/base64.h"
-#include "encode/baseN.h"
-
-uint8_t rotl8(uint8_t, uint8_t);
-uint16_t rotl16(uint16_t, uint16_t);
-unsigned rotl32(unsigned, unsigned);
-unsigned rotr32(unsigned, unsigned);
-uint64_t rotl64(uint64_t, uint64_t);
-uint64_t rotr64(uint64_t, uint64_t);
-
-int tp(lua_State*);
-
-#define common_hash_init_update(hashname) lua_common_hash_init_update(hashname, hashname)
-#define lua_common_hash_init_update(hashname, luaname) lua_common_hash_init(hashname, luaname) lua_common_hash_update(hashname, luaname)
-#define lua_common_hash_init(hashname, luaname) lua_common_hash_init_ni(hashname, luaname, hashname##_init())
-
-#define common_hash_clone(hashname) lua_common_hash_clone(hashname, hashname)
-#define lua_common_hash_clone(hashname, luaname) lua_common_hash_clone_oargs(hashname, luaname, l_##luaname##_init(L))
-#define lua_common_hash_clone_oargs(hashname, luaname, oinit)\
-int l_##luaname##_clone(lua_State* L){\
-  struct hashname##_hash* a = (struct hashname##_hash*)lua_touserdata(L, -1);\
-  oinit;\
-  struct hashname##_hash* b = (struct hashname##_hash*)lua_touserdata(L, -1);\
-  *b = *a;\
-  return 1;\
-}
-
-#define lua_common_hash_meta(luaname)\
-int _##luaname##_hash_add(lua_State*L){\
-    lua_pushvalue(L, 1);\
-    l_##luaname##_clone(L);\
-    lua_pushvalue(L, -1);\
-    lua_pushvalue(L, 2);\
-    return l_##luaname##_update(L);\
-  }\
-int _##luaname##_common_hash(lua_State* L){\
-    lua_newtable(L);\
-    int ti = lua_gettop(L);\
-    luaI_tsetcf(L, ti, "update", l_##luaname##_update);\
-    luaI_tsetcf(L, ti, "final", l_##luaname##_final);\
-    \
-    lua_pushvalue(L, 2);\
-    lua_gettable(L, ti);\
-    return 1;\
-  }
-
-#define lua_common_hash_meta_def(luaname)\
-  lua_newtable(L);\
-  int mt = lua_gettop(L);\
-  luaI_tsetcf(L, mt, "__index", _##luaname##_common_hash);\
-  luaI_tsetcf(L, mt, "__add", _##luaname##_hash_add);\
-  lua_pushvalue(L, mt);\
-  lua_setmetatable(L, ud);\
-
-#define lua_common_hash_init_ni(hashname, luaname, initf)\
- lua_common_hash_meta(luaname);\
- int l_##luaname##_init(lua_State* L){\
-  \
-  struct hashname##_hash* a = (struct hashname##_hash*)lua_newuserdata(L, sizeof * a);\
-  int ud = lua_gettop(L);\
-  *a = initf;\
-  lua_common_hash_meta_def(luaname);\
-  lua_pushvalue(L, ud);\
-  return 1;\
-}
-
-#define lua_common_hash_update(hashname, luaname)\
-int l_##luaname##_update(lua_State* L){\
-  struct hashname##_hash* a = (struct hashname##_hash*)lua_touserdata(L, -2);\
-  size_t len = 0;\
-  uint8_t* b = (uint8_t*)luaL_checklstring(L, -1, &len);\
-  \
-  hashname##_update(b, len, a);\
-  \
-  lua_pushvalue(L, -2);\
-  return 1;\
-}
-
-static const luaL_Reg crypto_function_list [] = {
-      {"setpearson",l_setpearson}, {"xxh64",l_xxh64},
-      {"xxh32",l_xxh32},  {"fletcher8",l_fletcher8},
-      {"fletcher16",l_fletcher16}, {"fletcher32",l_fletcher32},
-      {"setbuzhash",l_setbuzhash},
-      {"cityhash32", l_cityhash32},
-      {"cityhash64", l_cityhash64}, {"cityhash128", l_cityhash128}, 
-      {"farmhash32", l_farmhash32}, {"farmhash64", l_farmhash64},
-      {"fasthash32", l_fasthash32}, {"fasthash64", l_fasthash64},
-      {"loselose", l_loselose},
-      {"metrohash64_v1", l_metrohash64_v1}, {"metrohash64_v2", l_metrohash64_v2},
-      {"metrohash128_v1", l_metrohash128_v1}, {"metrohash128_v2", l_metrohash128_v2},
-      {"murmur1_32", l_murmur1_32}, {"murmur2_32", l_murmur2_32}, 
-      {"spookyhash128_v1", l_spookyhash128_v1}, {"spookyhash128_v2", l_spookyhash128_v2},
-      {"spookyhash64_v1", l_spookyhash64_v1}, {"spookyhash64_v2", l_spookyhash64_v2},
-      {"spookyhash32_v1", l_spookyhash32_v1}, {"spookyhash32_v2", l_spookyhash32_v2},
-      {"blake2b", l_blake2b}, 
-      {"blake512", l_blake512}, {"blake384", l_blake384},
-
-      {"adler32",l_adler32}, {"adler32_init",l_adler32_init}, {"adler32_update",l_adler32_update}, {"adler32_final",l_adler32_final},
-      {"bsdchecksum",l_bsdchecksum}, {"bsdchecksum_init",l_bsdchecksum_init}, {"bsdchecksum_update",l_bsdchecksum_update}, {"bsdchecksum_final",l_bsdchecksum_final},
-      {"buzhash8",l_buzhash8}, {"buzhash16",l_buzhash16},
-      {"crc8",l_crc8}, {"crc8_init",l_crc8_init}, {"crc8_update",l_crc8_update}, {"crc8_final",l_crc8_final},
-      {"crc16",l_crc16}, {"crc16_init",l_crc16_init}, {"crc16_update",l_crc16_update}, {"crc16_final",l_crc16_final},
-      {"crc32",l_crc32}, {"crc32_init",l_crc32_init}, {"crc32_update",l_crc32_update}, {"crc32_final",l_crc32_final},
-      {"djb2", l_djb2}, {"djb2_init", l_djb2_init}, {"djb2_update", l_djb2_update}, {"djb2_final", l_djb2_final},
-      {"fletcher8",l_fletcher8}, {"fletcher8_init",l_fletcher8_init}, {"fletcher8_update",l_fletcher8_update}, {"fletcher8_final",l_fletcher8_final},
-      {"fletcher16",l_fletcher16}, {"fletcher16_init",l_fletcher16_init}, {"fletcher16_update",l_fletcher16_update}, {"fletcher16_final",l_fletcher16_final},
-      {"fletcher32",l_fletcher32}, {"fletcher32_init",l_fletcher32_init}, {"fletcher32_update",l_fletcher32_update}, {"fletcher32_final",l_fletcher32_final},
-      {"fnv_0", l_fnv_0}, {"fnv_0_init", l_fnv_0_init}, {"fnv_0_update", l_fnv_0_update}, {"fnv_0_final", l_fnv_0_final},
-      {"fnv_1", l_fnv_1}, {"fnv_1_init", l_fnv_1_init}, {"fnv_1_update", l_fnv_1_update}, {"fnv_1_final", l_fnv_1_final},
-      {"fnv_a", l_fnv_a}, {"fnv_a_init", l_fnv_a_init}, {"fnv_a_update", l_fnv_a_update}, {"fnv_a_final", l_fnv_a_final},
-      {"oaat", l_oaat}, {"oaat_init", l_oaat_init}, {"oaat_update", l_oaat_update}, {"oaat_final", l_oaat_final},
-      {"loselose", l_loselose}, {"loselose_init", l_loselose_init}, {"loselose_update", l_loselose_update}, {"loselose_final", l_loselose_final},
-      {"pearson",l_pearson}, {"pearson_init",l_pearson_init}, {"pearson_update",l_pearson_update}, {"pearson_final",l_pearson_final},
-      {"pjw", l_pjw}, {"pjw_init", l_pjw_init}, {"pjw_update", l_pjw_update}, {"pjw_final", l_pjw_final},
-      {"sdbm", l_sdbm}, {"sdbm_init", l_sdbm_init}, {"sdbm_update", l_sdbm_update}, {"sdbm_final", l_sdbm_final},
-      {"sysvchecksum",l_sysvchecksum}, {"sysvchecksum_init",l_sysvchecksum_init}, {"sysvchecksum_update",l_sysvchecksum_update}, {"sysvchecksum_final",l_sysvchecksum_final},
-      {"xor8",l_xor8}, {"xor8_init",l_xor8_init}, {"xor8_update",l_xor8_update}, {"xor8_final",l_xor8_final},
-      {"md5",l_md5}, {"md5_init",l_md5_init}, {"md5_update",l_md5_update}, {"md5_final",l_md5_final},
-      {"sha0",l_sha0}, {"sha0_init",l_sha0_init}, {"sha0_update",l_sha0_update}, {"sha0_final",l_sha0_final},
-      {"sha1",l_sha1}, {"sha1_init",l_sha1_init}, {"sha1_update",l_sha1_update}, {"sha1_final",l_sha1_final},
-      {"sha512", l_sha512}, {"sha512_init", l_sha512_init}, {"sha512_update", l_sha512_update}, {"sha512_final", l_sha512_final},
-      {"sha384", l_sha384}, {"sha384_init", l_sha384_init}, {"sha384_update", l_sha384_update}, {"sha384_final", l_sha384_final},
-      {"sha512_t", l_sha512_t}, {"sha512_t_init", l_sha512_t_init}, {"sha512_t_update", l_sha512_t_update}, {"sha512_t_final", l_sha512_t_final},
-      {"sha256",l_sha256}, {"sha256_init",l_sha256_init}, {"sha256_update",l_sha256_update}, {"sha256_final",l_sha256_final},
-      {"sha224",l_sha224}, {"sha224_init",l_sha224_init}, {"sha224_update",l_sha224_update}, {"sha224_final",l_sha224_final},
-      {"blake256", l_blake256}, {"blake256_init", l_blake256_init}, {"blake256_update", l_blake256_update}, {"blake256_final", l_blake256_final},
-      {"blake224", l_blake224}, {"blake224_init", l_blake224_init}, {"blake224_update", l_blake224_update}, {"blake224_final", l_blake224_final},
-      {"blake512", l_blake512}, {"blake512_init", l_blake512_init}, {"blake512_update", l_blake512_update}, {"blake512_final", l_blake512_final},
-      {"blake384", l_blake384}, {"blake384_init", l_blake384_init}, {"blake384_update", l_blake384_update}, {"blake384_final", l_blake384_final},
-      {"blake2s", l_blake2s}, {"blake2s_init", l_blake2s_init}, {"blake2s_update", l_blake2s_update}, {"blake2s_final", l_blake2s_final}, 
-      {"uuencode",l_uuencode},
-      {"uudecode",l_uudecode},
-
-      {"base64encode",l_base64encode},
-      {"base64decode",l_base64decode},
-
-      {"baseconvert",l_baseconvert},
-
-      {NULL,NULL}
-};
-
+#include "lua.h"

+#include "util.h"

+#include "hash/md5.h"

+#include "hash/sha01.h"

+#include "hash/sha2xx.h"

+#include "hash/pearson.h"

+#include "hash/xxh.h"

+#include "hash/adler.h"

+#include "hash/bsdchecksum.h"

+#include "hash/crc.h"

+#include "hash/fletcher.h"

+#include "hash/sysvchecksum.h"

+#include "hash/xor.h"

+#include "hash/buzhash.h"

+#include "hash/cityhash.h"

+#include "hash/djb2.h"

+#include "hash/farmhash.h"

+#include "hash/fasthash.h"

+#include "hash/fnv.h"

+#include "hash/jenkins.h"

+#include "hash/loselose.h"

+#include "hash/metrohash.h"

+#include "hash/murmur.h"

+#include "hash/pjw.h"

+#include "hash/sdbm.h"

+#include "hash/sha2-256.h"

+#include "hash/spookyhash.h"

+#include "hash/blake2.h"

+#include "hash/blake.h"

+

+#include "encode/uuencode.h"

+#include "encode/base64.h"

+#include "encode/baseN.h"

+

+uint8_t rotl8(uint8_t, uint8_t);

+uint16_t rotl16(uint16_t, uint16_t);

+unsigned rotl32(unsigned, unsigned);

+unsigned rotr32(unsigned, unsigned);

+uint64_t rotl64(uint64_t, uint64_t);

+uint64_t rotr64(uint64_t, uint64_t);

+

+int tp(lua_State*);

+

+#define common_hash_init_update(hashname) lua_common_hash_init_update(hashname, hashname)

+#define lua_common_hash_init_update(hashname, luaname) lua_common_hash_init(hashname, luaname) lua_common_hash_update(hashname, luaname)

+#define lua_common_hash_init(hashname, luaname) lua_common_hash_init_ni(hashname, luaname, hashname##_init())

+

+#define common_hash_clone(hashname) lua_common_hash_clone(hashname, hashname)

+#define lua_common_hash_clone(hashname, luaname) lua_common_hash_clone_oargs(hashname, luaname, l_##luaname##_init(L))

+#define lua_common_hash_clone_oargs(hashname, luaname, oinit)\

+int l_##luaname##_clone(lua_State* L){\

+  struct hashname##_hash* a = (struct hashname##_hash*)lua_touserdata(L, -1);\

+  oinit;\

+  struct hashname##_hash* b = (struct hashname##_hash*)lua_touserdata(L, -1);\

+  *b = *a;\

+  return 1;\

+}

+

+#define lua_common_hash_meta(luaname)\

+int _##luaname##_hash_add(lua_State*L){\

+    lua_pushvalue(L, 1);\

+    l_##luaname##_clone(L);\

+    lua_pushvalue(L, -1);\

+    lua_pushvalue(L, 2);\

+    return l_##luaname##_update(L);\

+  }\

+int _##luaname##_common_hash(lua_State* L){\

+    lua_newtable(L);\

+    int ti = lua_gettop(L);\

+    luaI_tsetcf(L, ti, "update", l_##luaname##_update);\

+    luaI_tsetcf(L, ti, "final", l_##luaname##_final);\

+    \

+    lua_pushvalue(L, 2);\

+    lua_gettable(L, ti);\

+    return 1;\

+  }

+

+#define lua_common_hash_meta_def(luaname)\

+  lua_newtable(L);\

+  int mt = lua_gettop(L);\

+  luaI_tsetcf(L, mt, "__index", _##luaname##_common_hash);\

+  luaI_tsetcf(L, mt, "__add", _##luaname##_hash_add);\

+  lua_pushvalue(L, mt);\

+  lua_setmetatable(L, ud);\

+

+#define lua_common_hash_init_ni(hashname, luaname, initf)\

+ lua_common_hash_meta(luaname);\

+ int l_##luaname##_init(lua_State* L){\

+  \

+  struct hashname##_hash* a = (struct hashname##_hash*)lua_newuserdata(L, sizeof * a);\

+  int ud = lua_gettop(L);\

+  *a = initf;\

+  lua_common_hash_meta_def(luaname);\

+  lua_pushvalue(L, ud);\

+  return 1;\

+}

+

+#define lua_common_hash_update(hashname, luaname)\

+int l_##luaname##_update(lua_State* L){\

+  struct hashname##_hash* a = (struct hashname##_hash*)lua_touserdata(L, -2);\

+  size_t len = 0;\

+  uint8_t* b = (uint8_t*)luaL_checklstring(L, -1, &len);\

+  \

+  hashname##_update(b, len, a);\

+  \

+  lua_pushvalue(L, -2);\

+  return 1;\

+}

+

+static const luaL_Reg crypto_function_list [] = {

+      {"setpearson",l_setpearson}, {"xxh64",l_xxh64},

+      {"xxh32",l_xxh32},  {"fletcher8",l_fletcher8},

+      {"fletcher16",l_fletcher16}, {"fletcher32",l_fletcher32},

+      {"setbuzhash",l_setbuzhash},

+      {"cityhash32", l_cityhash32},

+      {"cityhash64", l_cityhash64}, {"cityhash128", l_cityhash128}, 

+      {"farmhash32", l_farmhash32}, {"farmhash64", l_farmhash64},

+      {"fasthash32", l_fasthash32}, {"fasthash64", l_fasthash64},

+      {"loselose", l_loselose},

+      {"metrohash64_v1", l_metrohash64_v1}, {"metrohash64_v2", l_metrohash64_v2},

+      {"metrohash128_v1", l_metrohash128_v1}, {"metrohash128_v2", l_metrohash128_v2},

+      {"murmur1_32", l_murmur1_32}, {"murmur2_32", l_murmur2_32}, 

+      {"spookyhash128_v1", l_spookyhash128_v1}, {"spookyhash128_v2", l_spookyhash128_v2},

+      {"spookyhash64_v1", l_spookyhash64_v1}, {"spookyhash64_v2", l_spookyhash64_v2},

+      {"spookyhash32_v1", l_spookyhash32_v1}, {"spookyhash32_v2", l_spookyhash32_v2},

+      {"blake2b", l_blake2b}, 

+      {"blake512", l_blake512}, {"blake384", l_blake384},

+

+      {"adler32",l_adler32}, {"adler32_init",l_adler32_init}, {"adler32_update",l_adler32_update}, {"adler32_final",l_adler32_final},

+      {"bsdchecksum",l_bsdchecksum}, {"bsdchecksum_init",l_bsdchecksum_init}, {"bsdchecksum_update",l_bsdchecksum_update}, {"bsdchecksum_final",l_bsdchecksum_final},

+      {"buzhash8",l_buzhash8}, {"buzhash16",l_buzhash16},

+      {"crc8",l_crc8}, {"crc8_init",l_crc8_init}, {"crc8_update",l_crc8_update}, {"crc8_final",l_crc8_final},

+      {"crc16",l_crc16}, {"crc16_init",l_crc16_init}, {"crc16_update",l_crc16_update}, {"crc16_final",l_crc16_final},

+      {"crc32",l_crc32}, {"crc32_init",l_crc32_init}, {"crc32_update",l_crc32_update}, {"crc32_final",l_crc32_final},

+      {"djb2", l_djb2}, {"djb2_init", l_djb2_init}, {"djb2_update", l_djb2_update}, {"djb2_final", l_djb2_final},

+      {"fletcher8",l_fletcher8}, {"fletcher8_init",l_fletcher8_init}, {"fletcher8_update",l_fletcher8_update}, {"fletcher8_final",l_fletcher8_final},

+      {"fletcher16",l_fletcher16}, {"fletcher16_init",l_fletcher16_init}, {"fletcher16_update",l_fletcher16_update}, {"fletcher16_final",l_fletcher16_final},

+      {"fletcher32",l_fletcher32}, {"fletcher32_init",l_fletcher32_init}, {"fletcher32_update",l_fletcher32_update}, {"fletcher32_final",l_fletcher32_final},

+      {"fnv_0", l_fnv_0}, {"fnv_0_init", l_fnv_0_init}, {"fnv_0_update", l_fnv_0_update}, {"fnv_0_final", l_fnv_0_final},

+      {"fnv_1", l_fnv_1}, {"fnv_1_init", l_fnv_1_init}, {"fnv_1_update", l_fnv_1_update}, {"fnv_1_final", l_fnv_1_final},

+      {"fnv_a", l_fnv_a}, {"fnv_a_init", l_fnv_a_init}, {"fnv_a_update", l_fnv_a_update}, {"fnv_a_final", l_fnv_a_final},

+      {"oaat", l_oaat}, {"oaat_init", l_oaat_init}, {"oaat_update", l_oaat_update}, {"oaat_final", l_oaat_final},

+      {"loselose", l_loselose}, {"loselose_init", l_loselose_init}, {"loselose_update", l_loselose_update}, {"loselose_final", l_loselose_final},

+      {"pearson",l_pearson}, {"pearson_init",l_pearson_init}, {"pearson_update",l_pearson_update}, {"pearson_final",l_pearson_final},

+      {"pjw", l_pjw}, {"pjw_init", l_pjw_init}, {"pjw_update", l_pjw_update}, {"pjw_final", l_pjw_final},

+      {"sdbm", l_sdbm}, {"sdbm_init", l_sdbm_init}, {"sdbm_update", l_sdbm_update}, {"sdbm_final", l_sdbm_final},

+      {"sysvchecksum",l_sysvchecksum}, {"sysvchecksum_init",l_sysvchecksum_init}, {"sysvchecksum_update",l_sysvchecksum_update}, {"sysvchecksum_final",l_sysvchecksum_final},

+      {"xor8",l_xor8}, {"xor8_init",l_xor8_init}, {"xor8_update",l_xor8_update}, {"xor8_final",l_xor8_final},

+      {"md5",l_md5}, {"md5_init",l_md5_init}, {"md5_update",l_md5_update}, {"md5_final",l_md5_final},

+      {"sha0",l_sha0}, {"sha0_init",l_sha0_init}, {"sha0_update",l_sha0_update}, {"sha0_final",l_sha0_final},

+      {"sha1",l_sha1}, {"sha1_init",l_sha1_init}, {"sha1_update",l_sha1_update}, {"sha1_final",l_sha1_final},

+      {"sha512", l_sha512}, {"sha512_init", l_sha512_init}, {"sha512_update", l_sha512_update}, {"sha512_final", l_sha512_final},

+      {"sha384", l_sha384}, {"sha384_init", l_sha384_init}, {"sha384_update", l_sha384_update}, {"sha384_final", l_sha384_final},

+      {"sha512_t", l_sha512_t}, {"sha512_t_init", l_sha512_t_init}, {"sha512_t_update", l_sha512_t_update}, {"sha512_t_final", l_sha512_t_final},

+      {"sha256",l_sha256}, {"sha256_init",l_sha256_init}, {"sha256_update",l_sha256_update}, {"sha256_final",l_sha256_final},

+      {"sha224",l_sha224}, {"sha224_init",l_sha224_init}, {"sha224_update",l_sha224_update}, {"sha224_final",l_sha224_final},

+      {"blake256", l_blake256}, {"blake256_init", l_blake256_init}, {"blake256_update", l_blake256_update}, {"blake256_final", l_blake256_final},

+      {"blake224", l_blake224}, {"blake224_init", l_blake224_init}, {"blake224_update", l_blake224_update}, {"blake224_final", l_blake224_final},

+      {"blake512", l_blake512}, {"blake512_init", l_blake512_init}, {"blake512_update", l_blake512_update}, {"blake512_final", l_blake512_final},

+      {"blake384", l_blake384}, {"blake384_init", l_blake384_init}, {"blake384_update", l_blake384_update}, {"blake384_final", l_blake384_final},

+      {"blake2s", l_blake2s}, {"blake2s_init", l_blake2s_init}, {"blake2s_update", l_blake2s_update}, {"blake2s_final", l_blake2s_final}, 

+      {"uuencode",l_uuencode},

+      {"uudecode",l_uudecode},

+

+      {"base64encode",l_base64encode},

+      {"base64decode",l_base64decode},

+

+      {"baseconvert",l_baseconvert},

+

+      {NULL,NULL}

+};

+