1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00

pageant.c: minor cleanup of struct typedefs.

These names are unwieldy enough - and there are about to be several
more of them - that I want to keep things organised.
This commit is contained in:
Simon Tatham 2020-01-25 17:24:17 +00:00
parent 98538caa39
commit 49cd1f7116

View File

@ -29,18 +29,20 @@ void random_read(void *buf, size_t size)
static bool pageant_local = false; static bool pageant_local = false;
typedef struct PageantKeySort PageantKeySort;
typedef struct PageantKey PageantKey;
/* /*
* Master list of all the keys we have stored, in any form at all. * Master list of all the keys we have stored, in any form at all.
*/ */
static tree234 *keytree; static tree234 *keytree;
typedef struct PageantKeySort { struct PageantKeySort {
/* Prefix of the main PageantKey structure which contains all the /* Prefix of the main PageantKey structure which contains all the
* data that the sorting order depends on. Also simple enough that * data that the sorting order depends on. Also simple enough that
* you can construct one for lookup purposes. */ * you can construct one for lookup purposes. */
int ssh_version; /* 1 or 2; primary sort key */ int ssh_version; /* 1 or 2; primary sort key */
ptrlen public_blob; /* secondary sort key */ ptrlen public_blob; /* secondary sort key */
} PageantKeySort; };
typedef struct PageantKey { struct PageantKey {
PageantKeySort sort; PageantKeySort sort;
strbuf *public_blob; /* the true owner of sort.public_blob */ strbuf *public_blob; /* the true owner of sort.public_blob */
char *comment; /* stored separately, whether or not in rkey/skey */ char *comment; /* stored separately, whether or not in rkey/skey */
@ -48,7 +50,7 @@ typedef struct PageantKey {
RSAKey *rkey; /* if ssh_version == 1 */ RSAKey *rkey; /* if ssh_version == 1 */
ssh2_userkey *skey; /* if ssh_version == 2 */ ssh2_userkey *skey; /* if ssh_version == 2 */
}; };
} PageantKey; };
static void pk_free(PageantKey *pk) static void pk_free(PageantKey *pk)
{ {