From 45923c08b00ccdfd888caf6d2b555a137c563988 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 18 Oct 2017 16:13:24 +0000
Subject:  Better packing / unpacking code

 Godbolted for x86_64 with gcc and clang.
---
 src/libstddjb/uint16_unpack_big.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libstddjb/uint16_unpack_big.c')

diff --git a/src/libstddjb/uint16_unpack_big.c b/src/libstddjb/uint16_unpack_big.c
index 73b94da..3f6f0df 100644
--- a/src/libstddjb/uint16_unpack_big.c
+++ b/src/libstddjb/uint16_unpack_big.c
@@ -1,12 +1,12 @@
 /* ISC license. */
 
 #include <stdint.h>
+#include <string.h>
 #include <skalibs/uint16.h>
-#include <skalibs/bytestr.h>
 
 void uint16_unpack_big (char const *s, uint16_t *u)
 {
-  uint16_t r = T8((unsigned char)s[0]) ; r <<= 8 ;
-  r += T8((unsigned char)s[1]) ;
-  *u = r ;
+  uint16_t x ;
+  memcpy(&x, s, sizeof(uint16_t)) ;
+  *u = uint16_big(x) ;
 }
-- 
cgit v1.2.3