streamOpenAppend: call to gribContainersNew() missing (bug fix)

8b3cd3d3 · Uwe Schulzweida · 13cb2517 · 8b3cd3d3 · 8b3cd3d3 · 8b3cd3d3
Commit 8b3cd3d3 authored Jul 02, 2016 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

ChangeLog ChangeLog +4 -0

src/gribapi.c src/gribapi.c +2 -4

src/stream.c src/stream.c +1 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2016-07-02  Uwe Schulzweida
+
+	* streamOpenAppend: call to gribContainersNew() missing (bug fix) [Bug #6944]
+
 2016-06-17  Uwe Schulzweida

 	* netCDF4: added support for attribute type NC_BYTE, NC_UBYTE, NC_USHORT and NC_UINT

--- a/src/gribapi.c
+++ b/src/gribapi.c
@@ -53,12 +53,10 @@ const char *gribapiLibraryVersionString(void)

 void gribContainersNew(stream_t * streamptr)
 {
-  int editionNumber = 2;
+  int editionNumber = (streamptr->filetype == FILETYPE_GRB) ? 1 : 2;

-  if ( streamptr->filetype == FILETYPE_GRB ) editionNumber = 1;
-  (void)editionNumber;
 #if  defined  (HAVE_LIBCGRIBEX)
-  if ( streamptr->filetype == FILETYPE_GRB )
+  if ( editionNumber == 1 )
    {
    }
  else

--- a/src/stream.c
+++ b/src/stream.c
@@ -654,6 +654,7 @@ int streamOpenA(const char *filename, const char *filemode, int filetype)
    case FILETYPE_GRB2:
      {
        fileID = gribOpen(filename, filemode);
+        if ( fileID != CDI_UNDEFID ) gribContainersNew(streamptr);
 	break;
      }
 #endif