From 706457b7bda7fdbab426b8dce83b318908339da4 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sat, 28 Sep 2019 00:45:40 +0200 Subject: Reorganize local header files Apart from public and internal header files, there is a third type called local header files, which are located next to source files in the source directory. Currently, they have different suffixes like '*_lcl.h', '*_local.h', or '*_int.h' This commit changes the different suffixes to '*_local.h' uniformly. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9333) --- crypto/property/defn_cache.c | 2 +- crypto/property/property.c | 2 +- crypto/property/property_lcl.h | 46 --------------------------------------- crypto/property/property_local.h | 46 +++++++++++++++++++++++++++++++++++++++ crypto/property/property_parse.c | 2 +- crypto/property/property_string.c | 2 +- 6 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 crypto/property/property_lcl.h create mode 100644 crypto/property/property_local.h (limited to 'crypto/property') diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c index aec05c1ae3..9bfbd13144 100644 --- a/crypto/property/defn_cache.c +++ b/crypto/property/defn_cache.c @@ -13,7 +13,7 @@ #include #include "internal/propertyerr.h" #include "internal/property.h" -#include "property_lcl.h" +#include "property_local.h" /* * Implement a property definition cache. diff --git a/crypto/property/property.c b/crypto/property/property.c index 4f67207a79..0111216057 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -19,7 +19,7 @@ #include "internal/thread_once.h" #include "crypto/lhash.h" #include "crypto/sparse_array.h" -#include "property_lcl.h" +#include "property_local.h" /* The number of elements in the query cache before we initiate a flush */ #define IMPL_CACHE_FLUSH_THRESHOLD 500 diff --git a/crypto/property/property_lcl.h b/crypto/property/property_lcl.h deleted file mode 100644 index 25cfde4649..0000000000 --- a/crypto/property/property_lcl.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include -#include "internal/property.h" - -typedef struct ossl_property_list_st OSSL_PROPERTY_LIST; -typedef int OSSL_PROPERTY_IDX; - -/* Property string functions */ -OSSL_PROPERTY_IDX ossl_property_name(OPENSSL_CTX *ctx, const char *s, - int create); -OSSL_PROPERTY_IDX ossl_property_value(OPENSSL_CTX *ctx, const char *s, - int create); - -/* Property list functions */ -void ossl_property_free(OSSL_PROPERTY_LIST *p); -int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query); -int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, - const OSSL_PROPERTY_LIST *defn); -OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, - const OSSL_PROPERTY_LIST *b); - -/* Property definition functions */ -OSSL_PROPERTY_LIST *ossl_parse_property(OPENSSL_CTX *ctx, const char *s); - -/* Property query functions */ -OSSL_PROPERTY_LIST *ossl_parse_query(OPENSSL_CTX *ctx, const char *s); - -/* Property definition cache functions */ -OSSL_PROPERTY_LIST *ossl_prop_defn_get(OPENSSL_CTX *ctx, const char *prop); -int ossl_prop_defn_set(OPENSSL_CTX *ctx, const char *prop, - OSSL_PROPERTY_LIST *pl); - -/* Property cache lock / unlock */ -int ossl_property_write_lock(OSSL_METHOD_STORE *); -int ossl_property_read_lock(OSSL_METHOD_STORE *); -int ossl_property_unlock(OSSL_METHOD_STORE *); - diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h new file mode 100644 index 0000000000..25cfde4649 --- /dev/null +++ b/crypto/property/property_local.h @@ -0,0 +1,46 @@ +/* + * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include "internal/property.h" + +typedef struct ossl_property_list_st OSSL_PROPERTY_LIST; +typedef int OSSL_PROPERTY_IDX; + +/* Property string functions */ +OSSL_PROPERTY_IDX ossl_property_name(OPENSSL_CTX *ctx, const char *s, + int create); +OSSL_PROPERTY_IDX ossl_property_value(OPENSSL_CTX *ctx, const char *s, + int create); + +/* Property list functions */ +void ossl_property_free(OSSL_PROPERTY_LIST *p); +int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query); +int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, + const OSSL_PROPERTY_LIST *defn); +OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, + const OSSL_PROPERTY_LIST *b); + +/* Property definition functions */ +OSSL_PROPERTY_LIST *ossl_parse_property(OPENSSL_CTX *ctx, const char *s); + +/* Property query functions */ +OSSL_PROPERTY_LIST *ossl_parse_query(OPENSSL_CTX *ctx, const char *s); + +/* Property definition cache functions */ +OSSL_PROPERTY_LIST *ossl_prop_defn_get(OPENSSL_CTX *ctx, const char *prop); +int ossl_prop_defn_set(OPENSSL_CTX *ctx, const char *prop, + OSSL_PROPERTY_LIST *pl); + +/* Property cache lock / unlock */ +int ossl_property_write_lock(OSSL_METHOD_STORE *); +int ossl_property_read_lock(OSSL_METHOD_STORE *); +int ossl_property_unlock(OSSL_METHOD_STORE *); + diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index c9fb7602fd..a16bcd6dba 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -16,7 +16,7 @@ #include "internal/property.h" #include "crypto/ctype.h" #include "internal/nelem.h" -#include "property_lcl.h" +#include "property_local.h" #include "e_os.h" typedef enum { diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c index d037f6a311..55d34688db 100644 --- a/crypto/property/property_string.c +++ b/crypto/property/property_string.c @@ -12,7 +12,7 @@ #include #include #include "crypto/lhash.h" -#include "property_lcl.h" +#include "property_local.h" /* * Property strings are a consolidation of all strings seen by the property -- cgit v1.2.3