Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 5faaa6d

Browse files
committed
opal/progress: fix warnings
This commit fixes several warning introduced by open-mpi/ompi@fc26d9c . Signed-off-by: Nathan Hjelm <[email protected]> (cherry picked from open-mpi/ompi@e082ed7) Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 3e6bc08 commit 5faaa6d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

opal/runtime/opal_progress.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static int debug_output = -1;
9494
*/
9595
static int fake_cb(void) { return 0; }
9696

97-
static int _opal_progress_unregister (opal_progress_callback_t cb, opal_progress_callback_t *callback_array,
97+
static int _opal_progress_unregister (opal_progress_callback_t cb, volatile opal_progress_callback_t *callback_array,
9898
size_t *callback_array_len);
9999

100100
/* init the progress engine - called from orte_init */
@@ -122,8 +122,8 @@ opal_progress_init(void)
122122
callbacks_lp = malloc (callbacks_lp_size * sizeof (callbacks_lp[0]));
123123

124124
if (NULL == callbacks || NULL == callbacks_lp) {
125-
free (callbacks);
126-
free (callbacks_lp);
125+
free ((void *) callbacks);
126+
free ((void *) callbacks_lp);
127127
callbacks_size = callbacks_lp_size = 0;
128128
callbacks = callbacks_lp = NULL;
129129
return OPAL_ERR_OUT_OF_RESOURCE;
@@ -158,12 +158,12 @@ opal_progress_finalize(void)
158158

159159
callbacks_len = 0;
160160
callbacks_size = 0;
161-
free(callbacks);
161+
free ((void *) callbacks);
162162
callbacks = NULL;
163163

164164
callbacks_lp_len = 0;
165165
callbacks_lp_size = 0;
166-
free(callbacks_lp);
166+
free ((void *) callbacks_lp);
167167
callbacks_lp = NULL;
168168

169169
opal_atomic_unlock(&progress_lock);
@@ -353,7 +353,7 @@ opal_progress_set_event_poll_rate(int polltime)
353353
#endif
354354
}
355355

356-
static int opal_progress_find_cb (opal_progress_callback_t cb, opal_progress_callback_t *cbs,
356+
static int opal_progress_find_cb (opal_progress_callback_t cb, volatile opal_progress_callback_t *cbs,
357357
size_t cbs_len)
358358
{
359359
for (size_t i = 0 ; i < cbs_len ; ++i) {
@@ -365,7 +365,7 @@ static int opal_progress_find_cb (opal_progress_callback_t cb, opal_progress_cal
365365
return OPAL_ERR_NOT_FOUND;
366366
}
367367

368-
static int _opal_progress_register (opal_progress_callback_t cb, opal_progress_callback_t **cbs,
368+
static int _opal_progress_register (opal_progress_callback_t cb, volatile opal_progress_callback_t **cbs,
369369
size_t *cbs_size, size_t *cbs_len)
370370
{
371371
int ret = OPAL_SUCCESS;
@@ -385,7 +385,7 @@ static int _opal_progress_register (opal_progress_callback_t cb, opal_progress_c
385385

386386
if (*cbs) {
387387
/* copy old callbacks */
388-
memcpy (tmp, *cbs, sizeof(tmp[0]) * *cbs_size);
388+
memcpy (tmp, (void *) *cbs, sizeof(tmp[0]) * *cbs_size);
389389
}
390390

391391
for (size_t i = *cbs_len ; i < 2 * *cbs_size ; ++i) {
@@ -441,7 +441,7 @@ int opal_progress_register_lp (opal_progress_callback_t cb)
441441
return ret;
442442
}
443443

444-
static int _opal_progress_unregister (opal_progress_callback_t cb, opal_progress_callback_t *callback_array,
444+
static int _opal_progress_unregister (opal_progress_callback_t cb, volatile opal_progress_callback_t *callback_array,
445445
size_t *callback_array_len)
446446
{
447447
int ret = opal_progress_find_cb (cb, callback_array, *callback_array_len);

0 commit comments

Comments
 (0)