diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-26 03:57:14 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-26 03:57:14 +0000 |
| commit | 9921832fa13cef31006cfa69bc5574636c36ac0f (patch) | |
| tree | 4faa87a1fbc9842126d3bdc61c0d64285ebcc849 /libc/stdio/fread.c | |
| parent | 292e2d7a707449b531422d37cec4608d304da24e (diff) | |
| download | uClibc-alpine-9921832fa13cef31006cfa69bc5574636c36ac0f.tar.bz2 uClibc-alpine-9921832fa13cef31006cfa69bc5574636c36ac0f.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdio/fread.c')
| -rw-r--r-- | libc/stdio/fread.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c index 0defb36a0..c603a9d2e 100644 --- a/libc/stdio/fread.c +++ b/libc/stdio/fread.c @@ -7,9 +7,14 @@ #include "_stdio.h" +libc_hidden_proto(fread_unlocked) + #ifdef __DO_UNLOCKED -size_t attribute_hidden __fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, +libc_hidden_proto(memcpy) +libc_hidden_proto(fflush_unlocked) + +size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, FILE * __restrict stream) { __STDIO_STREAM_VALIDATE(stream); @@ -44,7 +49,7 @@ size_t attribute_hidden __fread_unlocked(void * __restrict ptr, size_t size, siz if (avail > todo) { avail = todo; } - __memcpy(buffer, stream->__bufpos, avail); + memcpy(buffer, stream->__bufpos, avail); buffer += avail; stream->__bufpos += avail; if (!(todo -= avail)) { @@ -82,16 +87,18 @@ size_t attribute_hidden __fread_unlocked(void * __restrict ptr, size_t size, siz __STDIO_STREAM_VALIDATE(stream); return 0; } +libc_hidden_def(fread_unlocked) -weak_alias(__fread_unlocked,fread_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -hidden_strong_alias(__fread_unlocked,__fread) -weak_alias(__fread_unlocked,fread) +libc_hidden_proto(fread) +strong_alias(fread_unlocked,fread) +libc_hidden_def(fread) #endif #elif defined __UCLIBC_HAS_THREADS__ -size_t attribute_hidden __fread(void * __restrict ptr, size_t size, size_t nmemb, +libc_hidden_proto(fread) +size_t fread(void * __restrict ptr, size_t size, size_t nmemb, register FILE * __restrict stream) { size_t retval; @@ -99,12 +106,12 @@ size_t attribute_hidden __fread(void * __restrict ptr, size_t size, size_t nmemb __STDIO_AUTO_THREADLOCK(stream); - retval = __fread_unlocked(ptr, size, nmemb, stream); + retval = fread_unlocked(ptr, size, nmemb, stream); __STDIO_AUTO_THREADUNLOCK(stream); return retval; } -strong_alias(__fread,fread) +libc_hidden_def(fread) #endif |