[openib-general] [PATCH 7/13] osm: port to WinIB stack : opensm/osm_ucast_file.c

[Yevgeny Kliteynik]

Hi Sasha

[snip]
>> --- opensm/osm_ucast_file.c	(revision 9502)
>> +++ opensm/osm_ucast_file.c	(working copy)
>> @@ -52,18 +52,11 @@
>>  
>>  #include <iba/ib_types.h>
>>  #include <complib/cl_qmap.h>
>> +#include <complib/cl_debug.h>
> 
> Why this?

This is where PRIx64 is defined in Windows.

[snip]
>>  #include <opensm/osm_opensm.h>
>>  #include <opensm/osm_switch.h>
>>  #include <opensm/osm_log.h>
>>  
>> -#define PARSEERR(log, file_name, lineno, fmt, arg...) \
>> -		osm_log(log, OSM_LOG_ERROR, "PARSE ERROR: %s:%u: " fmt , \
>> -			file_name, lineno, ##arg )
>> -
>> -#define PARSEWARN(log, file_name, lineno, fmt, arg...) \
>> -		osm_log(log, OSM_LOG_VERBOSE, "PARSE WARN: %s:%u: " fmt , \
>> -			file_name, lineno, ##arg )
>> -
> 
> Is it possible to use C99 style var args macros (with __VA_ARGS___)? MS
> claims it is supported by VC. And it is supported by gcc too.

Indeed, the C99 style var arg macros are supported by VC6 and by gcc,
but not by WinDDK (at least by the version that we're using - 4.23).

[snip]
>> @@ -72,10 +65,11 @@ static uint16_t remap_lid(osm_opensm_t *
>>  
>>  	p_port = (osm_port_t *)cl_qmap_get(&p_osm->subn.port_guid_tbl, guid);
>>  	if (!p_port ||
>> -	    p_port == (osm_port_t *)cl_qmap_end(&p_osm->subn.port_guid_tbl)) {
>> +	    p_port == (osm_port_t *)cl_qmap_end(&p_osm->subn.port_guid_tbl)) 
>> +	{
> 
> Please don't break existing code formatting.

I will issue a new patch shortly w/o these cosmetic changes.

--
Yevgeny.