Remove iso_addr() and iso_ntoa() as part of the netiso removal.

From henning@, OK deraadt@

3 files changed, 3 insertions, 226 deletions

diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
index 81348fa0ff..b4d9feedd9 100644
--- a/src/lib/libc/net/Makefile.inc
+++ b/src/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile.inc,v 1.32 2004/02/10 18:11:58 jmc Exp $
+#       $OpenBSD: Makefile.inc,v 1.33 2004/07/13 21:06:58 millert Exp $
 
 # net sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
@@ -12,7 +12,7 @@ SRCS+=	base64.c freeaddrinfo.c gai_strerror.c getaddrinfo.c gethostnamadr.c \
         herror.c if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
         inet_lnaof.c inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
         inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c inet_pton.c \
-        ipx_addr.c ipx_ntoa.c iso_addr.c linkaddr.c ns_addr.c ns_ntoa.c \
+        ipx_addr.c ipx_ntoa.c linkaddr.c ns_addr.c ns_ntoa.c \
         nsap_addr.c \
         net_addrcmp.c \
         rcmd.c rresvport.c recv.c res_comp.c res_data.c res_debug.c \
@@ -30,7 +30,7 @@ SRCS+=	ip6opt.c rthdr.c vars6.c
 
 MAN+=   byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 getifaddrs.3 \
         getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 inet.3 \
-        if_indextoname.3 inet_net.3 iso_addr.3 link_addr.3 ns.3 ipx.3 \
+        if_indextoname.3 inet_net.3 link_addr.3 ns.3 ipx.3 \
         rcmd.3 rcmdsh.3 resolver.3 net_addrcmp.3 \
         inet6_option_space.3 inet6_rthdr_space.3 \
         getrrsetbyname.3
@@ -63,7 +63,6 @@ MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
         inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \
         inet.3 ntoa.3 inet.3 inet_ntop.3 inet.3 inet_pton.3
 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
-MLINKS+=iso_addr.3 iso_ntoa.3
 MLINKS+=link_addr.3 link_ntoa.3
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
 MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
diff --git a/src/lib/libc/net/iso_addr.3 b/src/lib/libc/net/iso_addr.3
deleted file mode 100644
index 896f769482..0000000000
--- a/src/lib/libc/net/iso_addr.3
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"     $OpenBSD: iso_addr.3,v 1.5 2003/06/02 20:18:35 millert Exp $
-.\"
-.\" Copyright (c) 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd June 4, 1993
-.Dt ISO_ADDR 3
-.Os
-.Sh NAME
-.Nm iso_addr ,
-.Nm iso_ntoa
-.Nd "network address conversion routines for Open System Interconnection"
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netiso/iso.h>
-.Ft struct iso_addr *
-.Fn iso_addr "char *cp"
-.Ft char *
-.Fn iso_ntoa "struct iso_addr *isoa"
-.Sh DESCRIPTION
-The routine
-.Fn iso_addr
-interprets character strings representing
-.Tn OSI
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn iso_ntoa
-takes
-.Tn OSI
-addresses and returns
-.Tn ASCII
-strings representing NSAPs (network service
-access points) in a
-notation inverse to that accepted by
-.Fn iso_addr .
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn OSI
-network addresses.
-.Pp
-The format employed by
-.Fn iso_addr
-is a sequence of hexadecimal
-.Dq digits
-(optionally separated by periods),
-of the form:
-.Bd -filled -offset indent
-<hex digits>.<hex digits>.<hex digits>
-.Ed
-.Pp
-Each pair of hexadecimal digits represents a byte
-with the leading digit indicating the higher-ordered bits.
-A period following an even number of bytes has no
-effect (but may be used to increase legibility).
-A period following an odd number of bytes has the
-effect of causing the byte of address being translated
-to have its higher order bits filled with zeros.
-.Sh RETURN VALUES
-.Fn iso_ntoa
-always returns a null terminated string.
-.Fn iso_addr
-always returns a pointer to a
-.Li struct iso_addr .
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn iso_addr
-and
-.Fn iso_ntoa
-functions appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values
-reside in a static memory area.
-.Pp
-The function
-.Fn iso_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/src/lib/libc/net/iso_addr.c b/src/lib/libc/net/iso_addr.c
deleted file mode 100644
index f0f8444325..0000000000
--- a/src/lib/libc/net/iso_addr.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: iso_addr.c,v 1.3 2003/06/02 20:18:35 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <netiso/iso.h>
-#include <string.h>
-
-/* States*/
-#define VIRGIN  0
-#define GOTONE  1
-#define GOTTWO  2
-/* Inputs */
-#define DIGIT   (4*0)
-#define END     (4*1)
-#define DELIM   (4*2)
-
-struct iso_addr *
-iso_addr(addr)
-        register const char *addr;
-{
-        static struct iso_addr out_addr;
-        register char *cp = out_addr.isoa_genaddr;
-        char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-        register int byte = 0, state = VIRGIN, new;
-
-        bzero((char *)&out_addr, sizeof(out_addr));
-        do {
-                if ((*addr >= '0') && (*addr <= '9')) {
-                        new = *addr - '0';
-                } else if ((*addr >= 'a') && (*addr <= 'f')) {
-                        new = *addr - 'a' + 10;
-                } else if ((*addr >= 'A') && (*addr <= 'F')) {
-                        new = *addr - 'A' + 10;
-                } else if (*addr == 0) 
-                        state |= END;
-                else
-                        state |= DELIM;
-                addr++;
-                switch (state /* | INPUT */) {
-                case GOTTWO | DIGIT:
-                        *cp++ = byte; /*FALLTHROUGH*/
-                case VIRGIN | DIGIT:
-                        state = GOTONE; byte = new; continue;
-                case GOTONE | DIGIT:
-                        state = GOTTWO; byte = new + (byte << 4); continue;
-                default: /* | DELIM */
-                        state = VIRGIN; *cp++ = byte; byte = 0; continue;
-                case GOTONE | END:
-                case GOTTWO | END:
-                        *cp++ = byte; /* FALLTHROUGH */
-                case VIRGIN | END:
-                        break;
-                }
-                break;
-        } while (cp < cplim); 
-        out_addr.isoa_len = cp - out_addr.isoa_genaddr;
-        return (&out_addr);
-}
-static char hexlist[] = "0123456789abcdef";
-
-char *
-iso_ntoa(isoa)
-        const struct iso_addr *isoa;
-{
-        static char obuf[64];
-        register char *out = obuf; 
-        register int i;
-        register u_char *in = (u_char *)isoa->isoa_genaddr;
-        u_char *inlim = in + isoa->isoa_len;
-
-        out[1] = 0;
-        while (in < inlim) {
-                i = *in++;
-                *out++ = '.';
-                if (i > 0xf) {
-                        out[1] = hexlist[i & 0xf];
-                        i >>= 4;
-                        out[0] = hexlist[i];
-                        out += 2;
-                } else
-                        *out++ = hexlist[i];
-        }
-        *out = 0;
-        return(obuf + 1);
-}