* modules.c (my_module): Clean up TRACE.

* subr.h [NULL2DOT, NULL2MT]: Add parens for safety.

src/ChangeLog

+2008-10-02  Derek R. Price  <derek@ximbiot.com>
+
+	* modules.c (my_module): Clean up TRACE.
+	* subr.h [NULL2DOT, NULL2MT]: Add parens for safety.
+
 2008-09-30  Derek R. Price  <derek@ximbiot.com>
 	* checkout.c (preload_update_dir): Eliminate global.  It was used in

src/modules.c

@@ -143,8 +143,8 @@ my_module (DBM *db, char *mname, enum mtype m_type, char *msg,
 #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:

src/subr.h

@@ -176,10 +176,10 @@ strneq (const char *a, const char *b, size_t n)
 /* 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.