mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-01 16:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #888 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10

Browse Source 
* commit 'f1cffac626e3e1ecbee0f55d7a970643b9c6b397':
  Remove old dependency construct
  HDFFV-10345 splelling and whitespace corrections
  HDFFV-10398 add sanitize attribute
This commit is contained in:
Allen Byrne 2018-02-06 16:04:03 -06:00
commit 833b8de87a
14 changed files with 659 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -725,7 +725,6 @@ if (BUILD_TESTING)
if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
add_subdirectory (tools/lib)
add_subdirectory (test)
endif ()
if (H5_HAVE_PARALLEL)

10
fortran/src/H5Df.c
View File

@ -567,7 +567,7 @@ DONE:
* dims - one-demnsional array of size 2
* dims[0] = MAXLENGTH
* dims[1] = number of elements of VL type
* len - array element lenghts
* len - array element lengths
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -641,7 +641,7 @@ DONE:
* dims[1] = number of elements of VL type
* OUTPUTS
* buf - data buffer
* len - array element lenghts
* len - array element lengths
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -882,7 +882,7 @@ h5dread_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spac
* dims - one-demnsional array of size 2
* dims[0] = MAXLENGTH
* dims[1] = number of elements of VL type
* len - array element lenghts
* len - array element lengths
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -956,7 +956,7 @@ DONE:
* dims[1] = number of elements of VL type
* OUTPUTS
* buf - data buffer
* len - array element lenghts
* len - array element lengths
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -1209,7 +1209,7 @@ h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
* dims[1] = number of elements of VL type
* OUTPUTS
* buf - data buffer
* len - array element lenghts
* len - array element lengths
* RETURNS
* 0 on success, -1 on failure
* AUTHOR

42
fortran/src/H5Gf.c
View File

