PSARC/2005/362 Removal of <rpc/trace.h>

4426428 libnsl needs some tidying up
6256192 Remaining ulonglong_t needs to be exorcised
6267468 rpcgen generates code gcc doesn't like
6271220 rpc/trace.h is obsolete and dead code
6271232 rpcgen fails to cast memset correctly

--HG--
rename : usr/src/lib/libnsl/dial/dk.h => deleted_files/usr/src/lib/libnsl/dial/dk.h
rename : usr/src/lib/libnsl/dial/dkbreak.c => deleted_files/usr/src/lib/libnsl/dial/dkbreak.c
rename : usr/src/lib/libnsl/dial/dkdial.c => deleted_files/usr/src/lib/libnsl/dial/dkdial.c
rename : usr/src/lib/libnsl/dial/dkerr.c => deleted_files/usr/src/lib/libnsl/dial/dkerr.c
rename : usr/src/lib/libnsl/dial/dkminor.c => deleted_files/usr/src/lib/libnsl/dial/dkminor.c
rename : usr/src/lib/libnsl/dial/dtnamer.c => deleted_files/usr/src/lib/libnsl/dial/dtnamer.c
rename : usr/src/lib/libnsl/rpc/rpc_trace.c => deleted_files/usr/src/lib/libnsl/rpc/rpc_trace.c
rename : usr/src/uts/common/rpc/trace.h => deleted_files/usr/src/uts/common/rpc/trace.h

1 files changed, 7 insertions, 25 deletions

diff --git a/usr/src/lib/libnsl/nss/getuserattr.c b/usr/src/lib/libnsl/nss/getuserattr.c
index 6b46061a97..b1252f4bb4 100644
--- a/usr/src/lib/libnsl/nss/getuserattr.c
+++ b/usr/src/lib/libnsl/nss/getuserattr.c
@@ -19,9 +19,10 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright (c) 1999 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,7 +32,6 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <nss_dbdefs.h>
-#include <rpc/trace.h>
 #include <string.h>
 #include <user_attr.h>
 
@@ -55,11 +55,9 @@ static DEFINE_NSS_GETENT(context);
 void
 _nss_initf_userattr(nss_db_params_t *p)
 {
-	trace1(TR__nss_initf_userattr, 0);
 	p->name = NSS_DBNAM_USERATTR;
 	p->config_name    = NSS_DBNAM_PASSWD; /* use config for "passwd" */
 	p->default_config = NSS_DEFCONF_USERATTR;
-	trace1(TR__nss_initf_userattr, 1);
 }
 
 
@@ -72,22 +70,16 @@ _nss_initf_userattr(nss_db_params_t *p)
 int
 str2userattr(const char *instr, int lenstr, void *ent, char *buffer, int buflen)
 {
-	char		*str = (char *)NULL;
-	char		*last = (char *)NULL;
+	char		*last = NULL;
 	char		*sep = KV_TOKEN_DELIMIT;
 	userstr_t	*user = (userstr_t *)ent;
 
-	trace3(TR_str2userattr, 0, lenstr, buflen);
 	if ((instr >= buffer && (buffer + buflen) > instr) ||
-	    (buffer >= instr && (instr + lenstr) > buffer)) {
-		trace3(TR_str2userattr, 1, lenstr, buflen);
+	    (buffer >= instr && (instr + lenstr) > buffer))
 		return (NSS_STR_PARSE_PARSE);
-	}
-	if (lenstr >= buflen) {
-		trace3(TR_str2userattr, 1, lenstr, buflen);
+	if (lenstr >= buflen)
 		return (NSS_STR_PARSE_ERANGE);
-	}
-	strncpy(buffer, instr, buflen);
+	(void) strncpy(buffer, instr, buflen);
 	/*
 	 * Remove newline that nis (yp_match) puts at the
 	 * end of the entry it retrieves from the map.
@@ -109,21 +101,17 @@ str2userattr(const char *instr, int lenstr, void *ent, char *buffer, int buflen)
 void
 _setuserattr(void)
 {
-	trace1(TR_setuserattr, 0);
 	userattr_stayopen = 0;
 	nss_setent(&db_root, _nss_initf_userattr, &context);
-	trace1(TR_setuserattr, 0);
 }
 
 
 void
 _enduserattr(void)
 {
-	trace1(TR_enduserattr, 0);
 	userattr_stayopen = 0;
 	nss_endent(&db_root, _nss_initf_userattr, &context);
 	nss_delete(&db_root);
-	trace1(TR_enduserattr, 0);
 }
 
 
@@ -133,12 +121,10 @@ _getuserattr(userstr_t *result, char *buffer, int buflen, int *h_errnop)
 	nss_XbyY_args_t arg;
 	nss_status_t    res;
 
-	trace2(TR_getuserattr, 0, buflen);
 	NSS_XbyY_INIT(&arg, result, buffer, buflen, str2userattr);
 	res = nss_getent(&db_root, _nss_initf_userattr, &context, &arg);
 	arg.status = res;
 	*h_errnop = arg.h_errno;
-	trace2(TR_getuserattr, 1, buflen);
 	return ((userstr_t *)NSS_XbyY_FINI(&arg));
 }
 
@@ -148,10 +134,8 @@ _fgetuserattr(FILE *f, userstr_t *result, char *buffer, int buflen)
 {
 	nss_XbyY_args_t arg;
 
-	trace2(TR_getuserattr, 0, buflen);
 	NSS_XbyY_INIT(&arg, result, buffer, buflen, str2userattr);
 	_nss_XbyY_fgets(f, &arg);
-	trace2(TR_getuserattr, 1, buflen);
 	return ((userstr_t *)NSS_XbyY_FINI(&arg));
 }
 
@@ -164,7 +148,6 @@ _getusernam(const char *name, userstr_t *result, char *buffer, int buflen,
 	nss_XbyY_args_t arg;
 	nss_status_t    res;
 
-	trace2(TR_getusernam, 0, buflen);
 	NSS_XbyY_INIT(&arg, result, buffer, buflen, str2userattr);
 	arg.key.name = name;
 	arg.stayopen = userattr_stayopen;
@@ -172,6 +155,5 @@ _getusernam(const char *name, userstr_t *result, char *buffer, int buflen,
 	    NSS_DBOP_USERATTR_BYNAME, &arg);
 	arg.status = res;
 	*errnop = arg.h_errno;
-	trace2(TR_getusernam, 1, buflen);
 	return ((userstr_t *)NSS_XbyY_FINI(&arg));
 }