mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 01:02:24 +00:00
Remove assorted dead code.
Assignments that are overwritten shortly afterwards and never used, and a completely unused variable. Also, the bogus array access in testbn.c could have actually accessed one beyond the array limit (though of course it's only in a test harness).
This commit is contained in:
parent
b03020cab9
commit
f2e76e07da
8
import.c
8
import.c
@ -1547,15 +1547,11 @@ struct ssh2_userkey *openssh_new_read(const Filename *filename,
|
|||||||
int i;
|
int i;
|
||||||
struct ssh2_userkey *retval = NULL;
|
struct ssh2_userkey *retval = NULL;
|
||||||
const char *errmsg;
|
const char *errmsg;
|
||||||
unsigned char *blob;
|
|
||||||
int blobsize = 0;
|
|
||||||
unsigned checkint0, checkint1;
|
unsigned checkint0, checkint1;
|
||||||
const void *priv, *string;
|
const void *priv, *string;
|
||||||
int privlen, stringlen, key_index;
|
int privlen, stringlen, key_index;
|
||||||
const struct ssh_signkey *alg = NULL;
|
const struct ssh_signkey *alg = NULL;
|
||||||
|
|
||||||
blob = NULL;
|
|
||||||
|
|
||||||
if (!key)
|
if (!key)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -1721,10 +1717,6 @@ struct ssh2_userkey *openssh_new_read(const Filename *filename,
|
|||||||
retkey = NULL; /* prevent the free */
|
retkey = NULL; /* prevent the free */
|
||||||
|
|
||||||
error:
|
error:
|
||||||
if (blob) {
|
|
||||||
smemclr(blob, blobsize);
|
|
||||||
sfree(blob);
|
|
||||||
}
|
|
||||||
if (retkey) {
|
if (retkey) {
|
||||||
sfree(retkey->comment);
|
sfree(retkey->comment);
|
||||||
if (retkey->data) {
|
if (retkey->data) {
|
||||||
|
@ -267,7 +267,6 @@ static void lz77_compress(struct LZ77Context *ctx,
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
nmatch = 0;
|
nmatch = 0;
|
||||||
hash = INVALID;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nmatch > 0) {
|
if (nmatch > 0) {
|
||||||
|
2
testbn.c
2
testbn.c
@ -82,8 +82,6 @@ int main(int argc, char **argv)
|
|||||||
val = val * 16 + fromxdigit(start[i+1]);
|
val = val * 16 + fromxdigit(start[i+1]);
|
||||||
*q++ = val;
|
*q++ = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
ptrs[ptrnum] = q;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(buf, "mul")) {
|
if (!strcmp(buf, "mul")) {
|
||||||
|
@ -365,7 +365,7 @@ void split_into_argv(char *cmdline, int *argc, char ***argv,
|
|||||||
|
|
||||||
if (quotes > 0) {
|
if (quotes > 0) {
|
||||||
/* Outside a quote segment, a quote starts one. */
|
/* Outside a quote segment, a quote starts one. */
|
||||||
if (!quote) quotes--, quote = 1;
|
if (!quote) quotes--;
|
||||||
|
|
||||||
/* Now we produce (n+1)/3 literal quotes... */
|
/* Now we produce (n+1)/3 literal quotes... */
|
||||||
for (i = 3; i <= quotes+1; i += 3) *q++ = '"';
|
for (i = 3; i <= quotes+1; i += 3) *q++ = '"';
|
||||||
|
Loading…
Reference in New Issue
Block a user