aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libc/net/name6.c
diff options
context:
space:
mode:
authorJason Evans <jasone@FreeBSD.org>2000-01-27 23:07:25 +0000
committerJason Evans <jasone@FreeBSD.org>2000-01-27 23:07:25 +0000
commit9233c4d9426e03b28e043baeefb6d5a37dc4086e (patch)
tree8606358bf2ae9c436cce380d290e7a73f9cddfc6 /lib/libc/net/name6.c
parent072229cdbb757229b7e11f102da326679db27d0e (diff)
downloadsrc-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/net/name6.c')
-rw-r--r--lib/libc/net/name6.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index e3ddf3ec14cd..3f39d0302dca 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -257,7 +257,7 @@ _ghbyname(const char *name, int af, int flags, int *errp)
* (or apropriate interval),
* because addresses will be dynamically assigned or deleted.
*/
- _libc_close(s);
+ _close(s);
}
for (i = 0; i < MAXHOSTCONF; i++) {
@@ -1184,21 +1184,21 @@ _icmp_fqdn_query(const struct in6_addr *addr, int ifindex)
(char *)&filter, sizeof(filter));
cc = sendmsg(s, &msg, 0);
if (cc < 0) {
- _libc_close(s);
+ _close(s);
return NULL;
}
FD_SET(s, &s_fds);
for (;;) {
fds = s_fds;
if (select(s + 1, &fds, NULL, NULL, &tout) <= 0) {
- _libc_close(s);
+ _close(s);
return NULL;
}
len = sizeof(sin6);
cc = recvfrom(s, buf, sizeof(buf), 0,
(struct sockaddr *)&sin6, &len);
if (cc <= 0) {
- _libc_close(s);
+ _close(s);
return NULL;
}
if (cc < sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr))
@@ -1209,7 +1209,7 @@ _icmp_fqdn_query(const struct in6_addr *addr, int ifindex)
if (fr->icmp6_fqdn_type == ICMP6_FQDN_REPLY)
break;
}
- _libc_close(s);
+ _close(s);
if (fr->icmp6_fqdn_cookie[1] != 0) {
/* rfc1788 type */
name = buf + sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) + 4;