diff options
author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
---|---|---|
committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-22 16:29:54 +0000 |
commit | c1210321e7aeb274076b14fc2f622edf442246fa (patch) | |
tree | bcbbf4eda53cdb8257bbc7add4616e01e31b1ae2 /include/asterisk/frame.h | |
parent | 2d9ba021dd38039616c82a4e317f652abe246ba3 (diff) |
- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause
- make data member of the ast_frame struct a named union instead of a void
Recently the ast_queue_hangup function got a new parameter, the hangupcause
Feedback came in that this is no good and that instead a new function should be created.
This I did.
The hangupcause was stored in the seqno member of the ast_frame struct. This is not very
elegant, and since there's already a data member that one should be used.
Problem is, this member was a void *.
Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone
wants to store another type in there in the future.
This commit is so massive, because all ast_frame.data uses have to be
altered to ast_frame.data.data
Thanks russellb and kpfleming for the feedback.
(closes issue #12674)
Reported by: mvanbaak
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/frame.h')
-rw-r--r-- | include/asterisk/frame.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 0cd748c03..e638b7d8c 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -156,7 +156,7 @@ struct ast_frame { /*! Optional source of frame for debugging */ const char *src; /*! Pointer to actual data */ - void *data; + union { void *ptr; uint32_t uint32; char pad[8]; } data; /*! Global delivery time */ struct timeval delivery; /*! For placing in a linked list */ @@ -181,7 +181,7 @@ struct ast_frame { */ #define AST_FRAME_SET_BUFFER(fr, _base, _ofs, _datalen) \ { \ - (fr)->data = (char *)_base + (_ofs); \ + (fr)->data.ptr = (char *)_base + (_ofs); \ (fr)->offset = (_ofs); \ (fr)->datalen = (_datalen); \ } @@ -446,9 +446,9 @@ void ast_swapcopy_samples(void *dst, const void *src, int samples); little-endian and big-endian. */ #if __BYTE_ORDER == __LITTLE_ENDIAN #define ast_frame_byteswap_le(fr) do { ; } while(0) -#define ast_frame_byteswap_be(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data, __f->data, __f->samples); } while(0) +#define ast_frame_byteswap_be(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data.ptr, __f->data.ptr, __f->samples); } while(0) #else -#define ast_frame_byteswap_le(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data, __f->data, __f->samples); } while(0) +#define ast_frame_byteswap_le(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data.ptr, __f->data.ptr, __f->samples); } while(0) #define ast_frame_byteswap_be(fr) do { ; } while(0) #endif |