@ -47,7 +47,7 @@
*/
int_f
h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
hid_t_f *grp_id, hid_t_f *lcpl_id, hid_t_f *gcpl_id, hid_t_f *gapl_id )
/******/
{
hid_t c_gcpl_id = -1; /* Group creation property list */
@ -69,11 +69,11 @@ h5gcreate_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size_hint,
else {
/* Create the group creation property list */
if((c_gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
goto DONE;
goto DONE;
/* Set the local heap size hint */
if(H5Pset_local_heap_size_hint(c_gcpl_id, (size_t)*size_hint) < 0)
goto DONE;
goto DONE;
/* Create the group */
c_grp_id = H5Gcreate2((hid_t)*loc_id, c_name, H5P_DEFAULT, c_gcpl_id, H5P_DEFAULT);
@ -308,9 +308,9 @@ h5gclose_c(hid_t_f *grp_id)
* link_type - link type
* current_name - name of the existing object for hard link,
* anything for the soft link
* current_namelen - current name lenghth
* current_namelen - current name length
* new_name - new name for the object
* new_namelen - new_name lenghth
* new_namelen - new_name length
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -365,7 +365,7 @@ h5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name,
goto DONE;
break;
/* End of the warnings fix */
default: /* Unknown/unhandled link type */
goto DONE;
} /* end switch */
@ -390,12 +390,12 @@ DONE:
* cur_name - name of the existing object for hard link releative
* to cur_loc_id location,
* anything for the soft link
* current_namelen - current name lenghth
* current_namelen - current name length
* link_type - link type
* new_loc_id - location identifier
* new_name - new name for the object releative to the new_loc_id
* location
* new_namelen - new_name lenghth
* new_namelen - new_name length
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -515,9 +515,9 @@ DONE:
* INPUTS
* loc_id - identifier of file or group
* src_name - name of the original object
* src_namelen - original name lenghth
* src_namelen - original name length
* dst_name - new name for the object
* dst_namelen - new name lenghth
* dst_namelen - new name length
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -565,10 +565,10 @@ DONE:
* INPUTS
* src_loc_id - identifier of file or group
* src_name - name of the original object relative to src_loc_id
* src_namelen - original name lenghth
* src_namelen - original name length
* dst_loc_id - new location identifier
* dst_name - new name for the object relative to dst_loc_id
* dst_namelen - new name lenghth
* dst_namelen - new name length
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -617,8 +617,8 @@ DONE:
* INPUTS
* loc_id - identifier of file or group
* name - name of the object that symbolic link points to
* namelen - the name lenghth
* size - lenghth of retrurned value
* namelen - the name length
* size - length of retrurned value
* OUTPUTS
* value - name to be returned
* RETURNS
@ -681,9 +681,9 @@ DONE:
* INPUTS
* loc_id - identifier of file or group
* name - name of object whose comment is to be set or reset
* namelen - the name lenghth
* namelen - the name length
* comment - the new comment
* commentlen - new comment lenghth
* commentlen - new comment length
* RETURNS
* 0 on success, -1 on failure
* AUTHOR
@ -732,7 +732,7 @@ DONE:
* INPUTS
* loc_id - identifier of file or group
* name - name of object whose comment is to be set or reset
* namelen - the name lenghth
* namelen - the name length
* bufsize - at most bufsize characters
* comment - the new comment
* RETURNS
@ -948,8 +948,8 @@ done:
*/
int_f
h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
/******/
{
char *c_group_name = NULL; /* Buffer to hold group name C string */
@ -965,7 +965,7 @@ h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
* Call H5Gget_info_by_idx function.
*/
if(H5Gget_info_by_idx((hid_t)*loc_id,c_group_name, (H5_index_t)*index_type,(H5_iter_order_t)*order,(hsize_t)*n,
&ginfo, (hid_t)*lapl_id) < 0)
&ginfo, (hid_t)*lapl_id) < 0)
HGOTO_DONE(FAIL);
/* Unpack the structure */
@ -1018,7 +1018,7 @@ h5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
*/
int_f
h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
/******/
{
char *c_group_name = NULL; /* Buffer to hold group name C string */

10
fortran/src/H5Pf.c
View File

@ -2638,7 +2638,7 @@ h5pget_hyper_vector_size_c ( hid_t_f *prp_id , size_t_f *size)
* INPUTS
* parent - property list class identifier
* name - name of the new class
* name_len - lenght of the "name" buffer
* name_len - length of the "name" buffer
* OUTPUTS
* class - new class identifier
* RETURNS
@ -3415,8 +3415,8 @@ h5pset_family_offset_c ( hid_t_f *prp_id , hsize_t_f *offset)
* mem_map - memory mapping array
* memb_fapl - property list for each memory usage type
* memb_name - array with members names
* len - array with the lenght of each name
* lenmax - lenght of the name a sdeclared in Fortran
* len - array with the length of each name
* lenmax - length of the name a sdeclared in Fortran
* flag - flag allowing partila access when one of the files is missing
* RETURNS
* 0 on success, -1 on failure
@ -3537,12 +3537,12 @@ h5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag)
* Call H5Pget_fapl_multi to set multi file dirver
* INPUTS
* prp_id - file_creation property list identifier
* lenmax - lenght of the name a sdeclared in Fortran
* lenmax - length of the name a sdeclared in Fortran
* OUTPUTS
* memb_map - memory mapping array
* memb_fapl - property list for each memory usage type
* memb_name - array with members names
* len - array with the lenght of each name
* len - array with the length of each name
* flag - flag allowing partila access when one of the files is missing
* RETURNS
* 0 on success, -1 on failure

2
fortran/src/H5Pff.F90
View File

@ -5313,7 +5313,7 @@ CONTAINS
!
! expression - buffer to hold transform expression
! hdferr - Error code
! Success: Actual lenght of the expression
! Success: Actual length of the expression
! If provided buffer "expression" is
! smaller, than expression will be
! truncated to fit into

66
fortran/src/H5Rff.F90
View File

@ -38,7 +38,7 @@
!
!*****
MODULE H5R
MODULE H5R
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_SIGNED_CHAR
USE H5GLOBAL
@ -62,7 +62,7 @@ MODULE H5R
END INTERFACE
TYPE :: hdset_reg_ref_t_f03
TYPE :: hdset_reg_ref_t_f03
INTEGER(C_SIGNED_CHAR), DIMENSION(1:H5R_DSET_REG_REF_BUF_SIZE_F) :: ref
END TYPE hdset_reg_ref_t_f03
@ -165,16 +165,16 @@ CONTAINS
! Retrieves the type of object that an object reference points to.
!
! INPUTS
! dset_id - identifier of the dataset containing
! dset_id - identifier of the dataset containing
! reference to the objects
! ref - reference to open
! ref - reference to open
! OUTPUTS
! obj_type - object_type, possible values:
! obj_type - object_type, possible values:
! H5G_UNKNOWN_F
! H5G_GROUP_F
! H5G_GROUP_F
! H5G_DATASET_F
! H5G_TYPE_F
! hdferr - Returns 0 if successful and -1 if fails
! hdferr - Returns 0 if successful and -1 if fails
!
! AUTHOR
! Elena Pourmal
@ -227,17 +227,17 @@ CONTAINS
! Retrieves a dataspace with the specified region selected
!
! INPUTS
! dset_id - identifier of the dataset containing
! dset_id - identifier of the dataset containing
! reference to the regions
! ref - reference to open
! ref - reference to open
! OUTPUTS
! space_id - dataspace identifier
! hdferr - Returns 0 if successful and -1 if fails
! space_id - dataspace identifier
! hdferr - Returns 0 if successful and -1 if fails
! AUTHOR
! Elena Pourmal
! August 12, 1999
!
! HISTORY
! HISTORY
! Explicit Fortran interfaces were added for
! called C functions (it is needed for Windows
! port). February 28, 2001
@ -276,16 +276,16 @@ CONTAINS
! h5rget_region_ptr_f
!
! PURPOSE
! Retrieves a dataspace with the specified region
! Retrieves a dataspace with the specified region
! selected using pointer
!
! INPUTS
! dset_id - identifier of the dataset containing
! dset_id - identifier of the dataset containing
! reference to the regions
! ref - reference to open
! ref - reference to open
! OUTPUTS
! space_id - dataspace identifier
! hdferr - Returns 0 if successful and -1 if fails
! space_id - dataspace identifier
! hdferr - Returns 0 if successful and -1 if fails
! AUTHOR
! M. Scot Breitenfeld
! August 4, 2012
@ -319,7 +319,7 @@ CONTAINS
! loc_id - location identifier
! name - name of the object at the specified location
! Outputs:
! ref - reference to the specified object
! ref - reference to the specified object
! hdferr - returns 0 if successful and -1 if fails
! AUTHOR
! Elena Pourmal
@ -363,11 +363,11 @@ CONTAINS
! Creates reference to the dataset region
!
! INPUTS
! loc_id - location identifier
! name - name of the dataset at the specified location
! space_id - dataspace identifier that describes selected region
! loc_id - location identifier
! name - name of the dataset at the specified location
! space_id - dataspace identifier that describes selected region
! OUTPUTS
! ref - reference to the dataset region
! ref - reference to the dataset region
! hdferr - returns 0 if successful and -1 if fails
! AUTHOR
! Elena Pourmal
@ -424,12 +424,12 @@ CONTAINS
!
! Inputs:
! loc_id - location identifier
! name - name of the dataset at the specified location
! name - name of the dataset at the specified location
! ref_type - type of reference:
! H5R_OBJECT
! H5T_STD_REF_DSETREG
! Outputs:
! ref - reference created by the function call.
! ref - reference created by the function call.
! hdferr - returns 0 if successful and -1 if fails.
! OPTIONAL
! space_id - dataspace identifier that describes selected region
@ -474,7 +474,7 @@ CONTAINS
! Inputs:
! dset_id - identifier of the dataset containing
! reference
! ref - reference to open
! ref - reference to open
! Outputs:
! obj_id - object_identifier
! hdferr - returns 0 if successful and -1 if fails
@ -515,8 +515,8 @@ CONTAINS
!
! Inputs:
! dset_id - identifier of the dataset containing
! reference to teh regions
! ref - reference to open
! reference to the regions
! ref - reference to open
! Outputs:
! obj_id - dataspace identifier
! hdferr - returns 0 if successful and -1 if fails
@ -585,7 +585,7 @@ CONTAINS
INTEGER(HID_T), INTENT(OUT) :: ref_obj_id
! Identifier of referenced object
INTEGER, INTENT(OUT) :: hdferr ! Error code
!*****
!*****
hdferr = h5rdereference_ptr_c(obj_id, ref_type, ref, ref_obj_id)
END SUBROUTINE h5rdereference_ptr_f
@ -600,14 +600,14 @@ CONTAINS
!
! Inputs:
! loc_id - Identifier for the file containing the reference or for any object in that file.
! ref - An object or dataset region reference.
! ref - An object or dataset region reference.
!
! Outputs:
! name - A name associated with the referenced object or dataset region.
! hdferr - Returns 0 if successful and -1 if fails.
!
! Optional parameters:
! size - The size of the name buffer, returning 0 (zero) if no name is associated
! size - The size of the name buffer, returning 0 (zero) if no name is associated
! with the identifier.
!
! AUTHOR
@ -648,7 +648,7 @@ CONTAINS
!
! Inputs:
! loc_id - Identifier for the file containing the reference or for any object in that file.
! ref - An object or dataset region reference.
! ref - An object or dataset region reference.
!
! Outputs:
! name - A name associated with the referenced object or dataset region.
@ -747,12 +747,12 @@ CONTAINS
! ref - Reference to query.
!
! Outputs:
! obj_type - Type of referenced object.
! obj_type - Type of referenced object.
! H5G_UNKNOWN_F
! H5G_GROUP_F
! H5G_DATASET_F
! H5G_TYPE_F
!
!
! hdferr - Returns 0 if successful and -1 if fails.
!
! AUTHOR

4
hl/fortran/src/H5LTf90proto.h
View File

@ -303,7 +303,7 @@ h5tbmake_table_c(size_t_f *namelen1,
hid_t_f *field_types,
hsize_t_f *chunk_size,
int_f *compress,
size_t_f *char_len_field_names, /* field_names lenghts */
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
_fcd buf); /* field_names */
@ -334,7 +334,7 @@ h5tbmake_table_ptr_c(size_t_f *namelen1,
hsize_t_f *chunk_size,
void *fill_data,
int_f *compress,
size_t_f *char_len_field_names, /* field_names lenghts */
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
char *field_names, /* field_names */
void *data);

6
hl/fortran/src/H5TBfc.c
View File

@ -38,7 +38,7 @@ int_f
h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *namelen, _fcd name,
hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, size_t_f *field_offset,
hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress,
size_t_f *char_len_field_names, /* field_names lenghts */
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
char *field_names) /* field_names */
{
@ -143,7 +143,7 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
_fcd name, hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size,
size_t_f *field_offset, hid_t_f *field_types, hsize_t_f *chunk_size,
void *fill_data, int_f *compress,
size_t_f *char_len_field_names, /* field_names lenghts */
size_t_f *char_len_field_names, /* field_names lengths */
size_t_f *max_char_size_field_names, /* char len of fields */
char *field_names,
void *data) /* field_names */
@ -638,7 +638,7 @@ done:
int_f
h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields,
size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size,
size_t_f *namelen2, /* field_names lenghts */
size_t_f *namelen2, /* field_names lengths */
size_t_f *lenmax, /* character len max */
_fcd field_names, /* field_names */
size_t_f *maxlen_out)

