Safe stack reorganisation in terms of function casts.

[openssl.git] / crypto / stack / stack.h

diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h
index 1613ac5fb1418304d917a0177f6bc9a30cd7cb50..8b436ca4b986cd1001144e554e5d4b351059a919 100644 (file)
--- a/crypto/stack/stack.h
+++ b/crypto/stack/stack.h
@@ -70,12 +70,9 @@ typedef struct stack_st
        int sorted;
 
        int num_alloc;
-       int (*comp)(const void *, const void *);
+       int (*comp)(const char * const *, const char * const *);
        } STACK;
 
-
-#define sk_new_null()  sk_new(NULL)
-
 #define M_sk_num(sk)           ((sk) ? (sk)->num:-1)
 #define M_sk_value(sk,n)       ((sk) ? (sk)->data[n] : NULL)
 
@@ -84,7 +81,8 @@ char *sk_value(const STACK *, int);
 
 char *sk_set(STACK *, int, char *);
 
-STACK *sk_new(int (*cmp)(const void *, const void *));
+STACK *sk_new(int (*cmp)(const char * const *, const char * const *));
+STACK *sk_new_null(void);
 void sk_free(STACK *);
 void sk_pop_free(STACK *st, void (*func)(void *));
 int sk_insert(STACK *sk,char *data,int where);
@@ -96,7 +94,9 @@ int sk_unshift(STACK *st,char *data);
 char *sk_shift(STACK *st);
 char *sk_pop(STACK *st);
 void sk_zero(STACK *st);
-int (*sk_set_cmp_func(STACK *sk, int (*c)(const void *,const void *)))(const void *, const void *);
+int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,
+                       const char * const *)))
+                       (const char * const *, const char * const *);
 STACK *sk_dup(STACK *st);
 void sk_sort(STACK *st);