summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libc/net/base64.c3
-rw-r--r--src/lib/libc/net/getaddrinfo.c6
-rw-r--r--src/lib/libc/net/getifaddrs.c6
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 @@
1/* $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $ */ 1/* $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996 by Internet Software Consortium. 4 * Copyright (c) 1996 by Internet Software Consortium.
@@ -56,6 +56,7 @@
56#include <stdlib.h> 56#include <stdlib.h>
57#include <string.h> 57#include <string.h>
58 58
59/* XXX abort illegal in library */
59#define Assert(Cond) if (!(Cond)) abort() 60#define Assert(Cond) if (!(Cond)) abort()
60 61
61static const char Base64[] = 62static 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 @@
1/* $OpenBSD: getaddrinfo.c,v 1.30 2001/08/20 02:23:05 itojun Exp $ */ 1/* $OpenBSD: getaddrinfo.c,v 1.31 2002/01/02 23:00:10 deraadt Exp $ */
2/* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */ 2/* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */
3 3
4/* 4/*
@@ -1052,7 +1052,7 @@ getanswer(answer, anslen, qname, qtype, pai)
1052 name_ok = res_hnok; 1052 name_ok = res_hnok;
1053 break; 1053 break;
1054 default: 1054 default:
1055 return (NULL); /* XXX should be abort(); */ 1055 return (NULL); /* XXX should be abort() -- but that is illegal */
1056 } 1056 }
1057 /* 1057 /*
1058 * find first satisfactory answer 1058 * find first satisfactory answer
@@ -1185,7 +1185,7 @@ getanswer(answer, anslen, qname, qtype, pai)
1185 cp += n; 1185 cp += n;
1186 break; 1186 break;
1187 default: 1187 default:
1188 abort(); 1188 abort(); /* XXX abort illegal in library */
1189 } 1189 }
1190 if (!had_error) 1190 if (!had_error)
1191 haveanswer++; 1191 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 @@
1/* $OpenBSD: getifaddrs.c,v 1.6 2001/08/20 02:27:10 itojun Exp $ */ 1/* $OpenBSD: getifaddrs.c,v 1.7 2002/01/02 23:00:10 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1995, 1999 4 * Copyright (c) 1995, 1999
@@ -152,7 +152,7 @@ getifaddrs(struct ifaddrs **pif)
152 case RTM_NEWADDR: 152 case RTM_NEWADDR:
153 ifam = (struct ifa_msghdr *)rtm; 153 ifam = (struct ifa_msghdr *)rtm;
154 if (index && ifam->ifam_index != index) 154 if (index && ifam->ifam_index != index)
155 abort(); /* this cannot happen */ 155 abort(); /* XXX abort illegal in library */
156 156
157#define RTA_MASKS (RTA_NETMASK | RTA_IFA | RTA_BRD) 157#define RTA_MASKS (RTA_NETMASK | RTA_IFA | RTA_BRD)
158 if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0) 158 if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
@@ -279,7 +279,7 @@ getifaddrs(struct ifaddrs **pif)
279 case RTM_NEWADDR: 279 case RTM_NEWADDR:
280 ifam = (struct ifa_msghdr *)rtm; 280 ifam = (struct ifa_msghdr *)rtm;
281 if (index && ifam->ifam_index != index) 281 if (index && ifam->ifam_index != index)
282 abort(); /* this cannot happen */ 282 abort(); /* XXX abort illegal in library */
283 283
284 if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0) 284 if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
285 break; 285 break;