From c1210321e7aeb274076b14fc2f622edf442246fa Mon Sep 17 00:00:00 2001
From: mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>
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
---
 codecs/codec_lpc10.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'codecs/codec_lpc10.c')

diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 1e4ec37f3..dfcdc7988 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -86,7 +86,7 @@ static struct ast_frame *lintolpc10_sample(void)
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin_lpc10_ex;
+	f.data.ptr = slin_lpc10_ex;
 	return &f;
 }
 
@@ -102,7 +102,7 @@ static struct ast_frame *lpc10tolin_sample(void)
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = lpc10_slin_ex;
+	f.data.ptr = lpc10_slin_ex;
 	return &f;
 }
 
@@ -151,7 +151,7 @@ static int lpc10tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 			ast_log(LOG_WARNING, "Out of buffer space\n");
 			return -1;
 		}
-		extract_bits(bits, f->data + len);
+		extract_bits(bits, f->data.ptr + len);
 		if (lpc10_decode(bits, tmpbuf, tmp->lpc10.dec)) {
 			ast_log(LOG_WARNING, "Invalid lpc10 data\n");
 			return -1;
@@ -179,7 +179,7 @@ static int lintolpc10_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 		ast_log(LOG_WARNING, "Out of buffer space\n");
 		return -1;
 	}
-	memcpy(tmp->buf + pvt->samples, f->data, f->datalen);
+	memcpy(tmp->buf + pvt->samples, f->data.ptr, f->datalen);
 	pvt->samples += f->samples;
 	return 0;
 }
-- 
cgit v1.2.3