Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Side by Side Diff: openssl/crypto/stack/stack.h

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/stack/safestack.h ('k') | openssl/crypto/stack/stack.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/stack/stack.h */ 1 /* crypto/stack/stack.h */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 extern "C" { 63 extern "C" {
64 #endif 64 #endif
65 65
66 typedef struct stack_st 66 typedef struct stack_st
67 { 67 {
68 int num; 68 int num;
69 char **data; 69 char **data;
70 int sorted; 70 int sorted;
71 71
72 int num_alloc; 72 int num_alloc;
73 » int (*comp)(const char * const *, const char * const *); 73 » int (*comp)(const void *, const void *);
74 » } STACK; 74 » } _STACK; /* Use STACK_OF(...) instead */
75 75
76 #define M_sk_num(sk) ((sk) ? (sk)->num:-1) 76 #define M_sk_num(sk) ((sk) ? (sk)->num:-1)
77 #define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL) 77 #define M_sk_value(sk,n) ((sk) ? (sk)->data[n] : NULL)
78 78
79 int sk_num(const STACK *); 79 int sk_num(const _STACK *);
80 char *sk_value(const STACK *, int); 80 void *sk_value(const _STACK *, int);
81 81
82 char *sk_set(STACK *, int, char *); 82 void *sk_set(_STACK *, int, void *);
83 83
84 STACK *sk_new(int (*cmp)(const char * const *, const char * const *)); 84 _STACK *sk_new(int (*cmp)(const void *, const void *));
85 STACK *sk_new_null(void); 85 _STACK *sk_new_null(void);
86 void sk_free(STACK *); 86 void sk_free(_STACK *);
87 void sk_pop_free(STACK *st, void (*func)(void *)); 87 void sk_pop_free(_STACK *st, void (*func)(void *));
88 int sk_insert(STACK *sk,char *data,int where); 88 int sk_insert(_STACK *sk, void *data, int where);
89 char *sk_delete(STACK *st,int loc); 89 void *sk_delete(_STACK *st, int loc);
90 char *sk_delete_ptr(STACK *st, char *p); 90 void *sk_delete_ptr(_STACK *st, void *p);
91 int sk_find(STACK *st,char *data); 91 int sk_find(_STACK *st, void *data);
92 int sk_find_ex(STACK *st,char *data); 92 int sk_find_ex(_STACK *st, void *data);
93 int sk_push(STACK *st,char *data); 93 int sk_push(_STACK *st, void *data);
94 int sk_unshift(STACK *st,char *data); 94 int sk_unshift(_STACK *st, void *data);
95 char *sk_shift(STACK *st); 95 void *sk_shift(_STACK *st);
96 char *sk_pop(STACK *st); 96 void *sk_pop(_STACK *st);
97 void sk_zero(STACK *st); 97 void sk_zero(_STACK *st);
98 int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *, 98 int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
99 » » » const char * const *))) 99 » (const void *, const void *);
100 » » » (const char * const *, const char * const *); 100 _STACK *sk_dup(_STACK *st);
101 STACK *sk_dup(STACK *st); 101 void sk_sort(_STACK *st);
102 void sk_sort(STACK *st); 102 int sk_is_sorted(const _STACK *st);
103 int sk_is_sorted(const STACK *st);
104 103
105 #ifdef __cplusplus 104 #ifdef __cplusplus
106 } 105 }
107 #endif 106 #endif
108 107
109 #endif 108 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/stack/safestack.h ('k') | openssl/crypto/stack/stack.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698