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/getnetgrent.c b/usr/src/lib/libresolv2/common/irs/getnetgrent.c
index 69e322d647..2a21772468 100644
--- a/usr/src/lib/libresolv2/common/irs/getnetgrent.c
+++ b/usr/src/lib/libresolv2/common/irs/getnetgrent.c
@@ -1,29 +1,22 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * Portions Copyright (c) 1996,1999 by Internet Software Consortium.
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1996-1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or 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: getnetgrent.c,v 1.17 2003/04/29 05:51:14 marka Exp $";
+static const char rcsid[] = "$Id: getnetgrent.c,v 1.6 2008/11/14 02:36:51 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports */
@@ -57,35 +50,18 @@ static struct net_data *init(void);
 #ifndef SETNETGRENT_ARGS
 #define SETNETGRENT_ARGS const char *netgroup
 #endif
-
-#ifdef	ORIGINAL_ISC_CODE
 void
-#else
-int
-#endif
 setnetgrent(SETNETGRENT_ARGS) {
 	struct net_data *net_data = init();
 
 	setnetgrent_p(netgroup, net_data);
-#ifdef	ORIGINAL_ISC_CODE
-#else
-	return (0);
-#endif
 }
 
-#ifdef	ORIGINAL_ISC_CODE
 void
-#else
-int
-#endif
 endnetgrent(void) {
 	struct net_data *net_data = init();
 
 	endnetgrent_p(net_data);
-#ifdef	ORIGINAL_ISC_CODE
-#else
-	return (0);
-#endif
 }
 
 #ifndef INNETGR_ARGS
@@ -99,9 +75,10 @@ innetgr(INNETGR_ARGS) {
 	return (innetgr_p(netgroup, host, user, domain, net_data));
 }
 
-#ifdef	ORIGINAL_ISC_CODE
 int
-getnetgrent(const char **host, const char **user, const char **domain) {
+getnetgrent(NGR_R_CONST char **host, NGR_R_CONST char **user,
+	    NGR_R_CONST char **domain)
+{
 	struct net_data *net_data = init();
 	const char *ch, *cu, *cd;
 	int ret;
@@ -115,16 +92,6 @@ getnetgrent(const char **host, const char **user, const char **domain) {
 	DE_CONST(cd, *domain);
 	return (ret);
 }
-#else
-int
-getnetgrent(char **host, char **user, char **domain) {
-	struct net_data *net_data = init();
-
-	return (getnetgrent_p((const char **)host, (const char **)user,
-		(const char **)domain, net_data));
-	
-}
-#endif /* ORIGINAL_ISC_CODE */
 
 /* Shared private. */
 
@@ -184,8 +151,10 @@ init(void) {
 			return (NULL);
 		}
 	}
-	
+
 	return (net_data);
 }
 
 #endif /*__BIND_NOSTATIC*/
+
+/*! \file */