diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-01-01 20:09:50 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-01-01 20:45:00 +0000 |
| commit | 43792592cae9e380c317691904d0c8a7cec370d1 (patch) | |
| tree | 82ac38c7ca61c455bcab539b0bc343173bc2693f | |
| parent | 5fbcb9a1fa3c212f6bca8094454ec61ccb926b3b (diff) | |
endian: Added 64-bit integer read function
| -rw-r--r-- | lib/curl_endian.c | 37 | ||||
| -rw-r--r-- | lib/curl_endian.h | 11 |
2 files changed, 46 insertions, 2 deletions
diff --git a/lib/curl_endian.c b/lib/curl_endian.c index 2d291c84c..7ce2646d4 100644 --- a/lib/curl_endian.c +++ b/lib/curl_endian.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -63,6 +63,41 @@ unsigned int Curl_read32_le(unsigned char *buf) } /* + * Curl_read64_le() + * + * This function converts a 64-bit integer from the little endian format, as + * used in the incoming package to whatever endian format we're using + * natively. + * + * Parameters: + * + * buf [in] - A pointer to a 8 byte buffer. + * + * Returns the integer. + */ +#if defined(HAVE_LONGLONG) +unsigned long long Curl_read64_le(unsigned char *buf) +{ + return ((unsigned long long)buf[0]) | + ((unsigned long long)buf[1] << 8) | + ((unsigned long long)buf[2] << 16) | + ((unsigned long long)buf[3] << 24) | + ((unsigned long long)buf[4] << 32) | + ((unsigned long long)buf[5] << 40) | + ((unsigned long long)buf[6] << 48) | + ((unsigned long long)buf[7] << 54); +} +#else +unsigned __int64 Curl_read64_le(unsigned char *buf) +{ + return ((unsigned __int64)buf[0]) | ((unsigned __int64)buf[1] << 8) | + ((unsigned __int64)buf[2] << 16) | ((unsigned __int64)buf[3] << 24) | + ((unsigned __int64)buf[4] << 32) | ((unsigned __int64)buf[5] << 40) | + ((unsigned __int64)buf[6] << 48) | ((unsigned __int64)buf[7] << 54); +} +#endif + +/* * Curl_write16_le() * * This function converts a 16-bit integer from the native endian format, diff --git a/lib/curl_endian.h b/lib/curl_endian.h index 79eb3e8f6..47a7ae6b8 100644 --- a/lib/curl_endian.h +++ b/lib/curl_endian.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -28,6 +28,15 @@ unsigned short Curl_read16_le(unsigned char *buf); /* Converts a 32-bit integer from little endian */ unsigned int Curl_read32_le(unsigned char *buf); +#if (CURL_SIZEOF_CURL_OFF_T > 4) +/* Converts a 64-bit integer from little endian */ +#if defined(HAVE_LONGLONG) +unsigned long long Curl_read64_le(unsigned char *buf); +#else +unsigned __int64 Curl_read64_le(unsigned char *buf); +#endif +#endif + /* Converts a 16-bit integer to little endian */ void Curl_write16_le(const short value, unsigned char *buffer); |