diff options
Diffstat (limited to 'crypto/conf/conf_lib.c')
| -rw-r--r-- | crypto/conf/conf_lib.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 719af7cb75c6..35a64ca627d5 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -44,7 +44,7 @@ int CONF_set_default_method(CONF_METHOD *meth) } LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, - long *eline) + long *eline) { LHASH_OF(CONF_VALUE) *ltmp; BIO *in = NULL; @@ -67,7 +67,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, #ifndef OPENSSL_NO_STDIO LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, - long *eline) + long *eline) { BIO *btmp; LHASH_OF(CONF_VALUE) *ltmp; @@ -82,7 +82,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, #endif LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, - long *eline) + long *eline) { CONF ctmp; int ret; @@ -96,7 +96,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, } STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf, - const char *section) + const char *section) { if (conf == NULL) { return NULL; @@ -109,7 +109,7 @@ STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf, } char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group, - const char *name) + const char *name) { if (conf == NULL) { return NCONF_get_string(NULL, group, name); @@ -122,7 +122,7 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group, } long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group, - const char *name) + const char *name) { int status; long result = 0; @@ -313,7 +313,7 @@ char *NCONF_get_string(const CONF *conf, const char *group, const char *name) return NULL; } ERR_raise_data(ERR_LIB_CONF, CONF_R_NO_VALUE, - "group=%s name=%s", group, name); + "group=%s name=%s", group, name); return NULL; } @@ -328,7 +328,7 @@ static int default_to_int(const CONF *conf, char c) } int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, - long *result) + long *result) { char *str; long res; @@ -366,7 +366,7 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, } long _CONF_get_number(const CONF *conf, const char *section, - const char *name) + const char *name) { int status; long result = 0; @@ -419,10 +419,9 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void) return ret; } - #ifndef OPENSSL_NO_STDIO int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings, - const char *filename) + const char *filename) { char *newfilename = NULL; @@ -439,13 +438,13 @@ int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings, } void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings, - unsigned long flags) + unsigned long flags) { settings->flags = flags; } int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings, - const char *appname) + const char *appname) { char *newappname = NULL; |