Skip to content

Commit 87b1d17

Browse files
bosilcabosilca
committed
Remove warnings.
clang 7.0 with the picky option on is extremely verbose, and complains about almost everything. Trying to make him happy, at least regarding the datatype engine.
1 parent fc5d458 commit 87b1d17

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎opal/datatype/opal_datatype_internal.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,9 @@ do { \
448448
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
449449
opal_datatype_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \
450450
opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %lu and data \n", \
451-
__FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \
452-
(INITPTR), (unsigned long)(COUNT) ); \
453-
opal_datatype_dump( (PDATA) ); \
451+
__FILE__, __LINE__, (void*)(ACTPTR), (unsigned long)(LENGTH), (void*)__lower_bound, (void*)__upper_bound, \
452+
(void*)(INITPTR), (unsigned long)(COUNT) ); \
453+
opal_datatype_dump( (PDATA) ); \
454454
} \
455455
}
456456

‎opal/datatype/opal_datatype_pack.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv,
119119

120120
assert( (pData->flags & OPAL_DATATYPE_FLAG_CONTIGUOUS) && ((OPAL_PTRDIFF_TYPE)pData->size != extent) );
121121
DO_DEBUG( opal_output( 0, "pack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n",
122-
pConv->pBaseBuf, *out_size ); );
122+
(void*)pConv->pBaseBuf, *out_size ); );
123123
if( stack[1].type != opal_datatype_uint1.id ) {
124124
stack[1].count *= opal_datatype_basicDatatypes[stack[1].type]->size;
125125
stack[1].type = opal_datatype_uint1.id;
@@ -196,7 +196,7 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv,
196196

197197
{
198198
DO_DEBUG( opal_output( 0, "pack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
199-
user_memory, packed_buffer, (unsigned long)remaining ); );
199+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
200200

201201
length = (0 == pConv->stack_pos ? 0 : stack[1].count); /* left over from the last pack */
202202
/* data left from last round and enough space in the buffer */
@@ -205,7 +205,7 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv,
205205
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf,
206206
pData, pConv->count );
207207
DO_DEBUG( opal_output( 0, "2. pack dest %p src %p length %lu\n",
208-
user_memory, packed_buffer, (unsigned long)length ); );
208+
(void*)user_memory, (void*)packed_buffer, (unsigned long)length ); );
209209
MEMCPY_CSUM( packed_buffer, user_memory, length, pConv );
210210
packed_buffer += length;
211211
user_memory += (extent - pData->size + length);
@@ -224,7 +224,7 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv,
224224
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf,
225225
pData, pConv->count );
226226
DO_DEBUG( opal_output( 0, "3. pack dest %p src %p length %lu\n",
227-
user_memory, packed_buffer, (unsigned long)pData->size ); );
227+
(void*)user_memory, (void*)packed_buffer, (unsigned long)pData->size ); );
228228
MEMCPY_CSUM( packed_buffer, user_memory, pData->size, pConv );
229229
packed_buffer += pData->size;
230230
user_memory += extent;
@@ -238,7 +238,7 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv,
238238
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf,
239239
pData, pConv->count );
240240
DO_DEBUG( opal_output( 0, "4. pack dest %p src %p length %lu\n",
241-
user_memory, packed_buffer, (unsigned long)remaining ); );
241+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
242242
MEMCPY_CSUM( packed_buffer, user_memory, remaining, pConv );
243243
user_memory += remaining;
244244
stack[1].count -= remaining;
@@ -287,7 +287,7 @@ opal_generic_simple_pack_function( opal_convertor_t* pConvertor,
287287

288288
DO_DEBUG( opal_output( 0, "opal_convertor_generic_simple_pack( %p:%p, {%p, %lu}, %d )\n",
289289
(void*)pConvertor, (void*)pConvertor->pBaseBuf,
290-
iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
290+
(void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
291291

292292
description = pConvertor->use_desc->desc;
293293

@@ -436,7 +436,7 @@ pack_predefined_heterogeneous( opal_convertor_t* CONVERTOR,
436436
DO_DEBUG( opal_output( 0, "pack [l %s r %s] memcpy( %p, %p, %lu ) => space %lu\n",
437437
((OPAL_PTRDIFF_TYPE)_l_blength == _elem->extent) ? "cont" : "----",
438438
((OPAL_PTRDIFF_TYPE)_r_blength == _elem->extent) ? "cont" : "----",
439-
*(DESTINATION), _source, (unsigned long)_r_blength,
439+
(void*)*(DESTINATION), (void*)_source, (unsigned long)_r_blength,
440440
(unsigned long)(*(SPACE)) ); );
441441
master->pFunctions[_elem->common.type]( CONVERTOR, _count,
442442
_source, *SPACE, _elem->extent,
@@ -468,7 +468,7 @@ opal_pack_general_function( opal_convertor_t* pConvertor,
468468

469469
DO_DEBUG( opal_output( 0, "opal_convertor_general_pack( %p:%p, {%p, %lu}, %d )\n",
470470
(void*)pConvertor, (void*)pConvertor->pBaseBuf,
471-
iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
471+
(void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
472472

473473
description = pConvertor->use_desc->desc;
474474

@@ -488,7 +488,7 @@ opal_pack_general_function( opal_convertor_t* pConvertor,
488488
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
489489
pos_desc, count_desc, (long)(conv_ptr - pConvertor->pBaseBuf),
490490
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
491-
491+
492492
for( iov_count = 0; iov_count < (*out_size); iov_count++ ) {
493493
iov_ptr = (unsigned char *) iov[iov_count].iov_base;
494494
iov_len_local = iov[iov_count].iov_len;
@@ -497,9 +497,9 @@ opal_pack_general_function( opal_convertor_t* pConvertor,
497497
type = description[pos_desc].elem.common.type;
498498
/* now here we have a basic datatype */
499499
DO_DEBUG( opal_output( 0, "pack (%p:%ld, %d, %ld) -> (%p, %ld) type %s\n",
500-
pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf,
500+
(void*)pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf,
501501
count_desc, description[pos_desc].elem.extent,
502-
iov_ptr, iov_len_local,
502+
(void*)iov_ptr, iov_len_local,
503503
opal_datatype_basicDatatypes[type]->name ); );
504504

505505
pack_predefined_heterogeneous( pConvertor, pElem, &count_desc,

‎opal/datatype/opal_datatype_pack.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static inline void pack_predefined_data( opal_convertor_t* CONVERTOR,
5050
OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf,
5151
(CONVERTOR)->pDesc, (CONVERTOR)->count );
5252
DO_DEBUG( opal_output( 0, "pack 1. memcpy( %p, %p, %lu ) => space %lu\n",
53-
*(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
53+
(void*)*(DESTINATION), (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
5454
MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) );
5555
_source += _copy_blength;
5656
*(DESTINATION) += _copy_blength;
@@ -60,7 +60,7 @@ static inline void pack_predefined_data( opal_convertor_t* CONVERTOR,
6060
OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf,
6161
(CONVERTOR)->pDesc, (CONVERTOR)->count );
6262
DO_DEBUG( opal_output( 0, "pack 2. memcpy( %p, %p, %lu ) => space %lu\n",
63-
*(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
63+
(void*)*(DESTINATION), (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
6464
MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) );
6565
*(DESTINATION) += _copy_blength;
6666
_source += _elem->extent;
@@ -91,7 +91,7 @@ static inline void pack_contiguous_loop( opal_convertor_t* CONVERTOR,
9191
OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _end_loop->size, (CONVERTOR)->pBaseBuf,
9292
(CONVERTOR)->pDesc, (CONVERTOR)->count );
9393
DO_DEBUG( opal_output( 0, "pack 3. memcpy( %p, %p, %lu ) => space %lu\n",
94-
*(DESTINATION), _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
94+
(void*)*(DESTINATION), (void*)_source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
9595
MEMCPY_CSUM( *(DESTINATION), _source, _end_loop->size, (CONVERTOR) );
9696
*(DESTINATION) += _end_loop->size;
9797
_source += _loop->extent;

‎opal/datatype/opal_datatype_unpack.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ unpack_predefined_data( opal_convertor_t* CONVERTOR, /* the convertor */
4949
OPAL_DATATYPE_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf,
5050
(CONVERTOR)->pDesc, (CONVERTOR)->count );
5151
DO_DEBUG( opal_output( 0, "unpack 1. memcpy( %p, %p, %lu ) => space %lu\n",
52-
_destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
52+
(void*)_destination, (void*)*(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
5353
MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) );
5454
*(SOURCE) += _copy_blength;
5555
_destination += _copy_blength;
@@ -59,7 +59,7 @@ unpack_predefined_data( opal_convertor_t* CONVERTOR, /* the convertor */
5959
OPAL_DATATYPE_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf,
6060
(CONVERTOR)->pDesc, (CONVERTOR)->count );
6161
DO_DEBUG( opal_output( 0, "unpack 2. memcpy( %p, %p, %lu ) => space %lu\n",
62-
_destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
62+
(void*)_destination, (void*)*(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
6363
MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) );
6464
*(SOURCE) += _copy_blength;
6565
_destination += _elem->extent;
@@ -90,7 +90,7 @@ static inline void unpack_contiguous_loop( opal_convertor_t* CONVERTOR,
9090
OPAL_DATATYPE_SAFEGUARD_POINTER( _destination, _end_loop->size, (CONVERTOR)->pBaseBuf,
9191
(CONVERTOR)->pDesc, (CONVERTOR)->count );
9292
DO_DEBUG( opal_output( 0, "unpack 3. memcpy( %p, %p, %lu ) => space %lu\n",
93-
_destination, *(SOURCE), (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
93+
(void*)_destination, (void*)*(SOURCE), (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
9494
MEMCPY_CSUM( _destination, *(SOURCE), _end_loop->size, (CONVERTOR) );
9595
*(SOURCE) += _end_loop->size;
9696
_destination += _loop->extent;

0 commit comments

Comments
 (0)