From: Vinson Lee <vlee@vmware.com>
Date: Wed, 30 Dec 2009 20:38:21 +0000 (-0800)
Subject: progs/glsl: Provide a better fix for fgets warning.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5b2713c92a89fc6c47c3546d36eeb549e126ebc0;p=mesa.git

progs/glsl: Provide a better fix for fgets warning.
---

diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c
index 3c795437f42..e9800c307f3 100644
--- a/progs/glsl/shtest.c
+++ b/progs/glsl/shtest.c
@@ -492,11 +492,8 @@ ReadConfigFile(const char *filename, struct config_file *conf)
    conf->num_uniforms = 0;
 
    /* ugly but functional parser */
-   while (!feof(f)) {
-      char *result;
-      result = fgets(line, sizeof(line), f);
-      (void) result;
-      if (!feof(f) && line[0]) {
+   while (fgets(line, sizeof(line), f) != NULL) {
+      if (line[0]) {
          if (strncmp(line, "vs ", 3) == 0) {
             VertShaderFile = strdup(line + 3);
             VertShaderFile[strlen(VertShaderFile) - 1] = 0;