aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-01-11 14:11:13 +0000
committerDr. Stephen Henson <steve@openssl.org>2016-01-11 17:50:27 +0000
commite6b5c341b94d357b0158ad74b12edd51399a4b87 (patch)
tree0957d4adb18236b4f70e0edf836023d7b39a0d23 /apps
parent8e423bde2561bcddbc1d67f1fcc182d7dfa3f04d (diff)
downloadopenssl-e6b5c341b94d357b0158ad74b12edd51399a4b87.tar.gz
Inline LHASH_OF
Make LHASH_OF use static inline functions. Add new lh_get_down_load and lh_set_down_load functions and their typesafe inline equivalents. Make lh_error a function instead of a macro. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/openssl.c1
-rw-r--r--apps/progs.h2
-rw-r--r--apps/progs.pl2
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 411fe6980d..539de761f0 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -153,7 +153,6 @@
* required type of "FUNCTION*"). This removes the necessity for
* macro-generated wrapper functions.
*/
-DECLARE_LHASH_OF(FUNCTION);
static LHASH_OF(FUNCTION) *prog_init(void);
static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]);
static void list_pkey(void);
diff --git a/apps/progs.h b/apps/progs.h
index 4a59b64a50..400fefcbfd 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -16,6 +16,8 @@ typedef struct function_st {
const OPTIONS *help;
} FUNCTION;
+DECLARE_LHASH_OF(FUNCTION);
+
extern int asn1parse_main(int argc, char *argv[]);
extern int ca_main(int argc, char *argv[]);
extern int ciphers_main(int argc, char *argv[]);
diff --git a/apps/progs.pl b/apps/progs.pl
index 065d954588..dd935cee0d 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -20,6 +20,8 @@ typedef struct function_st {
const OPTIONS *help;
} FUNCTION;
+DECLARE_LHASH_OF(FUNCTION);
+
EOF
grep(s/\.o//, @ARGV);