| [1139] | 1 | =================================================================== | 
|---|
|  | 2 | RCS file: /cvs/openafs/src/bucoord/bc.p.h,v | 
|---|
|  | 3 | retrieving revision 1.8 | 
|---|
|  | 4 | retrieving revision 1.9 | 
|---|
|  | 5 | diff -u -r1.8 -r1.9 | 
|---|
|  | 6 | --- openafs/src/bucoord/bc.p.h  2009/03/16 13:32:04     1.8 | 
|---|
|  | 7 | +++ openafs/src/bucoord/bc.p.h  2009/04/27 19:17:14     1.9 | 
|---|
|  | 8 | @@ -144,4 +144,4 @@ | 
|---|
|  | 9 | #define        BC_MAXSIMDUMPS      64 | 
|---|
|  | 10 | #define BC_MAXPORTS        128 /* max number of port offsets for volrestore */ | 
|---|
|  | 11 | /* debugging support */ | 
|---|
|  | 12 | -#define        dprintf(x) | 
|---|
|  | 13 | +#define        afs_dprintf(x) | 
|---|
|  | 14 | =================================================================== | 
|---|
|  | 15 | RCS file: /cvs/openafs/src/bucoord/ubik_db_if.c,v | 
|---|
|  | 16 | retrieving revision 1.17 | 
|---|
|  | 17 | retrieving revision 1.18 | 
|---|
|  | 18 | diff -u -r1.17 -r1.18 | 
|---|
|  | 19 | --- openafs/src/bucoord/ubik_db_if.c    2009/03/27 13:45:49     1.17 | 
|---|
|  | 20 | +++ openafs/src/bucoord/ubik_db_if.c    2009/04/27 19:17:14     1.18 | 
|---|
|  | 21 | @@ -574,7 +574,7 @@ | 
|---|
|  | 22 |  | 
|---|
|  | 23 | fileSize = (afs_int32) filesize(ctPtr->textStream); | 
|---|
|  | 24 |  | 
|---|
|  | 25 | -    dprintf(("filesize is %d\n", fileSize)); | 
|---|
|  | 26 | +    afs_dprintf(("filesize is %d\n", fileSize)); | 
|---|
|  | 27 |  | 
|---|
|  | 28 | rewind(ctPtr->textStream); | 
|---|
|  | 29 |  | 
|---|
|  | 30 | @@ -1350,7 +1350,7 @@ | 
|---|
|  | 31 | ERROR(errno); | 
|---|
|  | 32 | #endif | 
|---|
|  | 33 |  | 
|---|
|  | 34 | -    dprintf(("file is %s\n", tmpFileName)); | 
|---|
|  | 35 | +    afs_dprintf(("file is %s\n", tmpFileName)); | 
|---|
|  | 36 |  | 
|---|
|  | 37 | normal_exit: | 
|---|
|  | 38 | return code; | 
|---|
|  | 39 | =================================================================== | 
|---|
|  | 40 | RCS file: /cvs/openafs/src/config/debug.h,v | 
|---|
|  | 41 | retrieving revision 1.4 | 
|---|
|  | 42 | retrieving revision 1.5 | 
|---|
|  | 43 | diff -u -r1.4 -r1.5 | 
|---|
|  | 44 | --- openafs/src/config/debug.h  2003/07/15 23:14:55     1.4 | 
|---|
|  | 45 | +++ openafs/src/config/debug.h  2009/04/27 19:17:12     1.5 | 
|---|
|  | 46 | @@ -112,21 +112,21 @@ | 
|---|
|  | 47 |  | 
|---|
|  | 48 | #if defined(AFS_DEBUG) | 
|---|
|  | 49 | #if defined(lint) | 
|---|
|  | 50 | -#define dprintf(flag, str) printf str | 
|---|
|  | 51 | +#define afs_dprintf(flag, str) printf str | 
|---|
|  | 52 | #define dlprintf(flag, level, str) printf str | 
|---|
|  | 53 | #define dmprintf(flag, bit, str) printf str | 
|---|
|  | 54 | #else /* lint */ | 
|---|
|  | 55 | -#define dprintf(flag, str) \ | 
|---|
|  | 56 | +#define afs_dprintf(flag, str) \ | 
|---|
|  | 57 | (void)((flag) ? \ | 
|---|
|  | 58 | ( osi_dp str, osi_dp("\t%s, %d\n", __FILE__, __LINE__)):0) | 
|---|
|  | 59 | -#define dlprintf(flag, level, str) dprintf(((flag) >= (level)), str) | 
|---|
|  | 60 | -#define dmprintf(flag, bit, str) dprintf(((flag)&(1<<((bit)-1))), str) | 
|---|
|  | 61 | +#define dlprintf(flag, level, str) afs_dprintf(((flag) >= (level)), str) | 
|---|
|  | 62 | +#define dmprintf(flag, bit, str) afs_dprintf(((flag)&(1<<((bit)-1))), str) | 
|---|
|  | 63 |  | 
|---|
|  | 64 | #endif /* lint */ | 
|---|
|  | 65 |  | 
|---|
|  | 66 | #else /* AFS_DEBUG */ | 
|---|
|  | 67 |  | 
|---|
|  | 68 | -#define dprintf(flag, str) | 
|---|
|  | 69 | +#define afs_dprintf(flag, str) | 
|---|
|  | 70 | #define dlprintf(flag, level,str) | 
|---|
|  | 71 | #define dmprintf(flag, bit, str) | 
|---|
|  | 72 |  | 
|---|
|  | 73 | =================================================================== | 
|---|
|  | 74 | RCS file: /cvs/openafs/src/sgistuff/rcmd.c,v | 
|---|
|  | 75 | retrieving revision 1.1 | 
|---|
|  | 76 | retrieving revision 1.2 | 
|---|
|  | 77 | diff -u -r1.1 -r1.2 | 
|---|
|  | 78 | --- openafs/src/sgistuff/rcmd.c 2005/08/16 17:58:27     1.1 | 
|---|
|  | 79 | +++ openafs/src/sgistuff/rcmd.c 2009/04/27 19:17:15     1.2 | 
|---|
|  | 80 | @@ -55,8 +55,8 @@ | 
|---|
|  | 81 | #endif /* defined(AFS_HPUX_ENV) */ | 
|---|
|  | 82 | #ifdef TCP_DEBUG | 
|---|
|  | 83 | #include <sys/syslog.h> | 
|---|
|  | 84 | -#      define  DPRINTF(args)   dprintf args | 
|---|
|  | 85 | -dprintf(args) | 
|---|
|  | 86 | +#      define  DPRINTF(args)   afs_dprintf args | 
|---|
|  | 87 | +afs_dprintf(args) | 
|---|
|  | 88 | char *args; | 
|---|
|  | 89 | { | 
|---|
|  | 90 | char **argv; | 
|---|