X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6ee9b735013c0e636b027b77e9f6ba57a96e142f..b374e44331e7a57fcd27c7a80f380e1fee7ae675:/ssh.c?ds=sidebyside diff --git a/ssh.c b/ssh.c index 32753657..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, ...) @@ -656,10 +650,6 @@ void logeventf(Ssh ssh, char *fmt, ...) buf = dupvprintf(fmt, ap); va_end(ap); logevent(buf); - if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) { - fprintf(stderr, "%s\n", buf); - fflush(stderr); - } sfree(buf); } @@ -2072,7 +2062,7 @@ static char *connect_to_host(Ssh ssh, char *host, int port, * Try to find host. */ logeventf(ssh, "Looking up host \"%s\"", host); - addr = sk_namelookup(host, realhost); + addr = name_lookup(host, port, realhost); if ((err = sk_addr_error(addr))) return err;