diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-07 23:29:28 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-15 13:22:38 -0400 |
| commit | 159b9a4d170743910da4faeda3e900b023820cc9 (patch) | |
| tree | c8721b2546e9a8511cb256f97a819fa4cad208c4 /crypto/conf | |
| parent | fdcb499cc2cd57412e496302a4bca8c5d9f1a9c7 (diff) | |
Constify some conf_mod.c internal methods
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_mod.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 6235f50f84..d01d20e3d4 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -56,15 +56,16 @@ static STACK_OF(CONF_IMODULE) *initialized_modules = NULL; static void module_free(CONF_MODULE *md); static void module_finish(CONF_IMODULE *imod); -static int module_run(const CONF *cnf, char *name, char *value, +static int module_run(const CONF *cnf, const char *name, const char *value, unsigned long flags); static CONF_MODULE *module_add(DSO *dso, const char *name, conf_init_func *ifunc, conf_finish_func *ffunc); -static CONF_MODULE *module_find(char *name); -static int module_init(CONF_MODULE *pmod, char *name, char *value, +static CONF_MODULE *module_find(const char *name); +static int module_init(CONF_MODULE *pmod, const char *name, const char *value, const CONF *cnf); -static CONF_MODULE *module_load_dso(const CONF *cnf, char *name, char *value); +static CONF_MODULE *module_load_dso(const CONF *cnf, const char *name, + const char *value); /* Main function: load modules from a CONF structure */ @@ -144,7 +145,7 @@ int CONF_modules_load_file(const char *filename, const char *appname, return ret; } -static int module_run(const CONF *cnf, char *name, char *value, +static int module_run(const CONF *cnf, const char *name, const char *value, unsigned long flags) { CONF_MODULE *md; @@ -180,12 +181,13 @@ static int module_run(const CONF *cnf, char *name, char *value, } /* Load a module from a DSO */ -static CONF_MODULE *module_load_dso(const CONF *cnf, char *name, char *value) +static CONF_MODULE *module_load_dso(const CONF *cnf, + const char *name, const char *value) { DSO *dso = NULL; conf_init_func *ifunc; conf_finish_func *ffunc; - char *path = NULL; + const char *path = NULL; int errcode = 0; CONF_MODULE *md; /* Look for alternative path in module section */ @@ -257,7 +259,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name, * initialized more than once. */ -static CONF_MODULE *module_find(char *name) +static CONF_MODULE *module_find(const char *name) { CONF_MODULE *tmod; int i, nchar; @@ -280,7 +282,7 @@ static CONF_MODULE *module_find(char *name) } /* initialize a module */ -static int module_init(CONF_MODULE *pmod, char *name, char *value, +static int module_init(CONF_MODULE *pmod, const char *name, const char *value, const CONF *cnf) { int ret = 1; |