summaryrefslogtreecommitdiffstats
path: root/crypto/x509/by_dir.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-01-06 03:54:18 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-01-07 19:00:51 +0100
commit4a1f3f274108e25b97bd9870170fe2970892e155 (patch)
tree45e10bfbd19cec70d44d079d677b9852f12a501e /crypto/x509/by_dir.c
parentRename DECLARE*STACK_OF to DEFINE*STACK_OF (diff)
downloadopenssl-4a1f3f274108e25b97bd9870170fe2970892e155.tar.xz
openssl-4a1f3f274108e25b97bd9870170fe2970892e155.zip
Only declare stacks in headers
Don't define stacks in C source files: it causes warnings about unused functions in some compilers. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/x509/by_dir.c')
-rw-r--r--crypto/x509/by_dir.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 7e49daadfd..717d258c34 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -73,26 +73,24 @@
#include <openssl/lhash.h>
#include <openssl/x509.h>
#include "internal/x509_int.h"
+#include "x509_lcl.h"
-typedef struct lookup_dir_hashes_st {
+struct lookup_dir_hashes_st {
unsigned long hash;
int suffix;
-} BY_DIR_HASH;
+};
-typedef struct lookup_dir_entry_st {
+struct lookup_dir_entry_st {
char *dir;
int dir_type;
STACK_OF(BY_DIR_HASH) *hashes;
-} BY_DIR_ENTRY;
+};
typedef struct lookup_dir_st {
BUF_MEM *buffer;
STACK_OF(BY_DIR_ENTRY) *dirs;
} BY_DIR;
-DEFINE_STACK_OF(BY_DIR_HASH)
-DEFINE_STACK_OF(BY_DIR_ENTRY)
-
static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
char **ret);
static int new_dir(X509_LOOKUP *lu);