Skip to content
Snippets Groups Projects
Commit fdba1334 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Change datatype of nmiss to size_t.

parent da15206d
No related branches found
No related tags found
No related merge requests found
......@@ -921,7 +921,7 @@ int main(int argc, char *argv[])
printShortinfo(streamID1, vlistID1, Vardis);
}
int idum;
size_t idum;
int tsID = 0;
if ( Info || fname2 )
while ( (nrecs = streamInqTimestep(streamID1, tsID)) > 0 )
......
......@@ -176,7 +176,7 @@ void grb_read_var(stream_t * streamptr, int varID, int memtype, void *data, size
double missval = vlistInqVarMissval(vlistID, varID);
int imiss;
size_t imiss;
streamptr->tsteps[tsID].records[recID].zip = grbUnzipRecord(gribbuffer, &recsize);
......
......@@ -378,7 +378,7 @@ char *cdiFallbackIterator_copyVariableName(CdiIterator *super)
void cdiFallbackIterator_readField(CdiIterator *super, double *buffer, size_t *nmiss)
{
CdiFallbackIterator *me = (CdiFallbackIterator*)(void *)super;
int missingValues = 0;
size_t missingValues = 0;
streamReadVarSlice(me->streamId, me->curVariable, me->curLevel, buffer, &missingValues);
if(nmiss) *nmiss = (size_t)missingValues;
}
......@@ -386,7 +386,7 @@ void cdiFallbackIterator_readField(CdiIterator *super, double *buffer, size_t *n
void cdiFallbackIterator_readFieldF(CdiIterator *super, float *buffer, size_t *nmiss)
{
CdiFallbackIterator *me = (CdiFallbackIterator*)(void *)super;
int missingValues = 0;
size_t missingValues = 0;
streamReadVarSliceF(me->streamId, me->curVariable, me->curLevel, buffer, &missingValues);
if(nmiss) *nmiss = (size_t)missingValues;
}
......
......@@ -1359,7 +1359,7 @@ int cgribexDecode(int memtype, void *gribbuffer, size_t gribsize, void *data, si
if ( memtype == MEMTYPE_FLOAT )
{
float *restrict dataf = (float*) data;
for ( long i = 0; i < datasize; i++ )
for ( size_t i = 0; i < datasize; i++ )
if ( (fabs(dataf[i]-undef_pds) < undef_eps) || IS_EQUAL(dataf[i],FSEC3_MissVal) ) {
dataf[i] = (float)missval;
(*nmiss)++;
......@@ -1368,7 +1368,7 @@ int cgribexDecode(int memtype, void *gribbuffer, size_t gribsize, void *data, si
else
{
double *restrict datad = (double*) data;
for ( long i = 0; i < datasize; i++ )
for ( size_t i = 0; i < datasize; i++ )
if ( (fabs(datad[i]-undef_pds) < undef_eps) || IS_EQUAL(datad[i],FSEC3_MissVal) ) {
datad[i] = missval;
(*nmiss)++;
......
......@@ -106,7 +106,7 @@ The values are converted to the external data type of the variable, if necessary
void streamWriteVar(int streamID, int varID, const double *data, size_t nmiss)
{
void (*myCdiStreamWriteVar_)(int streamID, int varID, int memtype, const void *data, size_t nmiss)
= (void (*)(int, int, int, const void *, int))
= (void (*)(int, int, int, const void *, size_t))
namespaceSwitchGet(NSSWITCH_STREAM_WRITE_VAR_).func;
myCdiStreamWriteVar_(streamID, varID, MEMTYPE_DOUBLE, (const void *) data, nmiss);
......@@ -131,7 +131,7 @@ The values are converted to the external data type of the variable, if necessary
void streamWriteVarF(int streamID, int varID, const float *data, size_t nmiss)
{
int (*myCdiStreamWriteVar_)(int streamID, int varID, int memtype, const void *data, size_t nmiss)
= (int (*)(int, int, int, const void *, int))
= (int (*)(int, int, int, const void *, size_t))
namespaceSwitchGet(NSSWITCH_STREAM_WRITE_VAR_).func;
if ( myCdiStreamWriteVar_(streamID, varID, MEMTYPE_FLOAT, (const void *) data, nmiss) )
......@@ -280,7 +280,7 @@ void streamWriteVarChunk(int streamID, int varID,
{
void (*myCdiStreamWriteVarChunk_)(int streamID, int varID, int memtype,
const int rect[][2], const void *data, size_t nmiss)
= (void (*)(int, int, int, const int [][2], const void *, int))
= (void (*)(int, int, int, const int [][2], const void *, size_t))
namespaceSwitchGet(NSSWITCH_STREAM_WRITE_VAR_CHUNK_).func;
myCdiStreamWriteVarChunk_(streamID, varID, MEMTYPE_DOUBLE, rect, data, nmiss);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment