Merge branch 'pre-0.67'

[PuTTY.git] / misc.h

diff --git a/misc.h b/misc.h
index ae33e96e3fff7cb8dfd8d3d6cfc26a5bd5d2370c..d5999cbedee2f1d723e0fe8755cc6d638791708e 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -187,4 +187,9 @@ void debug_memdump(const void *buf, int len, int L);
   (cp)[0] = (unsigned char)((value) >> 8), \
   (cp)[1] = (unsigned char)(value) )
 
+/* Replace NULL with the empty string, permitting an idiom in which we
+ * get a string (pointer,length) pair that might be NULL,0 and can
+ * then safely say things like printf("%.*s", length, NULLTOEMPTY(ptr)) */
+#define NULLTOEMPTY(s) ((s)?(s):"")
+
 #endif