* Stores the result in *val and returns the number of input bytes read (or 0
* if the input is invalid, in which case *val is undefined).
*/
-size_t upkg_decode_index(long *val, unsigned char *bytes, size_t n)
+size_t upkg_decode_index(long *val, const unsigned char *bytes, size_t n)
{
- size_t i = 0;
-
*val = 0;
- while (i < MIN(n, 5)) {
+
+ for (size_t i = 0; i < MIN(n, 5); i++) {
/*
* Least significant bytes are first, so we need to do this
* nonsense.
*val += tmp;
if (!(bytes[i] & (i == 0 ? 0x40 : 0x80))) {
- i++;
- break;
+ if (bytes[0] & 0x80)
+ *val = -*val;
+ return i+1;
}
-
- i++;
}
- if (i > MIN(n, 5) || n == 0)
- return 0;
- if (bytes[0] & 0x80)
- *val = -*val;
- return i;
+ /* Error */
+ return 0;
}
static struct upkg_priv *init_upkg(unsigned char hdr[static UPKG_HDR_SIZE])