1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00

Removed some set but unused vars.

This commit is contained in:
Werner Koch 2011-08-09 10:54:22 +02:00
parent 0ad1458f82
commit a95143e225
14 changed files with 132 additions and 119 deletions

View File

@ -1,3 +1,11 @@
2011-08-09 Werner Koch <wk@g10code.com>
* rijndael.c (u32_a_t): New.
(do_encrypt_aligned, do_decrypt): Use the new type to avoid
problems with strict aliasing rules.
* dynload.c (register_cipher_extension): Remove unused var.
2010-10-18 Werner Koch <wk@g10code.com> 2010-10-18 Werner Koch <wk@g10code.com>
* rndw32.c (slow_gatherer_windowsNT): Add GNUPG_RNDW32_NOPERF envvar. * rndw32.c (slow_gatherer_windowsNT): Add GNUPG_RNDW32_NOPERF envvar.

View File

@ -53,7 +53,7 @@ static EXTLIST extensions;
void void
register_cipher_extension( const char *mainpgm, const char *fname ) register_cipher_extension( const char *mainpgm, const char *fname )
{ {
EXTLIST r, el, intex; EXTLIST r, el;
char *p, *pe; char *p, *pe;
if( *fname != DIRSEP_C ) { /* do tilde expansion etc */ if( *fname != DIRSEP_C ) { /* do tilde expansion etc */
@ -76,7 +76,6 @@ register_cipher_extension( const char *mainpgm, const char *fname )
*p = *pe = 0; *p = *pe = 0;
/* check that it is not already registered */ /* check that it is not already registered */
intex = NULL;
for(r = extensions; r; r = r->next ) { for(r = extensions; r; r = r->next ) {
if( !compare_filenames(r->name, el->name) ) { if( !compare_filenames(r->name, el->name) ) {
log_info("extension `%s' already registered\n", el->name ); log_info("extension `%s' already registered\n", el->name );

View File

@ -1,5 +1,11 @@
2011-08-09 Werner Koch <wk@g10code.com> 2011-08-09 Werner Koch <wk@g10code.com>
* keyedit.c (show_key_with_all_names): Remove unused var.
* apdu.c (open_pcsc_reader_direct): Remove unused var.
* sig-check.c (do_check): Remove unused var.
* keygen.c (ask_user_id): Fix loop break condition. See bug#1307. * keygen.c (ask_user_id): Fix loop break condition. See bug#1307.
* import.c (import_keys_internal): Make breaking the loop more * import.c (import_keys_internal): Make breaking the loop more

View File

@ -1473,7 +1473,7 @@ open_pcsc_reader_direct (const char *portstr)
long err; long err;
int slot; int slot;
char *list = NULL; char *list = NULL;
unsigned long nreader, listlen; unsigned long nreader;
char *p; char *p;
slot = new_reader_slot (); slot = new_reader_slot ();
@ -1517,7 +1517,6 @@ open_pcsc_reader_direct (const char *portstr)
return -1; return -1;
} }
listlen = nreader;
p = list; p = list;
while (nreader) while (nreader)
{ {

View File

@ -2644,7 +2644,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
KBNODE node; KBNODE node;
int i; int i;
int do_warn = 0; int do_warn = 0;
byte pk_version=0;
PKT_public_key *primary=NULL; PKT_public_key *primary=NULL;
if (opt.with_colons) if (opt.with_colons)
@ -2676,7 +2675,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
do_warn = 1; do_warn = 1;
} }
pk_version=pk->version;
primary=pk; primary=pk;
} }

View File

@ -293,7 +293,6 @@ run_in_pipemode(void)
IOBUF fp; IOBUF fp;
armor_filter_context_t afx; armor_filter_context_t afx;
struct pipemode_context_s stx; struct pipemode_context_s stx;
int rc;
memset( &afx, 0, sizeof afx); memset( &afx, 0, sizeof afx);
memset( &stx, 0, sizeof stx); memset( &stx, 0, sizeof stx);
@ -303,7 +302,7 @@ run_in_pipemode(void)
do { do {
write_status (STATUS_BEGIN_STREAM); write_status (STATUS_BEGIN_STREAM);
rc = proc_packets( NULL, fp ); proc_packets( NULL, fp );
write_status (STATUS_END_STREAM); write_status (STATUS_END_STREAM);
} while ( !stx.stop ); } while ( !stx.stop );

View File

@ -239,7 +239,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest,
{ {
MPI result = NULL; MPI result = NULL;
int rc=0; int rc=0;
struct cmp_help_context_s ctx;
if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) ) if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) )
return rc; return rc;
@ -291,8 +290,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest,
result = encode_md_value( pk, NULL, digest, sig->digest_algo ); result = encode_md_value( pk, NULL, digest, sig->digest_algo );
if (!result) if (!result)
return G10ERR_GENERAL; return G10ERR_GENERAL;
ctx.sig = sig;
ctx.md = digest;
rc = pubkey_verify( pk->pubkey_algo, result, sig->data, pk->pkey ); rc = pubkey_verify( pk->pubkey_algo, result, sig->data, pk->pkey );
mpi_free( result ); mpi_free( result );

View File

@ -1,3 +1,7 @@
2011-08-09 Werner Koch <wk@g10code.com>
* gpgkeys_hkp.c (srv_replace): Remove unused var.
2009-09-02 Werner Koch <wk@g10code.com> 2009-09-02 Werner Koch <wk@g10code.com>
* Makefile.am (gpgkeys_curl_SOURCES, gpgkeys_ldap_SOURCES) * Makefile.am (gpgkeys_curl_SOURCES, gpgkeys_ldap_SOURCES)

View File

@ -498,7 +498,6 @@ srv_replace(const char *srvtag)
{ {
#ifdef USE_DNS_SRV #ifdef USE_DNS_SRV
struct srventry *srvlist=NULL; struct srventry *srvlist=NULL;
int srvcount;
if(!srvtag) if(!srvtag)
return; return;
@ -511,7 +510,7 @@ srv_replace(const char *srvtag)
strcat(srvname,srvtag); strcat(srvname,srvtag);
strcat(srvname,"._tcp."); strcat(srvname,"._tcp.");
strcat(srvname,opt->host); strcat(srvname,opt->host);
srvcount=getsrv(srvname,&srvlist); getsrv(srvname,&srvlist);
} }
if(srvlist) if(srvlist)

View File

@ -1,3 +1,9 @@
2011-08-09 Werner Koch <wk@g10code.com>
* mpicoder.c (mpi_fromstr): Remove unused var.
* mpi-pow.c (mpi_powm): Remove unused var.
2011-07-04 Werner Koch <wk@g10code.com> 2011-07-04 Werner Koch <wk@g10code.com>
* longlong.h: [__arm__]: Do no use asm if thumb code generation is * longlong.h: [__arm__]: Do no use asm if thumb code generation is

View File

@ -42,7 +42,7 @@ mpi_powm( MPI res, MPI base, MPI exponent, MPI mod)
{ {
mpi_ptr_t rp, ep, mp, bp; mpi_ptr_t rp, ep, mp, bp;
mpi_size_t esize, msize, bsize, rsize; mpi_size_t esize, msize, bsize, rsize;
int esign, msign, bsign, rsign; int msign, bsign, rsign;
int esec, msec, bsec, rsec; int esec, msec, bsec, rsec;
mpi_size_t size; mpi_size_t size;
int mod_shift_cnt; int mod_shift_cnt;
@ -57,7 +57,6 @@ mpi_powm( MPI res, MPI base, MPI exponent, MPI mod)
esize = exponent->nlimbs; esize = exponent->nlimbs;
msize = mod->nlimbs; msize = mod->nlimbs;
size = 2 * msize; size = 2 * msize;
esign = exponent->sign;
msign = mod->sign; msign = mod->sign;
esec = mpi_is_secure(exponent); esec = mpi_is_secure(exponent);

View File

@ -200,7 +200,7 @@ mpi_read_from_buffer(byte *buffer, unsigned int *ret_nread, int secure)
int int
mpi_fromstr(MPI val, const char *str) mpi_fromstr(MPI val, const char *str)
{ {
int hexmode=0, sign=0, prepend_zero=0, i, j, c, c1, c2; int sign=0, prepend_zero=0, i, j, c, c1, c2;
unsigned nbits, nbytes, nlimbs; unsigned nbits, nbytes, nlimbs;
mpi_limb_t a; mpi_limb_t a;
@ -209,7 +209,7 @@ mpi_fromstr(MPI val, const char *str)
str++; str++;
} }
if( *str == '0' && str[1] == 'x' ) if( *str == '0' && str[1] == 'x' )
hexmode = 1; ;
else else
return 1; /* other bases are not yet supported */ return 1; /* other bases are not yet supported */
str += 2; str += 2;

View File

@ -3,6 +3,7 @@
* pka.c (get_pka_info): Turn ANSWER into a union to avoid aliasing * pka.c (get_pka_info): Turn ANSWER into a union to avoid aliasing
problems with modern compilers. See bug#1307. Reported by Steve problems with modern compilers. See bug#1307. Reported by Steve
Grubb. Grubb.
(get_pka_info): Remove unused vars.
2010-10-27 Werner Koch <wk@g10code.com> 2010-10-27 Werner Koch <wk@g10code.com>

View File

@ -122,7 +122,7 @@ get_pka_info (const char *address, unsigned char *fpr)
HEADER h; HEADER h;
} answer; } answer;
int anslen; int anslen;
int qdcount, ancount, nscount, arcount; int qdcount, ancount;
int rc; int rc;
unsigned char *p, *pend; unsigned char *p, *pend;
const char *domain; const char *domain;
@ -151,8 +151,6 @@ get_pka_info (const char *address, unsigned char *fpr)
qdcount = ntohs (answer.h.qdcount); qdcount = ntohs (answer.h.qdcount);
ancount = ntohs (answer.h.ancount); ancount = ntohs (answer.h.ancount);
nscount = ntohs (answer.h.nscount);
arcount = ntohs (answer.h.arcount);
if (!ancount) if (!ancount)
return NULL; /* Got no answer. */ return NULL; /* Got no answer. */