diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2024-03-13 17:31:48 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2024-03-13 17:31:48 +0000 |
| commit | ef5fddd3440cc726db2acb85ca55fdc9c996ea64 (patch) | |
| tree | e5b830a417043b1fa732b1225d47b02bf18afd6f /lib/libc | |
| parent | f7dbbbd1762f8f74d5a585230c56eca92e4fdb8b (diff) | |
| download | src-ef5fddd3440cc726db2acb85ca55fdc9c996ea64.tar.gz src-ef5fddd3440cc726db2acb85ca55fdc9c996ea64.zip | |
libsys: make __libsys_interposing static
Access __libsys_interposing with __libc_interposing_slot() in all
cases to support a move of these wrappers back to libc.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D44239
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/libc_interposing_table.c | 1 | ||||
| -rw-r--r-- | lib/libc/gen/sleep.c | 2 | ||||
| -rw-r--r-- | lib/libc/gen/usleep.c | 2 | ||||
| -rw-r--r-- | lib/libc/include/libc_private.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/lib/libc/gen/libc_interposing_table.c b/lib/libc/gen/libc_interposing_table.c index 6997dce86569..d15d32711910 100644 --- a/lib/libc/gen/libc_interposing_table.c +++ b/lib/libc/gen/libc_interposing_table.c @@ -49,7 +49,6 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = { interpos_func_t * __libc_interposing_slot(int interposno) { - /* XXX: forward compat. Remove after 15.0-RELEASE. */ if (__libc_interposing[interposno] == NULL) return (__libsys_interposing_slot(interposno)); return (&__libc_interposing[interposno]); diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c index 46a7dcc4dbca..7b6e80353c6e 100644 --- a/lib/libc/gen/sleep.c +++ b/lib/libc/gen/sleep.c @@ -56,7 +56,7 @@ __sleep(unsigned int seconds) time_to_sleep.tv_sec = seconds; time_to_sleep.tv_nsec = 0; if (((int (*)(const struct timespec *, struct timespec *)) - (*__libsys_interposing_slot(INTERPOS_nanosleep)))( + (*__libc_interposing_slot(INTERPOS_nanosleep)))( &time_to_sleep, &time_remaining) != -1) return (0); if (errno != EINTR) diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c index e312e55c6541..f58d81d978e3 100644 --- a/lib/libc/gen/usleep.c +++ b/lib/libc/gen/usleep.c @@ -46,7 +46,7 @@ __usleep(useconds_t useconds) time_to_sleep.tv_nsec = (useconds % 1000000) * 1000; time_to_sleep.tv_sec = useconds / 1000000; return (((int (*)(const struct timespec *, struct timespec *)) - (*__libsys_interposing_slot(INTERPOS_nanosleep)))(&time_to_sleep, + (*__libc_interposing_slot(INTERPOS_nanosleep)))(&time_to_sleep, NULL)); } diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 6a6de5b5645d..b3f31f6e4e87 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -201,7 +201,6 @@ typedef int (*interpos_func_t)(void); interpos_func_t *__libc_interposing_slot(int interposno); extern interpos_func_t __libc_interposing[] __hidden; interpos_func_t *__libsys_interposing_slot(int interposno); -extern interpos_func_t __libsys_interposing[] __hidden; enum { INTERPOS_accept, |