diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-27 17:28:11 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-27 17:28:11 (GMT) |
commit | a0a1959c58973095194f2d9ac5f9b13bb7b14fb4 (patch) | |
tree | 3f36cbd14d9ede9f00c4c26affb9ecab5d1a860f /hl | |
parent | f0690f13fb914ff39a32d88801eabcef759a0163 (diff) | |
download | hdf5-a0a1959c58973095194f2d9ac5f9b13bb7b14fb4.zip hdf5-a0a1959c58973095194f2d9ac5f9b13bb7b14fb4.tar.gz hdf5-a0a1959c58973095194f2d9ac5f9b13bb7b14fb4.tar.bz2 |
clang 13 format #1933 (#1939)
Diffstat (limited to 'hl')
34 files changed, 244 insertions, 244 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 33199f1..23a6f25 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -599,7 +599,7 @@ error: *------------------------------------------------------------------------- */ #pragma pack() // default alignment -const char * ABHI_PT("/abhiTest"); +const char *ABHI_PT("/abhiTest"); const hsize_t NUM_PACKETS = 5; const int STRING_LENGTH = 19; // including terminating NULL int diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c index be9fc4b..52e8228 100644 --- a/hl/examples/ex_image2.c +++ b/hl/examples/ex_image2.c @@ -118,8 +118,8 @@ out: static int read_data(const char *fname, /*IN*/ - hsize_t * width, /*OUT*/ - hsize_t * height /*OUT*/) + hsize_t *width, /*OUT*/ + hsize_t *height /*OUT*/) { int i, n; int color_planes; diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c index 3294ef4..d23a975 100644 --- a/hl/examples/ex_table_01.c +++ b/hl/examples/ex_table_01.c @@ -61,7 +61,7 @@ main(void) hid_t string_type; hid_t file_id; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; int i; diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c index fb2cad6..7d1482e 100644 --- a/hl/examples/ex_table_02.c +++ b/hl/examples/ex_table_02.c @@ -61,7 +61,7 @@ main(void) hid_t string_type; hid_t file_id; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; int i; diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c index 1063172..831dcf5 100644 --- a/hl/examples/ex_table_08.c +++ b/hl/examples/ex_table_08.c @@ -63,7 +63,7 @@ main(void) hid_t file_id; hsize_t chunk_size = 10; int compress = 0; - int * fill_data = NULL; + int *fill_data = NULL; hsize_t start; /* Record to start reading */ hsize_t nrecords; /* Number of records to insert/delete */ hsize_t nfields_out; diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c index c974e84..b38ba16 100644 --- a/hl/examples/ex_table_10.c +++ b/hl/examples/ex_table_10.c @@ -60,7 +60,7 @@ main(void) hid_t file_id; hsize_t chunk_size = 10; int compress = 0; - int * fill_data = NULL; + int *fill_data = NULL; hsize_t nfields_out; hsize_t nrecords_out; int i; diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c index a47b1c2..24f060a 100644 --- a/hl/fortran/src/H5DSfc.c +++ b/hl/fortran/src/H5DSfc.c @@ -256,7 +256,7 @@ done: int_f h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size) { - char * c_label = NULL; + char *c_label = NULL; ssize_t size_c = -1; int_f ret_value = 0; @@ -306,7 +306,7 @@ done: int_f h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size) { - char * c_scale_name = NULL; + char *c_scale_name = NULL; ssize_t size_c = -1; int_f ret_value = 0; diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c index b8897cc..339f08a 100644 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -43,7 +43,7 @@ h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f * int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t w = (hsize_t)*width; hsize_t h = (hsize_t)*height; @@ -96,7 +96,7 @@ h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf) { int ret_value = -1; herr_t ret; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -148,8 +148,8 @@ h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f * int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_il = NULL; + char *c_name = NULL; + char *c_il = NULL; hsize_t w = (hsize_t)*width; hsize_t h = (hsize_t)*height; @@ -211,12 +211,12 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t c_width; hsize_t c_height; hsize_t c_planes; hssize_t c_npals; - char * c_buf = NULL; /* buffer to hold C string */ + char *c_buf = NULL; /* buffer to hold C string */ /* * convert FORTRAN name to C name @@ -285,7 +285,7 @@ int_f h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; herr_t ret; /* @@ -330,7 +330,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) int_f h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf) { - char * c_name = NULL; + char *c_name = NULL; hsize_t c_dims[H5S_MAX_RANK]; int i; int rank = 2; @@ -383,8 +383,8 @@ h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_namepal = NULL; + char *c_name = NULL; + char *c_namepal = NULL; /* * convert FORTRAN name to C name @@ -443,8 +443,8 @@ h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *il int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_namepal = NULL; + char *c_name = NULL; + char *c_namepal = NULL; /* * convert FORTRAN name to C name @@ -503,7 +503,7 @@ h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *np int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hssize_t c_npals; /* @@ -559,7 +559,7 @@ h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t c_dims[2]; int i; @@ -618,7 +618,7 @@ h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_numb int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -669,7 +669,7 @@ int_f h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name; + char *c_name; herr_t ret; /* diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index 8847c01..499a166 100644 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -169,8 +169,8 @@ int_f h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size void *fill_data, int_f *compress, 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); + char *field_names, /* field_names */ + void *data); HDF5_HL_F90CSTUBDLL int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 4cb9265..eed2c36 100644 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -42,7 +42,7 @@ h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, h { int ret_value = -1; herr_t ret; - char * c_name = NULL; + char *c_name = NULL; hsize_t *c_dims = NULL; int i; @@ -107,7 +107,7 @@ h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_ herr_t ret; hid_t c_loc_id; hid_t c_type_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -161,8 +161,8 @@ h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_ int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_buf = NULL; /* * convert FORTRAN name to C name @@ -221,7 +221,7 @@ h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *b int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -275,9 +275,9 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f int ret_value = -1; herr_t ret = SUCCEED; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_attrname = NULL; + char *c_buf = NULL; size_t c_size; /* @@ -375,8 +375,8 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f int ret_value = -1; herr_t ret = SUCCEED; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; /* * convert FORTRAN name to C name @@ -456,9 +456,9 @@ h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si { int ret_value = -1; herr_t ret; - char * c_name = NULL; - char * c_attrname = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_attrname = NULL; + char *c_buf = NULL; /* * Convert FORTRAN name to C name @@ -526,7 +526,7 @@ h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *ra int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; int c_rank; /* @@ -579,7 +579,7 @@ int_f h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; herr_t ret; /* @@ -628,7 +628,7 @@ h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; H5T_class_t c_classtype; size_t c_type_size; hsize_t c_dims[32]; @@ -701,8 +701,8 @@ h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, siz int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; int c_rank; /* @@ -764,8 +764,8 @@ h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; H5T_class_t c_classtype; size_t c_type_size; hsize_t c_dims[32]; @@ -841,7 +841,7 @@ int_f h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c) { htri_t ret = -1; - char * c_path = NULL; + char *c_path = NULL; hbool_t check_object_valid; /* diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c index 91c420b..0997c68 100644 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -40,17 +40,17 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress, 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 */ + char *field_names) /* field_names */ { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; hsize_t num_elem; hsize_t i; hsize_t c_nfields = (hsize_t)*nfields; size_t *c_field_offset = NULL; - hid_t * c_field_types = NULL; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + hid_t *c_field_types = NULL; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; int_f ret_value = 0; num_elem = (hsize_t)*nfields; @@ -147,15 +147,15 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f * size_t_f *max_char_size_field_names, /* char len of fields */ char *field_names, void *data) /* field_names */ { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; hsize_t num_elem; hsize_t i; hsize_t c_nfields = (hsize_t)*nfields; size_t *c_field_offset = NULL; - hid_t * c_field_types = NULL; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + hid_t *c_field_types = NULL; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; int_f ret_value = 0; num_elem = (hsize_t)*nfields; @@ -248,7 +248,7 @@ int_f h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size, size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf) { - char * c_name = NULL; + char *c_name = NULL; size_t *c_dst_offset = NULL; size_t *c_dst_sizes = NULL; hsize_t c_nfields = (hsize_t)*nfields; @@ -308,8 +308,8 @@ int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; @@ -356,8 +356,8 @@ int_f h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; @@ -404,7 +404,7 @@ int_f h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; + char *c_name = NULL; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; @@ -448,7 +448,7 @@ int_f h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; + char *c_name = NULL; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; @@ -583,7 +583,7 @@ done: int_f h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords) { - char * c_name = NULL; + char *c_name = NULL; hsize_t c_nfields; hsize_t c_nrecords; int_f ret_value = 0; @@ -634,14 +634,14 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n size_t_f *maxlen_out) { - char * c_name = NULL; + char *c_name = NULL; hsize_t num_elem; hsize_t c_nfields = *nfields; size_t *c_field_sizes = NULL; size_t *c_field_offsets = NULL; size_t c_type_size; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; hsize_t i; int_f ret_value = 0; size_t c_lenmax; diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c index 1703669..d58957f 100644 --- a/hl/src/H5DO.c +++ b/hl/src/H5DO.c @@ -118,9 +118,9 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t hsize_t stride[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements to move when selecting */ hsize_t block[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements in a block */ - hsize_t * boundary = NULL; /* Boundary set in append flush property */ + hsize_t *boundary = NULL; /* Boundary set in append flush property */ H5D_append_cb_t append_cb; /* Callback function set in append flush property */ - void * udata; /* User data set in append flush property */ + void *udata; /* User data set in append flush property */ hbool_t hit = FALSE; /* Boundary is hit or not */ hsize_t k; /* Local index variable */ unsigned u; /* Local index variable */ diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 387419b..c63f60e 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -165,7 +165,7 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx) H5R_ref_t nref_j; hbool_t is_new_ref; - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ H5O_info2_t oi1, oi2; H5I_type_t it1, it2; @@ -738,14 +738,14 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx) hid_t ntid = H5I_INVALID_HID; /* attribute native type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - nds_list_t * ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - nds_list_t * ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ - ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - ds_list_t * dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ + nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + nds_list_t *ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */ H5R_ref_t nref; hobj_ref_t ref; /* reference to the DS */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ int i; size_t j; hssize_t ii; @@ -1237,10 +1237,10 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx) hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ H5R_ref_t nref; /* reference to the DS */ hobj_ref_t ref; /* reference to the DS */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ hid_t did_i; /* dataset ID in REFERENCE_LIST */ H5O_info2_t oi1, oi2, oi3, oi4; @@ -1605,7 +1605,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi hid_t sid; /* space ID */ hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ herr_t ret_value = 0; int j_idx; @@ -1797,7 +1797,7 @@ H5DSset_label(hid_t did, unsigned int idx, const char *label) H5I_type_t it; /* ID type */ unsigned int i; union { /* union is needed to eliminate compiler warnings about */ - char ** buf; /* discarding the 'const' qualifier in the free */ + char **buf; /* discarding the 'const' qualifier in the free */ char const **const_buf; /* buf calls */ } u; @@ -1996,7 +1996,7 @@ H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - char ** buf = NULL; /* buffer to store in the attribute */ + char **buf = NULL; /* buffer to store in the attribute */ H5I_type_t it; /* ID type */ size_t nbytes = 0; size_t copy_len; @@ -2147,7 +2147,7 @@ H5DSget_scale_name(hid_t did, char *name, size_t size) size_t nbytes; size_t copy_len; int has_name; - char * buf = NULL; + char *buf = NULL; /*------------------------------------------------------------------------- * parameter checking @@ -2262,7 +2262,7 @@ H5DSis_scale(hid_t did) herr_t attr_class; /* has the "CLASS" attribute */ htri_t is_ds = -1; /* set to "not a dimension scale" */ H5I_type_t it; /* type of identifier */ - char * buf = NULL; /* buffer to read name of attribute */ + char *buf = NULL; /* buffer to read name of attribute */ size_t string_size; /* size of storage for the attribute */ H5T_class_t type_class; H5T_str_t strpad; @@ -2375,7 +2375,7 @@ H5DSget_num_scales(hid_t did, unsigned int idx) hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ int nscales; @@ -2491,7 +2491,7 @@ H5DS_is_reserved(hid_t did) int has_class; hid_t tid = H5I_INVALID_HID; hid_t aid = H5I_INVALID_HID; - char * buf = NULL; /* Name of attribute */ + char *buf = NULL; /* Name of attribute */ size_t string_size; /* Size of storage for attribute */ herr_t ret; diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index ff10d57..b01d1b3 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -1066,7 +1066,7 @@ H5IMis_image(hid_t loc_id, const char *dset_name) int has_class; hid_t atid; hid_t aid = -1; - char * attr_data; /* Name of attribute */ + char *attr_data; /* Name of attribute */ hsize_t storage_size; /* Size of storage for attribute */ herr_t ret; @@ -1166,7 +1166,7 @@ H5IMis_palette(hid_t loc_id, const char *dset_name) int has_class; hid_t atid; hid_t aid = -1; - char * attr_data; /* Name of attribute */ + char *attr_data; /* Name of attribute */ hsize_t storage_size; /* Size of storage for attribute */ herr_t ret; diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c index 2368127..0cbf65d 100644 --- a/hl/src/H5LD.c +++ b/hl/src/H5LD.c @@ -157,7 +157,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) { int nfields; /* The # of comma-separated fields in "fields" */ hbool_t end_of_fields = FALSE; /* end of "fields" */ - char * fields_ptr; /* Pointer to "fields" */ + char *fields_ptr; /* Pointer to "fields" */ int ret_value = FAIL; /* Return value */ HDassert(listv); @@ -169,7 +169,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) /* Process till end of "fields" */ while (!end_of_fields) { H5LD_memb_t *memb = NULL; /* Pointer to structure for storing a field's info */ - char * cur; /* Pointer to a member in a field */ + char *cur; /* Pointer to a member in a field */ size_t len; /* Estimated # of members in a field */ hbool_t gotcomma = FALSE; /* A comma encountered */ hbool_t gotmember = FALSE; /* Getting member in a field */ @@ -335,7 +335,7 @@ H5LD_get_dset_type_size(hid_t did, const char *fields) hid_t dset_tid = -1; /* Dataset's type identifier */ hid_t tid = -1; /* Native Type identifier */ H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */ - char * dup_fields = NULL; /* A copy of "fields" */ + char *dup_fields = NULL; /* A copy of "fields" */ size_t ret_value = 0; /* Return value */ /* Get the datatype of the dataset */ @@ -421,8 +421,8 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims hsize_t start[H5S_MAX_RANK]; /* Starting offset */ hsize_t count[H5S_MAX_RANK]; /* ??offset */ H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */ - char * dup_fields = NULL; /* A copy of "fields" */ - char * sav_buf = NULL; /* Saved pointer temporary buffer */ + char *dup_fields = NULL; /* A copy of "fields" */ + char *sav_buf = NULL; /* Saved pointer temporary buffer */ unsigned ctr; /* Counter for # of curr_dims > prev_dims */ int ndims; /* Number of dimensions for the dataset */ int i; /* Local index variable */ @@ -494,7 +494,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims } /* end if */ else { /* "fields" is specified */ unsigned char *buf_p = (unsigned char *)buf; /* Pointer to the destination buffer */ - char * tmp_buf; /* Temporary buffer for data read */ + char *tmp_buf; /* Temporary buffer for data read */ size_t tot_tsize; /* Total datatype size */ size_t len; /* Estimate the number of comma-separated fields in "fields" */ diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index e4b7090..51e64fe 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -20,7 +20,7 @@ #define TMP_LEN 256 #define MAX(a, b) (((a) > (b)) ? (a) : (b)) size_t input_len; -char * myinput; +char *myinput; size_t indent = 0; /* File Image operations @@ -57,12 +57,12 @@ size_t indent = 0; /* Data structure to pass application data to callbacks. */ typedef struct { - void * app_image_ptr; /* Pointer to application buffer */ + void *app_image_ptr; /* Pointer to application buffer */ size_t app_image_size; /* Size of application buffer */ - void * fapl_image_ptr; /* Pointer to FAPL buffer */ + void *fapl_image_ptr; /* Pointer to FAPL buffer */ size_t fapl_image_size; /* Size of FAPL buffer */ int fapl_ref_count; /* Reference counter for FAPL buffer */ - void * vfd_image_ptr; /* Pointer to VFD buffer */ + void *vfd_image_ptr; /* Pointer to VFD buffer */ size_t vfd_image_size; /* Size of VFD buffer */ int vfd_ref_count; /* Reference counter for VFD buffer */ unsigned flags; /* Flags indicate how the file image will */ @@ -71,12 +71,12 @@ typedef struct { } H5LT_file_image_ud_t; /* callbacks prototypes for file image ops */ -static void * image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata); -static void * image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op, +static void *image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *udata); +static void *image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file_image_op, void *udata); -static void * image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata); +static void *image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *udata); static herr_t image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *udata); -static void * udata_copy(void *udata); +static void *udata_copy(void *udata); static herr_t udata_free(void *udata); /* Definition of callbacks for file image operations. */ @@ -102,7 +102,7 @@ static void * image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata) { H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata; - void * return_value = NULL; + void *return_value = NULL; /* callback is only used if the application buffer is not actually copied */ if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) @@ -282,7 +282,7 @@ static void * image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *_udata) { H5LT_file_image_ud_t *udata = (H5LT_file_image_ud_t *)_udata; - void * return_value = NULL; + void *return_value = NULL; /* callback is only used if the application buffer is not actually copied */ if (!(udata->flags & H5LT_FILE_IMAGE_DONT_COPY)) @@ -2224,7 +2224,7 @@ out: static char * print_enum(hid_t type, char *str, size_t *str_len, hbool_t no_ubuf, size_t indt) { - char ** name = NULL; /*member names */ + char **name = NULL; /*member names */ unsigned char *value = NULL; /*value array */ int nmembs; /*number of members */ char tmp_str[TMP_LEN]; @@ -2360,7 +2360,7 @@ herr_t H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len) { size_t str_len = INCREMENT; - char * text_str = NULL; + char *text_str = NULL; herr_t ret = SUCCEED; if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG) @@ -2751,7 +2751,7 @@ next: case H5T_ENUM: { hid_t super; size_t super_len; - char * stmp = NULL; + char *stmp = NULL; /* Print lead-in */ HDsnprintf(dt_str, *slen, "H5T_ENUM {\n"); @@ -2798,7 +2798,7 @@ next: case H5T_VLEN: { hid_t super; size_t super_len; - char * stmp = NULL; + char *stmp = NULL; /* Print lead-in */ HDsnprintf(dt_str, *slen, "H5T_VLEN {\n"); @@ -2841,7 +2841,7 @@ next: case H5T_ARRAY: { hid_t super; size_t super_len; - char * stmp = NULL; + char *stmp = NULL; hsize_t dims[H5S_MAX_RANK]; int ndims; @@ -2899,12 +2899,12 @@ next: break; } case H5T_COMPOUND: { - char * mname = NULL; + char *mname = NULL; hid_t mtype; size_t moffset; H5T_class_t mclass; size_t mlen; - char * mtmp = NULL; + char *mtmp = NULL; int nmembs; if ((nmembs = H5Tget_nmembers(dtype)) < 0) @@ -3604,9 +3604,9 @@ out: htri_t H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid) { - char * tmp_path = NULL; /* Temporary copy of the path */ - char * curr_name; /* Pointer to current component of path name */ - char * delimit; /* Pointer to path delimiter during traversal */ + char *tmp_path = NULL; /* Temporary copy of the path */ + char *curr_name; /* Pointer to current component of path name */ + char *delimit; /* Pointer to path delimiter during traversal */ H5I_type_t obj_type; htri_t link_exists, obj_exists; size_t path_length; diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c index 2464dd1..373d913 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -855,7 +855,7 @@ herr_t H5PTis_varlen(hid_t table_id) { H5T_class_t type; - htbl_t * table; + htbl_t *table; /* find the table struct from its ID */ if ((table = (htbl_t *)H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL) diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index efa61a3..303ea0e 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -66,7 +66,7 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi hsize_t dims_chunk[1]; hsize_t maxdims[1] = {H5S_UNLIMITED}; char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; hsize_t i; herr_t ret_val = -1; @@ -437,7 +437,7 @@ H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_nam hssize_t i, j; hsize_t count[1]; hsize_t offset[1]; - char * member_name = NULL; + char *member_name = NULL; size_t size_native; herr_t ret_val = -1; @@ -595,7 +595,7 @@ H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, con hsize_t offset[1]; hsize_t i; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; herr_t ret_val = -1; /* check the arguments */ @@ -899,7 +899,7 @@ H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_name hsize_t offset[1]; hsize_t mem_size[1]; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; hssize_t i, j; herr_t ret_val = -1; @@ -1056,7 +1056,7 @@ H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, cons hsize_t mem_size[1]; hsize_t i; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; herr_t ret_val = -1; /* check the arguments */ @@ -1212,8 +1212,8 @@ H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nr hsize_t mem_size[1]; hsize_t dims[1]; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; unsigned char *tmp_buf = NULL; herr_t ret_val = -1; @@ -1524,8 +1524,8 @@ H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize hsize_t ntotal_records; size_t type_size1; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; unsigned char *tmp_buf = NULL; herr_t ret_val = -1; @@ -1672,8 +1672,8 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c size_t type_size; size_t member_offset; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; char attr_name[255]; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; @@ -2033,7 +2033,7 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi hsize_t i; char table_title[255]; char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; hbool_t inserted; @@ -2446,7 +2446,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name) hsize_t i; char attr_name[255]; char table_title[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; htri_t has_fill = FALSE; @@ -3207,7 +3207,7 @@ H5TB_attach_attributes(const char *table_title, hid_t loc_id, const char *dset_n hid_t tid) { char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; hsize_t i; herr_t ret_val = -1; @@ -3272,7 +3272,7 @@ H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const si hid_t nmtype_id = H5I_INVALID_HID; size_t size_native; hsize_t nfields = 0; - char ** fnames = NULL; + char **fnames = NULL; unsigned i; hid_t ret_val = -1; diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c index d7a9f44..d6c6a3d 100644 --- a/hl/test/gen_test_ds.c +++ b/hl/test/gen_test_ds.c @@ -256,7 +256,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename herr_t ret_value = FAIL; hid_t dsid = -1; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if (H5DSis_attached(did, dsid, idx) == 1) { diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c index 12b6840..5a1f895 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -1171,7 +1171,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename herr_t ret_value = FAIL; hid_t dsid = -1; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if (H5DSis_attached(did, dsid, idx) == 1) { @@ -1204,7 +1204,7 @@ test_detachscales(void) int rank1 = 1; int rank3 = 3; hsize_t dims[] = {1, 2, 3}; /*some bogus numbers, not important for the test*/ - int * buf = NULL; + int *buf = NULL; char dname[16]; int i; @@ -2358,8 +2358,8 @@ test_simple(void) int s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300}; char dim0_label[16]; char dim1_label[16]; - char * dim0_labeld; - char * dim1_labeld; + char *dim0_labeld; + char *dim1_labeld; char dim0_labels[3]; char dim1_labels[3]; ssize_t dim0_label_size; @@ -2368,7 +2368,7 @@ test_simple(void) int scale_idx; int nscales; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; char snames[3]; int i, j; @@ -3602,10 +3602,10 @@ read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data) hid_t tid = -1; /* file type ID */ hid_t mtid = -1; /* memory type ID */ hssize_t nelmts; /* number of data elements */ - char * buf = NULL; /* data buffer */ + char *buf = NULL; /* data buffer */ size_t size; int i; - char * data = (char *)visitor_data; + char *data = (char *)visitor_data; /* unused */ (void)dset; @@ -4608,8 +4608,8 @@ test_types(void) hsize_t s2_dim[1] = {DIM2_SIZE}; /* size of DS 2 dataset */ float s1_float[DIM1_SIZE] = {10, 20, 30}; /* data of DS 1 dataset */ unsigned short s2_ushort[DIM2_SIZE] = {10, 20, 30, 40}; /* data of DS 2 dataset */ - const char * s1_str = "ABC"; - const char * s2_str = "ABCD"; + const char *s1_str = "ABC"; + const char *s2_str = "ABCD"; HDprintf("Testing scales with several datatypes\n"); @@ -4781,9 +4781,9 @@ test_data(void) hid_t dsid = -1; /* DS dataset ID */ hid_t dcpl; /* dataset creation property list */ hid_t sid; /* dataspace ID */ - float * vals = NULL; /* array to hold data values */ - float * latbuf = NULL; /* array to hold the latitude values */ - float * lonbuf = NULL; /* array to hold the longitude values */ + float *vals = NULL; /* array to hold data values */ + float *latbuf = NULL; /* array to hold the latitude values */ + float *lonbuf = NULL; /* array to hold the longitude values */ hsize_t dims[2]; /* array to hold dimensions */ hsize_t latdims[1]; /* array to hold dimensions */ hsize_t londims[1]; /* array to hold dimensions */ @@ -4953,7 +4953,7 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf) unsigned j; char str[20]; size_t nelms; - FILE * f; + FILE *f; float val; const char *data_file = H5_get_srcdir_filename(fname); diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c index 4448e41..318e13d 100644 --- a/hl/test/test_file_image.c +++ b/hl/test/test_file_image.c @@ -53,7 +53,7 @@ static int test_file_image(size_t open_images, size_t nflags, const unsigned *flags) { - hid_t * file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */ + hid_t *file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */ hsize_t dims1[RANK] = {2, 3}; /* original dimension of datasets */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; int data1[6] = {1, 2, 3, 4, 5, 6}; /* original contents of dataset */ @@ -63,13 +63,13 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) hsize_t dims4[RANK] = {3, 5}; /* extended dimensions of datasets */ int data4[15] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; /* extended contents of dataset */ - ssize_t * buf_size = NULL; /* pointer to array of buffer sizes */ - void ** buf_ptr = NULL; /* pointer to array of pointers to image buffers */ - char ** filename = NULL; /* pointer to array of pointers to filenames */ - unsigned * input_flags = NULL; /* pointer to array of flag combinations */ + ssize_t *buf_size = NULL; /* pointer to array of buffer sizes */ + void **buf_ptr = NULL; /* pointer to array of pointers to image buffers */ + char **filename = NULL; /* pointer to array of pointers to filenames */ + unsigned *input_flags = NULL; /* pointer to array of flag combinations */ size_t i, j, k, nrow, n_values; herr_t status1; - void * handle_ptr = NULL; /* pointers to driver buffer */ + void *handle_ptr = NULL; /* pointers to driver buffer */ unsigned char **core_buf_ptr_ptr = NULL; VERIFY(open_images > 1, "The number of open images must be greater than 1"); diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 4997df6..5d203e9 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -519,11 +519,11 @@ test_generate(void) { hid_t fid; hsize_t pal_dims[2] = {256, 3}; - float * data = NULL; + float *data = NULL; int imax, jmax, kmax; int n_elements; float valex, xmin, xmax, value; - FILE * f = NULL; + FILE *f = NULL; const char *data_file = H5_get_srcdir_filename(DATA_FILE4); int i; int retval = FAIL; @@ -757,13 +757,13 @@ out: static int read_data(const char *fname, /*IN*/ - hsize_t * width, /*OUT*/ - hsize_t * height /*OUT*/) + hsize_t *width, /*OUT*/ + hsize_t *height /*OUT*/) { int i, n; int color_planes; char str[20]; - FILE * f = NULL; + FILE *f = NULL; int w, h; int n_elements; const char *data_file = H5_get_srcdir_filename(fname); @@ -876,14 +876,14 @@ out: static int read_palette(const char *fname, rgb_t *palette, size_t palette_size) { - FILE * file; + FILE *file; char buffer[80]; unsigned u; unsigned int red; unsigned int green; unsigned int blue; unsigned nentries; - const char * data_file = H5_get_srcdir_filename(fname); + const char *data_file = H5_get_srcdir_filename(fname); /* ensure the given palette is valid */ if (!palette) diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c index 4b01f49..0331737 100644 --- a/hl/test/test_ld.c +++ b/hl/test/test_ld.c @@ -130,13 +130,13 @@ char g_tmp_buf[TMP_BUF_SIZE]; } \ else if (type == TWO_CMPD_VALID1) { \ test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf; \ - set_t * cb = (set_t *)_buf; \ + set_t *cb = (set_t *)_buf; \ \ VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n]) \ } \ else if (type == TWO_CMPD_VALID2) { \ test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf; \ - set_t * cb = (set_t *)_buf; \ + set_t *cb = (set_t *)_buf; \ \ VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n]) \ } \ @@ -211,10 +211,10 @@ typedef struct test_valid_fields2 { /* Temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */ #define TEST_BUF_SIZE 100 -int * iibuf; /* buffer for storing retrieved elements */ -int * ibuf; /* buffer for storing retrieved elements (integer) */ -set_t * cbuf; /* buffer for storing retrieved elements (compound) */ -set_t * ccbuf; /* buffer for storing retrieved elements (compound) */ +int *iibuf; /* buffer for storing retrieved elements */ +int *ibuf; /* buffer for storing retrieved elements (integer) */ +set_t *cbuf; /* buffer for storing retrieved elements (compound) */ +set_t *ccbuf; /* buffer for storing retrieved elements (compound) */ test_valid_fields1 *vbuf1; /* buffer for storing retrieved elements (FIELDS1) */ test_valid_fields2 *vbuf2; /* buffer for storing retrieved elements (FIELDS2) */ diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index 53f834a..e5d8e6e 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -468,7 +468,7 @@ make_attributes(hid_t loc_id, const char *obj_name) { int rank_out; - hsize_t * dims_out = 0; + hsize_t *dims_out = 0; H5T_class_t type_class; size_t type_size; int i; @@ -1073,7 +1073,7 @@ static int test_integers(void) { hid_t dtype; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3("\n text for integer types"); @@ -1131,7 +1131,7 @@ static int test_fps(void) { hid_t dtype; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for floating-point types"); @@ -1193,7 +1193,7 @@ test_strings(void) H5T_str_t str_pad; H5T_cset_t str_cset; H5T_class_t type_class; - char * dt_str = NULL; + char *dt_str = NULL; size_t str_len; HL_TESTING3(" text for string types"); @@ -1338,7 +1338,7 @@ test_opaques(void) hid_t dtype; size_t opq_size; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for opaque types"); @@ -1400,7 +1400,7 @@ test_enums(void) const char *name2 = "WHITE"; int value2; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for enum types"); @@ -1476,7 +1476,7 @@ test_variables(void) { hid_t dtype; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for variable types"); @@ -1538,7 +1538,7 @@ test_arrays(void) int ndims; hsize_t dims[3]; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for array types"); @@ -1601,10 +1601,10 @@ test_compounds(void) { hid_t dtype; int nmembs; - char * memb_name = NULL; + char *memb_name = NULL; H5T_class_t memb_class; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for compound types"); @@ -1682,41 +1682,41 @@ test_compound_bug(void) hid_t dtype; H5T_class_t type_class; int nmembs; - char * memb_name = NULL; - char * dt_str; + char *memb_name = NULL; + char *dt_str; size_t str_len; - char text[] = "H5T_COMPOUND { H5T_STD_I32LE " - "\"state_________________________________________________________________________________" - "\"; H5T_STD_I32LE " - "\"desc____________________________________________________________________________________" - "_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; " - "\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE " - "\"sub_____________________________________________________________________________________" - "__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; " - "CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE " - "\"final___________________________________________________________________________________" - "________________\"; } } \"sub\"; }"; - char text2[] = "H5T_COMPOUND {\n" - " H5T_STD_I16LE \"state___________________________" - "__________________________________________________" - "____\" : 0;\n" - " H5T_STD_I16LE \"desc____________________________" - "__________________________________________________" - "___________\" : 2;\n" - " H5T_VLEN { H5T_COMPOUND {\n" - " H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" " - "1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n" - " H5T_STD_I32LE \"sub___________________________" - "__________________________________________________" - "__________________________________1\" : 4;\n" - " H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_" - "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;" - " } \"sub_desc\" : 8;\n" - " H5T_STD_I32LE \"final_________________________" - "__________________________________________________" - "________________________\" : 16;\n" - " } } \"sub\" : 8;\n" - "}\n"; + char text[] = "H5T_COMPOUND { H5T_STD_I32LE " + "\"state_________________________________________________________________________________" + "\"; H5T_STD_I32LE " + "\"desc____________________________________________________________________________________" + "_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; " + "\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE " + "\"sub_____________________________________________________________________________________" + "__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; " + "CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE " + "\"final___________________________________________________________________________________" + "________________\"; } } \"sub\"; }"; + char text2[] = "H5T_COMPOUND {\n" + " H5T_STD_I16LE \"state___________________________" + "__________________________________________________" + "____\" : 0;\n" + " H5T_STD_I16LE \"desc____________________________" + "__________________________________________________" + "___________\" : 2;\n" + " H5T_VLEN { H5T_COMPOUND {\n" + " H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" " + "1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n" + " H5T_STD_I32LE \"sub___________________________" + "__________________________________________________" + "__________________________________1\" : 4;\n" + " H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_" + "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;" + " } \"sub_desc\" : 8;\n" + " H5T_STD_I32LE \"final_________________________" + "__________________________________________________" + "________________________\" : 16;\n" + " } } \"sub\" : 8;\n" + "}\n"; HL_TESTING3(" text for compound type of bug fix"); @@ -1806,8 +1806,8 @@ test_complicated_compound(void) hid_t dtype; int nmembs; H5T_class_t type_class; - char * line = NULL; - FILE * fp = NULL; + char *line = NULL; + FILE *fp = NULL; size_t size = 1024; const char *filename = H5_get_srcdir_filename(INPUT_FILE); diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c index e8b90f7..2c003d5 100644 --- a/hl/test/test_packet.c +++ b/hl/test/test_packet.c @@ -116,7 +116,7 @@ create_hl_table(hid_t fid) hid_t field_type[NFIELDS]; hid_t string_type; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; herr_t status; diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c index aa88a6c..5e06c85 100644 --- a/hl/test/test_packet_vlen.c +++ b/hl/test/test_packet_vlen.c @@ -333,7 +333,7 @@ test_compound_VL_VLtype(void) hsize_t count; /* Number of records in the table */ compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */ - hvl_t * t1, *t2; + hvl_t *t1, *t2; unsigned uu, vv, ww; /* Loop variables */ char msg[80]; /* For error message */ herr_t ret; /* Returned status from a callee */ @@ -516,7 +516,7 @@ test_VLof_VLtype(void) hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */ hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */ hsize_t count; /* Number of records in the table */ - hvl_t * t1; /* pointer to advance */ + hvl_t *t1; /* pointer to advance */ unsigned uu, vv, ww; /* Loop variables */ hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */ @@ -1368,7 +1368,7 @@ testfl_compound_VL_VLtype(void) hsize_t count; /* Number of records in the table */ compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */ - hvl_t * t1, *t2; + hvl_t *t1, *t2; unsigned uu, vv, ww; /* Loop variables */ char msg[80]; /* For error message */ herr_t ret; /* Returned status from a callee */ @@ -1551,7 +1551,7 @@ testfl_VLof_VLtype(void) hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */ hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */ hsize_t count; /* Number of records in the table */ - hvl_t * t1; /* pointer to advance */ + hvl_t *t1; /* pointer to advance */ unsigned uu, vv, ww; /* Loop variables */ hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */ diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 90a930c..24b7336 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -198,7 +198,7 @@ test_table(hid_t fid, int do_write) hid_t fid2; hsize_t chunk_size = 10; int compress = 0; - int * fill = NULL; + int *fill = NULL; particle_t fill1[1] = {{"no data", -1, -99.0, -99.0, -1}}; int fill1_new[1] = {-100}; hsize_t position; diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c index ca33f86..9d55ab8 100644 --- a/hl/tools/gif2h5/decompress.c +++ b/hl/tools/gif2h5/decompress.c @@ -17,7 +17,7 @@ GIFWORD iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip; unsigned long cols[256]; -char * cmd; +char *cmd; FILE *fp; diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h index 5ea8633..b193d8d 100644 --- a/hl/tools/gif2h5/gif.h +++ b/hl/tools/gif2h5/gif.h @@ -133,12 +133,12 @@ typedef struct _GifCommentExtension { ** extension. */ typedef struct _GifToMem { - GIFHEAD * GifHeader; - GIFIMAGEDESC ** GifImageDesc; + GIFHEAD *GifHeader; + GIFIMAGEDESC **GifImageDesc; GIFGRAPHICCONTROL **GifGraphicControlExtension; - GIFPLAINTEXT ** GifPlainTextExtension; - GIFAPPLICATION ** GifApplicationExtension; - GIFCOMMENT ** GifCommentExtension; + GIFPLAINTEXT **GifPlainTextExtension; + GIFAPPLICATION **GifApplicationExtension; + GIFCOMMENT **GifCommentExtension; } GIFTOMEM; /* diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c index 44e18e0..82cb15b 100644 --- a/hl/tools/gif2h5/gif2mem.c +++ b/hl/tools/gif2h5/gif2mem.c @@ -42,11 +42,11 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct) * The gif structure outline for passing data to memory is given in gif.h. * These pointers are redundant, should take them out in ver. 2 */ - GIFHEAD * gifHead; /* GIF Header structure */ - GIFIMAGEDESC ** gifImageDesc; /* Logical Image Descriptor struct */ - GIFPLAINTEXT ** gifPlainText; /* Plain Text Extension structure */ - GIFAPPLICATION ** gifApplication; /* Application Extension structure */ - GIFCOMMENT ** gifComment; /* Comment Extension structure */ + GIFHEAD *gifHead; /* GIF Header structure */ + GIFIMAGEDESC **gifImageDesc; /* Logical Image Descriptor struct */ + GIFPLAINTEXT **gifPlainText; /* Plain Text Extension structure */ + GIFAPPLICATION **gifApplication; /* Application Extension structure */ + GIFCOMMENT **gifComment; /* Comment Extension structure */ GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */ GIFWORD i; /* Loop counter */ diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c index 3a6bcae..3e1a477 100644 --- a/hl/tools/gif2h5/gifread.c +++ b/hl/tools/gif2h5/gifread.c @@ -54,7 +54,7 @@ GetByte(const GIFBYTE *MemGif) * otherwise 0 if no error occurred. */ int -ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */ +ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure */ GIFBYTE **MemGif2) /* GIF image file input FILE stream */ { GIFWORD i; /* Loop counter */ @@ -121,7 +121,7 @@ ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */ */ int ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { GIFWORD i; /* Loop counter */ @@ -210,7 +210,7 @@ ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor */ int ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -233,7 +233,7 @@ ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Ext */ int ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -270,7 +270,7 @@ ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension */ int ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -306,7 +306,7 @@ ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Ext */ int ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { @@ -331,7 +331,7 @@ ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension struc */ static GIFBYTE * ReadDataSubBlocks(GIFBYTE **MemGif2, /* GIF image file input FILE stream */ - GIFWORD * DSize) + GIFWORD *DSize) { GIFBYTE *ptr1; /* Pointer used to "walk the heap" */ GIFBYTE *ptr2; /* Pointer used to mark the top of the heap */ diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c index 7126da9..313606f 100644 --- a/hl/tools/gif2h5/hdfgifwr.c +++ b/hl/tools/gif2h5/hdfgifwr.c @@ -83,7 +83,7 @@ static int maxbits = XV_BITS; /* user settable max # bits/code */ static int maxcode; /* maximum code, given n_bits */ static int maxmaxcode = 1 << XV_BITS; /* NEVER generate this */ -static count_int * htab; +static count_int *htab; static unsigned short *codetab; #define HashTabOf(i) htab[i] diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c index 7756506..6fb06a4 100644 --- a/hl/tools/h5watch/extend_dset.c +++ b/hl/tools/h5watch/extend_dset.c @@ -82,8 +82,8 @@ extend_dset_two(const char *file, char *dname, int action1, int action2) hsize_t cur_dims[2]; /* current dimension sizes */ size_t dtype_size; /* size of the dataset's datatype */ unsigned num_elmts; /* number of elements in the dataset */ - int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */ - set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */ + int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */ + set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */ /* Allocate memory */ if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int)))) @@ -236,8 +236,8 @@ extend_dset_one(const char *file, char *dname, int action) hsize_t offset[1]; /* starting offsets of appended data */ hsize_t count[1]; /* dimension sizes of appended data */ size_t dtype_size; /* size of the dataset's datatype */ - int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */ - set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */ + int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */ + set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */ /* Allocate memory */ if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int)))) diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c index ce4a112..3c8f605 100644 --- a/hl/tools/h5watch/h5watch.c +++ b/hl/tools/h5watch/h5watch.c @@ -28,9 +28,9 @@ * This tool uses H5LD_memb_t data structure declared in H5LDprivate.h */ -const char * progname = "h5watch"; /* tool name */ -static char * g_list_of_fields = NULL; /* command line input for "list_of_fields" */ -static char * g_dup_fields = NULL; /* copy of "list_of_fields" */ +const char *progname = "h5watch"; /* tool name */ +static char *g_list_of_fields = NULL; /* command line input for "list_of_fields" */ +static char *g_dup_fields = NULL; /* copy of "list_of_fields" */ static H5LD_memb_t **g_listv = NULL; /* vector info for "list_of_fields" */ static hbool_t g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */ @@ -58,7 +58,7 @@ static void parse_command_line(int argc, const char *const *argv); * The long-named ones can be partially spelled. When * adding more, make sure that they don't clash with each other. */ -static const char * s_opts = "?"; +static const char *s_opts = "?"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {"dim", no_arg, 'd'}, {"di", no_arg, 'd'}, {"label", no_arg, 'l'}, {"labe", no_arg, 'l'}, @@ -498,7 +498,7 @@ check_dataset(hid_t fid, char *dsetname) hsize_t cur_dims[H5S_MAX_RANK]; /* size of dataspace dimensions */ hsize_t max_dims[H5S_MAX_RANK]; /* maximum size of dataspace dimensions */ hbool_t unlim_max_dims = FALSE; /* whether dataset has unlimited or max. dimension setting */ - void * edata; + void *edata; H5E_auto2_t func; H5D_layout_t layout; herr_t ret_value = SUCCEED; /* Return value */ |