From 6cfdb61f738e8f7405a322bfa2c4241700145eec Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sat, 20 Feb 2010 01:34:16 -0800
Subject: progs/redbook: Silence warn_unused_result warnings.

---
 progs/redbook/convolution.c | 10 +++++++---
 progs/redbook/histogram.c   | 10 +++++++---
 progs/redbook/minmax.c      | 11 ++++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'progs')

diff --git a/progs/redbook/convolution.c b/progs/redbook/convolution.c
index 0898ef25e1..c04a8727a7 100644
--- a/progs/redbook/convolution.c
+++ b/progs/redbook/convolution.c
@@ -75,6 +75,7 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 {
     int       n;
     GLubyte*  pixels;
+    size_t    num_read;
 
     FILE* infile = fopen( filename, "rb" );
 
@@ -83,8 +84,10 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
         exit(1);
     }
 
-    fread( width, sizeof( GLsizei ), 1, infile );
-    fread( height, sizeof( GLsizei ), 1, infile );
+    num_read = fread( width, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
+    num_read = fread( height, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
 
     *width = bswap(*width);
     *height = bswap(*height);
@@ -101,7 +104,8 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 	return NULL;
     }
 
-    fread( pixels, sizeof( GLubyte ), n, infile );
+    num_read = fread( pixels, sizeof( GLubyte ), n, infile );
+    assert(num_read == n);
     
     fclose( infile );
 
diff --git a/progs/redbook/histogram.c b/progs/redbook/histogram.c
index 70a5282577..12b0e315ca 100644
--- a/progs/redbook/histogram.c
+++ b/progs/redbook/histogram.c
@@ -83,6 +83,7 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 {
     int       n;
     GLubyte*  pixels;
+    size_t    num_read;
 
     FILE* infile = fopen( filename, "rb" );
 
@@ -91,8 +92,10 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
         exit(1);
     }
 
-    fread( width, sizeof( GLsizei ), 1, infile );
-    fread( height, sizeof( GLsizei ), 1, infile );
+    num_read = fread( width, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
+    num_read = fread( height, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
 
     *width = bswap(*width);
     *height = bswap(*height);
@@ -106,7 +109,8 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 	return NULL;
     }
 
-    fread( pixels, sizeof( GLubyte ), n, infile );
+    num_read = fread( pixels, sizeof( GLubyte ), n, infile );
+    assert(num_read == n);
     
     fclose( infile );
 
diff --git a/progs/redbook/minmax.c b/progs/redbook/minmax.c
index 8281800ba4..2c1356c9de 100644
--- a/progs/redbook/minmax.c
+++ b/progs/redbook/minmax.c
@@ -47,6 +47,7 @@
  */
 #include <GL/glew.h>
 #include <GL/glut.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -78,6 +79,7 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 {
     int       n;
     GLubyte*  pixels;
+    size_t    num_read;
 
     FILE* infile = fopen( filename, "rb" );
 
@@ -86,8 +88,10 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 	return NULL;
     }
 
-    fread( width, sizeof( GLsizei ), 1, infile );
-    fread( height, sizeof( GLsizei ), 1, infile );
+    num_read = fread( width, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
+    num_read = fread( height, sizeof( GLsizei ), 1, infile );
+    assert(num_read == 1);
 
     *width = bswap(*width);
     *height = bswap(*height);
@@ -101,7 +105,8 @@ readImage( const char* filename, GLsizei* width, GLsizei *height )
 	return NULL;
     }
 
-    fread( pixels, sizeof( GLubyte ), n, infile );
+    num_read = fread( pixels, sizeof( GLubyte ), n, infile );
+    assert(num_read == n);
     
     fclose( infile );
 
-- 
cgit v1.2.3