Fix cut-and-paste errors in nonfatal() implementations.

Unix GUI programs should not say 'Fatal Error' in the message box
title, and Plink should not destroy its logging context as a side
effect of printing a non-fatal error. Both appear to have been due to
inattentive cut and paste from the pre-existing fatal error functions.

[originally from svn r10044]

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 053c62102a438274b0bea276d93127e17769ab83..4b640443e849877b176364e56a1105d89ee81113 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3415,7 +3415,7 @@ void nonfatal(char *p, ...)
     va_start(ap, p);
     msg = dupvprintf(p, ap);
     va_end(ap);
-    fatal_message_box(NULL, msg);
+    nonfatal_message_box(NULL, msg);
     sfree(msg);
 }
 

diff --git a/unix/uxplink.c b/unix/uxplink.c
index ee5cef8aa30f0d50d37f5a99cdacb7f6ec5af679..87efe78a55fec59d0fe2d15571f01a28a727b063 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -74,10 +74,6 @@ void nonfatal(char *p, ...)
     va_end(ap);
     fputc('\n', stderr);
     postmsg(&cf);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
 }
 void connection_fatal(void *frontend, char *p, ...)
 {

diff --git a/windows/winplink.c b/windows/winplink.c
index a618c7eddd60e36fe64f538695d709dcfcca89ae..5849e0d4a1b8e0caa20cd287949b2af92aafdf9c 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -57,10 +57,6 @@ void nonfatal(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
 }
 void connection_fatal(void *frontend, char *p, ...)
 {