6289479 libresolv2 clean up and alignment with libbind.6.0

1 files changed, 19 insertions, 44 deletions

diff --git a/usr/src/lib/libresolv2/common/irs/irp_pw.c b/usr/src/lib/libresolv2/common/irs/irp_pw.c
index aa6fcbcbce..3722e5974d 100644
--- a/usr/src/lib/libresolv2/common/irs/irp_pw.c
+++ b/usr/src/lib/libresolv2/common/irs/irp_pw.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 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_pw.c,v 8.2 2001/11/01 07:29:26 marka Exp $";
+static const char rcsid[] = "$Id: irp_pw.c,v 1.4 2005/04/27 04:56:29 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Extern */
@@ -62,9 +55,9 @@ static int __bind_irs_pw_unneeded;
 /* Types */
 
 struct	pvt {
-	struct irp_p   *girpdata; /* global IRP data */
+	struct irp_p   *girpdata; /*%< global IRP data */
 	int		warned;
-	struct passwd	passwd;		/* password structure */
+	struct passwd	passwd;		/*%< password structure */
 };
 
 /* Forward */
@@ -111,9 +104,7 @@ irs_irp_pw(struct irs_acc *this) {
 
 /* Methods */
 
-
-
-/*
+/*%
  * void pw_close(struct irs_pw *this)
  *
  */
@@ -130,10 +121,7 @@ pw_close(struct irs_pw *this) {
 	memput(this, sizeof *this);
 }
 
-
-
-
-/*
+/*%
  * struct passwd * pw_next(struct irs_pw *this)
  *
  */
@@ -177,10 +165,7 @@ pw_next(struct irs_pw *this) {
 	return (pw);
 }
 
-
-
-
-/*
+/*%
  * struct passwd * pw_byname(struct irs_pw *this, const char *name)
  *
  */
@@ -228,10 +213,7 @@ pw_byname(struct irs_pw *this, const char *name) {
 	return (pw);
 }
 
-
-
-
-/*
+/*%
  * struct passwd * pw_byuid(struct irs_pw *this, uid_t uid)
  *
  */
@@ -279,10 +261,7 @@ pw_byuid(struct irs_pw *this, uid_t uid) {
 	return (pw);
 }
 
-
-
-
-/*
+/*%
  * void pw_rewind(struct irs_pw *this)
  *
  */
@@ -311,8 +290,7 @@ pw_rewind(struct irs_pw *this) {
 	return;
 }
 
-
-/*
+/*%
  * void pw_minimize(struct irs_pw *this)
  *
  */
@@ -327,11 +305,7 @@ pw_minimize(struct irs_pw *this) {
 
 /* Private. */
 
-
-
-/*
- * static void free_passwd(struct passwd *pw);
- *
+/*%
  *	Deallocate all the memory irp_unmarshall_pw allocated.
  *
  */
@@ -363,3 +337,4 @@ free_passwd(struct passwd *pw) {
 }
 
 #endif /* WANT_IRS_PW */
+/*! \file */