From c1210321e7aeb274076b14fc2f622edf442246fa Mon Sep 17 00:00:00 2001 From: mvanbaak 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: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b --- main/app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/app.c') diff --git a/main/app.c b/main/app.c index 0cd6ba844..ebdd237b3 100644 --- a/main/app.c +++ b/main/app.c @@ -337,7 +337,7 @@ static int linear_generator(struct ast_channel *chan, void *data, int len, int s struct ast_frame f = { .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR, - .data = buf + AST_FRIENDLY_OFFSET / 2, + .data.ptr = buf + AST_FRIENDLY_OFFSET / 2, .offset = AST_FRIENDLY_OFFSET, }; int res; -- cgit v1.2.3