progs/redbook: Silence warn_unused_result warnings.

diff --git a/progs/redbook/convolution.c b/progs/redbook/convolution.c
index 0898ef25e10e075003b33c408166981602d12ee5..c04a8727a713835a71354140b6808179ae2d5f84 100644 (file)
--- 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 70a5282577201a2ee6a5d4a7ce71a5056cca91b8..12b0e315ca11e3da66d58e41857d7c9244c34441 100644 (file)
--- 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 8281800ba439c6370b0868b36d7d0ebcc9cf4933..2c1356c9de4b5c991e22bc52a26f1d08d058a8da 100644 (file)
--- 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 );