1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00

Placate some gcc warnings.

[originally from svn r3761]
This commit is contained in:
Simon Tatham 2004-01-22 18:52:49 +00:00
parent ee72bf04df
commit 7b140b2fe7

View File

@ -483,9 +483,9 @@ struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase)
struct ssh2_userkey *retval = NULL;
char *errmsg;
unsigned char *blob;
int blobsize, blobptr, privptr;
char *modptr;
int modlen;
int blobsize = 0, blobptr, privptr;
char *modptr = NULL;
int modlen = 0;
blob = NULL;
@ -559,6 +559,8 @@ struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase)
num_integers = 9;
else if (key->type == OSSH_DSA)
num_integers = 6;
else
num_integers = 0; /* placate compiler warnings */
/*
* Space to create key blob in.
@ -666,7 +668,7 @@ int openssh_write(const Filename *filename, struct ssh2_userkey *key,
char *passphrase)
{
unsigned char *pubblob, *privblob, *spareblob;
int publen, privlen, sparelen;
int publen, privlen, sparelen = 0;
unsigned char *outblob;
int outlen;
struct mpint_pos numbers[9];
@ -1200,7 +1202,7 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase)
struct ssh2_userkey *ret = NULL, *retkey;
const struct ssh_signkey *alg;
unsigned char *blob = NULL;
int blobsize, publen, privlen;
int blobsize = 0, publen, privlen;
if (!key)
return NULL;
@ -1388,7 +1390,8 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase)
publen = pos;
pos += put_mp(blob+pos, x.start, x.bytes);
privlen = pos - publen;
}
} else
return NULL;
assert(privlen > 0); /* should have bombed by now if not */