summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-08-03 16:32:15 +0000
committertb <>2023-08-03 16:32:15 +0000
commit504c970f7055d5e4ff8638f6f4d62fd73e175d4b (patch)
tree454fd3b59e1879b9635914d89a433e50ac0cd398
parent149efabf8b58babe4663858937151c52afba4f9e (diff)
downloadopenbsd-504c970f7055d5e4ff8638f6f4d62fd73e175d4b.tar.gz
openbsd-504c970f7055d5e4ff8638f6f4d62fd73e175d4b.tar.bz2
openbsd-504c970f7055d5e4ff8638f6f4d62fd73e175d4b.zip
Remove unused sk/lh macros
ok jsing miod
-rw-r--r--src/lib/libcrypto/stack/safestack.h171
1 files changed, 1 insertions, 170 deletions
diff --git a/src/lib/libcrypto/stack/safestack.h b/src/lib/libcrypto/stack/safestack.h
index 9d0f1e0d1c..4f575ba947 100644
--- a/src/lib/libcrypto/stack/safestack.h
+++ b/src/lib/libcrypto/stack/safestack.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: safestack.h,v 1.28 2023/07/28 10:26:33 tb Exp $ */ 1/* $OpenBSD: safestack.h,v 1.29 2023/08/03 16:32:15 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -125,13 +125,6 @@ typedef const char *OPENSSL_CSTRING;
125 125
126DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char) 126DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
127 127
128/* Similarly, we sometimes use a block of characters, NOT
129 * nul-terminated. These should also be distinguished from "normal"
130 * stacks. */
131
132typedef void *OPENSSL_BLOCK;
133DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
134
135/* SKM_sk_... stack macros are internal to safestack.h: 128/* SKM_sk_... stack macros are internal to safestack.h:
136 * never use them directly, use sk_<type>_... instead */ 129 * never use them directly, use sk_<type>_... instead */
137#define SKM_sk_new(type, cmp) \ 130#define SKM_sk_new(type, cmp) \
@@ -685,50 +678,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
685#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st)) 678#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
686#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st)) 679#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
687 680
688#define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
689#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
690#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
691#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
692#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
693#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
694#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
695#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
696#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
697#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
698#define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
699#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
700#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
701#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
702#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
703#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
704#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
705#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
706#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
707#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
708#define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
709
710#define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
711#define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
712#define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
713#define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
714#define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
715#define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
716#define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
717#define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
718#define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
719#define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
720#define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
721#define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
722#define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
723#define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
724#define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
725#define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
726#define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
727#define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
728#define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
729#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
730#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
731
732#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp)) 681#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
733#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID) 682#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
734#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st)) 683#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
@@ -973,28 +922,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
973#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st)) 922#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
974#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st)) 923#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
975 924
976#define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
977#define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
978#define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
979#define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
980#define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
981#define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
982#define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
983#define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
984#define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
985#define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
986#define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
987#define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
988#define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
989#define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
990#define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
991#define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
992#define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
993#define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
994#define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
995#define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
996#define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
997
998#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp)) 925#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
999#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER) 926#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
1000#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st)) 927#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
@@ -1855,30 +1782,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
1855#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st)) 1782#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
1856#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st)) 1783#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
1857 1784
1858#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
1859#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
1860#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
1861#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
1862#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
1863#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
1864#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
1865#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
1866#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
1867#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
1868#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
1869#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
1870#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
1871#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
1872#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
1873#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp) \
1874 ((int (*)(const void * const *,const void * const *)) \
1875 sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
1876#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
1877#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
1878#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
1879#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
1880#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
1881
1882#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp))) 1785#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
1883#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null()) 1786#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
1884#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val)) 1787#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
@@ -1921,24 +1824,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
1921 LHM_lh_stats_bio(ADDED_OBJ,lh,out) 1824 LHM_lh_stats_bio(ADDED_OBJ,lh,out)
1922#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh) 1825#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
1923 1826
1924#define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
1925#define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
1926#define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
1927#define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
1928#define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
1929#define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
1930 LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
1931#define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
1932#define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
1933#define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
1934#define lh_APP_INFO_node_stats_bio(lh,out) \
1935 LHM_lh_node_stats_bio(APP_INFO,lh,out)
1936#define lh_APP_INFO_node_usage_stats_bio(lh,out) \
1937 LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
1938#define lh_APP_INFO_stats_bio(lh,out) \
1939 LHM_lh_stats_bio(APP_INFO,lh,out)
1940#define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
1941
1942#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value) 1827#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
1943#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst) 1828#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
1944#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst) 1829#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
@@ -1957,24 +1842,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
1957 LHM_lh_stats_bio(CONF_VALUE,lh,out) 1842 LHM_lh_stats_bio(CONF_VALUE,lh,out)
1958#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh) 1843#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
1959 1844
1960#define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
1961#define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
1962#define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
1963#define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
1964#define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
1965#define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
1966 LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
1967#define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
1968#define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
1969#define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
1970#define lh_ENGINE_PILE_node_stats_bio(lh,out) \
1971 LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
1972#define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
1973 LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
1974#define lh_ENGINE_PILE_stats_bio(lh,out) \
1975 LHM_lh_stats_bio(ENGINE_PILE,lh,out)
1976#define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
1977
1978#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state) 1845#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
1979#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst) 1846#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
1980#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst) 1847#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
@@ -2047,24 +1914,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
2047 LHM_lh_stats_bio(FUNCTION,lh,out) 1914 LHM_lh_stats_bio(FUNCTION,lh,out)
2048#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh) 1915#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
2049 1916
2050#define lh_MEM_new() LHM_lh_new(MEM,mem)
2051#define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
2052#define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
2053#define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
2054#define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
2055#define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
2056 LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
2057#define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
2058#define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
2059#define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
2060#define lh_MEM_node_stats_bio(lh,out) \
2061 LHM_lh_node_stats_bio(MEM,lh,out)
2062#define lh_MEM_node_usage_stats_bio(lh,out) \
2063 LHM_lh_node_usage_stats_bio(MEM,lh,out)
2064#define lh_MEM_stats_bio(lh,out) \
2065 LHM_lh_stats_bio(MEM,lh,out)
2066#define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
2067
2068#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name) 1917#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
2069#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst) 1918#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
2070#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst) 1919#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
@@ -2083,24 +1932,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
2083 LHM_lh_stats_bio(OBJ_NAME,lh,out) 1932 LHM_lh_stats_bio(OBJ_NAME,lh,out)
2084#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh) 1933#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
2085 1934
2086#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
2087#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
2088#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
2089#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
2090#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
2091#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
2092 LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
2093#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
2094#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
2095#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
2096#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
2097 LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
2098#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
2099 LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
2100#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
2101 LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
2102#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
2103
2104#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string) 1935#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
2105#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst) 1936#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
2106#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst) 1937#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)