generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More type-checking.

Browse Source
This commit is contained in:
Ben Laurie
2008-06-04 11:01:43 +00:00
parent 37cf49a3df
commit 5ce278a77b
58 changed files with 1518 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
crypto/stack/stack.c
View File

@@ -77,10 +77,11 @@ const char STACK_version[]="Stack" OPENSSL_VERSION_PTEXT;
#include <errno.h>
int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,const char * const *)))
(const char * const *, const char * const *)
int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void * const *,
const void * const *)))
(const void * const *, const void * const *)
{
int (*old)(const char * const *,const char * const *)=sk->comp;
int (*old)(const void * const *,const void * const *)=sk->comp;
if (sk->comp != c)
sk->sorted=0;
@@ -89,9 +90,9 @@ int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,const char * cons
return old;
}
STACK *sk_dup(STACK *sk)
_STACK *sk_dup(_STACK *sk)
{
STACK *ret;
_STACK *ret;
char **s;
if ((ret=sk_new(sk->comp)) == NULL) goto err;
@@ -112,19 +113,19 @@ err:
return(NULL);
}
STACK *sk_new_null(void)
_STACK *sk_new_null(void)
{
return sk_new((int (*)(const char * const *, const char * const *))0);
return sk_new((int (*)(const void * const *, const void * const *))0);
}
STACK *sk_new(int (*c)(const char * const *, const char * const *))
_STACK *sk_new(int (*c)(const void * const *, const void * const *))
{
STACK *ret;
_STACK *ret;
int i;
if ((ret=(STACK *)OPENSSL_malloc(sizeof(STACK))) == NULL)
if ((ret=OPENSSL_malloc(sizeof(_STACK))) == NULL)
goto err;
if ((ret->data=(char **)OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
if ((ret->data=OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
goto err;
for (i=0; i<MIN_NODES; i++)
ret->data[i]=NULL;
@@ -139,14 +140,14 @@ err:
return(NULL);
}
int sk_insert(STACK *st, char *data, int loc)
int sk_insert(_STACK *st, void *data, int loc)
{
char **s;
if(st == NULL) return 0;
if (st->num_alloc <= st->num+1)
{
s=(char **)OPENSSL_realloc((char *)st->data,
s=OPENSSL_realloc((char *)st->data,
(unsigned int)sizeof(char *)*st->num_alloc*2);
if (s == NULL)
return(0);
@@ -160,14 +161,14 @@ int sk_insert(STACK *st, char *data, int loc)
int i;
char **f,**t;
f=(char **)st->data;
t=(char **)&(st->data[1]);
f=st->data;
t=&(st->data[1]);
for (i=st->num; i>=loc; i--)
t[i]=f[i];
#ifdef undef /* no memmove on sunos :-( */
memmove( (char *)&(st->data[loc+1]),
(char *)&(st->data[loc]),
memmove(&(st->data[loc+1]),
&(st->data[loc]),
sizeof(char *)*(st->num-loc));
#endif
st->data[loc]=data;
@@ -177,7 +178,7 @@ int sk_insert(STACK *st, char *data, int loc)
return(st->num);
}
char *sk_delete_ptr(STACK *st, char *p)
void *sk_delete_ptr(_STACK *st, void *p)
{
int i;
@@ -187,7 +188,7 @@ char *sk_delete_ptr(STACK *st, char *p)
return(NULL);
}
char *sk_delete(STACK *st, int loc)
void *sk_delete(_STACK *st, int loc)
{
char *ret;
int i,j;
@@ -210,7 +211,7 @@ char *sk_delete(STACK *st, int loc)
return(ret);
}
static int internal_find(STACK *st, char *data, int ret_val_options)
static int internal_find(_STACK *st, void *data, int ret_val_options)
{
char **r;
int i;
@@ -239,40 +240,40 @@ static int internal_find(STACK *st, char *data, int ret_val_options)
return((int)(r-st->data));
}
int sk_find(STACK *st, char *data)
int sk_find(_STACK *st, void *data)
{
return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
}
int sk_find_ex(STACK *st, char *data)
int sk_find_ex(_STACK *st, void *data)
{
return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH);
}
int sk_push(STACK *st, char *data)
int sk_push(_STACK *st, void *data)
{
return(sk_insert(st,data,st->num));
}
int sk_unshift(STACK *st, char *data)
int sk_unshift(_STACK *st, void *data)
{
return(sk_insert(st,data,0));
}
char *sk_shift(STACK *st)
void *sk_shift(_STACK *st)
{
if (st == NULL) return(NULL);
if (st->num <= 0) return(NULL);
return(sk_delete(st,0));
}
char *sk_pop(STACK *st)
void *sk_pop(_STACK *st)
{
if (st == NULL) return(NULL);
if (st->num <= 0) return(NULL);
return(sk_delete(st,st->num-1));
}
void sk_zero(STACK *st)
void sk_zero(_STACK *st)
{
if (st == NULL) return;
if (st->num <= 0) return;
@@ -280,7 +281,7 @@ void sk_zero(STACK *st)
st->num=0;
}
void sk_pop_free(STACK *st, void (*func)(void *))
void sk_pop_free(_STACK *st, void (*func)(void *))
{
int i;
@@ -291,32 +292,32 @@ void sk_pop_free(STACK *st, void (*func)(void *))
sk_free(st);
}
void sk_free(STACK *st)
void sk_free(_STACK *st)
{
if (st == NULL) return;
if (st->data != NULL) OPENSSL_free(st->data);
OPENSSL_free(st);
}
int sk_num(const STACK *st)
int sk_num(const _STACK *st)
{
if(st == NULL) return -1;
return st->num;
}
char *sk_value(const STACK *st, int i)
void *sk_value(const _STACK *st, int i)
{
if(!st || (i < 0) || (i >= st->num)) return NULL;
return st->data[i];
}
char *sk_set(STACK *st, int i, char *value)
void *sk_set(_STACK *st, int i, void *value)
{
if(!st || (i < 0) || (i >= st->num)) return NULL;
return (st->data[i] = value);
}
void sk_sort(STACK *st)
void sk_sort(_STACK *st)
{
if (st && !st->sorted)
{
@@ -333,7 +334,7 @@ void sk_sort(STACK *st)
}
}
int sk_is_sorted(const STACK *st)
int sk_is_sorted(const _STACK *st)
{
if (!st)
return 1;