From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 16 May 2019 14:02:45 +0000 (+0100)
Subject: util/os_file: avoid shadowing read() with a local variable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=341ba406fde73c322fa4ed4a84c9ba1eb1a476b6;p=mesa.git

util/os_file: avoid shadowing read() with a local variable

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/util/os_file.c b/src/util/os_file.c
index da17d12b50e..400a2a12c4d 100644
--- a/src/util/os_file.c
+++ b/src/util/os_file.c
@@ -70,9 +70,9 @@ os_read_file(const char *filename)
       return NULL;
    }
 
-   ssize_t read;
+   ssize_t actually_read;
    size_t offset = 0, remaining = len - 1;
-   while ((read = readN(fd, buf + offset, remaining)) == remaining) {
+   while ((actually_read = readN(fd, buf + offset, remaining)) == remaining) {
       char *newbuf = realloc(buf, 2 * len);
       if (!newbuf) {
          free(buf);
@@ -83,14 +83,14 @@ os_read_file(const char *filename)
 
       buf = newbuf;
       len *= 2;
-      offset += read;
+      offset += actually_read;
       remaining = len - offset - 1;
    }
 
    close(fd);
 
-   if (read > 0)
-      offset += read;
+   if (actually_read > 0)
+      offset += actually_read;
 
    buf[offset] = '\0';