Fix const-correctness in info subscriber mechanism

Signed-off-by: Joseph Schuchart <[email protected]>

Author: devreal

ompi/communicator/comm_init.c

@@ -492,7 +492,7 @@ static void ompi_comm_destruct(ompi_communicator_t* comm)
 }
 
 #define OMPI_COMM_SET_INFO_FN(name, flag)       \
-    static char *ompi_comm_set_ ## name (opal_infosubscriber_t *obj, char *key, char *value) \
+    static const char *ompi_comm_set_ ## name (opal_infosubscriber_t *obj, const char *key, const char *value) \
     {                                                                   \
         ompi_communicator_t *comm = (ompi_communicator_t *) obj;        \
                                                                         \

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -81,7 +81,7 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, ompi_osc_rdma_mo
 static int ompi_osc_rdma_query_alternate_btls (ompi_communicator_t *comm, ompi_osc_rdma_module_t *module);
 static int ompi_osc_rdma_query_mtls (void);
 
-static char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, char *key, char *value);
+static const char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value);
 
 static char *ompi_osc_rdma_btl_names;
 static char *ompi_osc_rdma_mtl_names;
@@ -1509,7 +1509,8 @@ static int ompi_osc_rdma_component_select (struct ompi_win_t *win, void **base,
 }
 
 
-static char* ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, char *key, char *value)
+static const char*
+ompi_osc_rdma_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value)
 {
 
     struct ompi_win_t *win = (struct ompi_win_t*) obj;

ompi/mca/osc/sm/osc_sm_component.c

@@ -43,8 +43,8 @@ static int component_register (void);
 static int component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
                             struct ompi_communicator_t *comm, struct opal_info_t *info,
                             int flavor, int *model);
-static char* component_set_blocking_fence_info(opal_infosubscriber_t *obj, char *key, char *val);
-static char* component_set_alloc_shared_noncontig_info(opal_infosubscriber_t *obj, char *key, char *val);
+static const char* component_set_blocking_fence_info(opal_infosubscriber_t *obj, const char *key, const char *val);
+static const char* component_set_alloc_shared_noncontig_info(opal_infosubscriber_t *obj, const char *key, const char *val);
 
 
 ompi_osc_sm_component_t mca_osc_sm_component = {
@@ -561,8 +561,8 @@ ompi_osc_sm_set_info(struct ompi_win_t *win, struct opal_info_t *info)
 }
 
 
-static char*
-component_set_blocking_fence_info(opal_infosubscriber_t *obj, char *key, char *val)
+static const char*
+component_set_blocking_fence_info(opal_infosubscriber_t *obj, const char *key, const char *val)
 {
     ompi_osc_sm_module_t *module = (ompi_osc_sm_module_t*) ((struct ompi_win_t*) obj)->w_osc_module;
 /*
@@ -572,8 +572,8 @@ component_set_blocking_fence_info(opal_infosubscriber_t *obj, char *key, char *v
 }
 
 
-static char*
-component_set_alloc_shared_noncontig_info(opal_infosubscriber_t *obj, char *key, char *val)
+static const char*
+component_set_alloc_shared_noncontig_info(opal_infosubscriber_t *obj, const char *key, const char *val)
 {
 
     ompi_osc_sm_module_t *module = (ompi_osc_sm_module_t*) ((struct ompi_win_t*) obj)->w_osc_module;

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -264,7 +264,7 @@ static void ompi_osc_ucx_unregister_progress()
     _osc_ucx_init_unlock();
 }
 
-static char* ompi_osc_ucx_set_no_lock_info(opal_infosubscriber_t *obj, char *key, char *value)
+static const char* ompi_osc_ucx_set_no_lock_info(opal_infosubscriber_t *obj, const char *key, const char *value)
 {
 
     struct ompi_win_t *win = (struct ompi_win_t*) obj;

opal/util/info_subscriber.h

@@ -47,7 +47,7 @@ typedef struct opal_infosubscriber_t opal_infosubscriber_t;
 
 OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_infosubscriber_t);
 
-typedef char*(opal_key_interest_callback_t)(opal_infosubscriber_t*, char*, char*);
+typedef const char*(opal_key_interest_callback_t)(opal_infosubscriber_t*, const char*, const char*);
 
 /**
  *   opal_infosubscribe_change_info - Make changes to a Comm/Win/File Info
@@ -79,6 +79,6 @@ int opal_infosubscribe_change_info(opal_infosubscriber_t*, opal_info_t *);
  *   Does not try to optimize settings that are the same between old and new
  *   info's.
  */
-int opal_infosubscribe_subscribe(opal_infosubscriber_t*, char *, char *, opal_key_interest_callback_t);
+int opal_infosubscribe_subscribe(opal_infosubscriber_t*, const char *, const char *, opal_key_interest_callback_t);
 
 #endif /* OMPI_INFO_H */