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

Defer handling of missing gribapiScanTimestep2 to caller.

parent 61dcf543
......@@ -324,7 +324,7 @@ int grbScanTimestep1(stream_t * streamptr)
static
int grbScanTimestep2(stream_t * streamptr)
{
int status;
int status = 0;
int filetype;
filetype = streamptr->filetype;
......@@ -334,11 +334,13 @@ int grbScanTimestep2(stream_t * streamptr)
{
status = cgribexScanTimestep2(streamptr);
}
#endif
#if defined(HAVE_LIBCGRIBEX) && defined (HAVE_LIBGRIB_API)
else
#endif
{
status = gribapiScanTimestep2(streamptr);
}
#ifdef HAVE_LIBGRIB_API
status = gribapiScanTimestep2(streamptr);
#endif
return (status);
}
......
......@@ -1465,10 +1465,10 @@ int gribapiScanTimestep1(stream_t * streamptr)
}
#ifdef HAVE_LIBGRIB_API
int gribapiScanTimestep2(stream_t * streamptr)
{
int rstatus = 0;
#if defined (HAVE_LIBGRIB_API)
off_t recpos = 0;
unsigned char *gribbuffer = NULL;
size_t buffersize = 0;
......@@ -1729,12 +1729,10 @@ int gribapiScanTimestep2(stream_t * streamptr)
streamptr->record->buffer = gribbuffer;
streamptr->record->buffersize = buffersize;
#else
(void)streamptr;
#endif
return (rstatus);
}
#endif
#if defined (HAVE_LIBGRIB_API)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment