[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-2-ge8a0916

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=e8a0916581069d4244a075b0c878441b602cc954

The branch, master has been updated
       via  e8a0916581069d4244a075b0c878441b602cc954 (commit)
       via  3b91334247ad80409ee04c081c0be3e95023536d (commit)
      from  53604151bd76275e7e85bc267a074a0b8cd015b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8a0916581069d4244a075b0c878441b602cc954
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 16 10:27:05 2012 +0200

    fix warnings

commit 3b91334247ad80409ee04c081c0be3e95023536d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 16 10:26:58 2012 +0200

    Avoid stray return when compiling without trousers.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_buffers.c  |    1 -
 lib/gnutls_priority.c |    2 +-
 lib/gnutls_record.c   |    4 ++--
 lib/system.c          |    3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 4c4f9e3..973fb1c 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -1177,7 +1177,6 @@ _gnutls_handshake_io_recv_int (gnutls_session_t session,
                                handshake_buffer_st * hsk, unsigned int 
optional)
 {
   int ret;
-  time_t tleft = 0;
 
   ret = get_last_packet(session, htype, hsk, optional);
   if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED && ret != 
GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 54bb509..091780e 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -102,7 +102,7 @@ _add_priority (priority_st * st, const int *list)
       
       for (j=0;j<init;j++)
         {
-          if (st->priority[j] == list[num])
+          if (st->priority[j] == (unsigned)list[num])
             {
               num++;
               continue;
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 4eaa79f..396a800 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -992,7 +992,7 @@ begin:
 
   record_state = &record_params->read;
 
-  if (htype != -1 && session->internals.handshake_endtime > 0)
+  if (htype != (unsigned)-1 && session->internals.handshake_endtime > 0)
     {
       now = gnutls_time(0);
       if (now < session->internals.handshake_endtime)
@@ -1014,7 +1014,7 @@ begin:
   else
     packet_sequence = &record_state->sequence_number;
 
-  if (htype != -1 && session->internals.handshake_endtime > 0)
+  if (htype != (unsigned)-1 && session->internals.handshake_endtime > 0)
     {
       now = gnutls_time(0);
       if (now < session->internals.handshake_endtime)
diff --git a/lib/system.c b/lib/system.c
index 82572ba..9a0ebc2 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -437,7 +437,6 @@ 
gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list,
   if (ret > 0)
     r += ret;
 # endif
-#endif
-
   return r;
+#endif
 }


hooks/post-receive
-- 
GNU gnutls