1 files changed, 9 insertions, 22 deletions

diff --git a/src/lib/libc/net/linkaddr.c b/src/lib/libc/net/linkaddr.c
index 19a0de3abd..fcb0164ca4 100644
--- a/src/lib/libc/net/linkaddr.c
+++ b/src/lib/libc/net/linkaddr.c
@@ -1,5 +1,3 @@
-/*      $NetBSD: linkaddr.c,v 1.5 1995/02/25 06:20:49 cgd Exp $ */
-
 /*-
  * Copyright (c) 1990, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -12,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
  *
@@ -34,11 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)linkaddr.c  8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$NetBSD: linkaddr.c,v 1.5 1995/02/25 06:20:49 cgd Exp $";
-#endif
+static char rcsid[] = "$OpenBSD: linkaddr.c,v 1.4 2005/03/25 13:24:12 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -58,13 +48,11 @@ static char rcsid[] = "$NetBSD: linkaddr.c,v 1.5 1995/02/25 06:20:49 cgd Exp $";
 #define LETTER  (4*3)
 
 void
-link_addr(addr, sdl)
-        register const char *addr;
-        register struct sockaddr_dl *sdl;
+link_addr(const char *addr, struct sockaddr_dl *sdl)
 {
-        register char *cp = sdl->sdl_data;
+        char *cp = sdl->sdl_data;
         char *cplim = sdl->sdl_len + (char *)sdl;
-        register int byte = 0, state = NAMING, new;
+        int byte = 0, state = NAMING, new;
 
         bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
         sdl->sdl_family = AF_LINK;
@@ -129,13 +117,12 @@ link_addr(addr, sdl)
 static char hexlist[] = "0123456789abcdef";
 
 char *
-link_ntoa(sdl)
-        register const struct sockaddr_dl *sdl;
+link_ntoa(const struct sockaddr_dl *sdl)
 {
         static char obuf[64];
-        register char *out = obuf; 
-        register int i;
-        register u_char *in = (u_char *)LLADDR(sdl);
+        char *out = obuf; 
+        int i;
+        u_char *in = (u_char *)LLADDR(sdl);
         u_char *inlim = in + sdl->sdl_alen;
         int firsttime = 1;