1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 03:22:48 -05:00

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

View File

@ -211,7 +211,7 @@ static void aes_neon_setkey(ssh_cipher *ciph, const void *vkey)
const unsigned char *key = (const unsigned char *)vkey;
aes_neon_key_expand(key, ctx->ciph.vt->real_keybits / 32,
ctx->keysched_e, ctx->keysched_d);
ctx->keysched_e, ctx->keysched_d);
}
static void aes_neon_setiv_cbc(ssh_cipher *ciph, const void *iv)

View File

@ -296,7 +296,7 @@ static inline uint32_t des_S(uint32_t si6420, uint32_t si7531)
s73 ^= c73 & t->t73; c73 += 0x00080008;
}
debug("S out: s40=%08"PRIx32" s62=%08"PRIx32
" s51=%08"PRIx32" s73=%08"PRIx32"\n", s40, s62, s51, s73);
" s51=%08"PRIx32" s73=%08"PRIx32"\n", s40, s62, s51, s73);
/* Final selection within each pair */
s40 ^= (s40 << 4) & ((0xf000/0x004) * (c40 & 0x00040004));

View File

@ -341,8 +341,8 @@ static int dsa_pubkey_bits(const ssh_keyalg *self, ptrlen pub)
}
mp_int *dsa_gen_k(const char *id_string, mp_int *modulus,
mp_int *private_key,
unsigned char *digest, int digest_len)
mp_int *private_key,
unsigned char *digest, int digest_len)
{
/*
* The basic DSA signing algorithm is:

View File

@ -1705,7 +1705,7 @@ const ssh_kexes ssh_ecdh_kex = { lenof(ec_kex_list), ec_kex_list };
*/
const ssh_keyalg *ec_alg_by_oid(int len, const void *oid,
const struct ec_curve **curve)
const struct ec_curve **curve)
{
static const ssh_keyalg *algs_with_oid[] = {
&ssh_ecdsa_nistp256,

View File

@ -472,7 +472,7 @@ void ntru_bias(uint16_t *out, const uint16_t *in, unsigned bias,
* Given an array of values mod q, multiply each one by a constant.
*/
void ntru_scale(uint16_t *out, const uint16_t *in, uint16_t scale,
unsigned p, unsigned q)
unsigned p, unsigned q)
{
SETUP;
for (unsigned i = 0; i < p; i++)

View File

@ -548,7 +548,7 @@ static void rsa2_private_blob(ssh_key *key, BinarySink *bs)
}
static ssh_key *rsa2_new_priv(const ssh_keyalg *self,
ptrlen pub, ptrlen priv)
ptrlen pub, ptrlen priv)
{
BinarySource src[1];
ssh_key *sshk;