diff options
| author |   djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
| commit | 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch) | |
| tree | 3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libcrypto/ex_data.c | |
| parent | import of OpenSSL 0.9.8h (diff) | |
| download | wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/ex_data.c')
| -rw-r--r-- | lib/libcrypto/ex_data.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/libcrypto/ex_data.c b/lib/libcrypto/ex_data.c index 5b2e345c27b..3b11e7a5561 100644 --- a/lib/libcrypto/ex_data.c +++ b/lib/libcrypto/ex_data.c @@ -138,12 +138,8 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <openssl/buffer.h> -#include <openssl/bio.h> -#include <openssl/lhash.h> #include "cryptlib.h" +#include <openssl/lhash.h> /* What an "implementation of ex_data functionality" looks like */ struct st_CRYPTO_EX_DATA_IMPL @@ -287,7 +283,7 @@ static void def_cleanup_util_cb(CRYPTO_EX_DATA_FUNCS *funcs) /* This callback is used in lh_doall to destroy all EX_CLASS_ITEM values from * "ex_data" prior to the ex_data hash table being itself destroyed. Doesn't do * any locking. */ -static void def_cleanup_cb(const void *a_void) +static void def_cleanup_cb(void *a_void) { EX_CLASS_ITEM *item = (EX_CLASS_ITEM *)a_void; sk_CRYPTO_EX_DATA_FUNCS_pop_free(item->meth, def_cleanup_util_cb); @@ -358,7 +354,7 @@ static int def_add_index(EX_CLASS_ITEM *item, long argl, void *argp, } } toret = item->meth_num++; - sk_CRYPTO_EX_DATA_FUNCS_set(item->meth, toret, a); + (void)sk_CRYPTO_EX_DATA_FUNCS_set(item->meth, toret, a); err: CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); return toret; |