moving HDF5 dim fields to hdf5internal.h from nc4internal.h

include/hdf5internal.h

@@ -56,6 +56,13 @@ typedef struct  NC_HDF5_FILE_INFO
    hid_t hdfid;
 } NC_HDF5_FILE_INFO_T;
 
+/* This is a struct to handle the dim metadata. */
+typedef struct NC_HDF5_DIM_INFO
+{
+   hid_t hdf_dimscaleid;        /* Non-zero if a DIM_WITHOUT_VARIABLE dataset is in use (no coord var). */
+   HDF5_OBJID_T hdf5_objid;
+} NC_HDF5_DIM_INFO_T;
+
 /** Strut to hold HDF5-specific info for attributes. */
 typedef struct  NC_HDF5_ATT_INFO
 {

include/nc4internal.h

@@ -112,11 +112,12 @@ typedef struct NC_OBJ {
 typedef struct NC_DIM_INFO
 {
    NC_OBJ hdr;
-   struct NC_GRP_INFO* container;  /* containing group */
+   struct NC_GRP_INFO *container;  /* containing group */
    size_t len;
    nc_bool_t unlimited;         /* True if the dimension is unlimited */
    nc_bool_t extended;          /* True if the dimension needs to be extended */
    nc_bool_t too_long;          /* True if len is too big to fit in local size_t. */
+   void *format_dim_info;       /* Pointer to format-specific dim info. */
    hid_t hdf_dimscaleid;        /* Non-zero if a DIM_WITHOUT_VARIABLE dataset is in use (no coord var). */
    HDF5_OBJID_T hdf5_objid;
    struct NC_VAR_INFO *coord_var; /* The coord var, if it exists. */
@@ -125,7 +126,7 @@ typedef struct NC_DIM_INFO
 typedef struct NC_ATT_INFO
 {
    NC_OBJ hdr;
-   struct NC_OBJ* container;    /* containing group|var */
+   struct NC_OBJ *container;    /* containing group|var */
    int len;
    nc_bool_t dirty;             /* True if attribute modified */
    nc_bool_t created;           /* True if attribute already created */

libsrc4/nc4internal.c

@@ -1277,6 +1277,10 @@ dim_free(NC_DIM_INFO_T *dim)
    if (dim->hdr.name)
       free(dim->hdr.name);
 
+   /* Release any format-specific information. */
+   if (dim->format_dim_info)
+      free(dim->format_dim_info);
+
    free(dim);
    return NC_NOERR;
 }