From 0464f9b689df8fd1504df9db3de6ece8475e069d Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Mon, 27 Apr 2009 20:17:40 +0000
Subject: [PATCH] STABLE14-dprintf-rename-20090427

LICENSE IPL10
FIXES 124657

make dprintf be afs_dprintf to fix for fedora 11 and probably others


(cherry picked from commit 2f5ac61b0a8775c58536ee954f2208ab88d0b225)
---
 src/bucoord/bc.p.h       |  2 +-
 src/bucoord/ubik_db_if.c |  4 ++--
 src/config/debug.h       | 10 +++++-----
 src/sgistuff/rcmd.c      |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bucoord/bc.p.h b/src/bucoord/bc.p.h
index 4fbc1bfc6..be580abee 100644
--- a/src/bucoord/bc.p.h
+++ b/src/bucoord/bc.p.h
@@ -144,4 +144,4 @@ struct bc_dumpTask {
 #define	BC_MAXSIMDUMPS	    64
 #define BC_MAXPORTS	    128	/* max number of port offsets for volrestore */
 /* debugging support */
-#define	dprintf(x)
+#define	afs_dprintf(x)
diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c
index 2dacf39ad..a218413a6 100644
--- a/src/bucoord/ubik_db_if.c
+++ b/src/bucoord/ubik_db_if.c
@@ -601,7 +601,7 @@ bcdb_SaveTextFile(ctPtr)
 
     fileSize = (afs_int32) filesize(ctPtr->textStream);
 
-    dprintf(("filesize is %d\n", fileSize));
+    afs_dprintf(("filesize is %d\n", fileSize));
 
     rewind(ctPtr->textStream);
 
@@ -1390,7 +1390,7 @@ bc_openTextFile(udbClientTextP ctPtr, char *tmpFileName)
 	ERROR(errno);
 #endif
 
-    dprintf(("file is %s\n", tmpFileName));
+    afs_dprintf(("file is %s\n", tmpFileName));
 
   normal_exit:
     return code;
diff --git a/src/config/debug.h b/src/config/debug.h
index 0d0111173..2ec6ec8b2 100644
--- a/src/config/debug.h
+++ b/src/config/debug.h
@@ -112,21 +112,21 @@ if(!(x)) { fprintf(stderr, "assertion failed: line %d, file %s\n",\
 
 #if defined(AFS_DEBUG)
 #if defined(lint)
-#define dprintf(flag, str) printf str
+#define afs_dprintf(flag, str) printf str
 #define dlprintf(flag, level, str) printf str
 #define dmprintf(flag, bit, str) printf str
 #else /* lint */
-#define dprintf(flag, str) \
+#define afs_dprintf(flag, str) \
       (void)((flag) ? \
 	     ( osi_dp str, osi_dp("\t%s, %d\n", __FILE__, __LINE__)):0)
-#define dlprintf(flag, level, str) dprintf(((flag) >= (level)), str)
-#define dmprintf(flag, bit, str) dprintf(((flag)&(1<<((bit)-1))), str)
+#define dlprintf(flag, level, str) afs_dprintf(((flag) >= (level)), str)
+#define dmprintf(flag, bit, str) afs_dprintf(((flag)&(1<<((bit)-1))), str)
 
 #endif /* lint */
 
 #else /* AFS_DEBUG */
 
-#define dprintf(flag, str)
+#define afs_dprintf(flag, str)
 #define dlprintf(flag, level,str)
 #define dmprintf(flag, bit, str)
 
diff --git a/src/sgistuff/rcmd.c b/src/sgistuff/rcmd.c
index a27d7a495..d18f25371 100644
--- a/src/sgistuff/rcmd.c
+++ b/src/sgistuff/rcmd.c
@@ -55,8 +55,8 @@ RCSID
 #endif /* defined(AFS_HPUX_ENV) */
 #ifdef	TCP_DEBUG
 #include <sys/syslog.h>
-#	define	DPRINTF(args)	dprintf args
-dprintf(args)
+#	define	DPRINTF(args)	afs_dprintf args
+afs_dprintf(args)
      char *args;
 {
     char **argv;
-- 
2.39.5