projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
As with RSA, which was modified recently, this change makes it possible to
[oweals/openssl.git]
/
crypto
/
stack
/
stack.h
diff --git
a/crypto/stack/stack.h
b/crypto/stack/stack.h
index 0f825cc0c4a69a3340ad72b7f11d5abdf1a5229a..8b436ca4b986cd1001144e554e5d4b351059a919 100644
(file)
--- a/
crypto/stack/stack.h
+++ b/
crypto/stack/stack.h
@@
-70,23
+70,21
@@
typedef struct stack_st
int sorted;
int num_alloc;
int sorted;
int num_alloc;
- int (*comp)();
+ int (*comp)(
const char * const *, const char * const *
);
} STACK;
} 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 *);
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_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_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);
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);
STACK *sk_dup(STACK *st);
void sk_sort(STACK *st);