mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed unneeded HDF5 fields

Browse Source
This commit is contained in:
Ed Hartnett 2018-11-19 09:23:43 -07:00
parent fe62f61509
commit 3ec8b34bfb
4 changed files with 25 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nc4internal.h
View File

@ -232,14 +232,12 @@ typedef struct NC_TYPE_INFO
struct {
NClist* enum_member; /* <! NClist<NC_ENUM_MEMBER_INFO_T*> */
nc_type base_nc_typeid;
hid_t base_hdf_typeid;
} e; /* Enum */
struct Fields {
NClist* field; /* <! NClist<NC_FIELD_INFO_T*> */
} c; /* Compound */
struct {
nc_type base_nc_typeid;
hid_t base_hdf_typeid;
} v; /* Variable-length */
} u; /* Union of structs, for each type/class */
} NC_TYPE_INFO_T;

20
libhdf5/hdf5internal.c
View File

@ -602,26 +602,6 @@ nc4_rec_grp_HDF5_del(NC_GRP_INFO_T *grp)
if (type->native_hdf_typeid && H5Tclose(type->native_hdf_typeid) < 0)
return NC_EHDFERR;
type->native_hdf_typeid = 0;
/* Class-specific cleanup. Only enums and vlens have HDF5
* resources to close. */
switch (type->nc_type_class)
{
case NC_ENUM:
if (type->u.e.base_hdf_typeid && H5Tclose(type->u.e.base_hdf_typeid) < 0)
return NC_EHDFERR;
type->u.e.base_hdf_typeid = 0;
break;
case NC_VLEN:
if (type->u.v.base_hdf_typeid && H5Tclose(type->u.v.base_hdf_typeid) < 0)
return NC_EHDFERR;
type->u.v.base_hdf_typeid = 0;
break;
default: /* Do nothing. */
break;
}
}
/* Close the HDF5 group. */

63
libhdf5/hdf5open.c
View File

