Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp_var.h,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp_var.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- src/usr.bin/ftp/ftp_var.h	2007/12/05 00:15:25	1.76
+++ src/usr.bin/ftp/ftp_var.h	2007/12/05 03:46:34	1.77
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp_var.h,v 1.76 2007/12/05 00:15:25 lukem Exp $	*/
+/*	$NetBSD: ftp_var.h,v 1.77 2007/12/05 03:46:34 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
@@ -342,9 +342,11 @@ extern	struct option	optiontab[];
 #define DWARN(...)
 #else
 #define DPRINTF(...)	if (ftp_debug) (void)fprintf(ttyout, __VA_ARGS__)
-#define DWARN(...) if (ftp_debug) warn(__VA_ARGS__)
+#define DWARN(...)	if (ftp_debug) warn(__VA_ARGS__)
 #endif
 
+#define STRorNULL(s)	((s) ? (s) : "<null>")
+
 #ifdef NO_USAGE
 void xusage(void);
 #define UPRINTF(...)	xusage()