From ee246d0e0519c6aa7cb0aea17ea92c9a5c2dc16f Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Sun, 2 Nov 2008 23:56:13 +0000
Subject: import gcc 4.3.2 warning fixes from trunk, with a few changes
 specific to this branch

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@153710 f38db490-d61c-443f-a65b-d21fe96a405b
---
 formats/format_gsm.c        |  4 +++-
 formats/format_ogg_vorbis.c | 16 ++++++++++++----
 formats/format_wav.c        |  7 +++++--
 formats/format_wav_gsm.c    |  4 +++-
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'formats')

diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 3506f563e..571fed8e1 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -126,7 +126,9 @@ static int gsm_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
 		int i;
 		fseeko(fs->f, 0, SEEK_END);
 		for (i=0; i< (offset - max) / GSM_FRAME_SIZE; i++) {
-			fwrite(gsm_silence, 1, GSM_FRAME_SIZE, fs->f);
+			if (!fwrite(gsm_silence, 1, GSM_FRAME_SIZE, fs->f)) {
+				ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+			}
 		}
 	}
 	return fseeko(fs->f, offset, SEEK_SET);
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index de2a20c74..e3b81eff1 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -225,8 +225,12 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s,
 	while (!tmp->eos) {
 		if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
 			break;
-		fwrite(tmp->og.header, 1, tmp->og.header_len, s->f);
-		fwrite(tmp->og.body, 1, tmp->og.body_len, s->f);
+		if (!fwrite(tmp->og.header, 1, tmp->og.header_len, s->f)) {
+			ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+		}
+		if (!fwrite(tmp->og.body, 1, tmp->og.body_len, s->f)) {
+			ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+		}
 		if (ogg_page_eos(&tmp->og))
 			tmp->eos = 1;
 	}
@@ -251,8 +255,12 @@ static void write_stream(struct vorbis_desc *s, FILE *f)
 				if (ogg_stream_pageout(&s->os, &s->og) == 0) {
 					break;
 				}
-				fwrite(s->og.header, 1, s->og.header_len, f);
-				fwrite(s->og.body, 1, s->og.body_len, f);
+				if (!fwrite(s->og.header, 1, s->og.header_len, f)) {
+				ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+				}
+				if (!fwrite(s->og.body, 1, s->og.body_len, f)) {
+					ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+				}
 				if (ogg_page_eos(&s->og)) {
 					s->eos = 1;
 				}
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 5cf39ce99..3a629df71 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -334,8 +334,11 @@ static void wav_close(struct ast_filestream *s)
 	}
 
 	/* Pad to even length */
-	if (fs->bytes & 0x1)
-		fwrite(&zero, 1, 1, s->f);
+	if (fs->bytes & 0x1) {
+		if (!fwrite(&zero, 1, 1, s->f)) {
+			ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+		}
+	}
 }
 
 static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 4c3694cda..81fbded4b 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -496,7 +496,9 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
 		int i;
 		fseek(fs->f, 0, SEEK_END);
 		for (i=0; i< (offset - max) / MSGSM_FRAME_SIZE; i++) {
-			fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f);
+			if (!fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f)) {
+				ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+			}
 		}
 	}
 	s->secondhalf = 0;
-- 
cgit v1.2.3