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 | 4fa3480444a64a5be3055cf27d96d8e68d0a1d12 (patch) | |
tree | 96cb29b2d2a28a453d3789125d41c3c542bd4df5 /unix | |
parent | 3a42a09dadcb38e4f3481a4dd8b4c2bad5b6de4b (diff) |
Formatting: realign run-on parenthesised stuff.
My bulk indentation check also turned up a lot of cases where a run-on
function call or if statement didn't have its later lines aligned
correctly relative to the open paren.
I think this is quite easy to do by getting things out of
sync (editing the first line of the function call and forgetting to
update the rest, perhaps even because you never _saw_ the rest during
a search-replace). But a few didn't quite fit into that pattern, in
particular an outright misleading case in unix/askpass.c where the
second line of a call was aligned neatly below the _wrong_ one of the
open parens on the opening line.
Restored as many alignments as I could easily find.
Diffstat (limited to 'unix')
-rw-r--r-- | unix/askpass.c | 2 | ||||
-rw-r--r-- | unix/main-gtk-simple.c | 2 | ||||
-rw-r--r-- | unix/sftpserver.c | 2 | ||||
-rw-r--r-- | unix/unifont.c | 2 | ||||
-rw-r--r-- | unix/window.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/unix/askpass.c b/unix/askpass.c index 841912d9..f2cbafac 100644 --- a/unix/askpass.c +++ b/unix/askpass.c @@ -438,7 +438,7 @@ static const char *gtk_askpass_setup(struct askpass_ctx *ctx, gtk_window_set_title(GTK_WINDOW(ctx->dialog), window_title); gtk_window_set_position(GTK_WINDOW(ctx->dialog), GTK_WIN_POS_CENTER); g_signal_connect(G_OBJECT(ctx->dialog), "delete-event", - G_CALLBACK(askpass_dialog_closed), ctx); + G_CALLBACK(askpass_dialog_closed), ctx); ctx->promptlabel = gtk_label_new(prompt_text); align_label_left(GTK_LABEL(ctx->promptlabel)); gtk_widget_show(ctx->promptlabel); diff --git a/unix/main-gtk-simple.c b/unix/main-gtk-simple.c index 2f09cfbc..4cbb5a31 100644 --- a/unix/main-gtk-simple.c +++ b/unix/main-gtk-simple.c @@ -468,7 +468,7 @@ bool do_cmdline(int argc, char **argv, bool do_everything, Conf *conf) break; /* finished command-line processing */ } else err = true, fprintf(stderr, "%s: -e expects an argument\n", - appname); + appname); } else if (!strcmp(p, "-title")) { EXPECTS_ARG; diff --git a/unix/sftpserver.c b/unix/sftpserver.c index 7257c5c9..453a3ee0 100644 --- a/unix/sftpserver.c +++ b/unix/sftpserver.c @@ -545,7 +545,7 @@ static void uss_read(SftpServer *srv, SftpReplyBuilder *reply, } static void uss_write(SftpServer *srv, SftpReplyBuilder *reply, - ptrlen handle, uint64_t offset, ptrlen data) + ptrlen handle, uint64_t offset, ptrlen data) { UnixSftpServer *uss = container_of(srv, UnixSftpServer, srv); int fd; diff --git a/unix/unifont.c b/unix/unifont.c index 5eaded54..144ec87a 100644 --- a/unix/unifont.c +++ b/unix/unifont.c @@ -2573,7 +2573,7 @@ static void unifontsel_setup_stylelist(unifontsel_internal *fs, continue; /* we're filtering out this font */ } if (!info || !started || strnullcasecmp(currcs, info->charset) || - strnullcasecmp(currstyle, info->style)) { + strnullcasecmp(currstyle, info->style)) { /* * We've either finished a style/charset, or started a * new one, or both. diff --git a/unix/window.c b/unix/window.c index bdf9b598..d1c4bfff 100644 --- a/unix/window.c +++ b/unix/window.c @@ -3062,8 +3062,8 @@ static void gtkwin_clip_write( state->pasteout_data = snewn(len*6, char); state->pasteout_data_len = len*6; state->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0, - data, len, state->pasteout_data, - state->pasteout_data_len, NULL); + data, len, state->pasteout_data, + state->pasteout_data_len, NULL); if (state->pasteout_data_len == 0) { sfree(state->pasteout_data); state->pasteout_data = NULL; |