Apply STABLE14-dprintf-rename-20090427

* Apply upstream CVS deltas:
  - STABLE14-dprintf-rename-20090427: rename AFS's dprintf to avoid
    conflicts with one in the kernel.

diff --git a/debian/changelog b/debian/changelog
index de47b90b99b964410c0c66242547f29e6195597c..dfa8fa8a08f8b4d80357ae31338653c14870c514 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openafs (1.4.10+dfsg1-2) UNRELEASED; urgency=low
 
   * Apply upstream CVS deltas:
+    - STABLE14-dprintf-rename-20090427: rename AFS's dprintf to avoid
+      conflicts with one in the kernel.
     - STABLE14-linux26-defer-cred-changing-20090511: defer changing groups
       when the real and effective credentials of a process differ to avoid
       running afoul of checks in newer Linux kernels that cause oops.

diff --git a/src/bucoord/bc.p.h b/src/bucoord/bc.p.h
index 4fbc1bfc6105f9c298ddc1129a41425e2bdb517b..be580abee4525913ab298af05e49e8db4a7f022c 100644 (file)
--- 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 c9a5037bbe6291f4fd90eb3086feeae306645024..5d7bdd0b1cb373698e4155fa6fed183152649789 100644 (file)
--- a/src/bucoord/ubik_db_if.c
+++ b/src/bucoord/ubik_db_if.c
@@ -13,7 +13,7 @@
 #include <afs/stds.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/bucoord/ubik_db_if.c,v 1.10.2.5 2009/03/27 13:46:13 shadow Exp $");
+    ("$Header: /cvs/openafs/src/bucoord/ubik_db_if.c,v 1.10.2.6 2009/04/27 19:17:41 shadow Exp $");
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -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 0d0111173a42071de6d5074d4f0fc69b09fa6946..2ec6ec8b293b85e5b14fd87cecbd8e926868b7b4 100644 (file)
--- 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 9b5c6ae9da9a90ce45cb7ef43f9f260fec10255a..4907537a1123a5af358d565d9f142191ec1dc997 100644 (file)
--- a/src/sgistuff/rcmd.c
+++ b/src/sgistuff/rcmd.c
@@ -19,7 +19,7 @@
 #include <afs/param.h>
 
 RCSID
-    ("$Header: /cvs/openafs/src/sgistuff/rcmd.c,v 1.1.2.2 2005/08/16 18:00:44 shadow Exp $");
+    ("$Header: /cvs/openafs/src/sgistuff/rcmd.c,v 1.1.2.3 2009/04/27 19:17:42 shadow Exp $");
 
 #ifdef aiws /*AIX*/
 #include <sys/types.h>
@@ -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;