[asterisk-commits] tilghman: trunk r90158 - in /trunk: ./ formats/ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Nov 29 11:50:45 CST 2007
Author: tilghman
Date: Thu Nov 29 11:50:44 2007
New Revision: 90158
URL: http://svn.digium.com/view/asterisk?view=rev&rev=90158
Log:
Merged revisions 90155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90155 | tilghman | 2007-11-29 11:29:59 -0600 (Thu, 29 Nov 2007) | 5 lines
Use of "private" as a field name in a header file messes with C++ projects
Reported by: chewbacca
Patch by: casper
(Closes issue #11401)
........
Modified:
trunk/ (props changed)
trunk/formats/format_g726.c
trunk/formats/format_h263.c
trunk/formats/format_h264.c
trunk/formats/format_ogg_vorbis.c
trunk/formats/format_pcm.c
trunk/formats/format_wav.c
trunk/formats/format_wav_gsm.c
trunk/include/asterisk/mod_format.h
trunk/main/file.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/formats/format_g726.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_g726.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_g726.c (original)
+++ trunk/formats/format_g726.c Thu Nov 29 11:50:44 2007
@@ -62,7 +62,7 @@
*/
static int g726_open(struct ast_filestream *tmp, int rate)
{
- struct g726_desc *s = (struct g726_desc *)tmp->private;
+ struct g726_desc *s = (struct g726_desc *)tmp->_private;
s->rate = rate;
ast_debug(1, "Created filestream G.726-%dk.\n", 40 - s->rate * 8);
return 0;
@@ -115,7 +115,7 @@
static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
{
int res;
- struct g726_desc *fs = (struct g726_desc *)s->private;
+ struct g726_desc *fs = (struct g726_desc *)s->_private;
/* Send a frame from the file to the appropriate channel */
s->fr.frametype = AST_FRAME_VOICE;
@@ -135,7 +135,7 @@
static int g726_write(struct ast_filestream *s, struct ast_frame *f)
{
int res;
- struct g726_desc *fs = (struct g726_desc *)s->private;
+ struct g726_desc *fs = (struct g726_desc *)s->_private;
if (f->frametype != AST_FRAME_VOICE) {
ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
Modified: trunk/formats/format_h263.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_h263.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_h263.c (original)
+++ trunk/formats/format_h263.c Thu Nov 29 11:50:44 2007
@@ -67,7 +67,7 @@
int mark;
unsigned short len;
unsigned int ts;
- struct h263_desc *fs = (struct h263_desc *)s->private;
+ struct h263_desc *fs = (struct h263_desc *)s->_private;
/* Send a frame from the file to the appropriate channel */
if ((res = fread(&len, 1, sizeof(len), s->f)) < 1)
Modified: trunk/formats/format_h264.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_h264.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_h264.c (original)
+++ trunk/formats/format_h264.c Thu Nov 29 11:50:44 2007
@@ -59,7 +59,7 @@
int mark=0;
unsigned short len;
unsigned int ts;
- struct h264_desc *fs = (struct h264_desc *)s->private;
+ struct h264_desc *fs = (struct h264_desc *)s->_private;
/* Send a frame from the file to the appropriate channel */
if ((res = fread(&len, 1, sizeof(len), s->f)) < 1)
Modified: trunk/formats/format_ogg_vorbis.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_ogg_vorbis.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_ogg_vorbis.c (original)
+++ trunk/formats/format_ogg_vorbis.c Thu Nov 29 11:50:44 2007
@@ -85,7 +85,7 @@
int result;
char **ptr;
char *buffer;
- struct vorbis_desc *tmp = (struct vorbis_desc *)s->private;
+ struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private;
tmp->writing = 0;
@@ -195,7 +195,7 @@
ogg_packet header;
ogg_packet header_comm;
ogg_packet header_code;
- struct vorbis_desc *tmp = (struct vorbis_desc *)s->private;
+ struct vorbis_desc *tmp = (struct vorbis_desc *)s->_private;
tmp->writing = 1;
@@ -272,7 +272,7 @@
int i;
float **buffer;
short *data;
- struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
+ struct vorbis_desc *s = (struct vorbis_desc *)fs->_private;
if (!s->writing) {
ast_log(LOG_ERROR, "This stream is not set up for writing!\n");
@@ -311,7 +311,7 @@
*/
static void ogg_vorbis_close(struct ast_filestream *fs)
{
- struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
+ struct vorbis_desc *s = (struct vorbis_desc *)fs->_private;
if (s->writing) {
/* Tell the Vorbis encoder that the stream is finished
@@ -343,7 +343,7 @@
int result;
char *buffer;
int bytes;
- struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
+ struct vorbis_desc *s = (struct vorbis_desc *)fs->_private;
while (1) {
samples_in = vorbis_synthesis_pcmout(&s->vd, pcm);
@@ -426,7 +426,7 @@
int val;
int samples_in;
int samples_out = 0;
- struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
+ struct vorbis_desc *s = (struct vorbis_desc *)fs->_private;
short *buf; /* SLIN data buffer */
fs->fr.frametype = AST_FRAME_VOICE;
Modified: trunk/formats/format_pcm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_pcm.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Thu Nov 29 11:50:44 2007
@@ -167,7 +167,7 @@
#ifdef REALTIME_WRITE
if (s->fmt->format == AST_FORMAT_ALAW) {
- struct pcm_desc *pd = (struct pcm_desc *)fs->private;
+ struct pcm_desc *pd = (struct pcm_desc *)fs->_private;
struct stat stat_buf;
unsigned long cur_time = get_time();
unsigned long fpos = ( cur_time - pd->start_time ) * 8; /* 8 bytes per msec */
Modified: trunk/formats/format_wav.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_wav.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Thu Nov 29 11:50:44 2007
@@ -307,7 +307,7 @@
/* We don't have any header to read or anything really, but
if we did, it would go here. We also might want to check
and be sure it's a valid file. */
- struct wav_desc *tmp = (struct wav_desc *)s->private;
+ struct wav_desc *tmp = (struct wav_desc *)s->_private;
if ((tmp->maxlen = check_header(s->f)) < 0)
return -1;
return 0;
@@ -327,7 +327,7 @@
static void wav_close(struct ast_filestream *s)
{
char zero = 0;
- struct wav_desc *fs = (struct wav_desc *)s->private;
+ struct wav_desc *fs = (struct wav_desc *)s->_private;
/* Pad to even length */
if (fs->bytes & 0x1)
fwrite(&zero, 1, 1, s->f);
@@ -344,7 +344,7 @@
int bytes = WAV_BUF_SIZE; /* in bytes */
off_t here;
/* Send a frame from the file to the appropriate channel */
- struct wav_desc *fs = (struct wav_desc *)s->private;
+ struct wav_desc *fs = (struct wav_desc *)s->_private;
here = ftello(s->f);
if (fs->maxlen - here < bytes) /* truncate if necessary */
@@ -382,7 +382,7 @@
int x;
short tmp[8000], *tmpi;
#endif
- struct wav_desc *s = (struct wav_desc *)fs->private;
+ struct wav_desc *s = (struct wav_desc *)fs->_private;
int res;
if (f->frametype != AST_FRAME_VOICE) {
Modified: trunk/formats/format_wav_gsm.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_wav_gsm.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/formats/format_wav_gsm.c (original)
+++ trunk/formats/format_wav_gsm.c Thu Nov 29 11:50:44 2007
@@ -370,7 +370,7 @@
/* We don't have any header to read or anything really, but
if we did, it would go here. We also might want to check
and be sure it's a valid file. */
- struct wavg_desc *fs = (struct wavg_desc *)s->private;
+ struct wavg_desc *fs = (struct wavg_desc *)s->_private;
if (check_header(s->f))
return -1;
@@ -401,7 +401,7 @@
static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
{
/* Send a frame from the file to the appropriate channel */
- struct wavg_desc *fs = (struct wavg_desc *)s->private;
+ struct wavg_desc *fs = (struct wavg_desc *)s->_private;
s->fr.frametype = AST_FRAME_VOICE;
s->fr.subclass = AST_FORMAT_GSM;
@@ -435,7 +435,7 @@
{
int len;
int size;
- struct wavg_desc *fs = (struct wavg_desc *)s->private;
+ struct wavg_desc *fs = (struct wavg_desc *)s->_private;
if (f->frametype != AST_FRAME_VOICE) {
ast_log(LOG_WARNING, "Asked to write non-voice frame!\n");
@@ -481,7 +481,7 @@
static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
{
off_t offset=0, distance, max;
- struct wavg_desc *s = (struct wavg_desc *)fs->private;
+ struct wavg_desc *s = (struct wavg_desc *)fs->_private;
off_t min = MSGSM_DATA_OFFSET;
off_t cur = ftello(fs->f);
Modified: trunk/include/asterisk/mod_format.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/mod_format.h?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/include/asterisk/mod_format.h (original)
+++ trunk/include/asterisk/mod_format.h Thu Nov 29 11:50:44 2007
@@ -114,7 +114,7 @@
FILE *f;
struct ast_frame fr; /*!< frame produced by read, typically */
char *buf; /*!< buffer pointed to by ast_frame; */
- void *private; /*!< pointer to private buffer */
+ void *_private; /*!< pointer to private buffer */
const char *orig_chan_name;
};
Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?view=diff&rev=90158&r1=90157&r2=90158
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Thu Nov 29 11:50:44 2007
@@ -282,7 +282,7 @@
s->f = bfile;
if (fmt->desc_size)
- s->private = ((char *)(s+1)) + fmt->buf_size;
+ s->_private = ((char *)(s+1)) + fmt->buf_size;
if (fmt->buf_size)
s->buf = (char *)(s+1);
s->fr.src = fmt->name;
More information about the asterisk-commits
mailing list