diff options
| author | Peter Eisentraut | 2011-04-11 19:28:45 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2011-04-11 19:28:45 +0000 |
| commit | 5caa3479c2efd31fca1b271db687e5e57c7de2d4 (patch) | |
| tree | ad862f1b6620a5a376a67b4a320f23c212b45ef4 /contrib/pgcrypto/pgp-s2k.c | |
| parent | 3c381a55b0fa1c4ca328211e39df8e1a715129cb (diff) | |
Clean up most -Wunused-but-set-variable warnings from gcc 4.6
This warning is new in gcc 4.6 and part of -Wall. This patch cleans
up most of the noise, but there are some still warnings that are
trickier to remove.
Diffstat (limited to 'contrib/pgcrypto/pgp-s2k.c')
| -rw-r--r-- | contrib/pgcrypto/pgp-s2k.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c index ef16caf6851..349234e243c 100644 --- a/contrib/pgcrypto/pgp-s2k.c +++ b/contrib/pgcrypto/pgp-s2k.c @@ -39,14 +39,12 @@ static int calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len) { - unsigned md_bs, - md_rlen; + unsigned md_rlen; uint8 buf[PGP_MAX_DIGEST]; unsigned preload; unsigned remain; uint8 *dst = s2k->key; - md_bs = px_md_block_size(md); md_rlen = px_md_result_size(md); remain = s2k->key_len; @@ -83,14 +81,12 @@ calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key, static int calc_s2k_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len) { - unsigned md_bs, - md_rlen; + unsigned md_rlen; uint8 buf[PGP_MAX_DIGEST]; unsigned preload = 0; uint8 *dst; unsigned remain; - md_bs = px_md_block_size(md); md_rlen = px_md_result_size(md); dst = s2k->key; @@ -129,8 +125,7 @@ static int calc_s2k_iter_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len) { - unsigned md_bs, - md_rlen; + unsigned md_rlen; uint8 buf[PGP_MAX_DIGEST]; uint8 *dst; unsigned preload = 0; @@ -143,7 +138,6 @@ calc_s2k_iter_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, cval = s2k->iter; count = ((unsigned) 16 + (cval & 15)) << ((cval >> 4) + 6); - md_bs = px_md_block_size(md); md_rlen = px_md_result_size(md); remain = s2k->key_len; |