[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e23a3fc8e38a889035bf0964c70c7699f4a38e5c (commit)
       via  04fe876b5616793b32e92e965a662bbbed7f71d1 (commit)
      from  704563f04a8401781b359906c1f88a30e12af69c (commit)


- Log -----------------------------------------------------------------
commit e23a3fc8e38a889035bf0964c70c7699f4a38e5c
Author: Adam Eijdenberg <adam.eijdenberg at gmail.com>
Date:   Tue Aug 4 16:29:07 2015 -0700

    Fix clang uninitialized variable warning.
    
    We could just initialize it, but to be consistent with the rest of the file
    it seemed to make more sense to just drop.
    
    Reviewed-by: Ben Laurie <ben at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 04fe876b5616793b32e92e965a662bbbed7f71d1
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Aug 6 22:44:29 2015 +0100

    Revert "Fix uninitalised warning."
    
    This reverts commit 704563f04a8401781b359906c1f88a30e12af69c.
    
    Reverting in favour of the next commit which removes the underlying cause
    of the warning.
    
    Reviewed-by: Ben Laurie <ben at openssl.org>

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

Summary of changes:
 test/packettest.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/packettest.c b/test/packettest.c
index f7f9ec8..d6d0c08 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -131,7 +131,7 @@ static int test_PACKET_get_net_2(PACKET *pkt, size_t start)
 
 static int test_PACKET_get_net_3(PACKET *pkt, size_t start)
 {
-    unsigned long i = 0;
+    unsigned long i;
 
     if (       !PACKET_goto_bookmark(pkt, start)
             || !PACKET_get_net_3(pkt, &i)
@@ -140,7 +140,6 @@ static int test_PACKET_get_net_3(PACKET *pkt, size_t start)
             || !PACKET_get_net_3(pkt, &i)
             ||  i != 0xfafcfeUL
             ||  PACKET_get_net_3(pkt, &i)) {
-        fprintf(stderr, "i is %ld\n", i);
         fprintf(stderr, "test_PACKET_get_net_3() failed\n");
         return 0;
     }