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

Formatting: realign run-on parenthesised stuff.

Browse Source 
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.
This commit is contained in:
Simon Tatham
2022-08-03 20:48:46 +01:00
parent 3a42a09dad
commit 4fa3480444
38 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unix/askpass.c
View File

@ -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);

2
unix/main-gtk-simple.c
View File

@ -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;

2
unix/sftpserver.c
View File

@ -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;

2
unix/unifont.c
View File

@ -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.

4
unix/window.c
View File

@ -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;