Skip to content
Snippets Groups Projects
Commit 98dbc955 authored by Kevin P. Fleming's avatar Kevin P. Fleming
Browse files

silence some more compiler warnings

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 302c9430
No related branches found
No related tags found
No related merge requests found
...@@ -199,7 +199,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) ...@@ -199,7 +199,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
offset = sample_offset; offset = sample_offset;
} }
if (offset < 0) { if (offset < 0) {
ast_log(LOG_WARNING, "negative offset %ld, resetting to 0\n", offset); ast_log(LOG_WARNING, "negative offset %ld, resetting to 0\n", (long) offset);
offset = 0; offset = 0;
} }
if (whence == SEEK_FORCECUR && offset > max) { /* extend the file */ if (whence == SEEK_FORCECUR && offset > max) { /* extend the file */
...@@ -215,7 +215,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) ...@@ -215,7 +215,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
ret = 0; /* successful */ ret = 0; /* successful */
} else { } else {
if (offset > max) { if (offset > max) {
ast_log(LOG_WARNING, "offset too large %ld, truncating to %ld\n", offset, max); ast_log(LOG_WARNING, "offset too large %ld, truncating to %ld\n", (long) offset, (long) max);
offset = max; offset = max;
} }
ret = fseeko(fs->f, offset, SEEK_SET); ret = fseeko(fs->f, offset, SEEK_SET);
......
...@@ -276,7 +276,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) ...@@ -276,7 +276,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
if (offset < 0) { if (offset < 0) {
offset = 0; offset = 0;
ast_log(LOG_WARNING, "negative offset %ld, resetting to 0\n", offset); ast_log(LOG_WARNING, "negative offset %ld, resetting to 0\n", (long) offset);
} }
if (whence == SEEK_FORCECUR && offset > max) { if (whence == SEEK_FORCECUR && offset > max) {
size_t left = offset - max; size_t left = offset - max;
...@@ -291,7 +291,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) ...@@ -291,7 +291,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
ret = 0; /* success */ ret = 0; /* success */
} else { } else {
if (offset > max) { if (offset > max) {
ast_log(LOG_WARNING, "offset too large %ld, truncating to %ld\n", offset, max); ast_log(LOG_WARNING, "offset too large %ld, truncating to %ld\n", (long) offset, (long) max);
offset = max; offset = max;
} }
ret = fseeko(fs->f, offset, SEEK_SET); ret = fseeko(fs->f, offset, SEEK_SET);
......
...@@ -456,7 +456,9 @@ static inline void conv65( wav_byte * c, gsm_byte * d){ ...@@ -456,7 +456,9 @@ static inline void conv65( wav_byte * c, gsm_byte * d){
unsigned int sr = 0; unsigned int sr = 0;
unsigned int frame_chain; unsigned int frame_chain;
unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4]; unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4];
/* silence bogus compiler warning */
unsigned int xmc[13*4] = { 0, };
sr = *c++; sr = *c++;
LARc[0] = sr & 0x3f; sr >>= 6; LARc[0] = sr & 0x3f; sr >>= 6;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment