diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-23 18:00:50 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-23 18:00:50 +0000 |
| commit | 12deb3bf4d363a1996a4eb497037565a05493d94 (patch) | |
| tree | 604525f61a6b240013652a7c307ed66a3d384bb9 /formats | |
| parent | 9c4950dff36fc6083132969ac592045c5cda464e (diff) | |
silence some more compiler warnings
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10877 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
| -rw-r--r-- | formats/format_pcm.c | 4 | ||||
| -rw-r--r-- | formats/format_pcm_alaw.c | 4 | ||||
| -rw-r--r-- | formats/msgsm.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 240be65d1..d3f73e3b3 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -199,7 +199,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) offset = sample_offset; } 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; } 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) ret = 0; /* successful */ } else { 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; } ret = fseeko(fs->f, offset, SEEK_SET); diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index de90ce2da..af1705f79 100644 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -276,7 +276,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) if (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) { size_t left = offset - max; @@ -291,7 +291,7 @@ static int pcm_seek(struct ast_filestream *fs, off_t sample_offset, int whence) ret = 0; /* success */ } else { 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; } ret = fseeko(fs->f, offset, SEEK_SET); diff --git a/formats/msgsm.h b/formats/msgsm.h index ec12161c1..f951cc271 100644 --- a/formats/msgsm.h +++ b/formats/msgsm.h @@ -456,7 +456,9 @@ static inline void conv65( wav_byte * c, gsm_byte * d){ unsigned int sr = 0; 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++; LARc[0] = sr & 0x3f; sr >>= 6; |