[Cvs-cvs] ccvs/src ChangeLog modules.c subr.h

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/10/02 18:41:33

Modified files:
        src            : ChangeLog modules.c subr.h 

Log message:
        * modules.c (my_module): Clean up TRACE.
        * subr.h [NULL2DOT, NULL2MT]: Add parens for safety.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3626&r2=1.3627
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/modules.c?cvsroot=cvs&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.h?cvsroot=cvs&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3626
retrieving revision 1.3627
diff -u -b -r1.3626 -r1.3627
--- ChangeLog   30 Sep 2008 20:16:47 -0000      1.3626
+++ ChangeLog   2 Oct 2008 18:41:32 -0000       1.3627
@@ -1,3 +1,8 @@
+2008-10-02  Derek R. Price  <address@hidden>
+
+       * modules.c (my_module): Clean up TRACE.
+       * subr.h [NULL2DOT, NULL2MT]: Add parens for safety.
+
 2008-09-30  Derek R. Price  <address@hidden>
 
        * checkout.c (preload_update_dir): Eliminate global.  It was used in

Index: modules.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/modules.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- modules.c   19 Sep 2008 16:03:32 -0000      1.102
+++ modules.c   2 Oct 2008 18:41:33 -0000       1.103
@@ -143,8 +143,8 @@
 #endif
 
     TRACE (TRACE_FUNCTION, "my_module (%s, %s, %s, %s)",
-           mname ? mname : "(null)", msg ? msg : "(null)",
-           where ? where : "NULL", extra_arg ? extra_arg : "NULL");
+           TRACE_NULL (mname), TRACE_NULL (msg),
+           TRACE_NULL (where), TRACE_NULL (extra_arg));
 
     /* Don't process absolute directories.  Anything else could be a security
      * problem.  Before this check was put in place:

Index: subr.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- subr.h      29 Sep 2008 17:46:29 -0000      1.25
+++ subr.h      2 Oct 2008 18:41:33 -0000       1.26
@@ -176,10 +176,10 @@
 /* Convenience macro for printing the commonly used but sometimes empty
  * UPDATE_DIR string.
  */
-#define NULL2DOT(u) (u && *u ? u : ".")
+#define NULL2DOT(u) ((u) && *(u) ? (u) : ".")
 
 /* Convenience macro for equating a NULL pointer and the empty string.  */
-#define NULL2MT(s) (s ? s : "")
+#define NULL2MT(s) ((s) ? (s) : "")
 
 /* Replace pointer D with S, freeing D afterwards.  This is useful when S
  * is an expression containing D.