Mesa (mesa_7_7_branch): progs/tests: Silence warn_unused_result warning.

Vinson Lee vlee at kemper.freedesktop.org
Sun Jan 3 05:53:28 UTC 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: 32d18924dff424eb2e06454193c6c2024f1b2795
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32d18924dff424eb2e06454193c6c2024f1b2795

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan  2 21:52:51 2010 -0800

progs/tests: Silence warn_unused_result warning.

---

 progs/tests/vparray.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c
index af9b62d..fe168c6 100644
--- a/progs/tests/vparray.c
+++ b/progs/tests/vparray.c
@@ -37,13 +37,16 @@ static void read_surface( char *filename )
    }
 
    numverts = 0;
-   while (!feof(f) && numverts < MAXVERTS) {
-      fscanf( f, "%f %f %f  %f %f %f",
-	      &data[numverts][0], &data[numverts][1], &data[numverts][2],
-	      &data[numverts][3], &data[numverts][4], &data[numverts][5] );
+   while (numverts < MAXVERTS) {
+      int result;
+      result = fscanf( f, "%f %f %f  %f %f %f",
+	               &data[numverts][0], &data[numverts][1], &data[numverts][2],
+	               &data[numverts][3], &data[numverts][4], &data[numverts][5] );
+      if (result == EOF) {
+         break;
+      }
       numverts++;
    }
-   numverts--;
 
    printf("%d vertices, %d triangles\n", numverts, numverts-2);
    printf("data = %p\n", (void *) data);




More information about the mesa-commit mailing list