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

1 files changed, 4 insertions, 4 deletions

diff --git a/utils/stereorize.c b/utils/stereorize.c
index 7d72cbdbf..c8428320d 100644
--- a/utils/stereorize.c
+++ b/utils/stereorize.c
@@ -150,10 +150,10 @@ int main( int argcount, char *args[])
       for (; i < maxk; i++)
 	stereosample[2 * i + 1] = 0;
 
-      fwrite(stereosample, sizeof(*leftsample), 2 * maxk, out);
-      if (ferror( out) != 0)
-	fatalerror("Error writing to file '%s': %s\n",
-		   outfilename, strerror(errno));
+      if (!fwrite(stereosample, sizeof(*leftsample), 2 * maxk, out)) {
+	      fatalerror("Error writing to file '%s': %s\n",
+			 outfilename, strerror(errno));
+      }
    }
    /* That was an endless loop. This point is never reached. */
 }