From ce3d56920b15facbb64b3caf0d823a3f57c0dded Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Fri, 22 Dec 2017 09:14:07 -0500 Subject: Remove as much trailing whitespace as possible. Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0 --- formats/Makefile | 2 +- formats/format_g719.c | 3 +-- formats/format_g723.c | 12 ++++++------ formats/format_g726.c | 10 +++++----- formats/format_g729.c | 6 +++--- formats/format_gsm.c | 2 +- formats/format_h263.c | 2 +- formats/format_h264.c | 2 +- formats/format_ilbc.c | 4 ++-- formats/format_jpeg.c | 4 ++-- formats/format_ogg_vorbis.c | 6 +++--- formats/format_pcm.c | 8 ++++---- formats/format_siren14.c | 2 +- formats/format_siren7.c | 2 +- formats/format_sln.c | 2 +- formats/format_vox.c | 6 +++--- formats/format_wav.c | 18 +++++++++--------- formats/format_wav_gsm.c | 4 ++-- formats/msgsm.h | 4 ++-- 19 files changed, 49 insertions(+), 50 deletions(-) (limited to 'formats') diff --git a/formats/Makefile b/formats/Makefile index 069d30be4..08c627fa3 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for file format modules # # Copyright (C) 1999-2006, Digium, Inc. diff --git a/formats/format_g719.c b/formats/format_g719.c index e27822df7..505ab97f6 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -26,7 +26,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -158,4 +158,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.719", .unload = unload_module, .load_pri = AST_MODPRI_APP_DEPEND ); - diff --git a/formats/format_g723.c b/formats/format_g723.c index 9b770336d..ffff83410 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -16,11 +16,11 @@ * at the top of the source tree. */ -/*! +/*! * \file * * \brief Old-style G.723.1 frame/timestamp format. - * + * * \arg Extensions: g723, g723sf * \ingroup formats */ @@ -28,7 +28,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -46,7 +46,7 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) int delay; /* Read the delay for the next packet, and schedule again if necessary */ /* XXX is this ignored ? */ - if (fread(&delay, 1, 4, s->f) == 4) + if (fread(&delay, 1, 4, s->f) == 4) delay = ntohl(delay); else delay = -1; @@ -60,7 +60,7 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) if (size > G723_MAX_SIZE) { ast_log(LOG_WARNING, "Size %d is invalid\n", size); /* The file is apparently no longer any good, as we - shouldn't ever get frames even close to this + shouldn't ever get frames even close to this size. */ return NULL; } @@ -101,7 +101,7 @@ static int g723_write(struct ast_filestream *s, struct ast_frame *f) if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) { ast_log(LOG_WARNING, "Unable to write frame: res=%d (%s)\n", res, strerror(errno)); return -1; - } + } return 0; } diff --git a/formats/format_g726.c b/formats/format_g726.c index 50b558ec4..8379925c2 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -19,7 +19,7 @@ /*!\file * * \brief Headerless G.726 (16/24/32/40kbps) data format for Asterisk. - * + * * File name extensions: * \arg 40 kbps: g726-40 * \arg 32 kbps: g726-32 @@ -31,7 +31,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -51,7 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define BUF_SIZE (5*FRAME_TIME) /* max frame size in bytes ? */ /* Frame sizes in bytes */ -static int frame_size[4] = { +static int frame_size[4] = { FRAME_TIME * 5, FRAME_TIME * 4, FRAME_TIME * 3, @@ -143,12 +143,12 @@ static int g726_write(struct ast_filestream *s, struct ast_frame *f) struct g726_desc *fs = (struct g726_desc *)s->_private; if (f->datalen % frame_size[fs->rate]) { - ast_log(LOG_WARNING, "Invalid data length %d, should be multiple of %d\n", + ast_log(LOG_WARNING, "Invalid data length %d, should be multiple of %d\n", f->datalen, frame_size[fs->rate]); return -1; } if ((res = fwrite(f->data.ptr, 1, f->datalen, s->f)) != f->datalen) { - ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", + ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, frame_size[fs->rate], strerror(errno)); return -1; } diff --git a/formats/format_g729.c b/formats/format_g729.c index 35c68bd0c..946bbc52c 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -22,14 +22,14 @@ * \note This is not an encoder/decoder. The codec for g729 is only * available with a commercial license from Digium, due to patent * restrictions. Check http://www.digium.com for information. - * \arg Extensions: g729 + * \arg Extensions: g729 * \ingroup formats */ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -88,7 +88,7 @@ static int g729_seek(struct ast_filestream *fs, off_t sample_offset, int whence) cur = ftello(fs->f); fseeko(fs->f, 0, SEEK_END); max = ftello(fs->f); - + bytes = BUF_SIZE * (sample_offset / G729A_SAMPLES); if (whence == SEEK_SET) offset = bytes; diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 783d9553e..b16c8aadd 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -26,7 +26,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_h263.c b/formats/format_h263.c index be8e1df7a..ba1f331cc 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -27,7 +27,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_h264.c b/formats/format_h264.c index 30604004e..9c89af8a0 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -27,7 +27,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index d4fbe96e7..42d2281d0 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -2,7 +2,7 @@ * Asterisk -- An open source telephony toolkit. * * Brian K. West - * + * * Copyright (C) 1999 - 2005, Digium, Inc. * * Mark Spencer @@ -85,7 +85,7 @@ static int ilbc_seek(struct ast_filestream *fs, off_t sample_offset, int whence) cur = ftello(fs->f); fseeko(fs->f, 0, SEEK_END); max = ftello(fs->f); - + bytes = ILBC_BUF_SIZE * (sample_offset / ILBC_SAMPLES); if (whence == SEEK_SET) offset = bytes; diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 04125d7bd..5ae77e37d 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -19,7 +19,7 @@ /*! \file * * \brief JPEG File format support. - * + * * \arg File name extension: jpeg, jpg * \ingroup formats */ @@ -27,7 +27,7 @@ /*** MODULEINFO extended ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index a7a9447e7..cb0798ae2 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -64,13 +64,13 @@ struct ogg_vorbis_desc { /* format specific parameters */ ogg_stream_state os; ogg_page og; ogg_packet op; - + /* structures for handling Vorbis audio data */ vorbis_info vi; vorbis_comment vc; vorbis_dsp_state vd; vorbis_block vb; - + /*! \brief Indicates whether this filestream is set up for reading or writing. */ int writing; @@ -372,7 +372,7 @@ static off_t ogg_vorbis_tell(struct ast_filestream *fs) * \brief Seek to a specific position in an OGG/Vorbis filestream. * \param fs The filestream to take action on. * \param sample_offset New position for the filestream, measured in 8KHz samples. - * \param whence Location to measure + * \param whence Location to measure * \return 0 on success, -1 on failure. */ static int ogg_vorbis_seek(struct ast_filestream *fs, off_t sample_offset, int whence) diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 7b0648234..8710370ad 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -20,14 +20,14 @@ * * \brief Flat, binary, ulaw PCM file format. * \arg File name extension: alaw, al, alw, pcm, ulaw, ul, mu, ulw, g722, au - * + * * \ingroup formats */ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -195,7 +195,7 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f) /* Check if we have written to this position yet. If we have, then increment pos by one frame * for some degree of protection against receiving packets in the same clock tick. */ - + fstat(fileno(fs->f), &stat_buf ); if (stat_buf.st_size > fpos ) fpos += f->datalen; /* Incrementing with the size of this current frame */ @@ -229,7 +229,7 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f) } } #endif /* REALTIME_WRITE */ - + if ((res = fwrite(f->data.ptr, 1, f->datalen, fs->f)) != f->datalen) { ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, f->datalen, strerror(errno)); return -1; diff --git a/formats/format_siren14.c b/formats/format_siren14.c index 3e42bef9a..b63ec2ad6 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -26,7 +26,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_siren7.c b/formats/format_siren7.c index f1bde0012..c459cefca 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -26,7 +26,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_sln.c b/formats/format_sln.c index 48bad8ae7..b81046cc6 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -24,7 +24,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/format_vox.c b/formats/format_vox.c index 813dabf21..6073a131b 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -20,14 +20,14 @@ * * \brief Flat, binary, ADPCM vox file format. * \arg File name extensions: vox - * + * * \ingroup formats */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -124,7 +124,7 @@ static off_t vox_tell(struct ast_filestream *fs) { off_t offset; offset = ftello(fs->f) << 1; - return offset; + return offset; } static struct ast_format_def vox_f = { diff --git a/formats/format_wav.c b/formats/format_wav.c index cead61c5b..9e92e6a35 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -23,7 +23,7 @@ * \arg File name extension: wav (lower case) * \ingroup formats */ - + /*** MODULEINFO core ***/ @@ -168,9 +168,9 @@ static int check_header(FILE *f, int hz) } /* Skip any facts and get the first data block */ for(;;) - { + { char buf[4]; - + /* Begin data chunk */ if (fread(&buf, 1, 4, f) != 4) { ast_log(LOG_WARNING, "Read failed (block header format)\n"); @@ -189,7 +189,7 @@ static int check_header(FILE *f, int hz) return -1; continue; } - if(memcmp(buf, "data", 4) == 0 ) + if(memcmp(buf, "data", 4) == 0 ) break; ast_log(LOG_DEBUG, "Skipping unknown block '%.4s'\n", buf); if (fseek(f,data,SEEK_CUR) == -1 ) { @@ -202,7 +202,7 @@ static int check_header(FILE *f, int hz) truelength = lseek(fd, 0, SEEK_END); lseek(fd, curpos, SEEK_SET); truelength -= curpos; -#endif +#endif return data; } @@ -210,7 +210,7 @@ static int update_header(FILE *f) { off_t cur,end; int datalen,filelen,bytes; - + cur = ftello(f); fseek(f, 0, SEEK_END); end = ftello(f); @@ -219,7 +219,7 @@ static int update_header(FILE *f) datalen = htoll(bytes); /* chunk size is bytes of data plus 36 bytes of header */ filelen = htoll(36 + bytes); - + if (cur < 0) { ast_log(LOG_WARNING, "Unable to find our position\n"); return -1; @@ -434,7 +434,7 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) return -1; } tmpi = f->data.ptr; - for (x=0; x < f->datalen/2; x++) + for (x=0; x < f->datalen/2; x++) tmp[x] = (tmpi[x] << 8) | ((tmpi[x] & 0xff00) >> 8); if ((res = fwrite(tmp, 1, f->datalen, fs->f)) != f->datalen ) { @@ -447,7 +447,7 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f) } s->bytes += f->datalen; - + return 0; } diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 423dfe48a..1329d1a06 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -19,7 +19,7 @@ /*! \file * * \brief Save GSM in the proprietary Microsoft format. - * + * * Microsoft WAV format (Proprietary GSM) * \arg File name extension: WAV,wav49 (Upper case WAV, lower case is another format) * This format can be played on Windows systems, used for @@ -30,7 +30,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/formats/msgsm.h b/formats/msgsm.h index ba7738f1d..bb46a3a61 100644 --- a/formats/msgsm.h +++ b/formats/msgsm.h @@ -115,7 +115,7 @@ static inline void conv66(gsm_byte * d, wav_byte * c) { gsm_byte frame_chain; unsigned int sr; unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4]; - + readGSM_33(d); sr = 0; sr = (sr >> 6) | (LARc[0] << 10); @@ -459,7 +459,7 @@ static inline void conv65( wav_byte * c, gsm_byte * d){ unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4]; /* silence bogus compiler warning */ unsigned int xmc[13*4] = { 0, }; - + sr = *c++; LARc[0] = sr & 0x3f; sr >>= 6; sr |= (uword)*c++ << 2; -- cgit v1.2.3