projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix incorrect clock tick scaling in fallback case of clock()
[musl]
/
src
/
stdio
/
fread.c
diff --git
a/src/stdio/fread.c
b/src/stdio/fread.c
index
8105fe9
..
c461256
100644
(file)
--- a/
src/stdio/fread.c
+++ b/
src/stdio/fread.c
@@
-1,8
+1,9
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <string.h>
#define MIN(a,b) ((a)<(b) ? (a) : (b))
#define MIN(a,b) ((a)<(b) ? (a) : (b))
-size_t fread(void *
destv, size_t size, size_t nmemb, FILE *
f)
+size_t fread(void *
restrict destv, size_t size, size_t nmemb, FILE *restrict
f)
{
unsigned char *dest = destv;
size_t len = size*nmemb, l = len, k;
{
unsigned char *dest = destv;
size_t len = size*nmemb, l = len, k;
@@
-21,14
+22,9
@@
size_t fread(void *destv, size_t size, size_t nmemb, FILE *f)
l -= k;
}
l -= k;
}
- if (!l) {
- FUNLOCK(f);
- return nmemb;
- }
-
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
- k = f->read(f, dest, l);
+ k =
__toread(f) ? 0 :
f->read(f, dest, l);
if (k+1<=1) {
FUNLOCK(f);
return (len-l)/size;
if (k+1<=1) {
FUNLOCK(f);
return (len-l)/size;