diff options
| -rw-r--r-- | src/H5FDlog.h | 4 | ||||
| -rw-r--r-- | src/H5Lexternal.c | 2 | ||||
| -rw-r--r-- | src/H5Oattribute.c | 47 | ||||
| -rw-r--r-- | src/H5Tnative.c | 328 | ||||
| -rw-r--r-- | tools/h5jam/h5jam.c | 46 | ||||
| -rw-r--r-- | tools/h5jam/h5unjam.c | 16 | ||||
| -rw-r--r-- | tools/lib/h5diff.c | 5 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 12 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5diff_dset.c | 5 | ||||
| -rw-r--r-- | tools/lib/h5diff_util.c | 5 |
11 files changed, 239 insertions, 235 deletions
diff --git a/src/H5FDlog.h b/src/H5FDlog.h index bd1bbe2..ffc4df1 100644 --- a/src/H5FDlog.h +++ b/src/H5FDlog.h @@ -38,13 +38,13 @@ #define H5FD_LOG_FILE_IO (H5FD_LOG_FILE_READ|H5FD_LOG_FILE_WRITE) /* Flag for tracking "flavor" (type) of information stored at each byte */ #define H5FD_LOG_FLAVOR 0x00000020 -/* Flags for tracking total number of reads/writes/seeks */ +/* Flags for tracking total number of reads/writes/seeks/truncates */ #define H5FD_LOG_NUM_READ 0x00000040 #define H5FD_LOG_NUM_WRITE 0x00000080 #define H5FD_LOG_NUM_SEEK 0x00000100 #define H5FD_LOG_NUM_TRUNCATE 0x00000200 #define H5FD_LOG_NUM_IO (H5FD_LOG_NUM_READ|H5FD_LOG_NUM_WRITE|H5FD_LOG_NUM_SEEK|H5FD_LOG_NUM_TRUNCATE) -/* Flags for tracking time spent in open/read/write/seek/close */ +/* Flags for tracking time spent in open/stat/read/write/seek/close */ #define H5FD_LOG_TIME_OPEN 0x00000400 #define H5FD_LOG_TIME_STAT 0x00000800 #define H5FD_LOG_TIME_READ 0x00001000 diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index eb2ffe5..bbc9442 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -359,7 +359,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group, if(H5L_build_name(out_prefix_name, temp_file_name, &full_name/*out*/) < 0) { saved_env = (char *)H5MM_xfree(saved_env); HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename") - } + } /* end if */ ext_file = H5F_open(full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id); full_name = (char *)H5MM_xfree(full_name); diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c index f155c94..4a19ed4 100644 --- a/src/H5Oattribute.c +++ b/src/H5Oattribute.c @@ -472,9 +472,10 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id) { H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ - H5A_t *ret_value; /* Return value */ - H5A_t *exist_attr = NULL; /* Opened attribute object */ + H5A_t *exist_attr = NULL; /* Existing opened attribute object */ + H5A_t *opened_attr = NULL; /* Newly opened attribute object */ htri_t found_open_attr = FALSE; /* Whether opened object is found */ + H5A_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_TAG(H5O_attr_open_by_name, dxpl_id, loc->addr, NULL) @@ -500,14 +501,14 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id) if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, name)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute") else if(found_open_attr == TRUE) { - if(NULL == (ret_value = H5A_copy(NULL, exist_attr))) + if(NULL == (opened_attr = H5A_copy(NULL, exist_attr))) HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "can't copy existing attribute") } /* end else if */ else { /* Check for attributes in dense storage */ if(H5F_addr_defined(ainfo.fheap_addr)) { /* Open attribute with dense storage */ - if(NULL == (ret_value = H5A_dense_open(loc->file, dxpl_id, &ainfo, name))) + if(NULL == (opened_attr = H5A_dense_open(loc->file, dxpl_id, &ainfo, name))) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "can't open attribute") } /* end if */ else { @@ -530,19 +531,26 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id) /* Get attribute opened from object header */ HDassert(udata.attr); - ret_value = udata.attr; + opened_attr = udata.attr; } /* end else */ /* Mark datatype as being on disk now */ - if(H5T_set_loc(ret_value->shared->dt, loc->file, H5T_LOC_DISK) < 0) + if(H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location") - } /* end else */ + /* Set return value */ + ret_value = opened_attr; + done: if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header") + /* Release any resources, on error */ + if(NULL == ret_value && opened_attr) + if(H5A_close(opened_attr) < 0) + HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute") + FUNC_LEAVE_NOAPI_TAG(ret_value, NULL) } /* end H5O_attr_open_by_name() */ @@ -606,9 +614,10 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, { H5O_t *oh = NULL; /* Object header */ H5A_attr_iter_op_t attr_op; /* Attribute operator */ - H5A_t *exist_attr = NULL; /* Opened attribute object */ + H5A_t *exist_attr = NULL; /* Existing opened attribute object */ + H5A_t *opened_attr = NULL; /* Newly opened attribute object */ htri_t found_open_attr = FALSE; /* Whether opened object is found */ - H5A_t *ret_value = NULL; /* Return value */ + H5A_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5O_attr_open_by_idx) @@ -620,7 +629,7 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, attr_op.u.lib_op = H5O_attr_open_by_idx_cb; /* Iterate over attributes to locate correct one */ - if(H5O_attr_iterate_real((hid_t)-1, loc, dxpl_id, idx_type, order, n, NULL, &attr_op, &ret_value) < 0) + if(H5O_attr_iterate_real((hid_t)-1, loc, dxpl_id, idx_type, order, n, NULL, &attr_op, &opened_attr) < 0) HGOTO_ERROR(H5E_ATTR, H5E_BADITER, NULL, "can't locate attribute") /* Protect the object header to iterate over */ @@ -630,29 +639,37 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, /* Find out whether it has already been opened. If it has, close the object * and make a copy of the already opened object to share the object info. */ - if(ret_value) { - if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, ret_value->shared->name)) < 0) + if(opened_attr) { + if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, opened_attr->shared->name)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute") /* If found that the attribute is already opened, make a copy of it * and close the object just opened. */ if(found_open_attr && exist_attr) { - if(H5A_close(ret_value) < 0) + if(H5A_close(opened_attr) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute") - if(NULL == (ret_value = H5A_copy(NULL, exist_attr))) + if(NULL == (opened_attr = H5A_copy(NULL, exist_attr))) HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, NULL, "can't copy existing attribute") } else { /* Mark datatype as being on disk now */ - if(H5T_set_loc(ret_value->shared->dt, loc->file, H5T_LOC_DISK) < 0) + if(H5T_set_loc(opened_attr->shared->dt, loc->file, H5T_LOC_DISK) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "invalid datatype location") } /* end if */ } /* end if */ + /* Set return value */ + ret_value = opened_attr; + done: if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header") + /* Release any resources, on error */ + if(NULL == ret_value && opened_attr) + if(H5A_close(opened_attr) < 0) + HDONE_ERROR(H5E_ATTR, H5E_CANTCLOSEOBJ, NULL, "can't close attribute") + FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_attr_open_by_idx() */ diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 5b685b1..3699757 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -94,8 +94,6 @@ H5T_init_native_interface(void) * Programmer: Raymond Lu * Oct 3, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ hid_t @@ -147,38 +145,39 @@ done: * Programmer: Raymond Lu * Oct 3, 2002 * - * Modifications: - * Raymond Lu - * 27 April 2010 - * I changed the way that the offset, alignment, and size of - * nested compound type are calculated by using H5T_cmp_offset. - * The old way had a bug in it (see bug #1850). - * *------------------------------------------------------------------------- */ -static H5T_t* +static H5T_t * H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_align, size_t *offset, size_t *comp_size) { H5T_t *dt; /* Datatype to make native */ + H5T_t *super_type; /* Super type of VL, array and enum datatypes */ + H5T_t *nat_super_type; /* Native form of VL, array & enum super datatype */ + H5T_t *new_type = NULL; /* New native datatype */ + H5T_t *memb_type = NULL; /* Datatype of member */ + H5T_t **memb_list = NULL; /* List of compound member IDs */ + size_t *memb_offset = NULL; /* List of member offsets in compound type, including member size and alignment */ + char **comp_mname = NULL; /* List of member names in compound type */ + char *memb_name = NULL; /* Enum's member name */ + void *memb_value = NULL; /* Enum's member value */ + void *tmp_memb_value = NULL; /* Enum's member value */ + hsize_t *dims = NULL; /* Dimension sizes for array */ H5T_class_t h5_class; /* Class of datatype to make native */ size_t size; /* Size of datatype to make native */ size_t prec; /* Precision of datatype to make native */ int snmemb; /* Number of members in compound & enum types */ - unsigned nmemb; /* Number of members in compound & enum types */ - H5T_t *super_type; /* Super type of VL, array and enum datatypes */ - H5T_t *nat_super_type; /* Native form of VL, array & enum super datatype */ - H5T_t *new_type=NULL; /* New native datatype */ - unsigned i; /* Local index variable */ + unsigned nmemb = 0; /* Number of members in compound & enum types */ + unsigned u; /* Local index variable */ H5T_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI(H5T_get_native_type, NULL) assert(dtype); - if((h5_class = H5T_get_class(dtype, FALSE)) == H5T_NO_CLASS) + if(H5T_NO_CLASS == (h5_class = H5T_get_class(dtype, FALSE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid class") - if((size = H5T_get_size(dtype)) == 0) + if(0 == (size = H5T_get_size(dtype))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid size") switch(h5_class) { @@ -186,35 +185,36 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig { H5T_sign_t sign; /* Signedness of integer type */ - if((sign = H5T_get_sign(dtype))==H5T_SGN_ERROR) + if(H5T_SGN_ERROR == (sign = H5T_get_sign(dtype))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a valid signess") prec = dtype->shared->u.atomic.prec; - if((ret_value = H5T_get_native_integer(prec, sign, direction, struct_align, offset, comp_size))==NULL) + if(NULL == (ret_value = H5T_get_native_integer(prec, sign, direction, struct_align, offset, comp_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer type") - } + } /* end case */ break; case H5T_FLOAT: - if((ret_value = H5T_get_native_float(size, direction, struct_align, offset, comp_size))==NULL) + if(NULL == (ret_value = H5T_get_native_float(size, direction, struct_align, offset, comp_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type") break; case H5T_STRING: - if((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL) + if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type") if(H5T_IS_VL_STRING(dtype->shared)) { /* Update size, offset and compound alignment for parent. */ - if(H5T_cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, sizeof(char *), (size_t)1, H5T_POINTER_COMP_ALIGN_g, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") - } else { + } /* end if */ + else { /* Update size, offset and compound alignment for parent. */ - if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") - } + } /* end else */ break; /* The time type will be supported in the future. Simply return "not supported" @@ -226,17 +226,17 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig { prec = dtype->shared->u.atomic.prec; - if((ret_value = H5T_get_native_bitfield(prec, direction, struct_align, offset, comp_size))==NULL) + if(NULL == (ret_value = H5T_get_native_bitfield(prec, direction, struct_align, offset, comp_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve integer for bitfield type") - } + } /* end case */ break; case H5T_OPAQUE: - if((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL) + if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type") /* Update size, offset and compound alignment for parent. */ - if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, sizeof(char), size, H5T_NATIVE_SCHAR_COMP_ALIGN_g, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") break; @@ -246,11 +246,11 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig size_t ref_size; int not_equal; - if((ret_value=H5T_copy(dtype, H5T_COPY_TRANSIENT))==NULL) + if(NULL == (ret_value = H5T_copy(dtype, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot retrieve float type") /* Decide if the data type is object or dataset region reference. */ - if(NULL==(dt=(H5T_t *)H5I_object(H5T_STD_REF_OBJ_g))) + if(NULL == (dt = (H5T_t *)H5I_object(H5T_STD_REF_OBJ_g))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type") not_equal = H5T_cmp(ret_value, dt, FALSE); @@ -258,69 +258,65 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig if(!not_equal) { align = H5T_HOBJREF_COMP_ALIGN_g; ref_size = sizeof(hobj_ref_t); - } else { + } /* end if */ + else { align = H5T_HDSETREGREF_COMP_ALIGN_g; ref_size = sizeof(hdset_reg_ref_t); - } + } /* end else */ - if(H5T_cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, ref_size, (size_t)1, align, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") - } + } /* end case */ break; case H5T_COMPOUND: { - H5T_t *memb_type; /* Datatype of member */ - H5T_t **memb_list; /* List of compound member IDs */ - size_t *memb_offset; /* List of member offsets in compound type, including member size and alignment */ - size_t children_size=0;/* Total size of compound members */ - size_t children_st_align=0; /* The max alignment among compound members. This'll be the compound alignment */ - char **comp_mname; /* List of member names in compound type */ - - if((snmemb = H5T_get_nmembers(dtype))<=0) + size_t children_size = 0;/* Total size of compound members */ + size_t children_st_align = 0; /* The max alignment among compound members. This'll be the compound alignment */ + + if((snmemb = H5T_get_nmembers(dtype)) <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "compound data type doesn't have any member") - H5_ASSIGN_OVERFLOW(nmemb,snmemb,int,unsigned); + H5_ASSIGN_OVERFLOW(nmemb, snmemb, int, unsigned); - if((memb_list = (H5T_t**)H5MM_malloc(nmemb*sizeof(H5T_t*)))==NULL) + if(NULL == (memb_list = (H5T_t **)H5MM_calloc(nmemb * sizeof(H5T_t *)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") - if((memb_offset = (size_t*)H5MM_calloc(nmemb*sizeof(size_t)))==NULL) + if(NULL == (memb_offset = (size_t *)H5MM_calloc(nmemb * sizeof(size_t)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") - if((comp_mname = (char**)H5MM_malloc(nmemb*sizeof(char*)))==NULL) + if(NULL == (comp_mname = (char **)H5MM_calloc(nmemb * sizeof(char *)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") /* Construct child compound type and retrieve a list of their IDs, offsets, total size, and alignment for compound type. */ - for(i=0; i<nmemb; i++) { - if((memb_type = H5T_get_member_type(dtype, i, H5T_COPY_TRANSIENT))==NULL) + for(u = 0; u < nmemb; u++) { + if(NULL == (memb_type = H5T_get_member_type(dtype, u, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed") - if((comp_mname[i] = H5T_get_member_name(dtype, i))==NULL) + if(NULL == (comp_mname[u] = H5T_get_member_name(dtype, u))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member type retrieval failed") - if((memb_list[i] = H5T_get_native_type(memb_type, direction, &children_st_align, &(memb_offset[i]), &children_size))==NULL) + if(NULL == (memb_list[u] = H5T_get_native_type(memb_type, direction, &children_st_align, &(memb_offset[u]), &children_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "member identifier retrieval failed") - if(H5T_close(memb_type)<0) + if(H5T_close(memb_type) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype") - } + } /* end for */ /* The alignment for whole compound type */ if(children_st_align && children_size % children_st_align) - children_size += children_st_align-(children_size % children_st_align); + children_size += children_st_align - (children_size % children_st_align); /* Construct new compound type based on native type */ - if((new_type=H5T_create(H5T_COMPOUND, children_size))==NULL) + if(NULL == (new_type = H5T_create(H5T_COMPOUND, children_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot create a compound type") /* Insert members for the new compound type */ - for(i=0; i<nmemb; i++) { - if(H5T_insert(new_type, comp_mname[i], memb_offset[i], memb_list[i])<0) + for(u = 0; u < nmemb; u++) + if(H5T_insert(new_type, comp_mname[u], memb_offset[u], memb_list[u]) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member to compound datatype") - } /* Update size, offset and compound alignment for parent in the case of * nested compound type. The alignment for a compound type as one field in * a compound type is the biggest compound alignment among all its members. - * i.g. in the structure + * e.g. in the structure * typedef struct s1 { * char c; * int i; @@ -340,108 +336,105 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") /* Close member data type */ - for(i=0; i<nmemb; i++) { - if(H5T_close(memb_list[i])<0) + for(u = 0; u < nmemb; u++) { + if(H5T_close(memb_list[u]) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype") /* Free member names in list */ - H5MM_xfree(comp_mname[i]); - } + comp_mname[u] = (char *)H5MM_xfree(comp_mname[u]); + } /* end for */ /* Free lists for members */ - H5MM_xfree(memb_list); - H5MM_xfree(memb_offset); - H5MM_xfree(comp_mname); + memb_list = (H5T_t **)H5MM_xfree(memb_list); + memb_offset = (size_t *)H5MM_xfree(memb_offset); + comp_mname = (char **)H5MM_xfree(comp_mname); ret_value = new_type; - } + } /* end case */ break; case H5T_ENUM: { - char *memb_name; /* Enum's member name */ - void *memb_value, *tmp_memb_value; /* Enum's member value */ hid_t super_type_id, nat_super_type_id; /* Don't need to do anything special for alignment, offset since the ENUM type usually is integer. */ /* Retrieve base type for enumerated type */ - if((super_type=H5T_get_super(dtype))==NULL) + if(NULL == (super_type = H5T_get_super(dtype))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get base type for enumerate type") - if((nat_super_type = H5T_get_native_type(super_type, direction, struct_align, offset, comp_size))==NULL) + if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, struct_align, offset, comp_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "base native type retrieval failed") - if((super_type_id=H5I_register(H5I_DATATYPE, super_type, FALSE))<0) + if((super_type_id = H5I_register(H5I_DATATYPE, super_type, FALSE)) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype") - if((nat_super_type_id=H5I_register(H5I_DATATYPE, nat_super_type, FALSE))<0) + if((nat_super_type_id = H5I_register(H5I_DATATYPE, nat_super_type, FALSE)) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot register datatype") /* Allocate room for the enum values */ - if((tmp_memb_value = H5MM_calloc(H5T_get_size(super_type)))==NULL) + if(NULL == (tmp_memb_value = H5MM_calloc(H5T_get_size(super_type)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") - if((memb_value = H5MM_calloc(H5T_get_size(nat_super_type)))==NULL) + if(NULL == (memb_value = H5MM_calloc(H5T_get_size(nat_super_type)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") /* Construct new enum type based on native type */ - if((new_type=H5T_enum_create(nat_super_type))==NULL) + if(NULL == (new_type=H5T_enum_create(nat_super_type))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create enum type") /* Retrieve member info and insert members into new enum type */ - if((snmemb = H5T_get_nmembers(dtype))<=0) + if((snmemb = H5T_get_nmembers(dtype)) <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "enumerate data type doesn't have any member") - H5_ASSIGN_OVERFLOW(nmemb,snmemb,int,unsigned); - for(i=0; i<nmemb; i++) { - if((memb_name=H5T_get_member_name(dtype, i))==NULL) + H5_ASSIGN_OVERFLOW(nmemb, snmemb, int, unsigned); + for(u = 0; u < nmemb; u++) { + if(NULL == (memb_name = H5T_get_member_name(dtype, u))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member name") - if(H5T_get_member_value(dtype, i, tmp_memb_value)<0) + if(H5T_get_member_value(dtype, u, tmp_memb_value) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value") HDmemcpy(memb_value, tmp_memb_value, H5T_get_size(super_type)); - if(H5Tconvert(super_type_id, nat_super_type_id, (size_t)1, memb_value, NULL, H5P_DEFAULT)<0) + if(H5Tconvert(super_type_id, nat_super_type_id, (size_t)1, memb_value, NULL, H5P_DEFAULT) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get member value") - if(H5T_enum_insert(new_type, memb_name, memb_value)<0) + if(H5T_enum_insert(new_type, memb_name, memb_value) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot insert member") - H5MM_xfree(memb_name); + memb_name = (char *)H5MM_xfree(memb_name); } - H5MM_xfree(memb_value); - H5MM_xfree(tmp_memb_value); + memb_value = H5MM_xfree(memb_value); + tmp_memb_value = H5MM_xfree(tmp_memb_value); /* Close base type */ - if(H5Tclose(nat_super_type_id)<0) + if(H5Tclose(nat_super_type_id) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype") /* Close super type */ - if(H5Tclose(super_type_id)<0) + if(H5Tclose(super_type_id) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype") ret_value = new_type; - } + } /* end case */ break; case H5T_ARRAY: { int sarray_rank; /* Array's rank */ unsigned array_rank; /* Array's rank */ - hsize_t *dims = NULL; /* Dimension sizes for array */ hsize_t nelems = 1; - size_t super_offset=0; - size_t super_size=0; - size_t super_align=0; + size_t super_offset = 0; + size_t super_size = 0; + size_t super_align = 0; /* Retrieve dimension information for array data type */ if((sarray_rank = H5T_get_array_ndims(dtype)) <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension rank") H5_ASSIGN_OVERFLOW(array_rank, sarray_rank, int, unsigned); - if((dims = (hsize_t*)H5MM_malloc(array_rank * sizeof(hsize_t))) == NULL) + if(NULL == (dims = (hsize_t*)H5MM_malloc(array_rank * sizeof(hsize_t)))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot allocate memory") if(H5T_get_array_dims(dtype, dims) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot get dimension size") /* Retrieve base type for array type */ - if((super_type = H5T_get_super(dtype)) == NULL) + if(NULL == (super_type = H5T_get_super(dtype))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for array type") - if((nat_super_type = H5T_get_native_type(super_type, direction, &super_align, - &super_offset, &super_size)) == NULL) + if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, &super_align, + &super_offset, &super_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed") /* Close super type */ @@ -449,77 +442,98 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype") /* Create a new array type based on native type */ - if((new_type = H5T_array_create(nat_super_type, array_rank, dims)) == NULL) + if(NULL == (new_type = H5T_array_create(nat_super_type, array_rank, dims))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create array type") /* Close base type */ if(H5T_close(nat_super_type) < 0) HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype") - for(i = 0; i < array_rank; i++) - nelems *= dims[i]; + for(u = 0; u < array_rank; u++) + nelems *= dims[u]; H5_CHECK_OVERFLOW(nelems, hsize_t, size_t); if(H5T_cmp_offset(comp_size, offset, super_size, (size_t)nelems, super_align, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") - H5MM_xfree(dims); + dims = (hsize_t *)H5MM_xfree(dims); + ret_value = new_type; - } + } /* end case */ break; case H5T_VLEN: { size_t vl_align = 0; size_t vl_size = 0; - size_t super_size=0; + size_t super_size = 0; /* Retrieve base type for array type */ - if((super_type=H5T_get_super(dtype))==NULL) + if(NULL == (super_type = H5T_get_super(dtype))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get parent type for VL type") /* Don't need alignment, offset information if this VL isn't a field of compound type. If it * is, go to a few steps below to compute the information directly. */ - if((nat_super_type = H5T_get_native_type(super_type, direction, NULL, NULL, &super_size))==NULL) + if(NULL == (nat_super_type = H5T_get_native_type(super_type, direction, NULL, NULL, &super_size))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "parent native type retrieval failed") /* Close super type */ - if(H5T_close(super_type)<0) + if(H5T_close(super_type) < 0) HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype") /* Create a new array type based on native type */ - if((new_type=H5T_vlen_create(nat_super_type))==NULL) + if(NULL == (new_type = H5T_vlen_create(nat_super_type))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to create VL type") /* Close base type */ - if(H5T_close(nat_super_type)<0) + if(H5T_close(nat_super_type) < 0) HGOTO_ERROR(H5E_ARGS, H5E_CLOSEERROR, NULL, "cannot close datatype") /* Update size, offset and compound alignment for parent compound type directly. */ vl_align = H5T_HVL_COMP_ALIGN_g; vl_size = sizeof(hvl_t); - if(H5T_cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, vl_size, (size_t)1, vl_align, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") ret_value = new_type; - } + } /* end case */ break; case H5T_NO_CLASS: case H5T_NCLASSES: default: HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "data type doesn't match any native type") - } + } /* end switch */ done: /* Error cleanup */ - if(ret_value==NULL) { + if(NULL == ret_value) { if(new_type) - if(H5T_close(new_type)<0) + if(H5T_close(new_type) < 0) HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, NULL, "unable to release datatype") + + /* Free lists for members */ + if(memb_list) { + for(u = 0; u < nmemb; u++) + if(memb_list[u] && H5T_close(memb_list[u]) < 0) + HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot close datatype") + + memb_list = (H5T_t **)H5MM_xfree(memb_list); + } /* end if */ + memb_offset = (size_t *)H5MM_xfree(memb_offset); + if(comp_mname) { + for(u = 0; u < nmemb; u++) + if(comp_mname[u]) + H5MM_xfree(comp_mname[u]); + comp_mname = (char **)H5MM_xfree(comp_mname); + } /* end if */ + memb_name = (char *)H5MM_xfree(memb_name); + memb_value = H5MM_xfree(memb_value); + tmp_memb_value = H5MM_xfree(tmp_memb_value); + dims = (hsize_t *)H5MM_xfree(dims); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5T_get_native_type() */ /*------------------------------------------------------------------------- @@ -534,23 +548,16 @@ done: * Programmer: Raymond Lu * Oct 3, 2002 * - * Modifications: Pedro Vicente - * Sep 4, 2004 - * Choose the type based on the precision; this is to support cases - * like the Cray SV1, where the size of short is 8 but precision is 32 - * (e.g an INT (size 8, prec 64) would be converted to a SHORT - * (size 8, prec 32) if the size was the deciding factor) - * *------------------------------------------------------------------------- */ -static H5T_t* +static H5T_t * H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, size_t *struct_align, size_t *offset, size_t *comp_size) { H5T_t *dt; /* Appropriate native datatype to copy */ - hid_t tid=(-1); /* Datatype ID of appropriate native datatype */ - size_t align=0; /* Alignment necessary for native datatype */ - size_t native_size=0; /* Datatype size of the native type */ + hid_t tid = (-1); /* Datatype ID of appropriate native datatype */ + size_t align = 0; /* Alignment necessary for native datatype */ + size_t native_size = 0; /* Datatype size of the native type */ enum match_type { /* The different kinds of integers we can match */ H5T_NATIVE_INT_MATCH_CHAR, H5T_NATIVE_INT_MATCH_SHORT, @@ -558,46 +565,46 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, H5T_NATIVE_INT_MATCH_LONG, H5T_NATIVE_INT_MATCH_LLONG, H5T_NATIVE_INT_MATCH_UNKNOWN - } match=H5T_NATIVE_INT_MATCH_UNKNOWN; + } match = H5T_NATIVE_INT_MATCH_UNKNOWN; H5T_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL); + FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL) if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) { - if(prec<=H5Tget_precision(H5T_NATIVE_SCHAR)) { - match=H5T_NATIVE_INT_MATCH_CHAR; + if(prec <= H5Tget_precision(H5T_NATIVE_SCHAR)) { + match = H5T_NATIVE_INT_MATCH_CHAR; native_size = sizeof(char); } else if(prec<=H5Tget_precision(H5T_NATIVE_SHORT)) { - match=H5T_NATIVE_INT_MATCH_SHORT; + match = H5T_NATIVE_INT_MATCH_SHORT; native_size = sizeof(short); } else if(prec<=H5Tget_precision(H5T_NATIVE_INT)) { - match=H5T_NATIVE_INT_MATCH_INT; + match = H5T_NATIVE_INT_MATCH_INT; native_size = sizeof(int); - } else if(prec<=H5Tget_precision(H5T_NATIVE_LONG)) { - match=H5T_NATIVE_INT_MATCH_LONG; + } else if(prec <= H5Tget_precision(H5T_NATIVE_LONG)) { + match = H5T_NATIVE_INT_MATCH_LONG; native_size = sizeof(long); - } else if(prec<=H5Tget_precision(H5T_NATIVE_LLONG)) { - match=H5T_NATIVE_INT_MATCH_LLONG; + } else if(prec <= H5Tget_precision(H5T_NATIVE_LLONG)) { + match = H5T_NATIVE_INT_MATCH_LLONG; native_size = sizeof(long long); } else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */ - match=H5T_NATIVE_INT_MATCH_LLONG; + match = H5T_NATIVE_INT_MATCH_LLONG; native_size = sizeof(long long); } } else if(direction == H5T_DIR_DESCEND) { - if(prec>H5Tget_precision(H5T_NATIVE_LONG)) { - match=H5T_NATIVE_INT_MATCH_LLONG; + if(prec > H5Tget_precision(H5T_NATIVE_LONG)) { + match = H5T_NATIVE_INT_MATCH_LLONG; native_size = sizeof(long long); - } else if(prec>H5Tget_precision(H5T_NATIVE_INT)) { - match=H5T_NATIVE_INT_MATCH_LONG; + } else if(prec > H5Tget_precision(H5T_NATIVE_INT)) { + match = H5T_NATIVE_INT_MATCH_LONG; native_size = sizeof(long); - } else if(prec>H5Tget_precision(H5T_NATIVE_SHORT)) { - match=H5T_NATIVE_INT_MATCH_INT; + } else if(prec > H5Tget_precision(H5T_NATIVE_SHORT)) { + match = H5T_NATIVE_INT_MATCH_INT; native_size = sizeof(int); - } else if(prec>H5Tget_precision(H5T_NATIVE_SCHAR)) { - match=H5T_NATIVE_INT_MATCH_SHORT; + } else if(prec > H5Tget_precision(H5T_NATIVE_SCHAR)) { + match = H5T_NATIVE_INT_MATCH_SHORT; native_size = sizeof(short); } else { - match=H5T_NATIVE_INT_MATCH_CHAR; + match = H5T_NATIVE_INT_MATCH_CHAR; native_size = sizeof(char); } } @@ -605,7 +612,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, /* Set the appropriate native datatype information */ switch(match) { case H5T_NATIVE_INT_MATCH_CHAR: - if(sign==H5T_SGN_2) + if(sign == H5T_SGN_2) tid = H5T_NATIVE_SCHAR; else tid = H5T_NATIVE_UCHAR; @@ -614,7 +621,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, break; case H5T_NATIVE_INT_MATCH_SHORT: - if(sign==H5T_SGN_2) + if(sign == H5T_SGN_2) tid = H5T_NATIVE_SHORT; else tid = H5T_NATIVE_USHORT; @@ -622,7 +629,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, break; case H5T_NATIVE_INT_MATCH_INT: - if(sign==H5T_SGN_2) + if(sign == H5T_SGN_2) tid = H5T_NATIVE_INT; else tid = H5T_NATIVE_UINT; @@ -631,7 +638,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, break; case H5T_NATIVE_INT_MATCH_LONG: - if(sign==H5T_SGN_2) + if(sign == H5T_SGN_2) tid = H5T_NATIVE_LONG; else tid = H5T_NATIVE_ULONG; @@ -640,7 +647,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, break; case H5T_NATIVE_INT_MATCH_LLONG: - if(sign==H5T_SGN_2) + if(sign == H5T_SGN_2) tid = H5T_NATIVE_LLONG; else tid = H5T_NATIVE_ULLONG; @@ -654,21 +661,20 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction, } /* end switch */ /* Create new native type */ - assert(tid>=0); - if(NULL==(dt=(H5T_t *)H5I_object(tid))) + HDassert(tid >= 0); + if(NULL == (dt = (H5T_t *)H5I_object(tid))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a data type") - if((ret_value=H5T_copy(dt, H5T_COPY_TRANSIENT))==NULL) + if(NULL == (ret_value = H5T_copy(dt, H5T_COPY_TRANSIENT))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot copy type") /* compute size and offset of compound type member. */ - if(H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align)<0) + if(H5T_cmp_offset(comp_size, offset, native_size, (size_t)1, align, struct_align) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset") done: FUNC_LEAVE_NOAPI(ret_value) -} - +} /* end H5T_get_native_integer() */ /*------------------------------------------------------------------------- @@ -683,8 +689,6 @@ done: * Programmer: Raymond Lu * Oct 3, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static H5T_t* @@ -810,8 +814,6 @@ done: * Programmer: Raymond Lu * 1 December 2009 * - * Modifications: - * *------------------------------------------------------------------------- */ static H5T_t* @@ -824,7 +826,7 @@ H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_a size_t native_size=0; /* Datatype size of the native type */ H5T_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5T_get_native_bitfield, NULL); + FUNC_ENTER_NOAPI(H5T_get_native_bitfield, NULL) if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) { if(prec<=H5Tget_precision(H5T_NATIVE_B8)) { @@ -899,8 +901,6 @@ done: * Programmer: Raymond Lu * December 10, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index 17b1384..d6d3d8f 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -238,41 +238,33 @@ main (int argc, const char *argv[]) exit (EXIT_FAILURE); } - H5Pclose (plist); - H5Fclose (ifile); + H5Pclose(plist); + H5Fclose(ifile); - ufid = HDopen (ub_file, O_RDONLY, 0); - - if (ufid < 0) - { + ufid = HDopen(ub_file, O_RDONLY, 0); + if(ufid < 0) { error_msg("unable to open user block file \"%s\"\n", ub_file); exit (EXIT_FAILURE); } - res = stat (ub_file, &sbuf); - - if (res < 0) - { + res = HDfstat(ufid, &sbuf); + if(res < 0) { error_msg("Can't stat file \"%s\"\n", ub_file); exit (EXIT_FAILURE); } fsize = sbuf.st_size; - h5fid = HDopen (input_file, O_RDONLY, 0); - - if (h5fid < 0) - { + h5fid = HDopen(input_file, O_RDONLY, 0); + if(h5fid < 0) { error_msg("unable to open HDF5 file for read \"%s\"\n", input_file); exit (EXIT_FAILURE); } - res = stat (input_file, &sbuf2); - - if (res < 0) - { + res = HDfstat(h5fid, &sbuf2); + if(res < 0) { error_msg("Can't stat file \"%s\"\n", input_file); exit (EXIT_FAILURE); } @@ -396,19 +388,15 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout, ssize_t toend; ssize_t fromend; - if (startin > startout) - { + if(startin > startout) { /* this case is prohibited */ error_msg("copy_some_to_file: panic: startin > startout?\n"); exit (EXIT_FAILURE); } - if (limit < 0) - { - res = fstat (infid, &sbuf); - - if (res < 0) - { + if(limit < 0) { + res = HDfstat(infid, &sbuf); + if(res < 0) { error_msg("Can't stat file \n"); exit (EXIT_FAILURE); } @@ -416,14 +404,10 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout, howmuch = sbuf.st_size; } else - { howmuch = limit; - } - if (howmuch == 0) - { + if(howmuch == 0) return 0; - } /* assert (howmuch > 0) */ diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c index 8e31ce1..fd79e1a 100644 --- a/tools/h5jam/h5unjam.c +++ b/tools/h5jam/h5unjam.c @@ -221,22 +221,20 @@ main(int argc, const char *argv[]) } - res = stat(input_file, &sbuf); + ifid = HDopen(input_file,O_RDONLY,0); + if(ifid < 0) { + error_msg("unable to open input HDF5 file \"%s\"\n", input_file); + exit(EXIT_FAILURE); + } - if (res < 0) { + res = HDfstat(ifid, &sbuf); + if(res < 0) { error_msg("Can't stat file \"%s\"\n", input_file); exit(EXIT_FAILURE); } fsize = sbuf.st_size; - ifid = HDopen(input_file,O_RDONLY,0); - - if (ifid < 0) { - error_msg("unable to open input HDF5 file \"%s\"\n", input_file); - exit(EXIT_FAILURE); - } - if (do_delete && (ub_file != NULL)) { error_msg("??\"%s\"\n", ub_file); exit(EXIT_FAILURE); diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 640a20a..5f406cf 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -14,11 +14,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include <stdlib.h> + #include "H5private.h" -#include "h5diff.h" -#include "ph5diff.h" #include "h5tools.h" #include "h5tools_utils.h" +#include "h5diff.h" +#include "ph5diff.h" /* * Debug printf macros. The prefix allows output filtering by test scripts. diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 105462f..c889282 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -14,15 +14,15 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include <math.h> -#include "h5diff.h" -#include "ph5diff.h" -#include "H5private.h" -#include "h5tools.h" - - #include <sys/timeb.h> #include <time.h> +#include "H5private.h" +#include "h5tools.h" +#include "h5tools_utils.h" +#include "h5diff.h" +#include "ph5diff.h" + /*------------------------------------------------------------------------- * printf formatting diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index ad6f45b..7e5fb04 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -13,9 +13,11 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include "H5private.h" #include "h5tools.h" +#include "h5tools_utils.h" #include "h5diff.h" -#include "H5private.h" + /*------------------------------------------------------------------------- * Function: diff_attr diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 0f482b6..f8fc493 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -13,10 +13,11 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "h5diff.h" -#include "ph5diff.h" #include "H5private.h" #include "h5tools.h" +#include "h5tools_utils.h" +#include "h5diff.h" +#include "ph5diff.h" /*------------------------------------------------------------------------- diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c index 5df94fa..6d340d9 100644 --- a/tools/lib/h5diff_util.c +++ b/tools/lib/h5diff_util.c @@ -13,10 +13,11 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "h5diff.h" -#include "ph5diff.h" #include "H5private.h" #include "h5tools.h" +#include "h5tools_utils.h" +#include "h5diff.h" +#include "ph5diff.h" /* global variables */ |