aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-05-16 15:02:45 +0100
committerEric Engestrom <[email protected]>2019-06-09 13:14:13 +0000
commit341ba406fde73c322fa4ed4a84c9ba1eb1a476b6 (patch)
tree547b82e2784f15d4fa53905f46efbf2b7d544c3e /src
parent7e35f20d44321b20777020ad067d39116d142013 (diff)
util/os_file: avoid shadowing read() with a local variable
Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/util/os_file.c10
1 files changed, 5 insertions, 5 deletions
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';