nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 15:48:06 -05:00
Code Issues Projects Releases Wiki Activity

Extra inline helpers seat_{stdout,stderr}_pl.

Browse Source 
These take a ptrlen in place of separate buffer and length arguments.
Switched over to them in lots of places.
This commit is contained in:
Simon Tatham 2019-03-07 10:17:08 +00:00
parent 71a3e7da9e
commit 5eb6c19047
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
putty.h
View File

@ -991,8 +991,12 @@ void seat_connection_fatal(Seat *seat, const char *fmt, ...);
/* Handy aliases for seat_output which set is_stderr to a fixed value. */
static inline size_t seat_stdout(Seat *seat, const void *data, size_t len)
{ return seat_output(seat, false, data, len); }
static inline size_t seat_stdout_pl(Seat *seat, ptrlen data)
{ return seat_output(seat, false, data.ptr, data.len); }
static inline size_t seat_stderr(Seat *seat, const void *data, size_t len)
{ return seat_output(seat, true, data, len); }
static inline size_t seat_stderr_pl(Seat *seat, ptrlen data)
{ return seat_output(seat, true, data.ptr, data.len); }
/*
* Stub methods for seat implementations that want to use the obvious

2
ssh.c
View File

@ -715,7 +715,7 @@ static const char *connect_to_host(
* behave in quite the usual way. */
const char *msg =
"Reusing a shared connection to this server.\r\n";
seat_stderr(ssh->seat, msg, strlen(msg));
seat_stderr_pl(ssh->seat, ptrlen_from_asciz(msg));
}
} else {
/*

2
ssh2userauth.c
View File

@ -479,7 +479,7 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
(flags & (FLAG_VERBOSE | FLAG_INTERACTIVE))) {
while (bufchain_size(&s->banner) > 0) {
ptrlen data = bufchain_prefix(&s->banner);
seat_stderr(s->ppl.seat, data.ptr, data.len);
seat_stderr_pl(s->ppl.seat, data);
bufchain_consume(&s->banner, data.len);
}
}

2
sshcommon.c
View File

@ -804,7 +804,7 @@ void ssh_ppl_user_output_string_and_free(PacketProtocolLayer *ppl, char *text)
/* Messages sent via this function are from the SSH layer, not
* from the server-side process, so they always have the stderr
* flag set. */
seat_stderr(ppl->seat, text, strlen(text));
seat_stderr_pl(ppl->seat, ptrlen_from_asciz(text));
sfree(text);
}

4
unix/gtkwin.c
View File

@ -409,8 +409,8 @@ static void gtk_logging_error(LogPolicy *lp, const char *event)
/* Send 'can't open log file' errors to the terminal window.
* (Marked as stderr, although terminal.c won't care.) */
seat_stderr(&inst->seat, event, strlen(event));
seat_stderr(&inst->seat, "\r\n", 2);
seat_stderr_pl(&inst->seat, ptrlen_from_asciz(event));
seat_stderr_pl(&inst->seat, PTRLEN_LITERAL("\r\n"));
}
static const LogPolicyVtable gtk_logpolicy_vt = {

2
unix/uxpty.c
View File

@ -729,7 +729,7 @@ static void pty_real_select_result(Pty *pty, int fd, int event, int status)
* is better than no message at all */
message = dupprintf("\r\n[pterm: process terminated]\r\n");
}
seat_stdout(pty->seat, message, strlen(message));
seat_stdout_pl(pty->seat, ptrlen_from_asciz(message));
sfree(message);
}

4
windows/windlg.c
View File

@ -799,8 +799,8 @@ static void win_gui_logging_error(LogPolicy *lp, const char *event)
{
/* Send 'can't open log file' errors to the terminal window.
* (Marked as stderr, although terminal.c won't care.) */
seat_stderr(win_seat, event, strlen(event));
seat_stderr(win_seat, "\r\n", 2);
seat_stderr_pl(win_seat, ptrlen_from_asciz(event));
seat_stderr_pl(win_seat, PTRLEN_LITERAL("\r\n"));
}
void showeventlog(HWND hwnd)