From: Erik Rozendaal Date: Thu, 16 Dec 2004 09:07:43 +0000 (+0000) Subject: util.h: Shut up splint. X-Git-Tag: release-0.50~665 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afe39823e19948c5fdb13cc907b3c2a28bd8dd70;p=thirdparty%2Fldns.git util.h: Shut up splint. --- diff --git a/util.h b/util.h index 49585e2e..6a1f4cdb 100644 --- a/util.h +++ b/util.h @@ -32,11 +32,17 @@ #define DEP printf("DEPRICATED FUNCTION!\n"); -/* TODO: is this a good way? */ /* * Copy data allowing for unaligned accesses in network byte order * (big endian). */ +#ifdef S_SPLINT_S + +uint16_t read_uint16(const void *src); +uint32_t read_uint32(const void *src); + +#else /* S_SPLINT_S */ + static inline uint16_t read_uint16(const void *src) { @@ -55,13 +61,15 @@ read_uint32(const void *src) return ntohl(*(uint32_t *) src); #else uint8_t *p = (uint8_t *) src; - return (((uint32_t) p[0] << 24) + return ( ((uint32_t) p[0] << 24) | ((uint32_t) p[1] << 16) | ((uint32_t) p[2] << 8) - | (uint32_t) p[3]); + | (uint32_t) p[3]); #endif } +#endif /* !S_SPLINT_S */ + /* prototypes */ void xprintf_rd_field(t_rdata_field *); void xprintf_rr(ldns_rr_type *);