Commit aafa5bed authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix gcc-ism in use of variadic C preprocessor macros.

parent 6c9ffa05
......@@ -142,7 +142,7 @@ void modelRun ()
for ( j = 0; j < nVars; j++ )
zaxisDestroy ( zaxisID[i][j] );
gridDestroy ( gridID );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
}
......@@ -162,7 +162,7 @@ int main (int argc, char *argv[])
#ifdef USE_MPI
MPI_Comm commGlob, commModel;
int sizeGlob;
int rankGlob;
int rankGlob;
int IOMode, nProcsIO, count;
xmpi ( MPI_Init ( &argc, &argv));
......@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
xmpi ( MPI_Comm_rank ( commGlob, &rankGlob ));
if (argc > 1)
{
{
xassert ( argc >= 3 );
IOMode = atoi(argv[1]);
nProcsIO = atoi(argv[2]);
......
......@@ -578,7 +578,7 @@ void gridDefXname(int gridID, const char *xname)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning ("%s", "Operation not executed." );
return;
}
......@@ -611,7 +611,7 @@ void gridDefXlongname(int gridID, const char *xlongname)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning ("%s", "Operation not executed." );
return;
}
......@@ -644,7 +644,7 @@ void gridDefXunits(int gridID, const char *xunits)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed." );
return;
}
......@@ -677,7 +677,7 @@ void gridDefYname(int gridID, const char *yname)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -710,7 +710,7 @@ void gridDefYlongname(int gridID, const char *ylongname)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -743,7 +743,7 @@ void gridDefYunits(int gridID, const char *yunits)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1087,7 +1087,7 @@ void gridDefTrunc(int gridID, int trunc)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1119,7 +1119,7 @@ void gridDefXsize(int gridID, int xsize)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1158,7 +1158,7 @@ void gridDefPrec(int gridID, int prec)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1240,7 +1240,7 @@ void gridDefYsize(int gridID, int ysize)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1307,7 +1307,7 @@ void gridDefRowlon(int gridID, int nrowlon, const int *rowlon)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1377,7 +1377,7 @@ void gridDefMask(int gridID, const int *mask)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1442,7 +1442,7 @@ void gridDefMaskGME(int gridID, const int *mask)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1533,7 +1533,7 @@ void gridDefXvals(int gridID, const double *xvals)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1628,7 +1628,7 @@ void gridDefYvals(int gridID, const double *yvals)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1824,7 +1824,7 @@ void gridDefXpole(int gridID, double xpole)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1878,7 +1878,7 @@ void gridDefYpole(int gridID, double ypole)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1932,7 +1932,7 @@ void gridDefAngle(int gridID, double angle)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -1983,7 +1983,7 @@ void gridDefGMEnd(int gridID, int nd)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -2033,7 +2033,7 @@ void gridDefGMEni(int gridID, int ni)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -2083,7 +2083,7 @@ void gridDefGMEni2(int gridID, int ni2)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -2122,7 +2122,7 @@ void gridDefGMEni3(int gridID, int ni3)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3080,7 +3080,7 @@ void gridDefArea(int gridID, const double *area)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3151,7 +3151,7 @@ void gridDefNvertex(int gridID, int nvertex)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3197,7 +3197,7 @@ void gridDefXbounds(int gridID, const double *xbounds)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning ("%s", "Operation not executed.");
return;
}
......@@ -3314,7 +3314,7 @@ void gridDefYbounds(int gridID, const double *ybounds)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3838,7 +3838,7 @@ void gridDefLCC(int gridID, double originLon, double originLat, double lonParY,
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3925,7 +3925,7 @@ void gridDefLcc2(int gridID, double earth_radius, double lon_0, double lat_0, do
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -3980,7 +3980,7 @@ void gridDefLaea(int gridID, double earth_radius, double lon_0, double lat_0)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -4032,7 +4032,7 @@ void gridDefComplexPacking(int gridID, int lcomplex)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -4077,7 +4077,7 @@ void gridDefNumber(int gridID, int number)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -4107,7 +4107,7 @@ void gridDefPosition(int gridID, int position)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......@@ -4146,7 +4146,7 @@ void gridDefReference(int gridID, const char *reference)
if ( reshGetStatus ( gridID, &gridOps ) == CLOSED )
{
xwarning ( "Operation not executed." );
xwarning("%s", "Operation not executed.");
return;
}
......
......@@ -199,7 +199,7 @@ void backendCleanup ( void )
finalizePOSIXNONB ();
break;
default:
xdebug ( " BACKENDCLEANUP FUNCTION NOT IMPLEMENTED YET." );
xdebug("%s", " BACKENDCLEANUP FUNCTION NOT IMPLEMENTED YET.");
}
}
......
......@@ -311,7 +311,7 @@ void varsMapNDeco ( int nNodes, int * nodeSizes )
if ( streamSizes ) free ( streamSizes );
if ( resHs ) free ( resHs );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
}
/************************************************************************/
......@@ -321,7 +321,7 @@ void modelWinCleanup ( void )
{
int collID;
xdebug ( "START" );
xdebug("%s", "START");
if ( winPostSet != NULL &&
win != NULL &&
winBuffer != NULL &&
......@@ -343,7 +343,7 @@ void modelWinCleanup ( void )
if ( winBuffer ) free ( winBuffer );
if ( winBufferSize ) free ( winBufferSize );
xdebug ( "RETURN. CLEANED UP MPI_WIN'S" );
xdebug("%s", "RETURN. CLEANED UP MPI_WIN'S");
}
/************************************************************************/
......@@ -358,7 +358,7 @@ static
int rankModel = commInqRankModel ();
int root = commInqRootGlob ();
xdebug ( "START" );
xdebug("%s", "START");
xassert ( winBufferSize != NULL );
nstreams = reshCountType ( &streamOps );
......@@ -397,7 +397,7 @@ static
xdebug ("sumWinBufferSize=%d, MAXWINBUFFERSIZE=%d", sumWinBufferSize, MAXWINBUFFERSIZE );
xassert ( sumWinBufferSize <= MAXWINBUFFERSIZE );
xprintArray ( "winBufferSize", winBufferSize, nProcsColl, DATATYPE_INT );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
}
......@@ -433,7 +433,7 @@ void modelWinCreate ( void )
int collID, ranks[1];
int nProcsColl = commInqNProcsColl ();
xdebug ( "START" );
xdebug("%s", "START");
winBufferSize = xmalloc ( nProcsColl * sizeof ( winBufferSize[0] ));
winBuffer = xmalloc ( nProcsColl * sizeof ( winBuffer[0] ));
winBufferHead = xmalloc ( nProcsColl * sizeof ( winBufferHead[0] ));
......@@ -461,7 +461,7 @@ void modelWinCreate ( void )
xmpi ( MPI_Group_incl ( groupsIONetto[collID], 1, ranks,
&groupsIONetto[collID] ));
}
xdebug ( "RETURN, CREATED MPI_WIN'S" );
xdebug("%s", "RETURN, CREATED MPI_WIN'S");
}
/************************************************************************/
......@@ -562,7 +562,7 @@ void pioBufferFuncCall ( const char * func, int argc, ... )
size_t size = 0;
int funcID = func2Int ( func );
xdebug ( "START" );
xdebug("%s", "START");
if ( rankGlob != root ) return;
......@@ -702,7 +702,7 @@ void pioBufferFuncCall ( const char * func, int argc, ... )
va_end ( ap );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
}
#endif
......@@ -809,13 +809,15 @@ MPI_Comm pioInit_c ( MPI_Comm commGlob, int nProcsIO, int IOMode,
int pioInit ( int commGlobArg, int nProcsIO, int IOMode, int nNamespaces,
int * hasLocalFile )
{
xdebug( "START: %s, nProcsIO=%d, IOMode=%d, nNamespaces=%d",
#ifdef USE_MPI
"cdi parallel",
xdebug("START: %s, nProcsIO=%d, IOMode=%d, nNamespaces=%d",
"cdi parallel",
nProcsIO, IOMode, nNamespaces );
#else
"cdi serial",
xdebug("START: %s, nProcsIO=%d, IOMode=%d, nNamespaces=%d",
"cdi serial",
nProcsIO, IOMode, nNamespaces );
#endif
nProcsIO, IOMode, nNamespaces );
#ifdef USE_MPI
MPI_Comm commGlob;
......@@ -827,8 +829,7 @@ int pioInit ( int commGlobArg, int nProcsIO, int IOMode, int nNamespaces,
return MPI_Comm_c2f ( pioInit_c ( commGlob, nProcsIO, IOMode, nNamespaces,
hasLocalFile ));
#endif
xdebug ( "RETURN" );
xdebug("%s", "RETURN" );
return 0;
}
......@@ -841,7 +842,7 @@ void pioEndDef ( void )
int bufferSize;
int rankGlob = commInqRankGlob ();
xdebug ( "START" );
xdebug("%s", "START");
varsMapNDeco ( commInqNNodes (), commInqNodeSizes ());
......@@ -854,14 +855,14 @@ void pioEndDef ( void )
xmpi ( MPI_Send ( buffer, bufferSize, MPI_PACKED, commInqNProcsModel (),
RESOURCES, commInqCommsIO ( rankGlob )));
xdebug ( "SENT MESSAGE WITH TAG \"RESOURCES\"" );
xdebug("%s", "SENT MESSAGE WITH TAG \"RESOURCES\"");
reshPackBufferDestroy ( &buffer );
}
modelWinCreate ();
namespaceDefResStatus ( STAGE_TIMELOOP );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
#endif
}
......@@ -870,9 +871,9 @@ void pioEndDef ( void )
void pioEndTimestepping ( void )
{
#ifdef USE_MPI
xdebug ( "START" );
xdebug("%s", "START");
namespaceDefResStatus ( STAGE_CLEANUP );
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
#endif
}
......@@ -893,17 +894,17 @@ void pioFinalize ( void )
{
#ifdef USE_MPI
int collID, ibuffer = 1111;
xdebug ( "START" );
xdebug("%s", "START");
namespaceCleanup ();
for ( collID = 0; collID < commInqNProcsColl (); collID++ )
{
xmpi ( MPI_Send ( &ibuffer, 1, MPI_INT, commInqNProcsModel (),
FINALIZE, commInqCommsIO ( collID )));
xdebug ( "SENT MESSAGE WITH TAG \"FINALIZE\"" );
xdebug("%s", "SENT MESSAGE WITH TAG \"FINALIZE\"");
}
modelWinCleanup ();
commDestroy ();
xdebug ( "RETURN" );
xdebug("%s", "RETURN");
#endif
}
......@@ -918,7 +919,7 @@ void pioWriteTimestep ( int tsID, int vdate, int vtime )
int nProcsColl = commInqNProcsColl ();
int nProcsModel = commInqNProcsModel ();
xdebug ( "START" );
xdebug("%s", "START");
xassert ( tsID >= 0 &&
vdate >= 0 &&
......@@ -934,7 +935,7 @@ void pioWriteTimestep ( int tsID, int vdate, int vtime )
{
xmpi ( MPI_Send ( &buffer[0], timestepSize, MPI_INTEGER, nProcsModel,
WRITETS, commInqCommsIO ( rankGlob )));
xdebug ( "SENT MESSAGE WITH TAG \"WRITETS\"" );
xdebug("%s", "SENT MESSAGE WITH TAG \"WRITETS\"");
}
for ( collID = 0; collID < nProcsColl; collID++ )
......
......@@ -360,7 +360,7 @@ void finalizeMPINONB ( void )
}
else
{
xdebug ( "cleanup queue" );
xdebug("%s", "cleanup queue");
free ( bibAFiledataM );
}
}
......
......@@ -177,7 +177,7 @@ int destroyAFiledataPA ( void *v )
free ( afd->name );
free ( afd );
xdebug ( "cleaned up, return" );
xdebug("%s", "cleaned up, return");
return 0;
}
......@@ -234,7 +234,7 @@ int destroyBFiledataPA ( void *v )
free ( bfd->name );
free ( bfd );
xdebug ( "closed file and cleaned up, return" );
xdebug("%s", "closed file and cleaned up, return");
return iret;
}
......@@ -547,7 +547,8 @@ void pwPOSIXASYNCH ( void )
}
else
{
xdebug ( "all files are finished, destroy queue, return" );
xdebug("%s", "all files are finished, destroy queue,"
" return");
queueDestroy ( bibBFiledataPA );
}
if ( rtag ) ungetTag ( rtag );
......@@ -592,12 +593,12 @@ void sendPA ( aFiledataPA *afd, int id )
if ( afd->db == afd->db1 )
{
xdebug ( "Change to buffer 2 ..." );
xdebug("%s", "Change to buffer 2 ...");
afd->db = afd->db2;
}
else
{
xdebug ( "Change to buffer 1 ..." );
xdebug("%s", "Change to buffer 1 ...");
afd->db = afd->db1;
}
......@@ -779,7 +780,7 @@ void finalizePOSIXASYNCH ( void )
}
else
{
xdebug ( "cleanup queue" );
xdebug("%s", "cleanup queue");
queueDestroy ( bibAFiledataPA );
}
}
......
......@@ -327,7 +327,7 @@ void fpgPOSIXFPGUARDSENDRECV ( void )
}
else
{
xdebug ( "cleanup queue" );
xdebug("%s", "cleanup queue");
queueDestroy ( bibBFiledataPF );
}
if ( rtag ) ungetTag ( rtag );
......@@ -585,7 +585,7 @@ void finalizePOSIXFPGUARDSENDRECV ( void )
}
else
{
xdebug ( "cleanup queue" );
xdebug("%s", "cleanup queue");
queueDestroy ( bibAFiledataPF );
}
}
......
......@@ -149,7 +149,7 @@ int destroyAFiledataP ( void *v )
free ( afp->name );
free ( afp );
xdebug ( "cleaned up, return" );
xdebug("%s", "cleaned up, return");
return 0;
}
......@@ -180,7 +180,7 @@ int destroyBFiledataP ( void *v )
free ( bfp->nfinished );
free ( bfp );
xdebug ( "cleaned up, return" );
xdebug("%s", "cleaned up, return");
return iret;
}
......@@ -322,7 +322,7 @@ void pwPOSIXNONB ( void )
xmpi ( MPI_Recv ( messageBuffer, messagesize, MPI_CHAR, source,
tag, commNode, &status ));
xdebug ( "after recv, in loop" );
xdebug("%s", "after recv, in loop");
filename = strtok ( pMB, token );
pMB += ( strlen ( filename ) + 1 );
......@@ -453,7 +453,8 @@ void pwPOSIXNONB ( void )
}
else
{
xdebug ( "all files are finished, destroy queue, return" );
xdebug("%s", "all files are finished, destroy queue,"
" return");
queueDestroy ( bibBFiledataP );
}
if ( rtag ) ungetTag ( rtag );
......@@ -501,12 +502,12 @@ void sendP ( aFiledataP *afd, int id )
if ( afd->db == afd->db1 )
{
xdebug ( "Change to buffer 2 ..." );
xdebug("%s", "Change to buffer 2 ...");
afd->db = afd->db2;
}
else
{
xdebug ( "Change to buffer 1 ..." );
xdebug("%s", "Change to buffer 1 ...");
afd->db = afd->db1;
}
......@@ -688,7 +689,7 @@ void finalizePOSIXNONB ( void )
xmpi ( MPI_Send ( &buffer, 1, MPI_INT, specialRank, tag, commNode ));
xdebug ( "SENT MESSAGE WITH TAG \"IO_FINALIZE\" TO SPECIAL PROCESS" );
xdebug("%s", "SENT MESSAGE WITH TAG \"IO_FINALIZE\" TO SPECIAL PROCESS");
if ( bibAFiledataP->head != NULL )
{
......@@ -696,7 +697,7 @@ void finalizePOSIXNONB ( void )
}
else
{
xdebug ( "cleanup queue" );
xdebug("%s", "cleanup queue");
queueDestroy ( bibAFiledataP );
}
}
......