diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/net/base64.c | 3 | ||||
-rw-r--r-- | lib/libc/net/getaddrinfo.c | 6 | ||||
-rw-r--r-- | lib/libc/net/getifaddrs.c | 6 | ||||
-rw-r--r-- | lib/libc/rpc/auth_unix.c | 6 | ||||
-rw-r--r-- | lib/libc/rpc/svc_tcp.c | 8 |
5 files changed, 15 insertions, 14 deletions
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c index 452fe5afcc8..33b6ffdc41e 100644 --- a/lib/libc/net/base64.c +++ b/lib/libc/net/base64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $ */ +/* $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $ */ /* * Copyright (c) 1996 by Internet Software Consortium. @@ -56,6 +56,7 @@ #include <stdlib.h> #include <string.h> +/* XXX abort illegal in library */ #define Assert(Cond) if (!(Cond)) abort() static const char Base64[] = diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index f9ba1e55d71..5b36626ceb0 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getaddrinfo.c,v 1.30 2001/08/20 02:23:05 itojun Exp $ */ +/* $OpenBSD: getaddrinfo.c,v 1.31 2002/01/02 23:00:10 deraadt Exp $ */ /* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */ /* @@ -1052,7 +1052,7 @@ getanswer(answer, anslen, qname, qtype, pai) name_ok = res_hnok; break; default: - return (NULL); /* XXX should be abort(); */ + return (NULL); /* XXX should be abort() -- but that is illegal */ } /* * find first satisfactory answer @@ -1185,7 +1185,7 @@ getanswer(answer, anslen, qname, qtype, pai) cp += n; break; default: - abort(); + abort(); /* XXX abort illegal in library */ } if (!had_error) haveanswer++; diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index ca69af8b9e4..ee8f1cb5abf 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getifaddrs.c,v 1.6 2001/08/20 02:27:10 itojun Exp $ */ +/* $OpenBSD: getifaddrs.c,v 1.7 2002/01/02 23:00:10 deraadt Exp $ */ /* * Copyright (c) 1995, 1999 @@ -152,7 +152,7 @@ getifaddrs(struct ifaddrs **pif) case RTM_NEWADDR: ifam = (struct ifa_msghdr *)rtm; if (index && ifam->ifam_index != index) - abort(); /* this cannot happen */ + abort(); /* XXX abort illegal in library */ #define RTA_MASKS (RTA_NETMASK | RTA_IFA | RTA_BRD) if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0) @@ -279,7 +279,7 @@ getifaddrs(struct ifaddrs **pif) case RTM_NEWADDR: ifam = (struct ifa_msghdr *)rtm; if (index && ifam->ifam_index != index) - abort(); /* this cannot happen */ + abort(); /* XXX abort illegal in library */ if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0) break; diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c index b4f0c9448de..7b55938d379 100644 --- a/lib/libc/rpc/auth_unix.c +++ b/lib/libc/rpc/auth_unix.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: auth_unix.c,v 1.14 2001/09/15 13:51:00 deraadt Exp $"; +static char *rcsid = "$OpenBSD: auth_unix.c,v 1.15 2002/01/02 23:00:10 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -143,8 +143,8 @@ authunix_create(machname, uid, gid, len, aup_gids) * Serialize the parameters into origcred */ xdrmem_create(&xdrs, mymem, MAX_AUTH_BYTES, XDR_ENCODE); - if (! xdr_authunix_parms(&xdrs, &aup)) - abort(); + if (!xdr_authunix_parms(&xdrs, &aup)) + abort(); /* XXX abort illegal in library */ au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs); au->au_origcred.oa_flavor = AUTH_UNIX; #ifdef KERNEL diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c index f40f7e8644f..ad27be3888c 100644 --- a/lib/libc/rpc/svc_tcp.c +++ b/lib/libc/rpc/svc_tcp.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: svc_tcp.c,v 1.20 2001/09/15 13:51:01 deraadt Exp $"; +static char *rcsid = "$OpenBSD: svc_tcp.c,v 1.21 2002/01/02 23:00:10 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -82,9 +82,9 @@ static enum xprt_stat rendezvous_stat(); static struct xp_ops svctcp_rendezvous_op = { rendezvous_request, rendezvous_stat, - (bool_t (*)())abort, - (bool_t (*)())abort, - (bool_t (*)())abort, + (bool_t (*)())abort, /* XXX abort illegal in library */ + (bool_t (*)())abort, /* XXX abort illegal in library */ + (bool_t (*)())abort, /* XXX abort illegal in library */ svctcp_destroy }; |