6289479 libresolv2 clean up and alignment with libbind.6.0

1 files changed, 19 insertions, 52 deletions

diff --git a/usr/src/lib/libresolv2/common/irs/irp_pr.c b/usr/src/lib/libresolv2/common/irs/irp_pr.c
index e72f6c2fe4..ea876e8281 100644
--- a/usr/src/lib/libresolv2/common/irs/irp_pr.c
+++ b/usr/src/lib/libresolv2/common/irs/irp_pr.c
@@ -1,29 +1,22 @@
 /*
- * Copyright (c) 1999 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996 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_pr.c,v 8.1 1999/01/18 07:46:54 vixie Exp $";
+static const char rcsid[] = "$Id: irp_pr.c,v 1.3 2005/04/27 04:56:29 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* extern */
@@ -76,9 +69,7 @@ static void			free_proto(struct protoent *pr);
 
 /* Public */
 
-
-
-/*
+/*%
  * struct irs_pr * irs_irp_pr(struct irs_acc *this)
  *
  */
@@ -114,9 +105,7 @@ irs_irp_pr(struct irs_acc *this) {
 
 /* Methods */
 
-
-
-/*
+/*%
  * void pr_close(struct irs_pr *this)
  *
  */
@@ -133,9 +122,7 @@ pr_close(struct irs_pr *this) {
 	memput(this, sizeof *this);
 }
 
-
-
-/*
+/*%
  * struct protoent * pr_byname(struct irs_pr *this, const char *name)
  *
  */
@@ -184,9 +171,7 @@ pr_byname(struct irs_pr *this, const char *name) {
 	return (pr);
 }
 
-
-
-/*
+/*%
  * struct protoent * pr_bynumber(struct irs_pr *this, int proto)
  *
  */
@@ -235,10 +220,7 @@ pr_bynumber(struct irs_pr *this, int proto) {
 	return (pr);
 }
 
-
-
-
-/*
+/*%
  * void pr_rewind(struct irs_pr *this)
  *
  */
@@ -267,14 +249,7 @@ pr_rewind(struct irs_pr *this) {
 	return;
 }
 
-
-
-
-/*
- * struct protoent * pr_next(struct irs_pr *this)
- *
- * Notes:
- *
+/*%
  *	Prepares the cache if necessary and returns the next item in it.
  *
  */
@@ -318,10 +293,7 @@ pr_next(struct irs_pr *this) {
 	return (pr);
 }
 
-
-
-
-/*
+/*%
  * void pr_minimize(struct irs_pr *this)
  *
  */
@@ -333,14 +305,7 @@ pr_minimize(struct irs_pr *this) {
 	irs_irp_disconnect(pvt->girpdata);
 }
 
-
-
-
-
-
-/*
- * static void free_proto(struct protoent *pw);
- *
+/*%
  *	Deallocate all the memory irp_unmarshall_pr allocated.
  *
  */
@@ -358,3 +323,5 @@ free_proto(struct protoent *pr) {
 	for (p = pr->p_aliases ; p != NULL && *p != NULL ; p++)
 		free(*p);
 }
+
+/*! \file */