@ -1278,8 +1278,8 @@ read_type(NC_GRP_INFO_T *grp, hid_t hdf_typeid, char *type_name)
H5T_class_t class;
hid_t native_typeid;
size_t type_size;
int retval = NC_NOERR;
int nmembers;
int retval;
assert(grp && type_name);
@ -1373,50 +1373,43 @@ read_type(NC_GRP_INFO_T *grp, hid_t hdf_typeid, char *type_name)
hsize_t dims[NC_MAX_VAR_DIMS];
int d;
if ((ndims = H5Tget_array_ndims(member_hdf_typeid)) < 0) {
retval = NC_EHDFERR;
break;
}
if (H5Tget_array_dims(member_hdf_typeid, dims, NULL) != ndims) {
retval = NC_EHDFERR;
break;
}
if ((ndims = H5Tget_array_ndims(member_hdf_typeid)) < 0)
return NC_EHDFERR;
if (H5Tget_array_dims(member_hdf_typeid, dims, NULL) != ndims)
return NC_EHDFERR;
for (d = 0; d < ndims; d++)
dim_size[d] = dims[d];
/* What is the netCDF typeid of this member? */
if ((retval = get_netcdf_type(grp->nc4_info, H5Tget_super(member_hdf_typeid),
&member_xtype)))
break;
return retval;
/* Add this member to our list of fields in this compound type. */
if ((retval = nc4_field_list_add(type, member_name,
member_offset, H5Tget_super(member_hdf_typeid),
H5Tget_super(member_native_typeid),
member_xtype, ndims, dim_size)))
break;
return retval;
}
else
{
/* What is the netCDF typeid of this member? */
if ((retval = get_netcdf_type(grp->nc4_info, member_native_typeid,
&member_xtype)))
break;
return retval;
/* Add this member to our list of fields in this compound type. */
if ((retval = nc4_field_list_add(type, member_name,
member_offset, member_hdf_typeid, member_native_typeid,
member_xtype, 0, NULL)))
break;
return retval;
}
hdf5free(member_name);
member_name = NULL;
}
hdf5free(member_name);
member_name = NULL;
if(retval) /* error exit from loop */
return retval;
}
break;
@ -1455,9 +1448,8 @@ read_type(NC_GRP_INFO_T *grp, hid_t hdf_typeid, char *type_name)
LOG((5, "base_hdf_typeid 0x%x type_size %d base_nc_type %d",
base_hdf_typeid, type_size, base_nc_type));
/* Remember the base types for this vlen */
/* Remember the base type for this vlen. */
type->u.v.base_nc_typeid = base_nc_type;
type->u.v.base_hdf_typeid = base_hdf_typeid;
}
}
break;
@ -1493,9 +1485,8 @@ read_type(NC_GRP_INFO_T *grp, hid_t hdf_typeid, char *type_name)
LOG((5, "base_hdf_typeid 0x%x type_size %d base_nc_type %d",
base_hdf_typeid, type_size, base_nc_type));
/* Remember the base types for this enum */
/* Remember the base type for this enum. */
type->u.e.base_nc_typeid = base_nc_type;
type->u.e.base_hdf_typeid = base_hdf_typeid;
/* Find out how many member are in the enum. */
if ((nmembers = H5Tget_nmembers(hdf_typeid)) < 0)
@ -1512,41 +1503,27 @@ read_type(NC_GRP_INFO_T *grp, hid_t hdf_typeid, char *type_name)
{
/* Get the name and value from HDF5. */
if (!(member_name = H5Tget_member_name(hdf_typeid, i)))
{
retval = NC_EHDFERR;
break;
}
return NC_EHDFERR;
#ifdef JNA
strncpy(jna,member_name,1000);
member_name = jna;
#endif
if (strlen(member_name) > NC_MAX_NAME)
{
retval = NC_EBADNAME;
break;
}
return NC_EBADNAME;
if (H5Tget_member_value(hdf_typeid, i, value) < 0)
{
retval = NC_EHDFERR;
break;
}
return NC_EHDFERR;
/* Insert new field into this type's list of fields. */
if ((retval = nc4_enum_member_add(type, type->size,
member_name, value)))
{
break;
}
return retval;
hdf5free(member_name);
member_name = NULL;
}
hdf5free(member_name);
member_name = NULL;
if(value) free(value);
if(retval) /* error exit from loop */
return retval;
free(value);
}
break;

9
libhdf5/nc4hdf.c
View File

@ -1164,6 +1164,7 @@ static int
commit_type(NC_GRP_INFO_T *grp, NC_TYPE_INFO_T *type)
{
NC_HDF5_GRP_INFO_T *hdf5_grp;
hid_t base_hdf_typeid;
int retval;
assert(grp && grp->format_grp_info && type);
@ -1228,11 +1229,11 @@ commit_type(NC_GRP_INFO_T *grp, NC_TYPE_INFO_T *type)
{
/* Find the HDF typeid of the base type of this vlen. */
if ((retval = nc4_get_hdf_typeid(grp->nc4_info, type->u.v.base_nc_typeid,
&type->u.v.base_hdf_typeid, type->endianness)))
&base_hdf_typeid, type->endianness)))
return retval;
/* Create a vlen type. */
if ((type->hdf_typeid = H5Tvlen_create(type->u.v.base_hdf_typeid)) < 0)
if ((type->hdf_typeid = H5Tvlen_create(base_hdf_typeid)) < 0)
return NC_EHDFERR;
}
else if (type->nc_type_class == NC_OPAQUE)
@ -1251,11 +1252,11 @@ commit_type(NC_GRP_INFO_T *grp, NC_TYPE_INFO_T *type)
/* Find the HDF typeid of the base type of this enum. */
if ((retval = nc4_get_hdf_typeid(grp->nc4_info, type->u.e.base_nc_typeid,
&type->u.e.base_hdf_typeid, type->endianness)))
&base_hdf_typeid, type->endianness)))
return retval;
/* Create an enum type. */
if ((type->hdf_typeid = H5Tenum_create(type->u.e.base_hdf_typeid)) < 0)
if ((type->hdf_typeid = H5Tenum_create(base_hdf_typeid)) < 0)
return NC_EHDFERR;
/* Add all the members to the HDF5 type. */