1 files changed, 18 insertions, 21 deletions

diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/net/freeaddrinfo.c
index 3353fab052..58702d0b18 100644
--- a/src/lib/libc/stdlib/calloc.c
+++ b/src/lib/libc/net/freeaddrinfo.c
@@ -1,6 +1,7 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+/*      $OpenBSD: freeaddrinfo.c,v 1.6 2005/03/25 13:24:11 otto Exp $   */
+
+/*
+ * Copyright (c) 1996, 1997, 1998, 1999, Craig Metz, All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,9 +13,9 @@
  *    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
+ *      This product includes software developed by Craig Metz and
+ *      by other contributors.
+ * 4. Neither the name of the author nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,23 +32,19 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)calloc.c     5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: calloc.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stdlib.h>
-#include <string.h>
+#include <netdb.h>
 
-void *
-calloc(num, size)
-        size_t num;
-        register size_t size;
+void
+freeaddrinfo(struct addrinfo *ai)
 {
-        register void *p;
+        struct addrinfo *p;
 
-        size *= num;
-        if (p = malloc(size))
-                memset(p, '\0', size);
-        return(p);
+        do {
+                p = ai;
+                ai = ai->ai_next;
+                if (p->ai_canonname)
+                        free(p->ai_canonname);
+                free((void *)p);
+        } while (ai);
 }