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

Remove a lot of pointless 'struct' keywords.

This is the commit that f3295e0fb _should_ have been. Yesterday I just
added some typedefs so that I didn't have to wear out my fingers
typing 'struct' in new code, but what I ought to have done is to move
all the typedefs into defs.h with the rest, and then go through
cleaning up the legacy 'struct's all through the existing code.

But I was mostly trying to concentrate on getting the test suite
finished, so I just did the minimum. Now it's time to come back and do
it better.
This commit is contained in:
Simon Tatham
2019-01-04 06:51:44 +00:00
parent abebfdf0dd
commit 35690040fd
39 changed files with 452 additions and 449 deletions

View File

@ -344,7 +344,7 @@ struct rsa_key_thread_params {
int curve_bits; /* bits in elliptic curve (ECDSA) */
keytype keytype;
union {
struct RSAKey *key;
RSAKey *key;
struct dss_key *dsskey;
struct ecdsa_key *eckey;
struct eddsa_key *edkey;
@ -384,10 +384,10 @@ struct MainDlgState {
bool ssh2;
keytype keytype;
char **commentptr; /* points to key.comment or ssh2key.comment */
struct ssh2_userkey ssh2key;
ssh2_userkey ssh2key;
unsigned *entropy;
union {
struct RSAKey key;
RSAKey key;
struct dss_key dsskey;
struct ecdsa_key eckey;
struct eddsa_key edkey;
@ -402,7 +402,7 @@ static void hidemany(HWND hwnd, const int *ids, bool hideit)
}
}
static void setupbigedit1(HWND hwnd, int id, int idstatic, struct RSAKey *key)
static void setupbigedit1(HWND hwnd, int id, int idstatic, RSAKey *key)
{
char *buffer = ssh1_pubkey_str(key);
SetDlgItemText(hwnd, id, buffer);
@ -412,7 +412,7 @@ static void setupbigedit1(HWND hwnd, int id, int idstatic, struct RSAKey *key)
}
static void setupbigedit2(HWND hwnd, int id, int idstatic,
struct ssh2_userkey *key)
ssh2_userkey *key)
{
char *buffer = ssh2_pubkey_openssh_str(key);
SetDlgItemText(hwnd, id, buffer);
@ -648,8 +648,8 @@ void load_key_file(HWND hwnd, struct MainDlgState *state,
int ret;
const char *errmsg = NULL;
char *comment;
struct RSAKey newkey1;
struct ssh2_userkey *newkey2 = NULL;
RSAKey newkey1;
ssh2_userkey *newkey2 = NULL;
type = realtype = key_type(filename);
if (type != SSH_KEYTYPE_SSH1 &&

View File

@ -256,8 +256,8 @@ void old_keyfile_warning(void)
*/
void keylist_update(void)
{
struct RSAKey *rkey;
struct ssh2_userkey *skey;
RSAKey *rkey;
ssh2_userkey *skey;
int i;
if (keylist) {
@ -472,8 +472,8 @@ static void prompt_add_keyfile(void)
static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
struct RSAKey *rkey;
struct ssh2_userkey *skey;
RSAKey *rkey;
ssh2_userkey *skey;
switch (msg) {
case WM_INITDIALOG: