license: Upgrade to GPL version 3 or later.

[upkg.git] / src / pack.c

diff --git a/src/pack.c b/src/pack.c
index e711de19dcb50722d0f5a3e1362c45f31eff1de0..c0a6aaee378f68b24859cbbd1e84cc10570b42fd 100644 (file)
--- a/src/pack.c
+++ b/src/pack.c
@@ -2,9 +2,9 @@
  *  upkg: tool for manipulating Unreal Tournament packages.
  *  Copyright (C) 2009 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -56,7 +55,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 +67,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 +96,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; \
 }