svn rev #21773: trunk/src/lib/rpc/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21773
Commit By: raeburn
Log Message:
Define valgrind macros as no-ops if not USE_VALGRIND, and use unconditionally, per Danilo's suggestion.


Changed Files:
U   trunk/src/lib/rpc/xdr.c
Modified: trunk/src/lib/rpc/xdr.c
===================================================================
--- trunk/src/lib/rpc/xdr.c	2009-01-22 01:03:16 UTC (rev 21772)
+++ trunk/src/lib/rpc/xdr.c	2009-01-22 06:04:10 UTC (rev 21773)
@@ -56,6 +56,9 @@
 
 #ifdef USE_VALGRIND
 #include <valgrind/memcheck.h>
+#else
+#define VALGRIND_CHECK_DEFINED(LVALUE)		((void)0)
+#define VALGRIND_CHECK_READABLE(PTR,SIZE)	((void)0)
 #endif
 
 /*
@@ -97,9 +100,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*ip);
-#endif
 		if (*ip > 0x7fffffffL || *ip < -0x7fffffffL - 1L)
 			return (FALSE);
 
@@ -133,9 +134,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*up);
-#endif
 		if (*up > 0xffffffffUL)
 			return (FALSE);
 
@@ -168,9 +167,7 @@
 
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*lp);
-#endif
 		if (*lp > 0x7fffffffL || *lp < -0x7fffffffL - 1L)
 			return (FALSE);
 
@@ -194,9 +191,7 @@
 
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*ulp);
-#endif
 		if (*ulp > 0xffffffffUL)
 			return (FALSE);
 
@@ -222,9 +217,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*sp);
-#endif
 		l = (long) *sp;
 		return (XDR_PUTLONG(xdrs, &l));
 
@@ -255,9 +248,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*usp);
-#endif
 		l = (u_long) *usp;
 		return (XDR_PUTLONG(xdrs, (long *) &l));
 
@@ -283,7 +274,6 @@
 {
 	int i;
 
-#ifdef USE_VALGRIND
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
 		VALGRIND_CHECK_DEFINED(*cp);
@@ -291,7 +281,6 @@
 	default:
 		break;
 	}
-#endif
 	i = (*cp);
 	if (!xdr_int(xdrs, &i)) {
 		return (FALSE);
@@ -308,7 +297,6 @@
 {
 	u_int u;
 
-#ifdef USE_VALGRIND
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
 		VALGRIND_CHECK_DEFINED(*cp);
@@ -316,7 +304,6 @@
 	default:
 		break;
 	}
-#endif
 	u = (*cp);
 	if (!xdr_u_int(xdrs, &u)) {
 		return (FALSE);
@@ -336,9 +323,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*bp);
-#endif
 		lb = *bp ? XDR_TRUE : XDR_FALSE;
 		return (XDR_PUTLONG(xdrs, &lb));
 
@@ -367,7 +352,6 @@
 	/*
 	 * enums are treated as ints
 	 */
-#ifdef USE_VALGRIND
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
 		VALGRIND_CHECK_DEFINED(*ep);
@@ -375,7 +359,6 @@
 	default:
 		break;
 	}
-#endif
 	if (sizeof (enum sizecheck) == sizeof (long)) {
 		return (xdr_long(xdrs, (long *)ep));
 	} else if (sizeof (enum sizecheck) == sizeof (int)) {
@@ -425,9 +408,7 @@
 	}
 
 	if (xdrs->x_op == XDR_ENCODE) {
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_READABLE((volatile void *)cp, cnt);
-#endif
 		if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
 			return (FALSE);
 		}
@@ -518,9 +499,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*ip);
-#endif
 		l = *ip;
 		return (xdr_long(xdrs, &l));    
 
@@ -545,9 +524,7 @@
 	switch (xdrs->x_op) {
 
 	case XDR_ENCODE:
-#ifdef USE_VALGRIND
 		VALGRIND_CHECK_DEFINED(*up);
-#endif
 		ul = *up;
 		return (xdr_u_long(xdrs, &ul));