nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

Remove the two logevent calls passing NULL as the first argument.

Browse Source 
This was copied straight from winnet.c and I don't believe it's
_ever_ been valid in the Unix front end.

[originally from svn r5384]
This commit is contained in:
Simon Tatham 2005-02-22 23:30:09 +00:00
parent 62f83a3666
commit ee56a6b48f
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
unix/uxnet.c
View File

@ -911,11 +911,9 @@ void try_send(Actual_Socket s)
*/ */
s->writable = FALSE; s->writable = FALSE;
return; return;
} else if (nsent == 0 || } else {
err == ECONNABORTED || err == ECONNRESET) {
/* /*
* If send() returns CONNABORTED or CONNRESET, we * We unfortunately can't just call plug_closing(),
* unfortunately can't just call plug_closing(),
* because it's quite likely that we're currently * because it's quite likely that we're currently
* _in_ a call from the code we'd be calling back * _in_ a call from the code we'd be calling back
* to, so we'd have to make half the SSH code * to, so we'd have to make half the SSH code
@ -925,11 +923,6 @@ void try_send(Actual_Socket s)
*/ */
s->pending_error = err; s->pending_error = err;
return; return;
} else {
/* We're inside the Unix frontend here, so we know
* that the frontend handle is unnecessary. */
logevent(NULL, strerror(err));
fatalbox("%s", strerror(err));
} }
} else { } else {
if (s->sending_oob) { if (s->sending_oob) {
@ -1024,12 +1017,9 @@ static int net_select_result(int fd, int event)
ret = recv(s->s, buf, sizeof(buf), MSG_OOB); ret = recv(s->s, buf, sizeof(buf), MSG_OOB);
noise_ultralight(ret); noise_ultralight(ret);
if (ret <= 0) { if (ret <= 0) {
const char *str = (ret == 0 ? "Internal networking trouble" : return plug_closing(s->plug,
strerror(errno)); ret == 0 ? "Internal networking trouble" :
/* We're inside the Unix frontend here, so we know strerror(errno), errno, 0);
* that the frontend handle is unnecessary. */
logevent(NULL, str);
fatalbox("%s", str);
} else { } else {
/* /*
* Receiving actual data on a socket means we can * Receiving actual data on a socket means we can