From f330fb4783c8bcf539de71cd38aebfff9256d478 Mon Sep 17 00:00:00 2001 From: Russell Bryant <russell@russellbryant.com> Date: Tue, 11 Dec 2007 16:29:29 +0000 Subject: [PATCH] * In unaligned.h, remove some unnecessary casts and mark the arg of the get_unaligned functions as const * In event.c, use get_unaligned_uint32() in a couple of places to fix issues on architectures that don't allow unaligned access git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92305 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/unaligned.h | 20 ++++++++++---------- main/event.c | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/asterisk/unaligned.h b/include/asterisk/unaligned.h index 16791d6f03..c502efede4 100644 --- a/include/asterisk/unaligned.h +++ b/include/asterisk/unaligned.h @@ -29,43 +29,43 @@ extern "C" { #ifdef __GNUC__ /* If we just tell GCC what's going on, we can trust it to behave optimally */ -static inline unsigned int get_unaligned_uint32(void *p) +static inline unsigned int get_unaligned_uint32(const void *p) { - struct { unsigned int d; } __attribute__((packed)) *pp = (void *)p; + const struct { unsigned int d; } __attribute__((packed)) *pp = p; return pp->d; } -static inline unsigned short get_unaligned_uint16(void *p) +static inline unsigned short get_unaligned_uint16(const void *p) { - struct { unsigned short d; } __attribute__((packed)) *pp = (void *)p; + const struct { unsigned short d; } __attribute__((packed)) *pp = p; return pp->d; } static inline void put_unaligned_uint32(void *p, unsigned int datum) { - struct { unsigned int d; } __attribute__((packed)) *pp = (void *)p; + struct { unsigned int d; } __attribute__((packed)) *pp = p; pp->d = datum; } static inline void put_unaligned_uint16(void *p, unsigned short datum) { - struct { unsigned short d; } __attribute__((packed)) *pp = (void *)p; + struct { unsigned short d; } __attribute__((packed)) *pp = p; pp->d = datum; } #elif defined(SOLARIS) && defined(__sparc__) -static inline unsigned int get_unaligned_uint32(void *p) +static inline unsigned int get_unaligned_uint32(const void *p) { - unsigned char *cp = p; + const unsigned char *cp = p; return (cp[0] << 24) | (cp[1] << 16) | (cp[2] << 8) | cp[3]; } -static inline unsigned short get_unaligned_uint16(void *p) +static inline unsigned short get_unaligned_uint16(const void *p) { - unsigned char *cp = p; + const unsigned char *cp = p; return (cp[0] << 8) | cp[1] ; } diff --git a/main/event.c b/main/event.c index be0d3f2865..333b628a10 100644 --- a/main/event.c +++ b/main/event.c @@ -32,6 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/linkedlists.h" #include "asterisk/lock.h" #include "asterisk/utils.h" +#include "asterisk/unaligned.h" /* Only use one thread for now to ensure ordered delivery */ #define NUM_EVENT_THREADS 1 @@ -392,7 +393,7 @@ enum ast_event_ie_type ast_event_iterator_get_ie_type(struct ast_event_iterator uint32_t ast_event_iterator_get_ie_uint(struct ast_event_iterator *iterator) { - return ntohl(*iterator->ie->ie_payload); + return ntohl(get_unaligned_uint32(iterator->ie->ie_payload)); } const char *ast_event_iterator_get_ie_str(struct ast_event_iterator *iterator) @@ -416,7 +417,7 @@ uint32_t ast_event_get_ie_uint(const struct ast_event *event, enum ast_event_ie_ ie_val = ast_event_get_ie_raw(event, ie_type); - return ie_val ? ntohl(*ie_val) : 0; + return ie_val ? ntohl(get_unaligned_uint32(ie_val)) : 0; } const char *ast_event_get_ie_str(const struct ast_event *event, enum ast_event_ie_type ie_type) -- GitLab