Better packing / unpacking code

 Godbolted for x86_64 with gcc and clang.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/libstddjb/uint64_unpack.c b/src/libstddjb/uint64_unpack.c
index 452d3ea..ca7aad9 100644
--- a/src/libstddjb/uint64_unpack.c
+++ b/src/libstddjb/uint64_unpack.c
@@ -1,17 +1,11 @@
 /* ISC license. */
 
+#include <string.h>
 #include <skalibs/uint64.h>
-#include <skalibs/bytestr.h>
 
 void uint64_unpack (char const *s, uint64_t *u)
 {
-  uint64_t r = T8((unsigned char)s[7]) ; r <<= 8 ;
-  r += T8((unsigned char)s[6]) ; r <<= 8 ;
-  r += T8((unsigned char)s[5]) ; r <<= 8 ;
-  r += T8((unsigned char)s[4]) ; r <<= 8 ;
-  r += T8((unsigned char)s[3]) ; r <<= 8 ;
-  r += T8((unsigned char)s[2]) ; r <<= 8 ;
-  r += T8((unsigned char)s[1]) ; r <<= 8 ;
-  r += T8((unsigned char)s[0]) ;
-  *u = r ;
+  uint64_t x ;
+  memcpy(&x, s, sizeof(uint64_t)) ;
+  *u = uint64_little(x) ;
 }