Skip to content

Commit e082ed7

Browse files
committed
opal/progress: fix warnings
This commit fixes several warning introduced by fc26d9c . Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
1 parent c2a02ab commit e082ed7

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
@@ -93,7 +93,7 @@ static int debug_output = -1;
9393
*/
9494
static int fake_cb(void) { return 0; }
9595

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

9999
/* init the progress engine - called from orte_init */
@@ -118,8 +118,8 @@ opal_progress_init(void)
118118
callbacks_lp = malloc (callbacks_lp_size * sizeof (callbacks_lp[0]));
119119

120120
if (NULL == callbacks || NULL == callbacks_lp) {
121-
free (callbacks);
122-
free (callbacks_lp);
121+
free ((void *) callbacks);
122+
free ((void *) callbacks_lp);
123123
callbacks_size = callbacks_lp_size = 0;
124124
callbacks = callbacks_lp = NULL;
125125
return OPAL_ERR_OUT_OF_RESOURCE;
@@ -154,12 +154,12 @@ opal_progress_finalize(void)
154154

155155
callbacks_len = 0;
156156
callbacks_size = 0;
157-
free(callbacks);
157+
free ((void *) callbacks);
158158
callbacks = NULL;
159159

160160
callbacks_lp_len = 0;
161161
callbacks_lp_size = 0;
162-
free(callbacks_lp);
162+
free ((void *) callbacks_lp);
163163
callbacks_lp = NULL;
164164

165165
opal_atomic_unlock(&progress_lock);
@@ -349,7 +349,7 @@ opal_progress_set_event_poll_rate(int polltime)
349349
#endif
350350
}
351351

352-
static int opal_progress_find_cb (opal_progress_callback_t cb, opal_progress_callback_t *cbs,
352+
static int opal_progress_find_cb (opal_progress_callback_t cb, volatile opal_progress_callback_t *cbs,
353353
size_t cbs_len)
354354
{
355355
for (size_t i = 0 ; i < cbs_len ; ++i) {
@@ -361,7 +361,7 @@ static int opal_progress_find_cb (opal_progress_callback_t cb, opal_progress_cal
361361
return OPAL_ERR_NOT_FOUND;
362362
}
363363

364-
static int _opal_progress_register (opal_progress_callback_t cb, opal_progress_callback_t **cbs,
364+
static int _opal_progress_register (opal_progress_callback_t cb, volatile opal_progress_callback_t **cbs,
365365
size_t *cbs_size, size_t *cbs_len)
366366
{
367367
int ret = OPAL_SUCCESS;
@@ -381,7 +381,7 @@ static int _opal_progress_register (opal_progress_callback_t cb, opal_progress_c
381381

382382
if (*cbs) {
383383
/* copy old callbacks */
384-
memcpy (tmp, *cbs, sizeof(tmp[0]) * *cbs_size);
384+
memcpy (tmp, (void *) *cbs, sizeof(tmp[0]) * *cbs_size);
385385
}
386386

387387
for (size_t i = *cbs_len ; i < 2 * *cbs_size ; ++i) {
@@ -437,7 +437,7 @@ int opal_progress_register_lp (opal_progress_callback_t cb)
437437
return ret;
438438
}
439439

440-
static int _opal_progress_unregister (opal_progress_callback_t cb, opal_progress_callback_t *callback_array,
440+
static int _opal_progress_unregister (opal_progress_callback_t cb, volatile opal_progress_callback_t *callback_array,
441441
size_t *callback_array_len)
442442
{
443443
int ret = opal_progress_find_cb (cb, callback_array, *callback_array_len);

0 commit comments

Comments
 (0)