From 260f3dec11d702a907fdaf5aaee143abb01d0eb2 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 17 Apr 2001 08:24:29 +0000 Subject: [PATCH] Having now compiled the last few days' changes with MSVC, it's turned up a bunch of warnings, mostly unused variables. All fixed. git-svn-id: svn://svn.tartarus.org/sgt/putty@1058 cda61777-01e9-0310-a592-d414129be87e --- pageant.c | 8 +++++++- ssh.c | 18 +++++++----------- ssh.h | 1 + sshrsa.c | 2 +- terminal.c | 11 ++++------- tree234.c | 1 - 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pageant.c b/pageant.c index 1b303e2a..6f942625 100644 --- a/pageant.c +++ b/pageant.c @@ -56,6 +56,12 @@ static gsi_fn_t getsecurityinfo; #endif /* + * Exports from pageantc.c + */ +void agent_query(void *in, int inlen, void **out, int *outlen); +int agent_exists(void); + +/* * We need this to link with the RSA code, because rsaencrypt() * pads its data with random bytes. Since we only use rsadecrypt() * and the signing functions, which are deterministic, this should @@ -1220,7 +1226,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { * Find out if Pageant is already running. */ already_running = FALSE; - if (FindWindow("Pageant", "Pageant")) + if (agent_exists()) already_running = TRUE; else { diff --git a/ssh.c b/ssh.c index 8522e3d3..c47aebd1 100644 --- a/ssh.c +++ b/ssh.c @@ -366,8 +366,8 @@ static int ssh_channelfind(void *av, void *bv) { } static int alloc_channel_id(void) { - const int CHANNEL_NUMBER_OFFSET = 256; - int low, high, mid; + const unsigned CHANNEL_NUMBER_OFFSET = 256; + unsigned low, high, mid; int tsize; struct ssh_channel *c; @@ -572,8 +572,8 @@ next_packet: if (pktin.type == SSH1_MSG_DISCONNECT) { /* log reason code in disconnect message */ char buf[256]; - int msglen = GET_32BIT(pktin.body); - int nowlen; + unsigned msglen = GET_32BIT(pktin.body); + unsigned nowlen; strcpy(buf, "Remote sent disconnect: "); nowlen = strlen(buf); if (msglen > sizeof(buf)-nowlen-1) @@ -726,8 +726,8 @@ next_packet: /* log reason code in disconnect message */ char buf[256]; int reason = GET_32BIT(pktin.data+6); - int msglen = GET_32BIT(pktin.data+10); - int nowlen; + unsigned msglen = GET_32BIT(pktin.data+10); + unsigned nowlen; if (reason > 0 && reason < lenof(ssh2_disconnect_reasons)) { sprintf(buf, "Received disconnect message (%s)", ssh2_disconnect_reasons[reason]); @@ -2270,7 +2270,7 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { } else if (pktin.type == SSH1_SMSG_X11_OPEN) { /* Remote side is trying to open a channel to talk to our * X-Server. Give them back a local channel number. */ - struct ssh_channel *c, *d; + struct ssh_channel *c; logevent("Received X11 connect request"); /* Refuse if X11 forwarding is disabled. */ @@ -2304,7 +2304,6 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) { } else if (pktin.type == SSH1_SMSG_AGENT_OPEN) { /* Remote side is trying to open a channel to talk to our * agent. Give them back a local channel number. */ - unsigned i; struct ssh_channel *c; /* Refuse if agent forwarding is disabled. */ @@ -3920,9 +3919,6 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) ssh2_pkt_send(); sfree(c); } else { - struct ssh_channel *d; - unsigned i; - c->localid = alloc_channel_id(); c->closes = 0; c->v2.remwindow = ssh2_pkt_getuint32(); diff --git a/ssh.h b/ssh.h index 3c4791fb..fb6392f7 100644 --- a/ssh.h +++ b/ssh.h @@ -212,6 +212,7 @@ Bignum bignum_from_bytes(unsigned char *data, int nbytes); int ssh1_read_bignum(unsigned char *data, Bignum *result); int bignum_bitcount(Bignum bn); int ssh1_bignum_length(Bignum bn); +int ssh2_bignum_length(Bignum bn); int bignum_byte(Bignum bn, int i); int bignum_bit(Bignum bn, int i); void bignum_set_bit(Bignum bn, int i, int value); diff --git a/sshrsa.c b/sshrsa.c index 7f1d790e..930d151c 100644 --- a/sshrsa.c +++ b/sshrsa.c @@ -393,7 +393,7 @@ static void *rsa2_openssh_createkey(unsigned char **blob, int *len) { return rsa; } -static int *rsa2_openssh_fmtkey(void *key, unsigned char *blob, int len) { +static int rsa2_openssh_fmtkey(void *key, unsigned char *blob, int len) { struct RSAKey *rsa = (struct RSAKey *)key; int bloblen, i; diff --git a/terminal.c b/terminal.c index 37625104..7d6c727c 100644 --- a/terminal.c +++ b/terminal.c @@ -297,7 +297,7 @@ void term_init(void) { void term_size(int newrows, int newcols, int newsavelines) { tree234 *newsb, *newscreen, *newalt; unsigned long *newdisp, *newwant, *oldline, *line; - int i, j, crows, ccols; + int i, j, ccols; int posn, oldposn, furthest_back, oldsbsize; int save_alt_which = alt_which; @@ -416,7 +416,6 @@ void term_size(int newrows, int newcols, int newsavelines) { */ static void swap_screen (int which) { int t; - unsigned long tt; tree234 *ttr; if (which == alt_which) @@ -442,7 +441,7 @@ static void swap_screen (int which) { * Update the scroll bar. */ static void update_sbar(void) { - int nscreen, nscroll; + int nscroll; nscroll = count234(scrollback); @@ -593,7 +592,7 @@ static void save_cursor(int save) { * whole line, or parts thereof. */ static void erase_lots (int line_only, int from_begin, int to_end) { - pos start, end, here; + pos start, end; int erase_lattr; unsigned long *ldata; @@ -1683,7 +1682,6 @@ void term_out(void) { break; case SEEN_ESCHASH: { - unsigned long *p; unsigned long nlattr; unsigned long *ldata; int i, j; @@ -2037,7 +2035,7 @@ static void clipme(pos top, pos bottom, char *workbuf) { while (poslt(top, bottom)) { int nl = FALSE; unsigned long *ldata = lineptr(top.y); - pos lineend, nlpos; + pos nlpos; nlpos.y = top.y; nlpos.x = cols; @@ -2112,7 +2110,6 @@ void term_copyall (void) { */ static pos sel_spread_half (pos p, int dir) { unsigned long *ldata; - int x; short wvalue; ldata = lineptr(p.y); diff --git a/tree234.c b/tree234.c index 1aac3a6b..9d1d7b04 100644 --- a/tree234.c +++ b/tree234.c @@ -572,7 +572,6 @@ static void *delpos234_internal(tree234 *t, int index) { LOG(("deleting item %d from tree %p\n", index, t)); while (1) { while (n) { - int c; int ki; node234 *sub; -- 2.11.0