X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/a6f1f69cc4874e2f2f878289bfc0f677220dfda9..5fe7c42921be9f911805b4006f59a0910c9404d0:/src/pack.c?ds=sidebyside

diff --git a/src/pack.c b/src/pack.c
index e711de1..9f4998f 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -56,7 +56,7 @@ DEFPACK_LE(64, unsigned long long)
 #endif
 
 #define DEFUNPACK_BE(bits, type) type unpack_ ## bits ## _be ( \
-	unsigned char *in \
+	const unsigned char *in \
 ) { \
 	type v = 0; \
 	unsigned i; \
@@ -68,7 +68,7 @@ DEFPACK_LE(64, unsigned long long)
 }
 
 #define DEFUNPACK_LE(bits, type) type unpack_ ## bits ## _le ( \
-	unsigned char *in \
+	const unsigned char *in \
 ) { \
 	type v = 0; \
 	unsigned i; \
@@ -97,29 +97,27 @@ DEFUNPACK_LE(64, unsigned long long)
  */
 
 #define DEFUNPACK_SBE(bits, max, type) type unpack_s ## bits ## _be ( \
-	unsigned char *in \
+	const unsigned char *in \
 ) { \
 	type v = 0; \
 	unsigned i; \
 	int sign = (in[0] & 0x80) ? 1 : 0; \
-	in[0] &= 0x7f; \
 	for (i = 0; i < bits/8; i++) { \
 		v *= 256; \
-		v += in[i]; \
+		v += in[i] & (i == 0 ? 0x7f : 0xff); \
 	} \
 	return sign*(-max-1) + v; \
 }
 
 #define DEFUNPACK_SLE(bits, max, type) type unpack_s ## bits ## _le ( \
-	unsigned char *in \
+	const unsigned char *in \
 ) { \
 	type v = 0; \
 	unsigned i; \
 	int sign = (in[bits/8 - 1] & 0x80) ? 1 : 0; \
-	in[bits/8 - 1] &= 0x7f; \
 	for (i = 1; i <= bits/8; i++) { \
 		v *= 256; \
-		v += in[bits/8 - i]; \
+		v += in[bits/8 - i] & (i == 1 ? 0x7f : 0xff); \
 	} \
 	return sign*(-max-1) + v; \
 }