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)

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 6235f50f849f86d8494e806ea566f3ebfffa155c..d01d20e3d4483b01cad96d19725e5827c8845f61 100644 (file)
--- 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 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);
                       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);
                        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 */
 
 
 /* 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;
 }
 
     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;
                       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 */
 }
 
 /* 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;
 {
     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 */
     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.
  */
 
  * 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;
 {
     CONF_MODULE *tmod;
     int i, nchar;


@@ -280,7 +282,7 @@ static CONF_MODULE *module_find(char *name)
 }
 
 /* initialize a module */
 }
 
 /* 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;
                        const CONF *cnf)
 {
     int ret = 1;