projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dependencies for m_dss.c too.
[openssl.git]
/
crypto
/
ex_data.c
diff --git
a/crypto/ex_data.c
b/crypto/ex_data.c
index 05e5ec346b965cd936159702abb117e2c74e6ba8..e2bc8298d0a7a6f1b45e1a3cfe1c7248c00a9919 100644
(file)
--- a/
crypto/ex_data.c
+++ b/
crypto/ex_data.c
@@
-253,13
+253,13
@@
static unsigned long ex_class_item_hash(const EX_CLASS_ITEM *a)
{
return a->class_index;
}
{
return a->class_index;
}
-static IMPLEMENT_LHASH_HASH_FN(ex_class_item, EX_CLASS_ITEM)
;
+static IMPLEMENT_LHASH_HASH_FN(ex_class_item, EX_CLASS_ITEM)
static int ex_class_item_cmp(const EX_CLASS_ITEM *a, const EX_CLASS_ITEM *b)
{
return a->class_index - b->class_index;
}
static int ex_class_item_cmp(const EX_CLASS_ITEM *a, const EX_CLASS_ITEM *b)
{
return a->class_index - b->class_index;
}
-static IMPLEMENT_LHASH_COMP_FN(ex_class_item, EX_CLASS_ITEM)
;
+static IMPLEMENT_LHASH_COMP_FN(ex_class_item, EX_CLASS_ITEM)
/* Internal functions used by the "impl_default" implementation to access the
* state */
/* Internal functions used by the "impl_default" implementation to access the
* state */
@@
-317,7
+317,7
@@
static EX_CLASS_ITEM *def_get_class(int class_index)
{
/* Because we're inside the ex_data lock, the
* return value from the insert will be NULL */
{
/* Because we're inside the ex_data lock, the
* return value from the insert will be NULL */
- lh_EX_CLASS_ITEM_insert(ex_data, gen);
+
(void)
lh_EX_CLASS_ITEM_insert(ex_data, gen);
p = gen;
}
}
p = gen;
}
}
@@
-456,7
+456,7
@@
static int int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
return 0;
CRYPTO_r_lock(CRYPTO_LOCK_EX_DATA);
mx = sk_CRYPTO_EX_DATA_FUNCS_num(item->meth);
return 0;
CRYPTO_r_lock(CRYPTO_LOCK_EX_DATA);
mx = sk_CRYPTO_EX_DATA_FUNCS_num(item->meth);
- j = sk_num(from->sk);
+ j = sk_
void_
num(from->sk);
if(j < mx)
mx = j;
if(mx > 0)
if(j < mx)
mx = j;
if(mx > 0)
@@
-527,7
+527,7
@@
skip:
OPENSSL_free(storage);
if(ad->sk)
{
OPENSSL_free(storage);
if(ad->sk)
{
- sk_free(ad->sk);
+ sk_
void_
free(ad->sk);
ad->sk=NULL;
}
}
ad->sk=NULL;
}
}
@@
-600,24
+600,24
@@
int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
if (ad->sk == NULL)
{
if (ad->sk == NULL)
{
- if ((ad->sk=sk_new_null()) == NULL)
+ if ((ad->sk=sk_
void_
new_null()) == NULL)
{
CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
return(0);
}
}
{
CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
return(0);
}
}
- i=sk_num(ad->sk);
+ i=sk_
void_
num(ad->sk);
while (i <= idx)
{
while (i <= idx)
{
- if (!sk_push(ad->sk,NULL))
+ if (!sk_
void_
push(ad->sk,NULL))
{
CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
return(0);
}
i++;
}
{
CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
return(0);
}
i++;
}
- sk_set(ad->sk,idx,val);
+ sk_
void_
set(ad->sk,idx,val);
return(1);
}
return(1);
}
@@
-627,10
+627,10
@@
void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
{
if (ad->sk == NULL)
return(0);
{
if (ad->sk == NULL)
return(0);
- else if (idx >= sk_num(ad->sk))
+ else if (idx >= sk_
void_
num(ad->sk))
return(0);
else
return(0);
else
- return(sk_value(ad->sk,idx));
+ return(sk_v
oid_v
alue(ad->sk,idx));
}
IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS)
}
IMPLEMENT_STACK_OF(CRYPTO_EX_DATA_FUNCS)