6289479 libresolv2 clean up and alignment with libbind.6.0

1 files changed, 17 insertions, 48 deletions

diff --git a/usr/src/lib/libresolv2/common/irs/irp_ho.c b/usr/src/lib/libresolv2/common/irs/irp_ho.c
index 12a03edd1b..d4ce5c3bbe 100644
--- a/usr/src/lib/libresolv2/common/irs/irp_ho.c
+++ b/usr/src/lib/libresolv2/common/irs/irp_ho.c
@@ -1,29 +1,22 @@
 /*
- * Copyright 1999-2002 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996,1998 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irp_ho.c,v 8.3 2001/05/29 05:48:59 marka Exp $";
+static const char rcsid[] = "$Id: irp_ho.c,v 1.3 2005/04/27 04:56:28 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -91,9 +84,7 @@ static struct addrinfo * ho_addrinfo(struct irs_ho *this, const char *name,
 
 /* Public. */
 
-
-
-/*
+/*%
  * struct irs_ho * irs_irp_ho(struct irs_acc *this)
  *
  * Notes:
@@ -136,13 +127,7 @@ irs_irp_ho(struct irs_acc *this) {
 
 /* Methods. */
 
-
-
-/*
- * void ho_close(struct irs_ho *this)
- *
- * Notes:
- *
+/*%
  *	Closes down the module.
  *
  */
@@ -288,15 +273,7 @@ ho_byaddr(struct irs_ho *this, const void *addr, int len, int af) {
 	return (ho);
 }
 
-
-
-
-
-/*
- * struct hostent * ho_next(struct irs_ho *this)
- *
- * Notes:
- *
+/*%
  *	The implementation for gethostent(3). The first time it's
  *	called all the data is pulled from the remote(i.e. what
  *	the maximum number of gethostent(3) calls would return)
@@ -343,11 +320,7 @@ ho_next(struct irs_ho *this) {
 	return (ho);
 }
 
-
-
-
-
-/*
+/*%
  * void ho_rewind(struct irs_ho *this)
  *
  */
@@ -376,10 +349,7 @@ ho_rewind(struct irs_ho *this) {
 	return;
 }
 
-
-
-
-/*
+/*%
  * void ho_minimize(struct irs_ho *this)
  *
  */
@@ -393,10 +363,7 @@ ho_minimize(struct irs_ho *this) {
 	irs_irp_disconnect(pvt->girpdata);
 }
 
-
-
-
-/*
+/*%
  * void free_host(struct hostent *ho)
  *
  */
@@ -434,3 +401,5 @@ ho_addrinfo(struct irs_ho *this, const char *name, const struct addrinfo *pai)
 	UNUSED(pai);
 	return(NULL);
 }
+
+/*! \file */