fixed hashes and net stuff

9 files changed, 19 insertions, 16 deletions

diff --git a/src/hash/cityhash.c b/src/hash/cityhash.c
index 46bb1ed..f32453d 100644
--- a/src/hash/cityhash.c
+++ b/src/hash/cityhash.c
@@ -411,7 +411,7 @@ int l_cityhash64(lua_State* L){
   char digest[64];
 
   uint64_t u = cityhash64(a, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -424,7 +424,7 @@ int l_cityhash128(lua_State* L){
 
   uint64_t u1, u2;
   cityhash128(a, len, &u1, &u2);
-  sprintf(digest,"%08lx%08lx",u1, u2);
+  sprintf(digest,"%08llx%08llx",u1, u2);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/farmhash.c b/src/hash/farmhash.c
index 6533eb4..95047ee 100644
--- a/src/hash/farmhash.c
+++ b/src/hash/farmhash.c
@@ -163,7 +163,7 @@ int l_farmhash64(lua_State* L){
   char digest[64];
 
   uint64_t u = farmhash64(a, len);
-  sprintf(digest,"%08lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/fasthash.c b/src/hash/fasthash.c
index 0ac2cc0..993a22a 100644
--- a/src/hash/fasthash.c
+++ b/src/hash/fasthash.c
@@ -62,7 +62,7 @@ int l_fasthash64(lua_State* L){
   char digest[64];
 
   uint64_t u = fasthash64(a, len, seed);
-  sprintf(digest,"%08lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/fnv.c b/src/hash/fnv.c
index ac1f88b..9d5c646 100644
--- a/src/hash/fnv.c
+++ b/src/hash/fnv.c
@@ -32,7 +32,7 @@ int l_fnv_0(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_0);
-  sprintf(digest,"%08lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -44,7 +44,7 @@ int l_fnv_1(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_1);
-  sprintf(digest,"%08lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -56,7 +56,7 @@ int l_fnv_a(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_a);
-  sprintf(digest,"%08lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/fnv.h b/src/hash/fnv.h
index 029abcc..74f1722 100644
--- a/src/hash/fnv.h
+++ b/src/hash/fnv.h
@@ -1,9 +1,12 @@
 #include "../lua.h"
+#include "stdint.h"
 
 enum fnv_version {
     v_1, v_a, v_0
 };
 
+uint64_t fnv_1(uint8_t*, size_t, enum fnv_version);
+
 int l_fnv_1(lua_State*);
 int l_fnv_a(lua_State*);
 int l_fnv_0(lua_State*);
diff --git a/src/hash/metrohash.c b/src/hash/metrohash.c
index 9ce08b3..4e59f81 100644
--- a/src/hash/metrohash.c
+++ b/src/hash/metrohash.c
@@ -174,7 +174,7 @@ int l_metrohash64_v1(lua_State* L){
   char digest[64];
 
   uint64_t u = metrohash64(a, len, seed, v1);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -189,7 +189,7 @@ int l_metrohash64_v2(lua_State* L){
   char digest[64];
 
   uint64_t u = metrohash64(a, len, seed, v2);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -205,7 +205,7 @@ int l_metrohash128_v1(lua_State* L){
 
   uint64_t u1, u2;
   metrohash128(a, len, seed, &u1, &u2, v1);
-  sprintf(digest,"%016lx%016lx",u1,u2);
+  sprintf(digest,"%016llx%016llx",u1,u2);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -221,7 +221,7 @@ int l_metrohash128_v2(lua_State* L){
 
   uint64_t u1, u2;
   metrohash128(a, len, seed, &u1, &u2, v2);
-  sprintf(digest,"%016lx%016lx",u1,u2);
+  sprintf(digest,"%016llx%016llx",u1,u2);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/sdbm.c b/src/hash/sdbm.c
index d913d01..0c10289 100644
--- a/src/hash/sdbm.c
+++ b/src/hash/sdbm.c
@@ -21,7 +21,7 @@ int l_sdbm(lua_State* L){
   char digest[64];
 
   uint64_t u = sdbm(a, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/sha2-256.c b/src/hash/sha2-256.c
index e343825..d0c03f9 100644
--- a/src/hash/sha2-256.c
+++ b/src/hash/sha2-256.c
@@ -160,20 +160,20 @@ void sha2_512_t(uint8_t* out, uint8_t* in, int t){
     if(t%8!=0) return;
     uint64_t out_stream[8] = {0};
     sha512_gen(out_stream, in, sha_iv_gen(t));
-    for(int i = 0; i != 8; i++) sprintf((char*)out, "%s%016lx", out, out_stream[i]);
+    for(int i = 0; i != 8; i++) sprintf((char*)out, "%s%016llx", out, out_stream[i]);
     out[t/4] = '\0';
 }
 
 void sha2_512(uint8_t* out, uint8_t* in){
     uint64_t out_stream[8] = {0};
     sha512_gen(out_stream, in, sha512_iv);
-    for(int i = 0; i != 8; i++) sprintf((char*)out, "%s%016lx", out, out_stream[i]);
+    for(int i = 0; i != 8; i++) sprintf((char*)out, "%s%016llx", out, out_stream[i]);
 }
 
 void sha2_384(uint8_t* out, uint8_t* in){
     uint64_t out_stream[8] = {0};
     sha512_gen(out_stream, in, sha384_iv);
-    for(int i = 0; i != 6; i++) sprintf((char*)out, "%s%016lx", out, out_stream[i]);
+    for(int i = 0; i != 6; i++) sprintf((char*)out, "%s%016llx", out, out_stream[i]);
 }
 
 int l_sha512(lua_State* L){ 
diff --git a/src/hash/xxh.c b/src/hash/xxh.c
index 74cb202..deb9709 100644
--- a/src/hash/xxh.c
+++ b/src/hash/xxh.c
@@ -129,7 +129,7 @@ int l_xxh64(lua_State* L){
   char digest[64];
 
   uint64_t u = i_xxhash64(a, seed, len);
-  sprintf(digest,"%lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
 
   return 1;