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/stdtime/timelocal.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/stdtime/timelocal.c')
-rw-r--r-- | lib/libc/stdtime/timelocal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c index f95dda07e3f2..c765cf42b72e 100644 --- a/lib/libc/stdtime/timelocal.c +++ b/lib/libc/stdtime/timelocal.c @@ -157,7 +157,7 @@ __time_load_locale(const char *name) strcat(filename, "/"); strcat(filename, name); strcat(filename, "/LC_TIME"); - fd = _libc_open(filename, O_RDONLY); + fd = _open(filename, O_RDONLY); if (fd < 0) goto no_locale; if (fstat(fd, &st) != 0) @@ -173,9 +173,9 @@ __time_load_locale(const char *name) (void) strcpy(lbuf, name); p = lbuf + namesize; plim = p + st.st_size; - if (_libc_read(fd, p, (size_t) st.st_size) != st.st_size) + if (_read(fd, p, (size_t) st.st_size) != st.st_size) goto bad_lbuf; - if (_libc_close(fd) != 0) + if (_close(fd) != 0) goto bad_lbuf; /* ** Parse the locale file into localebuf. @@ -211,7 +211,7 @@ reset_locale: bad_lbuf: free(lbuf); bad_locale: - (void)_libc_close(fd); + (void)_close(fd); no_locale: _time_using_locale = save_using_locale; return -1; |