Avoid warning about empty structures and always define CHECKED_PTR_OF

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

diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h
index ec629d0fd2042dae0cdd367b7e50056c799bdf76..5cbb116a8b2f1c75720e817f065459cbda45ce20 100644 (file)
--- a/crypto/stack/stack.h
+++ b/crypto/stack/stack.h
@@ -70,34 +70,37 @@ 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);
 int sk_find(STACK *st,char *data);
+int sk_find_ex(STACK *st,char *data);
 int sk_push(STACK *st,char *data);
 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);
+int sk_is_sorted(const STACK *st);
 
 #ifdef  __cplusplus
 }