From f1e9371da8b502999b9aec1db7f68635395a7b6a Mon Sep 17 00:00:00 2001 From: Michiel van Baak Date: Thu, 22 May 2008 16:29:54 +0000 Subject: - 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: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/file.c') diff --git a/main/file.c b/main/file.c index 81d51e9a2..86efb6000 100644 --- a/main/file.c +++ b/main/file.c @@ -1193,7 +1193,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon, case AST_FRAME_VOICE: /* Write audio if appropriate */ if (audiofd > -1) - write(audiofd, fr->data, fr->datalen); + write(audiofd, fr->data.ptr, fr->datalen); default: /* Ignore all others */ break; -- cgit v1.2.3