diff options
Diffstat (limited to 'lib/num.h')
| -rw-r--r-- | lib/num.h | 28 |
1 files changed, 11 insertions, 17 deletions
@@ -28,11 +28,6 @@ #include <minmax.h> #include <byteswap.h> -int _gnutls_uint64pp(gnutls_uint64 *); -int _gnutls_uint48pp(gnutls_uint64 *); - -#define UINT64DATA(x) ((x).i) - inline static uint32_t _gnutls_uint24touint32(uint24 num) { uint32_t ret = 0; @@ -71,6 +66,17 @@ inline static uint32_t _gnutls_read_uint24(const uint8_t * data) return res; } +inline static uint64_t _gnutls_read_uint64(const uint8_t * data) +{ + uint64_t res; + + memcpy(&res, data, sizeof(uint64_t)); +#ifndef WORDS_BIGENDIAN + res = bswap_64(res); +#endif + return res; +} + inline static void _gnutls_write_uint64(uint64_t num, uint8_t * data) { #ifndef WORDS_BIGENDIAN @@ -150,16 +156,4 @@ inline static uint16_t _gnutls_conv_uint16(uint16_t data) #endif } -inline static uint32_t _gnutls_uint64touint32(const gnutls_uint64 * num) -{ - uint32_t ret; - - memcpy(&ret, &num->i[4], 4); -#ifndef WORDS_BIGENDIAN - ret = bswap_32(ret); -#endif - - return ret; -} - #endif /* GNUTLS_LIB_NUM_H */ |