X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fstack%2Fstack.h;h=8b436ca4b986cd1001144e554e5d4b351059a919;hb=0e4aa0d2d2807e0cbeac29b65d2b9061daed8941;hp=0f825cc0c4a69a3340ad72b7f11d5abdf1a5229a;hpb=ee8ba0b26c101262521a0bc10233cdd5a136d126;p=oweals%2Fopenssl.git

diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h
index 0f825cc0c4..8b436ca4b9 100644
--- a/crypto/stack/stack.h
+++ b/crypto/stack/stack.h
@@ -70,23 +70,21 @@ typedef struct stack_st
 	int sorted;
 
 	int num_alloc;
-	int (*comp)();
+	int (*comp)(const char * const *, const char * const *);
 	} STACK;
 
+#define M_sk_num(sk)		((sk) ? (sk)->num:-1)
+#define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)
 
-#define sk_new_null()	sk_new(NULL)
-
-#define M_sk_num(sk)		((sk)->num)
-#define M_sk_value(sk,n)	((sk)->data[n])
-
-int sk_num(STACK *);
-char *sk_value(STACK *, int);
+int sk_num(const STACK *);
+char *sk_value(const STACK *, int);
 
 char *sk_set(STACK *, int, char *);
 
-STACK *sk_new(int (*cmp)());
+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 sk_pop_free(STACK *st, void (*func)(void *));
 int sk_insert(STACK *sk,char *data,int where);
 char *sk_delete(STACK *st,int loc);
 char *sk_delete_ptr(STACK *st, char *p);
@@ -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)()))();
+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);