projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix floating point option range formatting
[fio.git]
/
iolog.c
diff --git
a/iolog.c
b/iolog.c
index 2b5eaf0c52dac715e971e26915d3015f9c274c2c..bfafc032f4bc63dc03964d4b050d2a0089723916 100644
(file)
--- a/
iolog.c
+++ b/
iolog.c
@@
-978,7
+978,7
@@
int iolog_file_inflate(const char *file)
struct iolog_compress ic;
z_stream stream;
struct stat sb;
struct iolog_compress ic;
z_stream stream;
struct stat sb;
- s
s
ize_t ret;
+ size_t ret;
size_t total;
void *buf;
FILE *f;
size_t total;
void *buf;
FILE *f;
@@
-1000,12
+1000,12
@@
int iolog_file_inflate(const char *file)
ic.seq = 1;
ret = fread(ic.buf, ic.len, 1, f);
ic.seq = 1;
ret = fread(ic.buf, ic.len, 1, f);
- if (ret
< 0
) {
+ if (ret
== 0 && ferror(f)
) {
perror("fread");
fclose(f);
free(buf);
return 1;
perror("fread");
fclose(f);
free(buf);
return 1;
- } else if (
ret != 1
) {
+ } else if (
ferror(f) || (!feof(f) && ret != 1)
) {
log_err("fio: short read on reading log\n");
fclose(f);
free(buf);
log_err("fio: short read on reading log\n");
fclose(f);
free(buf);