kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove stack macros for nonexistent types.

Browse Source 
There's a few that can't work since the types don't even exist.

Change-Id: Idf860b146439c95d33814d25bbc9b8f61774b569
Reviewed-on: https://boringssl-review.googlesource.com/6762
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-12-12 18:44:45 -05:00 committed by Adam Langley
parent 70ab223490
commit 841934f079
2 changed files with 0 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/openssl/stack.h
View File

@ -134,9 +134,6 @@ typedef struct stack_st {
* STACK_OF:GENERAL_NAME
* STACK_OF:GENERAL_NAMES
* STACK_OF:GENERAL_SUBTREE
* STACK_OF:MIME_HEADER
* STACK_OF:PKCS7_RECIP_INFO
* STACK_OF:PKCS7_SIGNER_INFO
* STACK_OF:POLICYINFO
* STACK_OF:POLICYQUALINFO
* STACK_OF:POLICY_MAPPING

256
include/openssl/stack_macros.h
View File

@ -1430,262 +1430,6 @@
copy_func), \
CHECKED_CAST(void (*)(void *), void (*)(GENERAL_SUBTREE *), free_func)))
/* MIME_HEADER */
#define sk_MIME_HEADER_new(comp) \
((STACK_OF(MIME_HEADER) *)sk_new(CHECKED_CAST( \
stack_cmp_func, int (*)(const MIME_HEADER **a, const MIME_HEADER **b), \
comp)))
#define sk_MIME_HEADER_new_null() ((STACK_OF(MIME_HEADER) *)sk_new_null())
#define sk_MIME_HEADER_num(sk) \
sk_num(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk))
#define sk_MIME_HEADER_zero(sk) \
sk_zero(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk));
#define sk_MIME_HEADER_value(sk, i) \
((MIME_HEADER *)sk_value( \
CHECKED_CAST(_STACK *, const STACK_OF(MIME_HEADER) *, sk), (i)))
#define sk_MIME_HEADER_set(sk, i, p) \
((MIME_HEADER *)sk_set(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
(i), CHECKED_CAST(void *, MIME_HEADER *, p)))
#define sk_MIME_HEADER_free(sk) \
sk_free(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk))
#define sk_MIME_HEADER_pop_free(sk, free_func) \
sk_pop_free( \
CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(void (*)(void *), void (*)(MIME_HEADER *), free_func))
#define sk_MIME_HEADER_insert(sk, p, where) \
sk_insert(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(void *, MIME_HEADER *, p), (where))
#define sk_MIME_HEADER_delete(sk, where) \
((MIME_HEADER *)sk_delete( \
CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), (where)))
#define sk_MIME_HEADER_delete_ptr(sk, p) \
((MIME_HEADER *)sk_delete_ptr( \
CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(void *, MIME_HEADER *, p)))
#define sk_MIME_HEADER_find(sk, out_index, p) \
sk_find(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), (out_index), \
CHECKED_CAST(void *, MIME_HEADER *, p))
#define sk_MIME_HEADER_shift(sk) \
((MIME_HEADER *)sk_shift(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk)))
#define sk_MIME_HEADER_push(sk, p) \
sk_push(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(void *, MIME_HEADER *, p))
#define sk_MIME_HEADER_pop(sk) \
((MIME_HEADER *)sk_pop(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk)))
#define sk_MIME_HEADER_dup(sk) \
((STACK_OF(MIME_HEADER) *)sk_dup( \
CHECKED_CAST(_STACK *, const STACK_OF(MIME_HEADER) *, sk)))
#define sk_MIME_HEADER_sort(sk) \
sk_sort(CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk))
#define sk_MIME_HEADER_is_sorted(sk) \
sk_is_sorted(CHECKED_CAST(_STACK *, const STACK_OF(MIME_HEADER) *, sk))
#define sk_MIME_HEADER_set_cmp_func(sk, comp) \
((int (*)(const MIME_HEADER **a, const MIME_HEADER **b))sk_set_cmp_func( \
CHECKED_CAST(_STACK *, STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(stack_cmp_func, \
int (*)(const MIME_HEADER **a, const MIME_HEADER **b), \
comp)))
#define sk_MIME_HEADER_deep_copy(sk, copy_func, free_func) \
((STACK_OF(MIME_HEADER) *)sk_deep_copy( \
CHECKED_CAST(const _STACK *, const STACK_OF(MIME_HEADER) *, sk), \
CHECKED_CAST(void *(*)(void *), MIME_HEADER *(*)(MIME_HEADER *), \
copy_func), \
CHECKED_CAST(void (*)(void *), void (*)(MIME_HEADER *), free_func)))
/* PKCS7_RECIP_INFO */
#define sk_PKCS7_RECIP_INFO_new(comp) \
((STACK_OF(PKCS7_RECIP_INFO) *)sk_new(CHECKED_CAST( \
stack_cmp_func, \
int (*)(const PKCS7_RECIP_INFO **a, const PKCS7_RECIP_INFO **b), comp)))
#define sk_PKCS7_RECIP_INFO_new_null() \
((STACK_OF(PKCS7_RECIP_INFO) *)sk_new_null())
#define sk_PKCS7_RECIP_INFO_num(sk) \
sk_num(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk))
#define sk_PKCS7_RECIP_INFO_zero(sk) \
sk_zero(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk));
#define sk_PKCS7_RECIP_INFO_value(sk, i) \
((PKCS7_RECIP_INFO *)sk_value( \
CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_RECIP_INFO) *, sk), (i)))
#define sk_PKCS7_RECIP_INFO_set(sk, i, p) \
((PKCS7_RECIP_INFO *)sk_set( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), (i), \
CHECKED_CAST(void *, PKCS7_RECIP_INFO *, p)))
#define sk_PKCS7_RECIP_INFO_free(sk) \
sk_free(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk))
#define sk_PKCS7_RECIP_INFO_pop_free(sk, free_func) \
sk_pop_free( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(void (*)(void *), void (*)(PKCS7_RECIP_INFO *), free_func))
#define sk_PKCS7_RECIP_INFO_insert(sk, p, where) \
sk_insert(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_RECIP_INFO *, p), (where))
#define sk_PKCS7_RECIP_INFO_delete(sk, where) \
((PKCS7_RECIP_INFO *)sk_delete( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), (where)))
#define sk_PKCS7_RECIP_INFO_delete_ptr(sk, p) \
((PKCS7_RECIP_INFO *)sk_delete_ptr( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_RECIP_INFO *, p)))
#define sk_PKCS7_RECIP_INFO_find(sk, out_index, p) \
sk_find(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
(out_index), CHECKED_CAST(void *, PKCS7_RECIP_INFO *, p))
#define sk_PKCS7_RECIP_INFO_shift(sk) \
((PKCS7_RECIP_INFO *)sk_shift( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk)))
#define sk_PKCS7_RECIP_INFO_push(sk, p) \
sk_push(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_RECIP_INFO *, p))
#define sk_PKCS7_RECIP_INFO_pop(sk) \
((PKCS7_RECIP_INFO *)sk_pop( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk)))
#define sk_PKCS7_RECIP_INFO_dup(sk) \
((STACK_OF(PKCS7_RECIP_INFO) *)sk_dup( \
CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_RECIP_INFO) *, sk)))
#define sk_PKCS7_RECIP_INFO_sort(sk) \
sk_sort(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk))
#define sk_PKCS7_RECIP_INFO_is_sorted(sk) \
sk_is_sorted(CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_RECIP_INFO) *, sk))
#define sk_PKCS7_RECIP_INFO_set_cmp_func(sk, comp) \
((int (*)(const PKCS7_RECIP_INFO **a, const PKCS7_RECIP_INFO **b)) \
sk_set_cmp_func( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(stack_cmp_func, int (*)(const PKCS7_RECIP_INFO **a, \
const PKCS7_RECIP_INFO **b), \
comp)))
#define sk_PKCS7_RECIP_INFO_deep_copy(sk, copy_func, free_func) \
((STACK_OF(PKCS7_RECIP_INFO) *)sk_deep_copy( \
CHECKED_CAST(const _STACK *, const STACK_OF(PKCS7_RECIP_INFO) *, sk), \
CHECKED_CAST(void *(*)(void *), \
PKCS7_RECIP_INFO *(*)(PKCS7_RECIP_INFO *), copy_func), \
CHECKED_CAST(void (*)(void *), void (*)(PKCS7_RECIP_INFO *), \
free_func)))
/* PKCS7_SIGNER_INFO */
#define sk_PKCS7_SIGNER_INFO_new(comp) \
((STACK_OF(PKCS7_SIGNER_INFO) *)sk_new(CHECKED_CAST( \
stack_cmp_func, \
int (*)(const PKCS7_SIGNER_INFO **a, const PKCS7_SIGNER_INFO **b), \
comp)))
#define sk_PKCS7_SIGNER_INFO_new_null() \
((STACK_OF(PKCS7_SIGNER_INFO) *)sk_new_null())
#define sk_PKCS7_SIGNER_INFO_num(sk) \
sk_num(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk))
#define sk_PKCS7_SIGNER_INFO_zero(sk) \
sk_zero(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk));
#define sk_PKCS7_SIGNER_INFO_value(sk, i) \
((PKCS7_SIGNER_INFO *)sk_value( \
CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_SIGNER_INFO) *, sk), (i)))
#define sk_PKCS7_SIGNER_INFO_set(sk, i, p) \
((PKCS7_SIGNER_INFO *)sk_set( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), (i), \
CHECKED_CAST(void *, PKCS7_SIGNER_INFO *, p)))
#define sk_PKCS7_SIGNER_INFO_free(sk) \
sk_free(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk))
#define sk_PKCS7_SIGNER_INFO_pop_free(sk, free_func) \
sk_pop_free(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(void (*)(void *), void (*)(PKCS7_SIGNER_INFO *), \
free_func))
#define sk_PKCS7_SIGNER_INFO_insert(sk, p, where) \
sk_insert(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_SIGNER_INFO *, p), (where))
#define sk_PKCS7_SIGNER_INFO_delete(sk, where) \
((PKCS7_SIGNER_INFO *)sk_delete( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), (where)))
#define sk_PKCS7_SIGNER_INFO_delete_ptr(sk, p) \
((PKCS7_SIGNER_INFO *)sk_delete_ptr( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_SIGNER_INFO *, p)))
#define sk_PKCS7_SIGNER_INFO_find(sk, out_index, p) \
sk_find(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
(out_index), CHECKED_CAST(void *, PKCS7_SIGNER_INFO *, p))
#define sk_PKCS7_SIGNER_INFO_shift(sk) \
((PKCS7_SIGNER_INFO *)sk_shift( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk)))
#define sk_PKCS7_SIGNER_INFO_push(sk, p) \
sk_push(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(void *, PKCS7_SIGNER_INFO *, p))
#define sk_PKCS7_SIGNER_INFO_pop(sk) \
((PKCS7_SIGNER_INFO *)sk_pop( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk)))
#define sk_PKCS7_SIGNER_INFO_dup(sk) \
((STACK_OF(PKCS7_SIGNER_INFO) *)sk_dup( \
CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_SIGNER_INFO) *, sk)))
#define sk_PKCS7_SIGNER_INFO_sort(sk) \
sk_sort(CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk))
#define sk_PKCS7_SIGNER_INFO_is_sorted(sk) \
sk_is_sorted(CHECKED_CAST(_STACK *, const STACK_OF(PKCS7_SIGNER_INFO) *, sk))
#define sk_PKCS7_SIGNER_INFO_set_cmp_func(sk, comp) \
((int (*)(const PKCS7_SIGNER_INFO **a, const PKCS7_SIGNER_INFO **b)) \
sk_set_cmp_func( \
CHECKED_CAST(_STACK *, STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(stack_cmp_func, int (*)(const PKCS7_SIGNER_INFO **a, \
const PKCS7_SIGNER_INFO **b), \
comp)))
#define sk_PKCS7_SIGNER_INFO_deep_copy(sk, copy_func, free_func) \
((STACK_OF(PKCS7_SIGNER_INFO) *)sk_deep_copy( \
CHECKED_CAST(const _STACK *, const STACK_OF(PKCS7_SIGNER_INFO) *, sk), \
CHECKED_CAST(void *(*)(void *), \
PKCS7_SIGNER_INFO *(*)(PKCS7_SIGNER_INFO *), copy_func), \
CHECKED_CAST(void (*)(void *), void (*)(PKCS7_SIGNER_INFO *), \
free_func)))
/* POLICYINFO */
#define sk_POLICYINFO_new(comp) \
((STACK_OF(POLICYINFO) *)sk_new(CHECKED_CAST( \