X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Flibcollectdclient%2Fnetwork_parse.c;h=a8f6bd61c8b541a20451c122a9b8b0195448730b;hp=49b1a007b8920f079b8afcf0f7ef8788e905dcea;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=4c4988b1c5d33ed70b2d6d6e5a4eae13cab9255b diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c index 49b1a007..a8f6bd61 100644 --- a/src/libcollectdclient/network_parse.c +++ b/src/libcollectdclient/network_parse.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -45,22 +46,7 @@ #elif HAVE_SYS_ENDIAN_H #include #else /* fallback */ -__attribute__((const)) static uint16_t be16toh(uint16_t n) { - uint8_t tmp[2]; - memmove(tmp, &n, sizeof(tmp)); - - return ((uint16_t)tmp[0] << 8) | ((uint16_t)tmp[1] << 0); -} - -__attribute__((const)) static uint64_t be64toh(uint64_t n) { - uint8_t tmp[8]; - memmove(tmp, &n, sizeof(tmp)); - - return ((uint64_t)tmp[0] << 56) | ((uint64_t)tmp[1] << 48) | - ((uint64_t)tmp[2] << 40) | ((uint64_t)tmp[3] << 32) | - ((uint64_t)tmp[4] << 24) | ((uint64_t)tmp[5] << 16) | - ((uint64_t)tmp[6] << 8) | ((uint64_t)tmp[7] << 0); -} +#include "collectd/stdendian.h" #endif #if HAVE_GCRYPT_H @@ -83,7 +69,7 @@ static int network_parse(void *data, size_t data_size, lcc_security_level_t sl, lcc_network_parse_options_t const *opts); #if HAVE_GCRYPT_H -static int init_gcrypt() { +static int init_gcrypt(void) { /* http://lists.gnupg.org/pipermail/gcrypt-devel/2003-August/000458.html * Because you can't know in a library whether another library has * already initialized the library */ @@ -235,7 +221,7 @@ static int parse_time(uint16_t type, void *payload, size_t payload_size, static double ntohd(double val) /* {{{ */ { - static int config = 0; + static int config; union { uint8_t byte[8];