diff options
Diffstat (limited to 'src/lib/libcrypto/stack/stack.h')
-rw-r--r-- | src/lib/libcrypto/stack/stack.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/stack/stack.h b/src/lib/libcrypto/stack/stack.h index a615d9b4c9..8b436ca4b9 100644 --- a/src/lib/libcrypto/stack/stack.h +++ b/src/lib/libcrypto/stack/stack.h | |||
@@ -70,23 +70,21 @@ typedef struct stack_st | |||
70 | int sorted; | 70 | int sorted; |
71 | 71 | ||
72 | int num_alloc; | 72 | int num_alloc; |
73 | int (*comp)(); | 73 | int (*comp)(const char * const *, const char * const *); |
74 | } STACK; | 74 | } STACK; |
75 | 75 | ||
76 | |||
77 | #define sk_new_null() sk_new(NULL) | ||
78 | |||
79 | #define M_sk_num(sk) ((sk) ? (sk)->num:-1) | 76 | #define M_sk_num(sk) ((sk) ? (sk)->num:-1) |
80 | #define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL) | 77 | #define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL) |
81 | 78 | ||
82 | int sk_num(STACK *); | 79 | int sk_num(const STACK *); |
83 | char *sk_value(STACK *, int); | 80 | char *sk_value(const STACK *, int); |
84 | 81 | ||
85 | char *sk_set(STACK *, int, char *); | 82 | char *sk_set(STACK *, int, char *); |
86 | 83 | ||
87 | STACK *sk_new(int (*cmp)()); | 84 | STACK *sk_new(int (*cmp)(const char * const *, const char * const *)); |
85 | STACK *sk_new_null(void); | ||
88 | void sk_free(STACK *); | 86 | void sk_free(STACK *); |
89 | void sk_pop_free(STACK *st, void (*func)()); | 87 | void sk_pop_free(STACK *st, void (*func)(void *)); |
90 | int sk_insert(STACK *sk,char *data,int where); | 88 | int sk_insert(STACK *sk,char *data,int where); |
91 | char *sk_delete(STACK *st,int loc); | 89 | char *sk_delete(STACK *st,int loc); |
92 | char *sk_delete_ptr(STACK *st, char *p); | 90 | char *sk_delete_ptr(STACK *st, char *p); |
@@ -96,7 +94,9 @@ int sk_unshift(STACK *st,char *data); | |||
96 | char *sk_shift(STACK *st); | 94 | char *sk_shift(STACK *st); |
97 | char *sk_pop(STACK *st); | 95 | char *sk_pop(STACK *st); |
98 | void sk_zero(STACK *st); | 96 | void sk_zero(STACK *st); |
99 | int (*sk_set_cmp_func(STACK *sk, int (*c)()))(); | 97 | int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *, |
98 | const char * const *))) | ||
99 | (const char * const *, const char * const *); | ||
100 | STACK *sk_dup(STACK *st); | 100 | STACK *sk_dup(STACK *st); |
101 | void sk_sort(STACK *st); | 101 | void sk_sort(STACK *st); |
102 | 102 | ||