>From ca300c774afe6f464a4357c3c5c14bb9f280e4a1 Mon Sep 17 00:00:00 2001
From: Stef Walter <address@hidden>
Date: Mon, 6 Jun 2011 16:20:55 +0000
Subject: [PATCH 1/2] Remove unused variables

 * GCC 4.6.0 prints a warning, and build failes with -Wunused
---
 lib/auth/srp.c           |    3 +--
 lib/auth/srp_rsa.c       |    3 +--
 lib/ext/session_ticket.c |    3 +--
 lib/gnutls_compress.c    |    6 ++----
 lib/hash.c               |    3 ---
 lib/nettle/ecc_mulmod.c  |    4 +---
 lib/x509/common.c        |    3 ---
 7 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/lib/auth/srp.c b/lib/auth/srp.c
index 17b2c0f..e3fbbde 100644
--- a/lib/auth/srp.c
+++ b/lib/auth/srp.c
@@ -695,7 +695,7 @@ _gnutls_proc_srp_server_kx (gnutls_session_t session, opaque * data,
 {
   uint8_t n_s;
   uint16_t n_g, n_n, n_b;
-  size_t _n_s, _n_g, _n_n, _n_b;
+  size_t _n_g, _n_n, _n_b;
   const uint8_t *data_n;
   const uint8_t *data_g;
   const uint8_t *data_s;
@@ -784,7 +784,6 @@ _gnutls_proc_srp_server_kx (gnutls_session_t session, opaque * data,
   data_b = &data[i];
   i += n_b;
 
-  _n_s = n_s;
   _n_g = n_g;
   _n_n = n_n;
   _n_b = n_b;
diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index 675e917..a9fd1d6 100644
--- a/lib/auth/srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -82,7 +82,7 @@ const mod_auth_st srp_dss_auth_struct = {
 static int
 gen_srp_cert_server_kx (gnutls_session_t session, gnutls_buffer_st* data)
 {
-  ssize_t ret, data_size;
+  ssize_t ret;
   gnutls_datum_t signature, ddata;
   gnutls_certificate_credentials_t cred;
   gnutls_pcert_st *apr_cert_list;
@@ -95,7 +95,6 @@ gen_srp_cert_server_kx (gnutls_session_t session, gnutls_buffer_st* data)
   if (ret < 0)
     return ret;
 
-  data_size = ret;
   ddata.data = data->data;
   ddata.size = data->length;
 
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index bb9eaf6..27e2176 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -671,7 +671,6 @@ _gnutls_recv_new_session_ticket (gnutls_session_t session)
   uint8_t *p;
   int data_size;
   gnutls_buffer_st buf;
-  uint32_t lifetime_hint;
   uint16_t ticket_len;
   int ret;
   session_ticket_ext_st *priv = NULL;
@@ -700,7 +699,7 @@ _gnutls_recv_new_session_ticket (gnutls_session_t session)
   data_size = buf.length;
 
   DECR_LENGTH_COM (data_size, 4, ret = GNUTLS_E_UNEXPECTED_PACKET_LENGTH; goto error);
-  lifetime_hint = _gnutls_read_uint32 (p);
+  /* skip over lifetime hint */
   p += 4;
 
   DECR_LENGTH_COM (data_size, 2, ret = GNUTLS_E_UNEXPECTED_PACKET_LENGTH; goto error);
diff --git a/lib/gnutls_compress.c b/lib/gnutls_compress.c
index cb8d65b..eed0b10 100644
--- a/lib/gnutls_compress.c
+++ b/lib/gnutls_compress.c
@@ -378,12 +378,10 @@ _gnutls_comp_deinit (comp_hd_t handle, int d)
 #ifdef HAVE_LIBZ
         case GNUTLS_COMP_DEFLATE:
           {
-            int err;
-
             if (d)
-              err = inflateEnd (handle->handle);
+              inflateEnd (handle->handle);
             else
-              err = deflateEnd (handle->handle);
+              deflateEnd (handle->handle);
             break;
           }
 #endif
diff --git a/lib/hash.c b/lib/hash.c
index 197530a..c240cf5 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -183,13 +183,10 @@ uint32_t _gnutls_bhash( const void *key, size_t length, uint32_t initval)
 {
   uint32_t a,b,c;                                          /* internal state */
   const uint8_t *k;
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
 
   /* Set up the internal state */
   a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
 
-  u.ptr = key;
-
   k = (const uint8_t *)key;
 
   /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
diff --git a/lib/nettle/ecc_mulmod.c b/lib/nettle/ecc_mulmod.c
index 6781b03..9cb1de8 100644
--- a/lib/nettle/ecc_mulmod.c
+++ b/lib/nettle/ecc_mulmod.c
@@ -48,7 +48,7 @@ ecc_mulmod (mpz_t k, ecc_point * G, ecc_point * R, mpz_t a, mpz_t modulus,
   ecc_point *tG, *M[3];
   int i, j, err;
   unsigned long buf;
-  int first, bitbuf, bitcpy, bitcnt, mode, digidx;
+  int bitcnt, mode, digidx;
 
   assert (k != NULL);
   assert (G != NULL);
@@ -98,8 +98,6 @@ ecc_mulmod (mpz_t k, ecc_point * G, ecc_point * R, mpz_t a, mpz_t modulus,
   bitcnt = 1;
   buf = 0;
   digidx = mpz_size (k) - 1;
-  bitcpy = bitbuf = 0;
-  first = 1;
 
   /* perform ops */
   for (;;)
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 22c8da0..b01f893 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -1101,12 +1101,9 @@ _gnutls_x509_write_value (ASN1_TYPE c, const char *root,
                           const gnutls_datum_t * data, int str)
 {
   int result;
-  int asize;
   ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
   gnutls_datum_t val = { NULL, 0 };
 
-  asize = data->size + 16;
-
   if (str)
     {
       /* Convert it to OCTET STRING
-- 
1.7.5.2