summaryrefslogtreecommitdiffstats
path: root/crypto/property
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2019-07-11 20:01:56 +0200
committerRichard Levitte <levitte@openssl.org>2019-07-16 05:26:28 +0200
commitcbfa5b03989ee6b8f5c13c4284d5bae02c562f20 (patch)
tree3310c99c9e47c0fa88a276e789cad33136663185 /crypto/property
parentRemove function name from errors (diff)
downloadopenssl-cbfa5b03989ee6b8f5c13c4284d5bae02c562f20.tar.xz
openssl-cbfa5b03989ee6b8f5c13c4284d5bae02c562f20.zip
Regenerate mkerr files
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9058)
Diffstat (limited to 'crypto/property')
-rw-r--r--crypto/property/property_err.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index 619e5e7d60..49dc525273 100644
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -13,19 +13,6 @@
#ifndef OPENSSL_NO_ERR
-static const ERR_STRING_DATA PROP_str_functs[] = {
- {ERR_PACK(ERR_LIB_PROP, PROP_F_OSSL_PARSE_PROPERTY, 0),
- "ossl_parse_property"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_OSSL_PARSE_QUERY, 0), "ossl_parse_query"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_HEX, 0), "parse_hex"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_NAME, 0), "parse_name"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_NUMBER, 0), "parse_number"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_OCT, 0), "parse_oct"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_STRING, 0), "parse_string"},
- {ERR_PACK(ERR_LIB_PROP, PROP_F_PARSE_UNQUOTED, 0), "parse_unquoted"},
- {0, NULL}
-};
-
static const ERR_STRING_DATA PROP_str_reasons[] = {
{ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long"},
{ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
@@ -52,10 +39,8 @@ static const ERR_STRING_DATA PROP_str_reasons[] = {
int ERR_load_PROP_strings(void)
{
#ifndef OPENSSL_NO_ERR
- if (ERR_func_error_string(PROP_str_functs[0].error) == NULL) {
- ERR_load_strings_const(PROP_str_functs);
+ if (ERR_func_error_string(PROP_str_reasons[0].error) == NULL)
ERR_load_strings_const(PROP_str_reasons);
- }
#endif
return 1;
}