diff options
author | Jason Evans <jasone@FreeBSD.org> | 2000-01-27 23:07:25 +0000 |
---|---|---|
committer | Jason Evans <jasone@FreeBSD.org> | 2000-01-27 23:07:25 +0000 |
commit | 9233c4d9426e03b28e043baeefb6d5a37dc4086e (patch) | |
tree | 8606358bf2ae9c436cce380d290e7a73f9cddfc6 /lib/libc/stdio/stdio.c | |
parent | 072229cdbb757229b7e11f102da326679db27d0e (diff) | |
download | src-9233c4d9426e03b28e043baeefb6d5a37dc4086e.tar.gz src-9233c4d9426e03b28e043baeefb6d5a37dc4086e.zip |
Simplify sytem call renaming. Instead of _foo() <-- _libc_foo <-- foo(),
just use _foo() <-- foo(). In the case of a libpthread that doesn't do
call conversion (such as linuxthreads and our upcoming libpthread), this
is adequate. In the case of libc_r, we still need three names, which are
now _thread_sys_foo() <-- _foo() <-- foo().
Convert all internal libc usage of: aio_suspend(), close(), fsync(), msync(),
nanosleep(), open(), fcntl(), read(), and write() to _foo() instead of foo().
Remove all internal libc usage of: creat(), pause(), sleep(), system(),
tcdrain(), wait(), and waitpid().
Make thread cancellation fully POSIX-compliant.
Suggested by: deischen
Notes
Notes:
svn path=/head/; revision=56698
Diffstat (limited to 'lib/libc/stdio/stdio.c')
-rw-r--r-- | lib/libc/stdio/stdio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c index 777f33677ec0..b8a3f47aa148 100644 --- a/lib/libc/stdio/stdio.c +++ b/lib/libc/stdio/stdio.c @@ -60,7 +60,7 @@ __sread(cookie, buf, n) register FILE *fp = cookie; register int ret; - ret = _libc_read(fp->_file, buf, (size_t)n); + ret = _read(fp->_file, buf, (size_t)n); /* if the read succeeded, update the current offset */ if (ret >= 0) fp->_offset += ret; @@ -80,7 +80,7 @@ __swrite(cookie, buf, n) if (fp->_flags & __SAPP) (void) lseek(fp->_file, (off_t)0, SEEK_END); fp->_flags &= ~__SOFF; /* in case FAPPEND mode is set */ - return (_libc_write(fp->_file, buf, (size_t)n)); + return (_write(fp->_file, buf, (size_t)n)); } fpos_t @@ -107,5 +107,5 @@ __sclose(cookie) void *cookie; { - return (_libc_close(((FILE *)cookie)->_file)); + return (_close(((FILE *)cookie)->_file)); } |