From 382908adb0d45df6bb519e8838e5aa91fb7434c7 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Thu, 19 Dec 2002 14:24:28 +0000
Subject: [PATCH] Move the stderr output of event log messages in verbose mode
 to the general logging module rather than localising it in ssh.c. This means
 it should work in other protocols as well (notably Telnet, where it might
 actually be useful for debugging negotiations).

git-svn-id: svn://svn.tartarus.org/sgt/putty@2360 cda61777-01e9-0310-a592-d414129be87e
---
 logging.c | 12 +++++++++++-
 ssh.c     |  8 +-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/logging.c b/logging.c
index 06f0678b..9e8b9f83 100644
--- a/logging.c
+++ b/logging.c
@@ -34,11 +34,21 @@ void logtraffic(void *handle, unsigned char c, int logmode)
 }
 
 /*
- * Log an Event Log entry (used in SSH packet logging mode).
+ * Log an Event Log entry. Used in SSH packet logging mode; this is
+ * also as convenient a place as any to put the output of Event Log
+ * entries to stderr when a command-line tool is in verbose mode.
+ * (In particular, this is a better place to put it than in the
+ * front ends, because it only has to be done once for all
+ * platforms. Platforms which don't have a meaningful stderr can
+ * just avoid defining FLAG_STDERR.
  */
 void log_eventlog(void *handle, char *event)
 {
     struct LogContext *ctx = (struct LogContext *)handle;
+    if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) {
+	fprintf(stderr, "%s\n", event);
+	fflush(stderr);
+    }
     if (cfg.logtype != LGTYP_PACKETS)
 	return;
     if (!ctx->lgfp)
diff --git a/ssh.c b/ssh.c
index 0ac24d26..ccd3ea08 100644
--- a/ssh.c
+++ b/ssh.c
@@ -638,13 +638,7 @@ struct ssh_tag {
     int (*s_rdpkt) (Ssh ssh, unsigned char **data, int *datalen);
 };
 
-#define logevent(s) do { \
-    logevent(ssh->frontend, s); \
-    if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) { \
-	fprintf(stderr, "%s\n", s); \
-	fflush(stderr); \
-    } \
-} while (0)
+#define logevent(s) logevent(ssh->frontend, s)
 
 /* logevent, only printf-formatted. */
 void logeventf(Ssh ssh, char *fmt, ...)
-- 
2.11.0