8
hl/test/test_ds.c
View File

@ -3080,7 +3080,7 @@ static int test_simple(void)
/*-------------------------------------------------------------------------
* get the label using a static buffer smaller than the string lenght
* get the label using a static buffer smaller than the string length
*-------------------------------------------------------------------------
*/
@ -3118,7 +3118,7 @@ static int test_simple(void)
*-------------------------------------------------------------------------
*/
/* get the lenght of the scale name (pass NULL in name) */
/* get the length of the scale name (pass NULL in name) */
if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) < 0)
goto out;
@ -3151,7 +3151,7 @@ static int test_simple(void)
goto out;
/*-------------------------------------------------------------------------
* get the scale name using a static buffer smaller than the string lenght
* get the scale name using a static buffer smaller than the string length
*-------------------------------------------------------------------------
*/
@ -4925,7 +4925,7 @@ static int test_errors2(void)
hsize_t dimd[2] = {3,3}; /* size of data dataset */
hsize_t dims[1] = {3}; /* size of scale dataset */
char lbuf[255]; /* label buffer */
ssize_t label_len; /* label lenght */
ssize_t label_len; /* label length */
int scale_idx; /* scale index */
int nscales; /* number of scales in DIM */
int count; /* visitor data */

112
src/H5Zscaleoffset.c
View File

