label abort() from inside library as ILLEGAL

3 files changed, 8 insertions, 7 deletions

diff --git a/src/lib/libc/net/base64.c b/src/lib/libc/net/base64.c
index 452fe5afcc..33b6ffdc41 100644
--- a/src/lib/libc/net/base64.c
+++ b/src/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/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index f9ba1e55d7..5b36626ceb 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/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/src/lib/libc/net/getifaddrs.c b/src/lib/libc/net/getifaddrs.c
index ca69af8b9e..ee8f1cb5ab 100644
--- a/src/lib/libc/net/getifaddrs.c
+++ b/src/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;