summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
13950b2)
Also change the unpack functions to use pointer to const unsigned char
so that this sort of problem doesn't happen in the future.
#endif
#define DEFUNPACK_BE(bits, type) type unpack_ ## bits ## _be ( \
#endif
#define DEFUNPACK_BE(bits, type) type unpack_ ## bits ## _be ( \
+ const unsigned char *in \
) { \
type v = 0; \
unsigned i; \
) { \
type v = 0; \
unsigned i; \
}
#define DEFUNPACK_LE(bits, type) type unpack_ ## bits ## _le ( \
}
#define DEFUNPACK_LE(bits, type) type unpack_ ## bits ## _le ( \
+ const unsigned char *in \
) { \
type v = 0; \
unsigned i; \
) { \
type v = 0; \
unsigned i; \
*/
#define DEFUNPACK_SBE(bits, max, type) type unpack_s ## bits ## _be ( \
*/
#define DEFUNPACK_SBE(bits, max, type) type unpack_s ## bits ## _be ( \
+ const unsigned char *in \
) { \
type v = 0; \
unsigned i; \
int sign = (in[0] & 0x80) ? 1 : 0; \
) { \
type v = 0; \
unsigned i; \
int sign = (in[0] & 0x80) ? 1 : 0; \
for (i = 0; i < bits/8; i++) { \
v *= 256; \
for (i = 0; i < bits/8; i++) { \
v *= 256; \
+ v += in[i] & (i == 0 ? 0x7f : 0xff); \
} \
return sign*(-max-1) + v; \
}
#define DEFUNPACK_SLE(bits, max, type) type unpack_s ## bits ## _le ( \
} \
return sign*(-max-1) + v; \
}
#define DEFUNPACK_SLE(bits, max, type) type unpack_s ## bits ## _le ( \
+ const unsigned char *in \
) { \
type v = 0; \
unsigned i; \
int sign = (in[bits/8 - 1] & 0x80) ? 1 : 0; \
) { \
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; \
for (i = 1; i <= bits/8; i++) { \
v *= 256; \
+ v += in[bits/8 - i] & (i == 1 ? 0x7f : 0xff); \
} \
return sign*(-max-1) + v; \
}
} \
return sign*(-max-1) + v; \
}
void pack_64_le(unsigned char *, unsigned long long);
#endif
void pack_64_le(unsigned char *, unsigned long long);
#endif
-unsigned short unpack_16_be(unsigned char *);
-unsigned long unpack_32_be(unsigned char *);
+unsigned short unpack_16_be(const unsigned char *);
+unsigned long unpack_32_be(const unsigned char *);
-unsigned long long unpack_64_be(unsigned char *);
+unsigned long long unpack_64_be(const unsigned char *);
-unsigned short unpack_16_le(unsigned char *);
-unsigned long unpack_32_le(unsigned char *);
+unsigned short unpack_16_le(const unsigned char *);
+unsigned long unpack_32_le(const unsigned char *);
-unsigned long long unpack_64_le(unsigned char *);
+unsigned long long unpack_64_le(const unsigned char *);
-short unpack_s16_be(unsigned char *);
-long unpack_s32_be(unsigned char *);
+short unpack_s16_be(const unsigned char *);
+long unpack_s32_be(const unsigned char *);
-long long unpack_s64_be(unsigned char *);
+long long unpack_s64_be(const unsigned char *);
-short unpack_s16_le(unsigned char *);
-long unpack_s32_le(unsigned char *);
+short unpack_s16_le(const unsigned char *);
+long unpack_s32_le(const unsigned char *);
-long long unpack_s64_le(unsigned char *);
+long long unpack_s64_le(const unsigned char *);