@ -13,16 +13,16 @@
#include "H5Zmodule.h" /* This source code file is part of the H5Z module */
#include "H5private.h" /* Generic Functions */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5private.h" /* Generic Functions */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#include "H5Oprivate.h" /* Object headers */
#include "H5Sprivate.h" /* Dataspaces */
#include "H5Tprivate.h" /* Datatypes */
#include "H5Zpkg.h" /* Data filters */
#include "H5Sprivate.h" /* Dataspaces */
#include "H5Tprivate.h" /* Datatypes */
#include "H5Zpkg.h" /* Data filters */
/* Struct of parameters needed for compressing/decompressing one atomic datatype */
typedef struct {
@ -78,13 +78,13 @@ static void H5Z_scaleoffset_compress(unsigned char *data, unsigned d_nelmts, uns
/* This message derives from H5Z */
H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
H5Z_CLASS_T_VERS, /* H5Z_class_t version */
H5Z_FILTER_SCALEOFFSET, /* Filter id number */
H5Z_FILTER_SCALEOFFSET, /* Filter id number */
1, /* Assume encoder present: check before registering */
1, /* decoder_present flag (set to true) */
"scaleoffset", /* Filter name for debugging */
H5Z_can_apply_scaleoffset, /* The "can apply" callback */
"scaleoffset", /* Filter name for debugging */
H5Z_can_apply_scaleoffset, /* The "can apply" callback */
H5Z_set_local_scaleoffset, /* The "set local" callback */
H5Z_filter_scaleoffset, /* The actual filter function */
H5Z_filter_scaleoffset, /* The actual filter function */
}};
/* Local macros */
@ -665,15 +665,15 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_modify_4(i, type, pow_fun, buf, d_nelmts, min, D_val) \
}
/*-------------------------------------------------------------------------
* Function: H5Z_can_apply_scaleoffset
* Function: H5Z_can_apply_scaleoffset
*
* Purpose: Check the parameters for scaleoffset compression for
* Purpose: Check the parameters for scaleoffset compression for
* validity and whether they fit a particular dataset.
*
* Return: Success: Non-negative
* Failure: Negative
* Return: Success: Non-negative
* Failure: Negative
*
* Programmer: Xiaowen Wu
* Friday, February 4, 2005
@ -685,7 +685,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
static htri_t
H5Z_can_apply_scaleoffset(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
{
const H5T_t *type; /* Datatype */
const H5T_t *type; /* Datatype */
H5T_class_t dtype_class; /* Datatype's class */
H5T_order_t dtype_order; /* Datatype's endianness order */
htri_t ret_value = TRUE; /* Return value */
@ -694,20 +694,20 @@ H5Z_can_apply_scaleoffset(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_
/* Get datatype */
if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
/* Get datatype's class, for checking the "datatype class" */
if((dtype_class = H5T_get_class(type, TRUE)) == H5T_NO_CLASS)
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype class")
/* Get datatype's size, for checking the "datatype size" */
if(H5T_get_size(type) == 0)
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
if(dtype_class == H5T_INTEGER || dtype_class == H5T_FLOAT) {
/* Get datatype's endianness order */
if((dtype_order = H5T_get_order(type)) == H5T_ORDER_ERROR)
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "can't retrieve datatype endianness order")
/* Range check datatype's endianness order */
if(dtype_order != H5T_ORDER_LE && dtype_order != H5T_ORDER_BE)
@ -719,17 +719,17 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5Z_can_apply_scaleoffset() */
/*-------------------------------------------------------------------------
* Function: H5Z_scaleoffset_get_type
* Function: H5Z_scaleoffset_get_type
*
* Purpose: Get the specific integer type based on datatype size and sign
* Purpose: Get the specific integer type based on datatype size and sign
* or floating-point type based on size
*
* Return: Success: id number of integer type
* Failure: 0
* Return: Success: id number of integer type
* Failure: 0
*
* Programmer: Xiaowen Wu
* Programmer: Xiaowen Wu
* Wednesday, April 13, 2005
*
* Modifications:
@ -784,14 +784,14 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
/*-------------------------------------------------------------------------
* Function: H5Z_scaleoffset_set_parms_fillval
* Function: H5Z_scaleoffset_set_parms_fillval
*
* Purpose: Get the fill value of the dataset and store in cd_values[]
* Purpose: Get the fill value of the dataset and store in cd_values[]
*
* Return: Success: Non-negative
* Failure: Negative
* Return: Success: Non-negative
* Failure: Negative
*
* Programmer: Xiaowen Wu
* Monday, March 7, 2005
@ -836,17 +836,17 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5Z_scaleoffset_set_parms_fillval() */
/*-------------------------------------------------------------------------
* Function: H5Z_set_local_scaleoffset
* Function: H5Z_set_local_scaleoffset
*
* Purpose: Set the "local" dataset parameters for scaleoffset
* Purpose: Set the "local" dataset parameters for scaleoffset
* compression.
*
* Return: Success: Non-negative
* Failure: Negative
* Return: Success: Non-negative
* Failure: Negative
*
* Programmer: Xiaowen Wu
* Programmer: Xiaowen Wu
* Friday, February 4, 2005
*
* Modifications:
@ -857,8 +857,8 @@ static herr_t
H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
{
H5P_genplist_t *dcpl_plist; /* Property list pointer */
H5T_t *type; /* Datatype */
const H5S_t *ds; /* Dataspace */
H5T_t *type; /* Datatype */
const H5S_t *ds; /* Dataspace */
unsigned flags; /* Filter flags */
size_t cd_nelmts = H5Z_SCALEOFFSET_USER_NPARMS; /* Number of filter parameters */
unsigned cd_values[H5Z_SCALEOFFSET_TOTAL_NPARMS]; /* Filter parameters */
@ -879,14 +879,14 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
/* Get datatype */
if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
/* Initialize the parameters to a known state */
HDmemset(cd_values, 0, sizeof(cd_values));
/* Get the filter's current parameters */
if(H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SCALEOFFSET, &flags, &cd_nelmts, cd_values, (size_t)0, NULL, NULL) < 0)
HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get scaleoffset parameters")
HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "can't get scaleoffset parameters")
/* Get dataspace */
if(NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
@ -930,7 +930,7 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
/* Get datatype's size */
if((dtype_size = H5T_get_size(type)) == 0)
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "bad datatype size")
/* Set "local" parameter for datatype size */
H5_CHECK_OVERFLOW(dtype_size, size_t, unsigned);
@ -1008,23 +1008,23 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
/* Modify the filter's parameters for this dataset */
if(H5P_modify_filter(dcpl_plist, H5Z_FILTER_SCALEOFFSET, flags, (size_t)H5Z_SCALEOFFSET_TOTAL_NPARMS, cd_values) < 0)
HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local scaleoffset parameters")
HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "can't set local scaleoffset parameters")
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5Z_set_local_scaleoffset() */
/*-------------------------------------------------------------------------
* Function: H5Z_filter_scaleoffset
* Function: H5Z_filter_scaleoffset
*
* Purpose: Implement an I/O filter for storing packed integer
* Purpose: Implement an I/O filter for storing packed integer
* data using scale and offset method.
*
* Return: Success: Size of buffer filtered
* Failure: 0
* Return: Success: Size of buffer filtered
* Failure: 0
*
* Programmer: Xiaowen Wu
* Programmer: Xiaowen Wu
* Monday, February 7, 2005
*
* Modifications:
@ -1051,13 +1051,13 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
unsigned char *outbuf = NULL; /* pointer to new output buffer */
unsigned buf_offset = 21; /* buffer offset because of parameters stored in file */
unsigned i; /* index */
parms_atomic p; /* paramters needed for compress/decompress functions */
parms_atomic p; /* parameters needed for compress/decompress functions */
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
if(cd_nelmts != H5Z_SCALEOFFSET_TOTAL_NPARMS)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scaleoffset number of paramters")
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid scaleoffset number of parameters")
/* Check if memory byte order matches dataset datatype byte order */
switch(H5T_native_order_g) {
@ -1107,7 +1107,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
/* if scale_factor is less than 0 for integer, library will reset it to 0
* in this case, library will calculate the minimum-bits
*/
if(scale_factor < 0) scale_factor = 0;
if(scale_factor < 0) scale_factor = 0;
}
/* fixed-minimum-bits method is not implemented and is forbidden */
@ -1128,7 +1128,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
minbits = (uint32_t)scale_factor;
}
/* prepare paramters to pass to compress/decompress functions */
/* prepare parameters to pass to compress/decompress functions */
p.size = cd_values[H5Z_SCALEOFFSET_PARM_SIZE];
p.mem_order = H5T_native_order_g;
@ -1310,7 +1310,7 @@ done:
* atomic datatype is treated on byte basis
*/
/* change byte order of input buffer either from little-endian to big-endian
* or from big-endian to little-endian 2/21/2005
*/

