[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  6e2e6ed4faefc7ac57fd053cfac227352632fb81 (commit)
      from  e0c89df9e424e681cf523fac718c425f9b5e6c27 (commit)


- Log -----------------------------------------------------------------
commit 6e2e6ed4faefc7ac57fd053cfac227352632fb81
Author: hongliang <513918845 at qq.com>
Date:   Wed Jul 12 10:51:00 2017 +0800

    coding style: remove extra whitespace charactor
    
    CLA: trivial
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3913)

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

Summary of changes:
 crypto/lhash/lhash.c     | 2 +-
 crypto/lhash/lhash_lcl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 0fbd385..8f28c48 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -32,7 +32,7 @@ OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c)
         return NULL;
     if ((ret->b = OPENSSL_zalloc(sizeof(*ret->b) * MIN_NODES)) == NULL)
         goto err;
-    if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL) 
+    if ((ret->retrieve_stats_lock = CRYPTO_THREAD_lock_new()) == NULL)
         goto err;
     ret->comp = ((c == NULL) ? (OPENSSL_LH_COMPFUNC)strcmp : c);
     ret->hash = ((h == NULL) ? (OPENSSL_LH_HASHFUNC)OPENSSL_LH_strhash : h);
diff --git a/crypto/lhash/lhash_lcl.h b/crypto/lhash/lhash_lcl.h
index 01d463f..64d3134 100644
--- a/crypto/lhash/lhash_lcl.h
+++ b/crypto/lhash/lhash_lcl.h
@@ -21,7 +21,7 @@ struct lhash_st {
     /*
      * some stats are updated on lookup, which callers aren't expecting to have
      * to take an exclusive lock around. This lock protects them on platforms
-     * without atomics, and their types are int rather than unsigned long below 
+     * without atomics, and their types are int rather than unsigned long below
      * so they can be adjusted with CRYPTO_atomic_add.
      */
     CRYPTO_RWLOCK *retrieve_stats_lock;