diff options
| author | Simon Tatham <anakin@pobox.com> | 2022-08-03 22:48:46 +0300 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2022-08-03 22:48:46 +0300 |
| commit | 3a42a09dadcb38e4f3481a4dd8b4c2bad5b6de4b (patch) | |
| tree | 692ee59b65c3b8d83c90a464f82a3661e0a3d45b /ssh | |
| parent | b6d7c81d43a7d54cbdd4dcee75099248227627f9 (diff) | |
Formatting: normalise back to 4-space indentation.
In several pieces of development recently I've run across the
occasional code block in the middle of a function which suddenly
switched to 2-space indent from this code base's usual 4. I decided I
was tired of it, so I ran the whole code base through a re-indenter,
which made a huge mess, and then manually sifted out the changes that
actually made sense from that pass.
Indeed, this caught quite a few large sections with 2-space indent
level, a couple with 8, and a handful of even weirder things like 3
spaces or 12. This commit fixes them all.
Diffstat (limited to 'ssh')
| -rw-r--r-- | ssh/channel.h | 4 | ||||
| -rw-r--r-- | ssh/connection1-server.c | 10 | ||||
| -rw-r--r-- | ssh/connection2.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ssh/channel.h b/ssh/channel.h index 14dfccb5..d4eb78aa 100644 --- a/ssh/channel.h +++ b/ssh/channel.h @@ -84,10 +84,10 @@ static inline bool chan_want_close(Channel *ch, bool leof, bool reof) static inline bool chan_rcvd_exit_status(Channel *ch, int status) { return ch->vt->rcvd_exit_status(ch, status); } static inline bool chan_rcvd_exit_signal( - Channel *ch, ptrlen sig, bool core, ptrlen msg) + Channel *ch, ptrlen sig, bool core, ptrlen msg) { return ch->vt->rcvd_exit_signal(ch, sig, core, msg); } static inline bool chan_rcvd_exit_signal_numeric( - Channel *ch, int sig, bool core, ptrlen msg) + Channel *ch, int sig, bool core, ptrlen msg) { return ch->vt->rcvd_exit_signal_numeric(ch, sig, core, msg); } static inline bool chan_run_shell(Channel *ch) { return ch->vt->run_shell(ch); } diff --git a/ssh/connection1-server.c b/ssh/connection1-server.c index 1123327c..cc69bdb3 100644 --- a/ssh/connection1-server.c +++ b/ssh/connection1-server.c @@ -113,15 +113,15 @@ bool ssh1_handle_direction_specific_packet( BinarySource_UPCAST(pktin), 1); if (get_err(pktin)) { - ppl_logevent("Unable to decode pty request packet"); - success = false; + ppl_logevent("Unable to decode pty request packet"); + success = false; } else if (!chan_allocate_pty( s->mainchan_chan, termtype, width, height, pixwidth, pixheight, modes)) { - ppl_logevent("Unable to allocate a pty"); - success = false; + ppl_logevent("Unable to allocate a pty"); + success = false; } else { - success = true; + success = true; } pktout = ssh_bpp_new_pktout( diff --git a/ssh/connection2.c b/ssh/connection2.c index ec330927..f2f07b17 100644 --- a/ssh/connection2.c +++ b/ssh/connection2.c @@ -1565,8 +1565,8 @@ static void ssh2_delete_sharing_channel(ConnectionLayer *cl, unsigned localid) } static void ssh2_send_packet_from_downstream( - ConnectionLayer *cl, unsigned id, int type, - const void *data, int datalen, const char *additional_log_text) + ConnectionLayer *cl, unsigned id, int type, + const void *data, int datalen, const char *additional_log_text) { struct ssh2_connection_state *s = container_of(cl, struct ssh2_connection_state, cl); |