[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  aef492683ba31aae8491e6e2b64588f7787109a2 (commit)
      from  c27bc74698ed043b7549d5637ec0a8cf65b39e59 (commit)


- Log -----------------------------------------------------------------
commit aef492683ba31aae8491e6e2b64588f7787109a2
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun May 28 15:01:36 2017 +0200

    Revert "Add internal functions to fetch a refcount"
    
    It turned out to be a bad idea.
    
    This reverts commits 6891a79da67ccd621b67e49b60ddc188d7864291
    and c27bc74698ed043b7549d5637ec0a8cf65b39e59.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3576)

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

Summary of changes:
 include/internal/refcount.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index 5fae6fd..591561f 100644
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -22,12 +22,6 @@
 
 typedef _Atomic int CRYPTO_REF_COUNT;
 
-static ossl_inline int CRYPTO_GET_REF(_Atomic int *val, int *ret, void *lock)
-{
-    *ret = atomic_fetch_add_explicit(val, 0, memory_order_relaxed);
-    return 1;
-}
-
 static ossl_inline int CRYPTO_UP_REF(_Atomic int *val, int *ret, void *lock)
 {
     *ret = atomic_fetch_add_explicit(val, 1, memory_order_relaxed) + 1;
@@ -48,12 +42,6 @@ static ossl_inline int CRYPTO_DOWN_REF(_Atomic int *val, int *ret, void *lock)
 
 typedef int CRYPTO_REF_COUNT;
 
-static ossl_inline int CRYPTO_GET_REF(int *val, int *ret, void *lock)
-{
-    *ret = __atomic_fetch_add(val, 0, __ATOMIC_RELAXED);
-    return 1;
-}
-
 static ossl_inline int CRYPTO_UP_REF(int *val, int *ret, void *lock)
 {
     *ret = __atomic_fetch_add(val, 1, __ATOMIC_RELAXED) + 1;
@@ -72,7 +60,6 @@ static ossl_inline int CRYPTO_DOWN_REF(int *val, int *ret, void *lock)
 
 typedef int CRYPTO_REF_COUNT;
 
-# define CRYPTO_GET_REF(val, ret, lock) CRYPTO_atomic_add(val, 0, ret, lock)
 # define CRYPTO_UP_REF(val, ret, lock) CRYPTO_atomic_add(val, 1, ret, lock)
 # define CRYPTO_DOWN_REF(val, ret, lock) CRYPTO_atomic_add(val, -1, ret, lock)