mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-05-28 15:24:49 -05:00
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]
This commit is contained in:
parent
a3d069d2c1
commit
7223973988
@ -3415,7 +3415,7 @@ void nonfatal(char *p, ...)
|
|||||||
va_start(ap, p);
|
va_start(ap, p);
|
||||||
msg = dupvprintf(p, ap);
|
msg = dupvprintf(p, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
fatal_message_box(NULL, msg);
|
nonfatal_message_box(NULL, msg);
|
||||||
sfree(msg);
|
sfree(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,10 +74,6 @@ void nonfatal(char *p, ...)
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
fputc('\n', stderr);
|
fputc('\n', stderr);
|
||||||
postmsg(&cf);
|
postmsg(&cf);
|
||||||
if (logctx) {
|
|
||||||
log_free(logctx);
|
|
||||||
logctx = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
void connection_fatal(void *frontend, char *p, ...)
|
void connection_fatal(void *frontend, char *p, ...)
|
||||||
{
|
{
|
||||||
|
@ -57,10 +57,6 @@ void nonfatal(char *p, ...)
|
|||||||
vfprintf(stderr, p, ap);
|
vfprintf(stderr, p, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
fputc('\n', stderr);
|
fputc('\n', stderr);
|
||||||
if (logctx) {
|
|
||||||
log_free(logctx);
|
|
||||||
logctx = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
void connection_fatal(void *frontend, char *p, ...)
|
void connection_fatal(void *frontend, char *p, ...)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user