1034
src/H5detect.c
View File

File diff suppressed because it is too large Load Diff

4
tools/CMakeLists.txt
View File

@ -9,9 +9,7 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
# --------------------------------------------------------------------
# If testing was NOT enabled, then we need to build the tools library
# --------------------------------------------------------------------
if (NOT BUILD_TESTING)
add_subdirectory (lib)
endif ()
add_subdirectory (lib)
#-----------------------------------------------------------------------------
# Setup include Directories

4
tools/src/h5import/h5import.c
View File

@ -1405,7 +1405,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
const char *err14a = "COMPRESSION-PARAM keyword appears twice in %s.\n";
const char *err14b = "Error in retrieving the compression parameter from %s.\n";
const char *err15a = "EXTERNAL-STORAGE keyword appears twice in %s.\n";
const char *err15b = "Error in retrieving the external storage paramters from %s.\n";
const char *err15b = "Error in retrieving the external storage parameters from %s.\n";
const char *err16a = "MAXIMUM-DIMENSIONS keyword appears twice in %s.\n";
const char *err16b = "MAXIMUM-DIMENSIONS cannot appear before DIMENSION-SIZES are provided.\n";
const char *err16c = "Error in retrieving the maximum dimension sizes from %s.\n";
@ -3690,7 +3690,7 @@ static int getCompressionParameter(struct Input *in, FILE *strm)
{
/* currently supports only GZIP */
/* can be extended by adding more values to COMPRESSION-TYPE and */
/* handling the paramters here by adding more cases */
/* handling the parameters here by adding more cases */
int ival;
const char *err1 = "Unable to get integer value.\n";

2
tools/test/h5copy/h5copygentest.c
View File

@ -225,7 +225,7 @@ static void gent_compressed(hid_t loc_id)
/*-------------------------------------------------------------------------
* Function: gent_named_vl
*
* Purpose: Generate a variable lenght named datatype for a dataset in
* Purpose: Generate a variable length named datatype for a dataset in
LOC_ID
*
*-------------------------------------------------------------------------