diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-28 15:05:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 15:05:11 (GMT) |
| commit | 762c111350cc31137a80e24126b00d9aacf3b2a9 (patch) | |
| tree | 8d21ed8a877bc60b9c517b7505ce80e2cf8031a9 | |
| parent | c1c4db3c4a0cbef6eceaab2f069e895936fbbe34 (diff) | |
| download | hdf5-762c111350cc31137a80e24126b00d9aacf3b2a9.zip hdf5-762c111350cc31137a80e24126b00d9aacf3b2a9.tar.gz hdf5-762c111350cc31137a80e24126b00d9aacf3b2a9.tar.bz2 | |
clang 13 format #1933 (#1941)
452 files changed, 4325 insertions, 4314 deletions
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 4f696e7..2d7943c 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -8,11 +8,11 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip-ci')" steps: - uses: actions/checkout@v2 - - name: Run clang-format style check for C programs. - uses: DoozyX/clang-format-lint-action@v0.11 + - name: Run clang-format style check for C and Java programs. + uses: DoozyX/clang-format-lint-action@v0.13 with: source: '.' - extensions: 'c,h,cpp,hpp' - clangFormatVersion: 10 + extensions: 'c,h,cpp,hpp,java' + clangFormatVersion: 13 style: file exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h' diff --git a/.github/workflows/clang-format-fix.yml b/.github/workflows/clang-format-fix.yml index 082d617..a390a8b 100644 --- a/.github/workflows/clang-format-fix.yml +++ b/.github/workflows/clang-format-fix.yml @@ -9,12 +9,12 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip-ci')" steps: - uses: actions/checkout@v2 - - name: Run clang-format style check for C programs. - uses: DoozyX/clang-format-lint-action@v0.11 + - name: Run clang-format style check for C and Java programs. + uses: DoozyX/clang-format-lint-action@v0.13 with: source: '.' - extensions: 'c,h,cpp,hpp' - clangFormatVersion: 10 + extensions: 'c,h,cpp,hpp,java' + clangFormatVersion: 13 inplace: True style: file exclude: './config ./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.c ./hl/src/H5LTparse.h ./src/H5Epubgen.h ./src/H5Einit.h ./src/H5Eterm.h ./src/H5Edefin.h ./src/H5version.h ./src/H5overflow.h' diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp index 5ea2094..268c806 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -82,7 +82,7 @@ main(void) dims[1] = 20; cdims[0] = 20; cdims[1] = 20; - DataSpace * dataspace = new DataSpace(RANK, dims); // create new dspace + DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace DSetCreatPropList ds_creatplist; // create dataset creation prop list ds_creatplist.setChunk(2, cdims); // then modify it for compression ds_creatplist.setDeflate(6); diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp index 482b197..8c5c74d 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -537,7 +537,7 @@ Attribute::p_read_fixed_len(const DataType &mem_type, H5std_string &strg) const // If there is data, allocate buffer and read it. if (attr_size > 0) { - char * strg_C = new char[attr_size + 1]; + char *strg_C = new char[attr_size + 1]; herr_t ret_value = H5Aread(id, mem_type.getId(), strg_C); if (ret_value < 0) { delete[] strg_C; // de-allocate for fixed-len string diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h index 6704130..37918b4 100644 --- a/c++/src/H5DataSet.h +++ b/c++/src/H5DataSet.h @@ -75,20 +75,20 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs { // The memory and file dataspaces and the transferring property list // can be defaults. void read(void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL, - const DataSpace & file_space = DataSpace::ALL, + const DataSpace &file_space = DataSpace::ALL, const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const; void read(H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL, - const DataSpace & file_space = DataSpace::ALL, + const DataSpace &file_space = DataSpace::ALL, const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const; // Writes the buffered data to this dataset. // The memory and file dataspaces and the transferring property list // can be defaults. void write(const void *buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL, - const DataSpace & file_space = DataSpace::ALL, + const DataSpace &file_space = DataSpace::ALL, const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const; void write(const H5std_string &buf, const DataType &mem_type, const DataSpace &mem_space = DataSpace::ALL, - const DataSpace & file_space = DataSpace::ALL, + const DataSpace &file_space = DataSpace::ALL, const DSetMemXferPropList &xfer_plist = DSetMemXferPropList::DEFAULT) const; // Iterates the selected elements in the specified dataspace - not implemented in C++ style yet diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index 5586d84..94fa2b9 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -45,9 +45,9 @@ class H5_DLLCPP Exception { // Returns the detailed message set at the time the exception is thrown H5std_string getDetailMsg() const; - const char * getCDetailMsg() const; // C string of detailed message + const char *getCDetailMsg() const; // C string of detailed message H5std_string getFuncName() const; // function name as a string object - const char * getCFuncName() const; // function name as a char string + const char *getCFuncName() const; // function name as a char string // Turns on the automatic error printing. static void setAutoPrint(H5E_auto2_t &func, void *client_data); diff --git a/c++/src/H5File.h b/c++/src/H5File.h index 745ed9f..5a2857e 100644 --- a/c++/src/H5File.h +++ b/c++/src/H5File.h @@ -32,10 +32,10 @@ class H5_DLLCPP H5File : public Group { // Creates or opens an HDF5 file. H5File(const char *name, unsigned int flags, const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT, - const FileAccPropList & access_plist = FileAccPropList::DEFAULT); + const FileAccPropList &access_plist = FileAccPropList::DEFAULT); H5File(const H5std_string &name, unsigned int flags, const FileCreatPropList &create_plist = FileCreatPropList::DEFAULT, - const FileAccPropList & access_plist = FileAccPropList::DEFAULT); + const FileAccPropList &access_plist = FileAccPropList::DEFAULT); // Open the file void openFile(const H5std_string &name, unsigned int flags, diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp index 1cbb43f..2b6b9e5 100644 --- a/c++/src/H5Location.cpp +++ b/c++/src/H5Location.cpp @@ -1420,7 +1420,7 @@ H5std_string H5Location::getLinkval(const char *name, size_t size) const { H5L_info_t linkinfo; - char * value_C; // value in C string + char *value_C; // value in C string size_t val_size = size; H5std_string value = ""; herr_t ret_value; diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h index 10f5a3c..7e2fdad 100644 --- a/c++/src/H5Location.h +++ b/c++/src/H5Location.h @@ -28,8 +28,8 @@ typedef void (*attr_operator_t)(H5Location &loc /*in*/, const H5std_string attr_ class UserData4Aiterate { // user data for attribute iteration public: attr_operator_t op; - void * opData; - H5Location * location; + void *opData; + H5Location *location; }; /*! \class H5Location @@ -117,26 +117,26 @@ class H5_DLLCPP H5Location : public IdComponent { // Creates a soft link from link_name to target_name. void link(const char *target_name, const char *link_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void link(const H5std_string &target_name, const H5std_string &link_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Creates a hard link from new_name to curr_name. void link(const char *curr_name, const H5Location &new_loc, const char *new_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void link(const H5std_string &curr_name, const H5Location &new_loc, const H5std_string &new_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Creates a hard link from new_name to curr_name in same location. void link(const char *curr_name, const hid_t same_loc, const char *new_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void link(const H5std_string &curr_name, const hid_t same_loc, const H5std_string &new_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Removes the specified link from this location. void unlink(const char *link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; @@ -145,39 +145,39 @@ class H5_DLLCPP H5Location : public IdComponent { // Copies a link from this location to another. void copyLink(const char *src_name, const H5Location &dst, const char *dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void copyLink(const H5std_string &src_name, const H5Location &dst, const H5std_string &dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Makes a copy of a link in the same location. void copyLink(const char *src_name, const char *dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void copyLink(const H5std_string &src_name, const H5std_string &dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Renames a link in this location and moves to a new location. void moveLink(const char *src_name, const H5Location &dst, const char *dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void moveLink(const H5std_string &src_name, const H5Location &dst, const H5std_string &dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Renames a link in this location. void moveLink(const char *src_name, const char *dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; void moveLink(const H5std_string &src_name, const H5std_string &dst_name, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT, - const LinkAccPropList & lapl = LinkAccPropList::DEFAULT) const; + const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Returns the information of the named link. - H5L_info_t getLinkInfo(const char * link_name, + H5L_info_t getLinkInfo(const char *link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; - H5L_info_t getLinkInfo(const H5std_string & link_name, + H5L_info_t getLinkInfo(const H5std_string &link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Returns the value of a symbolic link. diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index cb6afa7..803fca3 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -469,7 +469,7 @@ test_compression(H5File &file) } } - char * tconv_buf = new char[1000]; + char *tconv_buf = new char[1000]; DataSet *dataset = NULL; try { const hsize_t size[2] = {100, 200}; diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index 1114568..3eb18e4 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -292,7 +292,7 @@ test_attr_getname() // 1. With arbitrary buf_size that is larger than the name size size_t buf_size = FATTR1_NAME.length() + 10; - char * fattr1_name = new char[buf_size + 1]; + char *fattr1_name = new char[buf_size + 1]; HDmemset(fattr1_name, 0, buf_size + 1); ssize_t name_size = 0; // actual length of attribute name name_size = fattr1.getName(fattr1_name, buf_size + 1); @@ -1509,7 +1509,7 @@ test_string_attr() // Read and verify the attribute string as a string of chars; buffer // is dynamically allocated. size_t attr_size = gr_flattr1.getInMemDataSize(); - char * fl_dyn_string_att_check; + char *fl_dyn_string_att_check; fl_dyn_string_att_check = new char[attr_size + 1]; gr_flattr1.read(fls_type, fl_dyn_string_att_check); if (HDstrcmp(fl_dyn_string_att_check, ATTRSTR_DATA.c_str()) != 0) diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp index 7864b40..f7c82db 100644 --- a/c++/test/tcompound.cpp +++ b/c++/test/tcompound.cpp @@ -96,13 +96,13 @@ test_compound_2() int e, d, c[4], b, a; } dst_typ_t; - src_typ_t * s_ptr; - dst_typ_t * d_ptr; + src_typ_t *s_ptr; + dst_typ_t *d_ptr; const int nelmts = NTESTELEM; const hsize_t four = 4; int i; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - ArrayType * array_dt = NULL; + ArrayType *array_dt = NULL; // Output message about test being performed SUBTEST("Compound Element Reordering"); @@ -211,13 +211,13 @@ test_compound_3() int a, c[4], e; } dst_typ_t; - src_typ_t * s_ptr; - dst_typ_t * d_ptr; + src_typ_t *s_ptr; + dst_typ_t *d_ptr; int i; const int nelmts = NTESTELEM; const hsize_t four = 4; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - ArrayType * array_dt = NULL; + ArrayType *array_dt = NULL; // Output message about test being performed SUBTEST("Compound Datatype Subset Conversions"); @@ -328,13 +328,13 @@ test_compound_4() int e; } dst_typ_t; - src_typ_t * s_ptr; - dst_typ_t * d_ptr; + src_typ_t *s_ptr; + dst_typ_t *d_ptr; int i; const int nelmts = NTESTELEM; const hsize_t four = 4; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; - ArrayType * array_dt = NULL; + ArrayType *array_dt = NULL; // Output message about test being performed SUBTEST("Compound Element Shrinking & Reordering"); @@ -453,8 +453,8 @@ test_compound_5() hsize_t dims[1] = {4}; src_typ_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; dst_typ_t *dst; - void * buf = HDcalloc(2, sizeof(dst_typ_t)); - void * bkg = HDcalloc(2, sizeof(dst_typ_t)); + void *buf = HDcalloc(2, sizeof(dst_typ_t)); + void *bkg = HDcalloc(2, sizeof(dst_typ_t)); ArrayType *array_dt = NULL; // Output message about test being performed @@ -545,8 +545,8 @@ test_compound_6() long d; } dst_typ_t; - src_typ_t * s_ptr; - dst_typ_t * d_ptr; + src_typ_t *s_ptr; + dst_typ_t *d_ptr; int i; const int nelmts = NTESTELEM; unsigned char *buf = NULL, *orig = NULL, *bkg = NULL; diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp index 4170387..65f70ad 100644 --- a/c++/test/tdspl.cpp +++ b/c++/test/tdspl.cpp @@ -66,7 +66,7 @@ test_transfplist() // Find out the length of the transform expression, allocate the buffer // for it, then read and verify the expression from the copied plist ssize_t tran_len = dxpl_c_to_f_copy.getDataTransform(NULL); - char * c_to_f_read = (char *)HDmalloc(tran_len + 1); + char *c_to_f_read = (char *)HDmalloc(tran_len + 1); HDmemset(c_to_f_read, 0, tran_len + 1); dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1); verify_val((const char *)c_to_f_read, (const char *)c_to_f, "DSetMemXferPropList::getDataTransform", diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index 97f1174..1d7529f 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -158,7 +158,7 @@ typedef struct { int stop; /* # of iterations to stop after */ int64_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited link" flag array */ - hbool_t * visited; /* Pointer to array of "visited link" flags */ + hbool_t *visited; /* Pointer to array of "visited link" flags */ } link_iter_info_t; #if 0 diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index c975158..78f4c7e 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -391,7 +391,7 @@ test_named() static hsize_t ds_size[2] = {10, 20}; hsize_t i; unsigned attr_data[10][20]; - DataType * ds_type = NULL; + DataType *ds_type = NULL; SUBTEST("Named datatypes"); try { @@ -719,7 +719,7 @@ test_encode_decode() verify_val(inttyp.hasBinaryDesc(), true, "DataType::encode", __LINE__, __FILE__); // Create an IntType instance from the decoded pointer and verify it - IntType * decoded_int_ptr(static_cast<IntType *>(inttyp.decode())); + IntType *decoded_int_ptr(static_cast<IntType *>(inttyp.decode())); H5T_sign_t int_sign = decoded_int_ptr->getSign(); verify_val(int_sign, H5T_SGN_NONE, "DataType::decode", __LINE__, __FILE__); verify_val(inttyp == *decoded_int_ptr, true, "DataType::decode", __LINE__, __FILE__); diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index a757edd..13e9051 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -277,7 +277,7 @@ test_vlstring_array_dataset() // Create and write another dataset. DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space)); - char * wdata2 = (char *)HDcalloc(65534, sizeof(char)); + char *wdata2 = (char *)HDcalloc(65534, sizeof(char)); HDmemset(wdata2, 'A', 65533); dataset2.write(&wdata2, vlst); @@ -327,7 +327,7 @@ test_vlstrings_special() { const char *wdata[SPACE1_DIM1] = {"one", "two", "", "four"}; const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL}; - char * rdata[SPACE1_DIM1]; // Information read in + char *rdata[SPACE1_DIM1]; // Information read in // Output message about test being performed. SUBTEST("Special VL Strings"); @@ -388,7 +388,7 @@ test_vlstrings_special() // Create the property list and set the fill value for the second // dataset. DSetCreatPropList dcpl; - char * fill = NULL; // Fill value + char *fill = NULL; // Fill value dcpl.setFillValue(vlst, &fill); dataset = file1.createDataSet("Dataset4", vlst, sid1, dcpl); @@ -862,7 +862,7 @@ write_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, ch static void read_scalar_dset(H5File &file, DataType &type, DataSpace &space, char *name, char *data) { - char * data_read; + char *data_read; DataSet dset; try { dset = file.openDataSet(name); diff --git a/doxygen/examples/H5I_examples.c b/doxygen/examples/H5I_examples.c index 4aa4783..657e1b5 100644 --- a/doxygen/examples/H5I_examples.c +++ b/doxygen/examples/H5I_examples.c @@ -129,7 +129,7 @@ fail_dcpl:; { __label__ fail_id, fail_obj, fail_register; H5I_type_t type; - int * obj; + int *obj; hid_t obj_id; // register a new ID type diff --git a/doxygen/examples/H5Pget_object_flush_cb.c b/doxygen/examples/H5Pget_object_flush_cb.c index d18f3df..b3854f0 100644 --- a/doxygen/examples/H5Pget_object_flush_cb.c +++ b/doxygen/examples/H5Pget_object_flush_cb.c @@ -1,7 +1,7 @@ hid_t fapl_id; unsigned counter; H5F_object_flush_t *ret_cb; -unsigned * ret_counter; +unsigned *ret_counter; /* Create a copy of the file access property list */ fapl_id = H5Pcreate(H5P_FILE_ACCESS); diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c index d88f589..f0a6aa5 100644 --- a/examples/h5_attribute.c +++ b/examples/h5_attribute.c @@ -190,7 +190,7 @@ main(void) ret = H5Oget_info(dataset, &oinfo); for (i = 0; i < (unsigned)oinfo.num_attrs; i++) { attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, H5P_DEFAULT, - H5P_DEFAULT); + H5P_DEFAULT); atype = H5Aget_type(attr); type_class = H5Tget_class(atype); if (type_class == H5T_STRING) { @@ -229,7 +229,7 @@ attr_info(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *opdata) herr_t ret; int i; size_t npoints; /* Number of elements in the array attribute. */ - float * float_array; /* Pointer to the array attribute. */ + float *float_array; /* Pointer to the array attribute. */ /* avoid warnings */ opdata = opdata; diff --git a/examples/h5_dtransform.c b/examples/h5_dtransform.c index a364ec1..576ad60 100644 --- a/examples/h5_dtransform.c +++ b/examples/h5_dtransform.c @@ -72,7 +72,7 @@ main(void) hid_t dxpl_id_f_to_c, dxpl_id_c_to_f; /* data transform handles */ const char *f_to_c = "(5/9.0)*(x-32)"; const char *c_to_f = "(9/5.0)*x + 32"; - char * transform; + char *transform; float windchillC[ROWS][COLS]; int i, j, transform_size; diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c index bc2e246..a22dc97 100644 --- a/examples/h5_elink_unix2win.c +++ b/examples/h5_elink_unix2win.c @@ -43,7 +43,7 @@ elink_unix2win_trav(const char *link_name, hid_t cur_group, const void *udata, s hid_t fid; const char *file_name; const char *obj_name; - char * new_fname = NULL; /* Buffer allocated to hold Unix file path */ + char *new_fname = NULL; /* Buffer allocated to hold Unix file path */ ssize_t prefix_len; /* External link prefix length */ size_t fname_len; size_t start_pos; /* Initial position in new_fname buffer */ diff --git a/examples/h5_group.c b/examples/h5_group.c index 59b0422..5512461 100644 --- a/examples/h5_group.c +++ b/examples/h5_group.c @@ -82,7 +82,7 @@ main(void) dims[1] = 20; dataspace = H5Screate_simple(RANK, dims, NULL); dataset = H5Dcreate2(file, "/Data/Float_Data", H5T_NATIVE_FLOAT, dataspace, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + H5P_DEFAULT); /* *Close the second dataset and file. diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c index ccc20fa..43c09b3 100644 --- a/fortran/src/H5Af.c +++ b/fortran/src/H5Af.c @@ -1144,7 +1144,7 @@ nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf) /******/ { size_t c_bufsize; - char * c_buf = NULL; /* Buffer to hold C string */ + char *c_buf = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ c_bufsize = (size_t)*bufsize + 1; @@ -1495,10 +1495,10 @@ nh5aget_name_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int hsize_t_f *n, _fcd name, size_t_f *size, hid_t_f *lapl_id) /******/ { - char * c_obj_name = NULL; /* Buffer to hold C string */ + char *c_obj_name = NULL; /* Buffer to hold C string */ ssize_t c_size; size_t c_buf_size; - char * c_buf = NULL; + char *c_buf = NULL; int_f ret_value = 0; /* Return value */ /* @@ -1698,7 +1698,7 @@ nh5aget_info_by_idx_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, int hsize_t_f *data_size) /******/ { - char * c_obj_name = NULL; /* Buffer to hold C string */ + char *c_obj_name = NULL; /* Buffer to hold C string */ H5A_info_t ainfo; int_f ret_value = 0; /* Return value */ @@ -1764,8 +1764,8 @@ nh5aget_info_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _f int_f *cset, hsize_t_f *data_size) /******/ { - char * c_obj_name = NULL; /* Buffer to hold C string */ - char * c_attr_name = NULL; /* Buffer to hold C string */ + char *c_obj_name = NULL; /* Buffer to hold C string */ + char *c_attr_name = NULL; /* Buffer to hold C string */ H5A_info_t ainfo; int_f ret_value = 0; /* Return value */ diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c index 400d70a..c9d7656 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -644,7 +644,7 @@ nh5dwrite_ref_obj_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i hid_t c_mem_space_id; hid_t c_file_space_id; hid_t c_xfer_prp; - hobj_ref_t * buf_c; + hobj_ref_t *buf_c; unsigned int i, n; /* @@ -1639,7 +1639,7 @@ nh5dvlen_get_max_len_c(hid_t_f *dset_id, hid_t_f *type_id, hid_t_f *space_id, si hid_t c_dset_id; hid_t c_type_id; hid_t c_space_id; - hvl_t * c_buf; + hvl_t *c_buf; int i; hssize_t num_elem; herr_t status; @@ -1712,7 +1712,7 @@ nh5dwrite_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_spac int_f *tmp; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hsize_t num_elem; @@ -1788,7 +1788,7 @@ nh5dread_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space herr_t status; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hssize_t num_elem; @@ -1860,10 +1860,10 @@ nh5dwrite_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space hid_t c_file_space_id; hid_t c_xfer_prp; herr_t status; - char * tmp, *tmp_p; + char *tmp, *tmp_p; size_t max_len; - char ** c_buf; + char **c_buf; hsize_t i; hsize_t num_elem; @@ -1951,10 +1951,10 @@ nh5dread_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ hid_t c_file_space_id; hid_t c_xfer_prp; herr_t status; - char * tmp, *tmp_p; + char *tmp, *tmp_p; size_t max_len; - char ** c_buf; + char **c_buf; hsize_t i; hsize_t num_elem; @@ -2042,7 +2042,7 @@ nh5dwrite_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i real_f *tmp; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hsize_t num_elem; @@ -2118,7 +2118,7 @@ nh5dread_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id herr_t status; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hssize_t num_elem; diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c index 114486c..f137f9f 100644 --- a/fortran/src/H5Ef.c +++ b/fortran/src/H5Ef.c @@ -160,7 +160,7 @@ int_f nh5eget_major_c(int_f *error_no, _fcd name, size_t_f *namelen) /******/ { - char * c_name = NULL; + char *c_name = NULL; size_t c_namelen = (size_t)*namelen; int_f ret_value = 0; @@ -208,7 +208,7 @@ int_f nh5eget_minor_c(int_f *error_no, _fcd name, size_t_f *namelen) /******/ { - char * c_name = NULL; + char *c_name = NULL; size_t c_namelen = (size_t)*namelen; int_f ret_value = 0; diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c index 9f54bf0..0de2795 100644 --- a/fortran/src/H5Ff.c +++ b/fortran/src/H5Ff.c @@ -48,7 +48,7 @@ nh5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, h /******/ { int ret_value = -1; - char * c_name; + char *c_name; int_f c_namelen; hid_t c_file_id; unsigned c_access_flags; @@ -156,7 +156,7 @@ nh5fmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hi /******/ { int ret_value = -1; - char * c_name; + char *c_name; int_f c_namelen; hid_t c_loc_id; hid_t c_file_id; @@ -214,7 +214,7 @@ nh5funmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen) /******/ { int ret_value = -1; - char * c_name; + char *c_name; int_f c_namelen; hid_t c_loc_id; htri_t status; @@ -265,7 +265,7 @@ nh5fopen_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *acc_prp, hid /******/ { int ret_value = -1; - char * c_name; + char *c_name; int_f c_namelen; hid_t c_file_id; unsigned c_access_flags; @@ -433,7 +433,7 @@ nh5fis_hdf5_c(_fcd name, int_f *namelen, int_f *flag) /******/ { int ret_value = -1; - char * c_name; + char *c_name; int_f c_namelen; htri_t status; @@ -554,7 +554,7 @@ nh5fget_obj_ids_c(hid_t_f *file_id, int_f *obj_type, size_t_f *max_objs, hid_t_f size_t u; size_t c_max_objs; ssize_t c_num_objs; - hid_t * c_obj_ids; + hid_t *c_obj_ids; c_file_id = (hid_t)*file_id; c_obj_type = (unsigned)*obj_type; @@ -626,7 +626,7 @@ int_f nh5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen) /******/ { - char * c_buf = NULL; /* Buffer to hold C string */ + char *c_buf = NULL; /* Buffer to hold C string */ ssize_t size_c = -1; int_f ret_value = 0; /* Return value */ diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c index 70f189e..2515292 100644 --- a/fortran/src/H5Gf.c +++ b/fortran/src/H5Gf.c @@ -174,9 +174,9 @@ nh5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _ { H5O_info_t oinfo; hid_t c_loc_id = (hid_t)*loc_id; - char * c_name = NULL; + char *c_name = NULL; size_t c_obj_namelen; - char * c_obj_name = NULL; + char *c_obj_name = NULL; hsize_t c_idx = (hsize_t)*idx; hid_t gid = (-1); /* Temporary group ID */ int ret_value = -1; @@ -251,7 +251,7 @@ int_f nh5gn_members_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *nmembers) /******/ { - char * c_name = NULL; + char *c_name = NULL; H5G_info_t ginfo; int ret_value = -1; @@ -750,7 +750,7 @@ int_f nh5gget_comment_c(hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment) /******/ { - char * c_name = NULL, *c_comment = NULL; + char *c_name = NULL, *c_comment = NULL; size_t c_bufsize; int ret_value = -1; @@ -954,7 +954,7 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *max_corder, int_f *mounted) /******/ { - char * c_group_name = NULL; /* Buffer to hold group name C string */ + char *c_group_name = NULL; /* Buffer to hold group name C string */ int_f ret_value = 0; /* Return value */ H5G_info_t ginfo; /* @@ -1024,7 +1024,7 @@ nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted) /******/ { - char * c_group_name = NULL; /* Buffer to hold group name C string */ + char *c_group_name = NULL; /* Buffer to hold group name C string */ int_f ret_value = 0; /* Return value */ H5G_info_t ginfo; /* diff --git a/fortran/src/H5If.c b/fortran/src/H5If.c index 0a8d0eb..3faad5b 100644 --- a/fortran/src/H5If.c +++ b/fortran/src/H5If.c @@ -89,7 +89,7 @@ nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_siz hid_t c_obj_id; ssize_t c_size; size_t c_buf_size; - char * c_buf = NULL; + char *c_buf = NULL; /* * Allocate buffer to hold name of an object diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c index fa1a6af..9a5ceea 100644 --- a/fortran/src/H5Lf.c +++ b/fortran/src/H5Lf.c @@ -342,7 +342,7 @@ nh5ldelete_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, i int_f *order, hsize_t_f *n, hid_t_f *lapl_id) /******/ { - char * c_group_name = NULL; /* Buffer to hold C string */ + char *c_group_name = NULL; /* Buffer to hold C string */ H5_index_t c_index_field; H5_iter_order_t c_order; int_f ret_value = 0; /* Return value */ @@ -456,7 +456,7 @@ nh5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int hid_t_f *lapl_id) /******/ { - char * c_link_name = NULL; /* Buffer to hold C string */ + char *c_link_name = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ H5L_info_t link_buff; @@ -525,7 +525,7 @@ nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *cset, haddr_t_f *address, size_t_f *val_size, hid_t_f *lapl_id) /******/ { - char * c_group_name = NULL; /* Buffer to hold C string */ + char *c_group_name = NULL; /* Buffer to hold C string */ H5_index_t c_index_field; H5_iter_order_t c_order; int_f ret_value = 0; /* Return value */ @@ -699,8 +699,8 @@ nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *order, hsize_t_f *n, size_t_f *size, _fcd name, hid_t_f *lapl_id) /******/ { - char * c_group_name = NULL; /* Buffer to hold C string */ - char * c_name = NULL; /* Buffer to hold C string */ + char *c_group_name = NULL; /* Buffer to hold C string */ + char *c_name = NULL; /* Buffer to hold C string */ size_t c_size; ssize_t c_size_link; int_f ret_value = 0; /* Return value */ @@ -1040,7 +1040,7 @@ h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, int_f *index int_f ret_value = -1; /* Return value */ herr_t func_ret_value; /* H5Linterate return value */ hsize_t idx_c = 0; - char * c_name = NULL; /* Buffer to hold C string */ + char *c_name = NULL; /* Buffer to hold C string */ /* * Convert FORTRAN name to C name diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c index 31382e2..a9ab423 100644 --- a/fortran/src/H5Of.c +++ b/fortran/src/H5Of.c @@ -316,7 +316,7 @@ h5oget_info_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *la H5O_info_t_f *object_info) /******/ { - char * c_name = NULL; /* Buffer to hold C string */ + char *c_name = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ H5O_info_t Oinfo; @@ -365,7 +365,7 @@ h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *namelen, int_f hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info) /******/ { - char * c_group_name = NULL; /* Buffer to hold C string */ + char *c_group_name = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ H5O_info_t Oinfo; H5_index_t c_index_field; @@ -517,7 +517,7 @@ h5ovisit_by_name_c(hid_t_f *loc_id, _fcd object_name, size_t_f *namelen, int_f * { int_f ret_value = -1; /* Return value */ herr_t func_ret_value; /* H5Linterate return value */ - char * c_object_name = NULL; /* Buffer to hold C string */ + char *c_object_name = NULL; /* Buffer to hold C string */ /* * Convert FORTRAN name to C name @@ -762,7 +762,7 @@ nh5oopen_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id) /******/ { - char * c_group_name = NULL; /* Buffer to hold C string */ + char *c_group_name = NULL; /* Buffer to hold C string */ int_f ret_value = 0; H5_index_t c_index_type; H5_iter_order_t c_order; @@ -811,7 +811,7 @@ int_f nh5oget_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize) /******/ { - char * c_comment = NULL; /* Buffer to hold C string */ + char *c_comment = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ size_t c_commentsize; @@ -868,8 +868,8 @@ nh5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, _fcd size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id) /******/ { - char * c_comment = NULL; /* Buffer to hold C string */ - char * c_name = NULL; /* Buffer to hold C string */ + char *c_comment = NULL; /* Buffer to hold C string */ + char *c_name = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Return value */ ssize_t c_bufsize; size_t c_commentsize; diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index 4293d4c..74fa69e 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -1535,8 +1535,8 @@ nh5pset_fapl_split_c(hid_t_f *prp_id, int_f *meta_len, _fcd meta_ext, hid_t_f *m hid_t c_meta_plist; hid_t c_raw_plist; herr_t ret = -1; - char * c_meta_ext; - char * c_raw_ext; + char *c_meta_ext; + char *c_raw_ext; c_meta_ext = (char *)HD5f2cstring(meta_ext, (size_t)*meta_len); if (c_meta_ext == NULL) @@ -1914,7 +1914,7 @@ nh5pget_filter_c(hid_t_f *prp_id, int_f *filter_number, int_f *flags, size_t_f * size_t c_cd_nelmts = 0; H5Z_filter_t c_filter; unsigned int *c_cd_values = NULL; - char * c_name = NULL; + char *c_name = NULL; unsigned i; int ret_value = -1; @@ -1982,7 +1982,7 @@ nh5pset_external_c(hid_t_f *prp_id, _fcd name, int_f *namelen, off_t_f *offset, hid_t c_prp_id; herr_t ret; hsize_t c_bytes; - char * c_name; + char *c_name; size_t c_namelen = (size_t)*namelen; off_t c_offset; c_bytes = (hsize_t)*bytes; @@ -2079,7 +2079,7 @@ nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f *name_size, _fcd name, unsigned c_idx; herr_t status; size_t c_namelen; - char * c_name = NULL; + char *c_name = NULL; off_t c_offset; hsize_t size; @@ -3107,7 +3107,7 @@ nh5pexist_c(hid_t_f *cls, _fcd name, int_f *name_len) { int_f ret_value = -1; hid_t c_class; - char * c_name; + char *c_name; htri_t status; c_name = (char *)HD5f2cstring(name, (size_t)*name_len); @@ -3189,7 +3189,7 @@ nh5pget_size_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size) { int_f ret_value = -1; hid_t c_plist; - char * c_name; + char *c_name; size_t c_size; c_name = (char *)HD5f2cstring(name, (size_t)*name_len); @@ -3902,11 +3902,11 @@ nh5pset_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd hid_t c_prp_id; H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES]; hid_t c_memb_fapl[H5FD_MEM_NTYPES]; - char * c_memb_name[H5FD_MEM_NTYPES]; + char *c_memb_name[H5FD_MEM_NTYPES]; haddr_t c_memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; herr_t status; - char * tmp, *tmp_p, *tmp_pp; + char *tmp, *tmp_p, *tmp_pp; int i; int c_lenmax; long double tmp_max_addr; @@ -4035,11 +4035,11 @@ nh5pget_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd hid_t c_prp_id; H5FD_mem_t c_memb_map[H5FD_MEM_NTYPES]; hid_t c_memb_fapl[H5FD_MEM_NTYPES]; - char * c_memb_name[H5FD_MEM_NTYPES]; + char *c_memb_name[H5FD_MEM_NTYPES]; haddr_t c_memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; herr_t status; - char * tmp, *tmp_p; + char *tmp, *tmp_p; int i; size_t c_lenmax; size_t length = 0; @@ -4208,7 +4208,7 @@ nh5pget_filter_by_id_c(hid_t_f *prp_id, int_f *filter_id, int_f *flags, size_t_f size_t c_cd_nelmts = (size_t)*cd_nelmts; size_t c_cd_nelmts_in = (size_t)*cd_nelmts; unsigned int *c_cd_values = NULL; - char * c_name = NULL; + char *c_name = NULL; unsigned i; int_f ret_value = -1; @@ -5031,7 +5031,7 @@ int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size) /******/ { - char * c_expression = NULL; /* Buffer to hold C string */ + char *c_expression = NULL; /* Buffer to hold C string */ size_t c_expression_len = (size_t)*expression_len + 1; ssize_t ret; int_f ret_value = 0; @@ -5763,7 +5763,7 @@ h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len_ptr) { int ret_value = -1; size_t c_buf_len_ptr; - void * c_buf_ptr = NULL; + void *c_buf_ptr = NULL; c_buf_len_ptr = (size_t)*buf_len_ptr; diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c index f20e033..10a7d9c 100644 --- a/fortran/src/H5Rf.c +++ b/fortran/src/H5Rf.c @@ -44,7 +44,7 @@ int_f nh5rcreate_object_c(haddr_t_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen) /******/ { - char * c_name = NULL; + char *c_name = NULL; hobj_ref_t ref_c; int_f ret_value = 0; @@ -95,7 +95,7 @@ int_f nh5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id) /******/ { - char * c_name = NULL; + char *c_name = NULL; hdset_reg_ref_t ref_c; int_f ret_value = 0; @@ -439,7 +439,7 @@ nh5rget_name_object_c(hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *name hobj_ref_t ref_c = (hobj_ref_t)*ref; ssize_t c_size; size_t c_bufsize = (size_t)*name_len + 1; - char * c_buf = NULL; /* Buffer to hold C string */ + char *c_buf = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* @@ -496,7 +496,7 @@ nh5rget_name_region_c(hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_len hdset_reg_ref_t ref_c; ssize_t c_size; size_t c_bufsize = (size_t)*name_len + 1; - char * c_buf = NULL; /* Buffer to hold C string */ + char *c_buf = NULL; /* Buffer to hold C string */ int_f ret_value = 0; /* Copy the reference to query */ @@ -558,7 +558,7 @@ h5rget_name_ptr_c(hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_t int_f ret_value = -1; ssize_t c_size; size_t c_bufsize; - char * c_buf = NULL; /* Buffer to hold C string */ + char *c_buf = NULL; /* Buffer to hold C string */ c_bufsize = (size_t)*name_len + 1; /* diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index c08b5d7..3b0fad9 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -1253,7 +1253,7 @@ nh5sselect_elements_c(hid_t_f *space_id, int_f *op, size_t_f *nelements, hsize_t int rank; size_t i; int j; - hsize_t * c_coord; + hsize_t *c_coord; size_t c_nelements; c_op = (H5S_seloper_t)*op; diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c index c94a23b..cd5d03f 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1297,7 +1297,7 @@ nh5tget_member_name_c(hid_t_f *type_id, int_f *idx, _fcd member_name, int_f *nam int ret_value = -1; hid_t c_type_id; unsigned c_index; - char * c_name; + char *c_name; c_type_id = *type_id; c_index = (unsigned)*idx; @@ -1616,7 +1616,7 @@ nh5tinsert_c(hid_t_f *type_id, _fcd name, int_f *namelen, size_t_f *offset, hid_ /******/ { int ret_value = -1; - char * c_name; + char *c_name; herr_t error; c_name = (char *)HD5f2cstring(name, (size_t)*namelen); @@ -1774,7 +1774,7 @@ nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value) /******/ { int ret_value = -1; - char * c_name; + char *c_name; herr_t error; int_f c_value; @@ -1820,7 +1820,7 @@ nh5tenum_nameof_c(hid_t_f *type_id, int_f *value, _fcd name, size_t_f *namelen) { int ret_value = -1; hid_t c_type_id; - char * c_name; + char *c_name; size_t c_namelen; herr_t error; int_f c_value; @@ -1864,7 +1864,7 @@ nh5tenum_valueof_c(hid_t_f *type_id, _fcd name, int_f *namelen, int_f *value) /******/ { int ret_value = -1; - char * c_name; + char *c_name; herr_t error; c_name = (char *)HD5f2cstring(name, (size_t)*namelen); if (c_name == NULL) @@ -1943,7 +1943,7 @@ nh5tset_tag_c(hid_t_f *type_id, _fcd tag, int_f *namelen) { int ret_value = -1; herr_t status; - char * c_tag; + char *c_tag; c_tag = (char *)HD5f2cstring(tag, (size_t)*namelen); diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 9550a62..5ad94f0 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 8635acf..9c4513a 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 9c476b3..84c58aa 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 5d447dd..43272dd 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 4ba5d64..ff7e27d 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 fa94511..36736aa 100644 --- a/hl/fortran/src/H5DSfc.c +++ b/hl/fortran/src/H5DSfc.c @@ -256,7 +256,7 @@ done: int_f nh5dsget_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 nh5dsget_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 931fa64..a203fd4 100644 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -43,7 +43,7 @@ nh5immake_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 @@ nh5imread_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 @@ nh5immake_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 @@ nh5imget_image_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; 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 nh5imis_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 @@ nh5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) int_f nh5immake_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 @@ nh5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ile 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 @@ nh5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *i 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 @@ nh5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n 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 @@ nh5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pa 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 @@ nh5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_num 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 nh5imis_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/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 82686c1..755dbeb 100644 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -42,7 +42,7 @@ nh5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, { int ret_value = -1; herr_t ret; - char * c_name = NULL; + char *c_name = NULL; hsize_t *c_dims = NULL; int i; @@ -360,7 +360,7 @@ nh5ltread_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 @@ -666,8 +666,8 @@ nh5ltmake_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 @@ -726,7 +726,7 @@ nh5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char * 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 @@ -780,8 +780,8 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size 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; size_t c_size; /* @@ -850,8 +850,8 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si 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; size_t c_size; /* @@ -913,8 +913,8 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, s 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; size_t c_size; /* @@ -976,9 +976,9 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, s int ret_value = -1; herr_t ret; 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; /* * convert FORTRAN name to C name @@ -1044,8 +1044,8 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size 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; /* * convert FORTRAN name to C name @@ -1112,8 +1112,8 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si 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; /* * convert FORTRAN name to C name @@ -1173,8 +1173,8 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, s 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; /* * convert FORTRAN name to C name @@ -1233,9 +1233,9 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, s { 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 @@ -1303,7 +1303,7 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *r int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; int c_rank; /* @@ -1356,7 +1356,7 @@ int_f nh5ltfind_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; /* @@ -1405,7 +1405,7 @@ nh5ltget_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]; @@ -1478,8 +1478,8 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si 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; /* @@ -1541,8 +1541,8 @@ nh5ltget_attribute_info_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_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]; @@ -1618,7 +1618,7 @@ int_f nh5ltpath_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 9fc36ba..c06b2f3 100644 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -40,17 +40,17 @@ nh5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *nam hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress, size_t_f *char_len_field_names, /* field_names lenghts */ size_t_f *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; @@ -144,8 +144,8 @@ int_f nh5tbwrite_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; @@ -225,8 +225,8 @@ int_f nh5tbread_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; @@ -305,7 +305,7 @@ int_f nh5tbwrite_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; @@ -377,7 +377,7 @@ int_f nh5tbread_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; @@ -568,7 +568,7 @@ done: int_f nh5tbget_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; @@ -619,14 +619,14 @@ nh5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f * 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/H5DOpublic.h b/hl/src/H5DOpublic.h index 9e26f80..9cc01b7 100644 --- a/hl/src/H5DOpublic.h +++ b/hl/src/H5DOpublic.h @@ -38,8 +38,8 @@ H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, /*in*/ hid_t dxpl_id, /*in*/ const hsize_t *offset, /*in*/ - uint32_t * filters, /*out*/ - void * buf); /*out*/ + uint32_t *filters, /*out*/ + void *buf); /*out*/ #ifdef __cplusplus } diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 16d1217..fde5313 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -133,7 +133,7 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx) ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ hobj_ref_t ref_to_ds; /* reference to the DS */ hobj_ref_t ref_j; /* iterator reference */ - 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_info_t oi1, oi2; H5I_type_t it1, it2; @@ -575,7 +575,7 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx) ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */ 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; @@ -938,7 +938,7 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx) int rank; /* rank of dataset */ ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ 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_info_t oi1, oi2, oi3, oi4; @@ -1235,7 +1235,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi hid_t sid; /* space ID */ hid_t tid = -1; /* attribute type ID */ hid_t aid = -1; /* 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; @@ -1408,7 +1408,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; /*------------------------------------------------------------------------- @@ -1610,7 +1610,7 @@ H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) hid_t tid = -1; /* attribute type ID */ hid_t aid = -1; /* 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; @@ -1768,7 +1768,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 @@ -1888,7 +1888,7 @@ H5DSis_scale(hid_t did) herr_t has_class; /* has the "CLASS" attribute */ htri_t is_ds; /* boolean return value */ H5I_type_t it; /* ID type */ - char * buf; /* Name of attribute */ + char *buf; /* Name of attribute */ hsize_t storage_size; /* Size of storage for attribute */ /*------------------------------------------------------------------------- @@ -1992,7 +1992,7 @@ H5DSget_num_scales(hid_t did, unsigned int idx) hid_t tid = -1; /* attribute type ID */ hid_t aid = -1; /* 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; @@ -2113,7 +2113,7 @@ H5DS_is_reserved(hid_t did) int has_class; hid_t tid = -1; hid_t aid = -1; - char * buf; /* Name of attribute */ + char *buf; /* Name of attribute */ hsize_t storage_size; /* Size of storage for attribute */ herr_t ret; diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 143cc14..3520afd 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -1067,7 +1067,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; @@ -1167,7 +1167,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/H5LT.c b/hl/src/H5LT.c index 5396078..7876aee 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)) @@ -2229,7 +2229,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 */ unsigned char *copy = NULL; /*a pointer to value array */ int nmembs; /*number of members */ @@ -2364,7 +2364,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; + char *text_str; herr_t ret = SUCCEED; if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG) @@ -2755,7 +2755,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"); @@ -2837,7 +2837,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; @@ -2891,12 +2891,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) @@ -3565,9 +3565,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 058caff..0381227 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -860,7 +860,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 7c6ba69..5a25c3a 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -69,7 +69,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; @@ -440,7 +440,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; @@ -598,7 +598,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 */ @@ -902,7 +902,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; @@ -1059,7 +1059,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 */ @@ -1215,8 +1215,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; @@ -1527,8 +1527,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; @@ -1675,8 +1675,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; @@ -2036,7 +2036,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; @@ -2449,7 +2449,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; @@ -3210,7 +3210,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; @@ -3275,7 +3275,7 @@ H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const si hid_t nmtype_id = H5I_BADID; 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/dectris_hl_perf.c b/hl/test/dectris_hl_perf.c index c9e1307..3238027 100644 --- a/hl/test/dectris_hl_perf.c +++ b/hl/test/dectris_hl_perf.c @@ -128,7 +128,7 @@ create_file(hid_t fapl_id) size_t buf_size = CHUNK_NY * CHUNK_NZ * sizeof(unsigned int); const Bytef *z_src; - Bytef * z_dst; /*destination buffer */ + Bytef *z_dst; /*destination buffer */ uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size); uLong z_src_nbytes = (uLong)buf_size; diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c index c3fc7ff..2e7ca8c 100644 --- a/hl/test/gen_test_ds.c +++ b/hl/test/gen_test_ds.c @@ -254,7 +254,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 119040c..cc93720 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -409,7 +409,7 @@ create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldi int rank = 4; int rankds = 1; hsize_t dims[4] = {DIM1_SIZE, DIM2_SIZE, DIM3_SIZE, DIM4_SIZE}; - long * buf = NULL; + long *buf = NULL; hsize_t s1_dim[1] = {DIM1_SIZE}; hsize_t s2_dim[1] = {DIM2_SIZE}; hsize_t s3_dim[1] = {DIM3_SIZE}; @@ -1165,7 +1165,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) { @@ -1198,7 +1198,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; @@ -2352,8 +2352,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; @@ -2362,7 +2362,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; @@ -3596,10 +3596,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; @@ -4602,8 +4602,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"); @@ -4775,9 +4775,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 */ @@ -4947,7 +4947,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_dset_opt.c b/hl/test/test_dset_opt.c index 9341d3b..50a4b6d 100644 --- a/hl/test/test_dset_opt.c +++ b/hl/test/test_dset_opt.c @@ -142,11 +142,11 @@ test_direct_chunk_write(hid_t file) size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); const Bytef *z_src = (const Bytef *)(direct_buf); - Bytef * z_dst = NULL; /*destination buffer */ + Bytef *z_dst = NULL; /*destination buffer */ uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size); uLong z_src_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t start[2]; /* Start of hyperslab */ hsize_t stride[2]; /* Stride of hyperslab */ @@ -682,7 +682,7 @@ static size_t filter_bogus1(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ ssize_t buf_left = (ssize_t)*buf_size; /* Amount of data buffer left to process */ if (flags & H5Z_FLAG_REVERSE) { /* read */ @@ -718,7 +718,7 @@ static size_t filter_bogus2(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ ssize_t buf_left = (ssize_t)*buf_size; /* Amount of data buffer left to process */ if (flags & H5Z_FLAG_REVERSE) { /* read */ @@ -1463,7 +1463,7 @@ test_direct_chunk_read_no_cache(hid_t file) Bytef *z_dst = (Bytef *)(direct_buf); uLong z_dst_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t start[2]; /* Start of hyperslab */ hsize_t stride[2]; /* Stride of hyperslab */ @@ -1636,12 +1636,12 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) hsize_t offset[2]; /* chunk offset used for H5DOread_chunk */ size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); - Bytef * z_src = NULL; /* source buffer */ + Bytef *z_src = NULL; /* source buffer */ uLongf z_src_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(buf_size); - Bytef * z_dst = (Bytef *)(direct_buf); + Bytef *z_dst = (Bytef *)(direct_buf); uLong z_dst_nbytes = (uLong)buf_size; int aggression = 9; /* Compression aggression setting */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ hsize_t read_buf_size = 0; hsize_t start[2]; /* Start of hyperslab */ @@ -2150,7 +2150,7 @@ test_single_chunk(unsigned config) else /* Write the data to the dataset */ if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, (void *)wdata) < 0) - goto error; + goto error; /* * Close and release resources. @@ -2192,7 +2192,7 @@ test_single_chunk(unsigned config) else /* Read the data */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) - goto error; + goto error; /* Verify that the data read was correct. */ for (i = 0; i < DIM0; i++) { diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c index cc53b07..feefb81 100644 --- a/hl/test/test_file_image.c +++ b/hl/test/test_file_image.c @@ -47,7 +47,7 @@ static int test_file_image(size_t open_images, size_t nflags, 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 */ @@ -57,13 +57,13 @@ test_file_image(size_t open_images, size_t nflags, 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 dc1be96..bff30c1 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_lite.c b/hl/test/test_lite.c index 655778f..b870fdd 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -467,7 +467,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; @@ -1028,7 +1028,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"); @@ -1086,7 +1086,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"); @@ -1148,7 +1148,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"); @@ -1293,7 +1293,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"); @@ -1355,7 +1355,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"); @@ -1431,7 +1431,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"); @@ -1493,7 +1493,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"); @@ -1556,10 +1556,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"); @@ -1637,41 +1637,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"); @@ -1761,8 +1761,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 6d6bf34..d812247 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 6199e27..9b5d8ac 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 4f7c0ef..10dab73 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 2b4a344..306fcf2 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 c66250b..e9d8fdc 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 redunant, 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 */ register GIFWORD i; /* Loop counter */ @@ -64,7 +64,7 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct) GIFBYTE aTemp; GIFBYTE j; GIFBYTE w; /* Two more variables needed only while testing */ - GIFBYTE * b; /* Endian Ordering */ + GIFBYTE *b; /* Endian Ordering */ /* Allocate memory for the GIF structures */ /* Plug the structs into GifMemoryStruct at the end */ diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c index 6cfcdea..3413e70 100644 --- a/hl/tools/gif2h5/gifread.c +++ b/hl/tools/gif2h5/gifread.c @@ -54,7 +54,7 @@ GetByte(GIFBYTE *MemGif) * otherwise 0 if no error occured. */ 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/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c index 9ebfd4f..266add1 100644 --- a/hl/tools/gif2h5/hdf2gif.c +++ b/hl/tools/gif2h5/hdf2gif.c @@ -44,8 +44,8 @@ FILE *fpGif = NULL; int main(int argc, char **argv) { - GIFBYTE * Image; - void * edata; + GIFBYTE *Image; + void *edata; H5E_auto2_t func; /* compression structs */ @@ -497,7 +497,7 @@ done: static void H5_debug_mask(const char *s) { - FILE * stream = stderr; + FILE *stream = stderr; char pkg_name[32], *rest; size_t i; hbool_t clear; @@ -682,8 +682,8 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) char substr[] = H5_VERS_SUBRELEASE; static int checked = 0; /* If we've already checked the version info */ static unsigned int disable_version_check = 0; /* Set if the version check should be disabled */ - static const char * version_mismatch_warning = VERSION_MISMATCH_WARNING; - static const char * release_mismatch_warning = RELEASE_MISMATCH_WARNING; + static const char *version_mismatch_warning = VERSION_MISMATCH_WARNING; + static const char *release_mismatch_warning = RELEASE_MISMATCH_WARNING; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT_NOERR_NOFS @@ -222,10 +222,10 @@ hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t H5_ATTR_UNUSED aapl_id) { - H5A_t * attr = NULL; /* Attribute created */ + H5A_t *attr = NULL; /* Attribute created */ H5G_loc_t loc; /* Object location */ - H5T_t * type; /* Datatype to use for attribute */ - H5S_t * space; /* Dataspace to use for attribute */ + H5T_t *type; /* Datatype to use for attribute */ + H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -296,14 +296,14 @@ hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id) { - H5A_t * attr = NULL; /* Attribute created */ + H5A_t *attr = NULL; /* Attribute created */ H5G_loc_t loc; /* Object location */ H5G_loc_t obj_loc; /* Location used to open group */ H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ - H5T_t * type; /* Datatype to use for attribute */ - H5S_t * space; /* Dataspace to use for attribute */ + H5T_t *type; /* Datatype to use for attribute */ + H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -376,7 +376,7 @@ hid_t H5Aopen(hid_t loc_id, const char *attr_name, hid_t H5_ATTR_UNUSED aapl_id) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute opened */ + H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) @@ -440,7 +440,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t hid_t lapl_id) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute opened */ + H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value; FUNC_ENTER_API(FAIL) @@ -505,7 +505,7 @@ hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t H5_ATTR_UNUSED aapl_id, hid_t lapl_id) { - H5A_t * attr = NULL; /* Attribute opened */ + H5A_t *attr = NULL; /* Attribute opened */ H5G_loc_t loc; /* Object location */ hid_t ret_value; /* Return value */ @@ -786,7 +786,7 @@ done: ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf) { - H5A_t * my_attr; /* Attribute object for ID */ + H5A_t *my_attr; /* Attribute object for ID */ ssize_t ret_value = -1; FUNC_ENTER_API((-1)) @@ -828,7 +828,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_i char *name /*out*/, size_t size, hid_t lapl_id) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute object for name */ + H5A_t *attr = NULL; /* Attribute object for name */ ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) @@ -892,7 +892,7 @@ done: hsize_t H5Aget_storage_size(hid_t attr_id) { - H5A_t * attr; /* Attribute object for ID */ + H5A_t *attr; /* Attribute object for ID */ hsize_t ret_value; /* Return value */ FUNC_ENTER_API(0) @@ -961,7 +961,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H hid_t lapl_id) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute object for name */ + H5A_t *attr = NULL; /* Attribute object for name */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1018,7 +1018,7 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_i H5A_info_t *ainfo, hid_t lapl_id) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute object for name */ + H5A_t *attr = NULL; /* Attribute object for name */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -783,7 +783,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add #if H5AC__TRACE_FILE_ENABLED char trace[128] = ""; size_t trace_entry_size = 0; - FILE * trace_file_ptr = NULL; + FILE *trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ herr_t ret_value = SUCCEED; /* Return value */ @@ -894,7 +894,7 @@ H5AC_mark_entry_dirty(void *thing) #ifdef H5_HAVE_PARALLEL { H5AC_info_t *entry_ptr = (H5AC_info_t *)thing; - H5C_t * cache_ptr = entry_ptr->cache_ptr; + H5C_t *cache_ptr = entry_ptr->cache_ptr; HDassert(cache_ptr); HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); @@ -1069,11 +1069,11 @@ void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *udata, H5AC_protect_t rw) { unsigned protect_flags = H5C__NO_FLAGS_SET; - void * thing = (void *)NULL; + void *thing = (void *)NULL; #if H5AC__TRACE_FILE_ENABLED char trace[128] = ""; size_t trace_entry_size = 0; - FILE * trace_file_ptr = NULL; + FILE *trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ void *ret_value; /* Return value */ @@ -1198,7 +1198,7 @@ H5AC_resize_entry(void *thing, size_t new_size) #ifdef H5_HAVE_PARALLEL { H5AC_info_t *entry_ptr = (H5AC_info_t *)thing; - H5C_t * cache_ptr = entry_ptr->cache_ptr; + H5C_t *cache_ptr = entry_ptr->cache_ptr; HDassert(cache_ptr); HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); @@ -1735,7 +1735,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config H5C_auto_size_ctl_t internal_config; #if H5AC__TRACE_FILE_ENABLED H5AC_cache_config_t trace_config = H5AC__DEFAULT_CACHE_CONFIG; - FILE * trace_file_ptr = NULL; + FILE *trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ FUNC_ENTER_NOAPI(FAIL) @@ -1971,7 +1971,7 @@ H5AC_close_trace_file(H5AC_t *cache_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - FILE * trace_file_ptr = NULL; + FILE *trace_file_ptr = NULL; FUNC_ENTER_NOAPI(FAIL) @@ -2025,7 +2025,7 @@ H5AC_open_trace_file(H5AC_t *cache_ptr, const char *trace_file_name) { herr_t ret_value = SUCCEED; /* Return value */ char file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 2]; - FILE * file_ptr = NULL; + FILE *file_ptr = NULL; #ifdef H5_HAVE_PARALLEL H5AC_aux_t *aux_ptr = NULL; #endif /* H5_HAVE_PARALLEL */ @@ -2130,7 +2130,7 @@ done: herr_t H5AC_add_candidate(H5AC_t *cache_ptr, haddr_t addr) { - H5AC_aux_t * aux_ptr; + H5AC_aux_t *aux_ptr; H5AC_slist_entry_t *slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -2203,7 +2203,7 @@ H5AC_broadcast_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr, haddr_t * { hbool_t success = FALSE; H5AC_aux_t *aux_ptr = NULL; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; MPI_Offset *MPI_Offset_buf_ptr = NULL; size_t buf_size = 0; int mpi_result; @@ -2311,11 +2311,11 @@ H5AC_broadcast_clean_list(H5AC_t *cache_ptr) { herr_t ret_value = SUCCEED; /* Return value */ haddr_t addr; - haddr_t * addr_buf_ptr = NULL; - H5AC_aux_t * aux_ptr = NULL; - H5SL_node_t * slist_node_ptr = NULL; + haddr_t *addr_buf_ptr = NULL; + H5AC_aux_t *aux_ptr = NULL; + H5SL_node_t *slist_node_ptr = NULL; H5AC_slist_entry_t *slist_entry_ptr = NULL; - MPI_Offset * buf_ptr = NULL; + MPI_Offset *buf_ptr = NULL; size_t buf_size; int i = 0; int mpi_result; @@ -2628,11 +2628,11 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t *cache_ptr, int *num_entries_ptr, hadd herr_t ret_value = SUCCEED; /* Return value */ hbool_t success = FALSE; haddr_t addr; - H5AC_aux_t * aux_ptr = NULL; - H5SL_node_t * slist_node_ptr = NULL; + H5AC_aux_t *aux_ptr = NULL; + H5SL_node_t *slist_node_ptr = NULL; H5AC_slist_entry_t *slist_entry_ptr = NULL; - MPI_Offset * MPI_Offset_buf_ptr = NULL; - haddr_t * haddr_buf_ptr = NULL; + MPI_Offset *MPI_Offset_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; size_t buf_size; int i = 0; int num_entries = 0; @@ -2823,7 +2823,7 @@ done: static herr_t H5AC_log_deleted_entry(H5AC_t *cache_ptr, H5AC_info_t *entry_ptr, haddr_t addr, unsigned int flags) { - H5AC_aux_t * aux_ptr; + H5AC_aux_t *aux_ptr; H5AC_slist_entry_t *slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -2913,7 +2913,7 @@ done: static herr_t H5AC_log_dirtied_entry(const H5AC_info_t *entry_ptr, haddr_t addr) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -3030,7 +3030,7 @@ H5AC_log_flushed_entry(H5C_t *cache_ptr, haddr_t addr, hbool_t was_dirty, unsign { herr_t ret_value = SUCCEED; /* Return value */ hbool_t cleared; - H5AC_aux_t * aux_ptr; + H5AC_aux_t *aux_ptr; H5AC_slist_entry_t *slist_entry_ptr = NULL; FUNC_ENTER_NOAPI(FAIL) @@ -3249,11 +3249,11 @@ done: static herr_t H5AC_log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; hbool_t entry_in_cache; hbool_t entry_dirty; size_t entry_size; - H5AC_aux_t * aux_ptr = NULL; + H5AC_aux_t *aux_ptr = NULL; H5AC_slist_entry_t *slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -3488,7 +3488,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_p { int mpi_code; int num_candidates = 0; - haddr_t * candidates_list_ptr = NULL; + haddr_t *candidates_list_ptr = NULL; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -3695,7 +3695,7 @@ static herr_t H5AC_receive_and_apply_clean_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, H5AC_t *cache_ptr) { H5AC_aux_t *aux_ptr; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; MPI_Offset *MPI_Offset_buf_ptr = NULL; int mpi_result; int num_entries = 0; @@ -3804,7 +3804,7 @@ H5AC_receive_candidate_list(H5AC_t *cache_ptr, int *num_entries_ptr, haddr_t **h { hbool_t success = FALSE; H5AC_aux_t *aux_ptr; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; MPI_Offset *MPI_Offset_buf_ptr = NULL; int mpi_result; int num_entries; @@ -3948,7 +3948,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f, hid_t dxpl_id, H5AC_t *cache_ptr) { int mpi_code; int num_entries = 0; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -4373,7 +4373,7 @@ done: herr_t H5AC_run_sync_point(H5F_t *f, hid_t dxpl_id, int sync_point_op) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 1fce17e..360f9c3 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -297,7 +297,7 @@ H5_DLL herr_t H5AC_get_entry_status(const H5F_t *f, haddr_t addr, unsigned *stat H5_DLL herr_t H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *thing, unsigned int flags); H5_DLL herr_t H5AC_pin_protected_entry(void *thing); -H5_DLL void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *udata, +H5_DLL void *H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *udata, H5AC_protect_t rw); H5_DLL herr_t H5AC_resize_entry(void *thing, size_t new_size); H5_DLL herr_t H5AC_unpin_entry(void *thing); diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c index abacc08..ede3a6f 100644 --- a/src/H5Abtree2.c +++ b/src/H5Abtree2.c @@ -50,12 +50,12 @@ */ typedef struct H5A_fh_ud_cmp_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - const char * name; /* Name of attribute to compare */ + const char *name; /* Name of attribute to compare */ const H5A_dense_bt2_name_rec_t *record; /* v2 B-tree record for attribute */ H5A_bt2_found_t found_op; /* Callback when correct attribute is found */ - void * found_op_data; /* Callback data when correct attribute is found */ + void *found_op_data; /* Callback data when correct attribute is found */ /* upward */ int cmp; /* Comparison of two attribute names */ @@ -152,7 +152,7 @@ static herr_t H5A_dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata) { H5A_fh_ud_cmp_t *udata = (H5A_fh_ud_cmp_t *)_udata; /* User data for 'op' callback */ - H5A_t * attr = NULL; /* Pointer to attribute created from heap object */ + H5A_t *attr = NULL; /* Pointer to attribute created from heap object */ hbool_t took_ownership = FALSE; /* Whether the "found" operator took ownership of the attribute */ herr_t ret_value = SUCCEED; /* Return value */ @@ -204,7 +204,7 @@ done: static herr_t H5A_dense_btree2_name_store(void *_nrecord, const void *_udata) { - const H5A_bt2_ud_ins_t * udata = (const H5A_bt2_ud_ins_t *)_udata; + const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata; H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -235,7 +235,7 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata) static herr_t H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result) { - const H5A_bt2_ud_common_t * bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata; + const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata; const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec; herr_t ret_value = SUCCEED; /* Return value */ @@ -252,7 +252,7 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result = 1; else { H5A_fh_ud_cmp_t fh_udata; /* User data for fractal heap 'op' callback */ - H5HF_t * fheap; /* Fractal heap handle to use for finding object */ + H5HF_t *fheap; /* Fractal heap handle to use for finding object */ /* Sanity check */ HDassert(bt2_udata->name_hash == bt2_rec->hash); @@ -391,7 +391,7 @@ H5A_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H static herr_t H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata) { - const H5A_bt2_ud_ins_t * udata = (const H5A_bt2_ud_ins_t *)_udata; + const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata; H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -421,7 +421,7 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata) static herr_t H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, int *result) { - const H5A_bt2_ud_common_t * bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata; + const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata; const H5A_dense_bt2_corder_rec_t *bt2_rec = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5Adense.c b/src/H5Adense.c index 3414921..778f132 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -68,11 +68,11 @@ */ typedef struct H5A_bt2_od_wrt_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5HF_t *fheap; /* Fractal heap handle to operate on */ H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */ - H5A_t * attr; /* Attribute to write */ + H5A_t *attr; /* Attribute to write */ haddr_t corder_bt2_addr; /* v2 B-tree address of creation order index */ } H5A_bt2_od_wrt_t; @@ -82,7 +82,7 @@ typedef struct H5A_bt2_od_wrt_t { */ typedef struct { /* downward (internal) */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5HF_t *fheap; /* Fractal heap handle */ H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */ @@ -92,7 +92,7 @@ typedef struct { hid_t loc_id; /* Object ID for application callback */ hsize_t skip; /* Number of attributes to skip */ const H5A_attr_iter_op_t *attr_op; /* Callback for each attribute */ - void * op_data; /* Callback data for each attribute */ + void *op_data; /* Callback data for each attribute */ /* upward */ int op_ret; /* Return value from callback */ @@ -105,7 +105,7 @@ typedef struct { */ typedef struct { /* downward (internal) */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ const H5A_dense_bt2_name_rec_t *record; /* v2 B-tree record for attribute */ @@ -129,10 +129,10 @@ typedef struct H5A_bt2_ud_rm_t { */ typedef struct H5A_bt2_ud_rmbi_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - H5HF_t * fheap; /* Fractal heap handle */ - H5HF_t * shared_fheap; /* Fractal heap handle for shared messages */ + H5HF_t *fheap; /* Fractal heap handle */ + H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */ H5_index_t idx_type; /* Index type for operation */ haddr_t other_bt2_addr; /* v2 B-tree address of "other" index */ } H5A_bt2_ud_rmbi_t; @@ -174,9 +174,9 @@ H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo) { H5HF_create_t fheap_cparam; /* Fractal heap creation parameters */ H5B2_create_t bt2_cparam; /* v2 B-tree creation parameters */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for names */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for names */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -309,12 +309,12 @@ H5A_t * H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name) { H5A_bt2_ud_common_t udata; /* User data for v2 B-tree modify */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ htri_t attr_exists; /* Attribute exists in v2 B-tree */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -397,11 +397,11 @@ herr_t H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr) { H5A_bt2_ud_ins_t udata; /* User data for v2 B-tree insertion */ - H5HF_t * fheap = NULL; /* Fractal heap handle for attributes */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order index */ - H5WB_t * wb = NULL; /* Wrapped buffer for attribute data */ + H5HF_t *fheap = NULL; /* Fractal heap handle for attributes */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ + H5WB_t *wb = NULL; /* Wrapped buffer for attribute data */ uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing message */ unsigned mesg_flags = 0; /* Flags for storing message */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ @@ -463,7 +463,7 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr) udata.id = attr->sh_loc.u.heap_id; } /* end if */ else { - void * attr_ptr; /* Pointer to serialized message */ + void *attr_ptr; /* Pointer to serialized message */ size_t attr_size; /* Size of serialized attribute in the heap */ /* Find out the size of buffer needed for serialized message */ @@ -587,9 +587,9 @@ static herr_t H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) { H5A_dense_bt2_name_rec_t *record = (H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */ - H5A_bt2_od_wrt_t * op_data = (H5A_bt2_od_wrt_t *)_op_data; /* "op data" from v2 B-tree modify */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order index */ - H5WB_t * wb = NULL; /* Wrapped buffer for attribute data */ + H5A_bt2_od_wrt_t *op_data = (H5A_bt2_od_wrt_t *)_op_data; /* "op data" from v2 B-tree modify */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ + H5WB_t *wb = NULL; /* Wrapped buffer for attribute data */ uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */ herr_t ret_value = SUCCEED; /* Return value */ @@ -640,7 +640,7 @@ H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) *changed = TRUE; } /* end if */ else { - void * attr_ptr; /* Pointer to serialized message */ + void *attr_ptr; /* Pointer to serialized message */ size_t attr_size; /* Size of serialized attribute in the heap */ /* Find out the size of buffer needed for serialized attribute */ @@ -702,9 +702,9 @@ H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr) { H5A_bt2_ud_common_t udata; /* User data for v2 B-tree modify */ H5A_bt2_od_wrt_t op_data; /* "Op data" for v2 B-tree modify */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -841,11 +841,11 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char * const char *new_name) { H5A_bt2_ud_common_t udata; /* User data for v2 B-tree modify */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order ndex */ - H5A_t * attr_copy = NULL; /* Copy of attribute to rename */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order ndex */ + H5A_t *attr_copy = NULL; /* Copy of attribute to rename */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */ htri_t attr_exists; /* Attribute exists in v2 B-tree */ @@ -1033,7 +1033,7 @@ H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) --bt2_udata->skip; else { H5A_fh_ud_cp_t fh_udata; /* User data for fractal heap 'op' callback */ - H5HF_t * fheap; /* Fractal heap handle for attribute storage */ + H5HF_t *fheap; /* Fractal heap handle for attribute storage */ /* Check for iterating over shared attribute */ if (record->flags & H5O_MSG_FLAG_SHARED) @@ -1120,10 +1120,10 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf H5_iter_order_t order, hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */ herr_t ret_value; /* Return value */ @@ -1253,8 +1253,8 @@ static herr_t H5A__dense_remove_bt2_cb(const void *_record, void *_udata) { const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; - H5A_bt2_ud_rm_t * udata = (H5A_bt2_ud_rm_t *)_udata; /* User data for callback */ - H5A_t * attr = *(H5A_t **)udata->common.found_op_data; /* Pointer to attribute to remove */ + H5A_bt2_ud_rm_t *udata = (H5A_bt2_ud_rm_t *)_udata; /* User data for callback */ + H5A_t *attr = *(H5A_t **)udata->common.found_op_data; /* Pointer to attribute to remove */ H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1317,10 +1317,10 @@ herr_t H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name) { H5A_bt2_ud_rm_t udata; /* User data for v2 B-tree record removal */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5A_t * attr_copy = NULL; /* Copy of attribute to remove */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5A_t *attr_copy = NULL; /* Copy of attribute to remove */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1403,10 +1403,10 @@ done: static herr_t H5A__dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) { - H5HF_t * fheap; /* Fractal heap handle */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5HF_t *fheap; /* Fractal heap handle */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* v2 B-tree record */ - H5A_bt2_ud_rmbi_t * bt2_udata = (H5A_bt2_ud_rmbi_t *)_bt2_udata; /* User data for callback */ + H5A_bt2_ud_rmbi_t *bt2_udata = (H5A_bt2_ud_rmbi_t *)_bt2_udata; /* User data for callback */ H5A_fh_ud_cp_t fh_udata; /* User data for fractal heap 'op' callback */ H5O_shared_t sh_loc; /* Shared message info for attribute */ hbool_t use_sh_loc; /* Whether to use the attribute's shared location or the separate one */ @@ -1532,10 +1532,10 @@ herr_t H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1659,9 +1659,9 @@ htri_t H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *name) { H5A_bt2_ud_common_t udata; /* User data for v2 B-tree modify */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5HF_t * shared_fheap = NULL; /* Fractal heap handle for shared header messages */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5HF_t *shared_fheap = NULL; /* Fractal heap handle for shared header messages */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ htri_t attr_sharable; /* Flag indicating attributes are sharable */ htri_t ret_value = TRUE; /* Return value */ @@ -1746,7 +1746,7 @@ H5A__dense_delete_bt2_cb(const void *_record, void *_bt2_udata) const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */ H5A_bt2_ud_common_t *bt2_udata = (H5A_bt2_ud_common_t *)_bt2_udata; /* User data for callback */ - H5A_t * attr = NULL; /* Attribute being removed */ + H5A_t *attr = NULL; /* Attribute being removed */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -1808,7 +1808,7 @@ herr_t H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo) { H5A_bt2_ud_common_t udata; /* v2 B-tree user data for deleting attributes */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index a70d94e..2c6150a 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -148,10 +148,10 @@ H5A__term_deprec_interface(void) hid_t H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t plist_id) { - H5A_t * attr = NULL; /* Attribute created */ + H5A_t *attr = NULL; /* Attribute created */ H5G_loc_t loc; /* Object location */ - H5T_t * type; /* Datatype to use for attribute */ - H5S_t * space; /* Dataspace to use for attribute */ + H5T_t *type; /* Datatype to use for attribute */ + H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) @@ -209,7 +209,7 @@ hid_t H5Aopen_name(hid_t loc_id, const char *name) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute opened */ + H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value; FUNC_ENTER_API(FAIL) @@ -266,7 +266,7 @@ hid_t H5Aopen_idx(hid_t loc_id, unsigned idx) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute opened */ + H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value; FUNC_ENTER_API(FAIL) @@ -318,7 +318,7 @@ int H5Aget_num_attrs(hid_t loc_id) { H5O_loc_t *loc; /* Object location for attribute */ - void * obj; + void *obj; int ret_value; FUNC_ENTER_API(FAIL) diff --git a/src/H5Aint.c b/src/H5Aint.c index 4deb056..86d03cf 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -51,7 +51,7 @@ /* Data exchange structure to use when building table of compact attributes for an object */ typedef struct { - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5A_attr_table_t *atable; /* Pointer to attribute table to build */ size_t curr_attr; /* Current attribute to operate on */ @@ -67,12 +67,12 @@ typedef struct { /* Data exchange structure to use when copying an attribute from _SRC to _DST */ typedef struct { const H5O_ainfo_t *ainfo; /* dense information */ - H5F_t * file; /* file */ - hbool_t * recompute_size; /* Flag to indicate if size changed */ - H5O_copy_t * cpy_info; /* Information on copying options */ + H5F_t *file; /* file */ + hbool_t *recompute_size; /* Flag to indicate if size changed */ + H5O_copy_t *cpy_info; /* Information on copying options */ hid_t dxpl_id; /* DXPL for operation */ - const H5O_loc_t * oloc_src; - H5O_loc_t * oloc_dst; + const H5O_loc_t *oloc_src; + H5O_loc_t *oloc_dst; } H5A_dense_file_cp_ud_t; /********************/ @@ -131,11 +131,11 @@ H5A_t * H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space, hid_t acpl_id, hid_t dxpl_id) { - H5A_t * attr = NULL; /* Attribute created */ + H5A_t *attr = NULL; /* Attribute created */ hssize_t snelmts; /* elements in attribute */ size_t nelmts; /* elements in attribute */ htri_t tri_ret; /* htri_t return value */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -353,8 +353,8 @@ H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ - H5A_t * attr = NULL; /* Attribute from object header */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *attr = NULL; /* Attribute from object header */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -416,8 +416,8 @@ H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_na H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ - H5A_t * attr = NULL; /* Attribute from object header */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *attr = NULL; /* Attribute from object header */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -479,9 +479,9 @@ done: herr_t H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id) { - uint8_t * tconv_buf = NULL; /* datatype conv buffer */ + uint8_t *tconv_buf = NULL; /* datatype conv buffer */ hbool_t tconv_owned = FALSE; /* Whether the datatype conv buffer is owned by attribute */ - uint8_t * bkg_buf = NULL; /* temp conversion buffer */ + uint8_t *bkg_buf = NULL; /* temp conversion buffer */ hssize_t snelmts; /* elements in attribute */ size_t nelmts; /* elements in attribute */ H5T_path_t *tpath = NULL; /* conversion information*/ @@ -593,8 +593,8 @@ done: herr_t H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id) { - uint8_t * tconv_buf = NULL; /* datatype conv buffer*/ - uint8_t * bkg_buf = NULL; /* background buffer */ + uint8_t *tconv_buf = NULL; /* datatype conv buffer*/ + uint8_t *bkg_buf = NULL; /* background buffer */ hssize_t snelmts; /* elements in attribute */ size_t nelmts; /* elements in attribute*/ H5T_path_t *tpath = NULL; /* type conversion info */ @@ -901,9 +901,9 @@ H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo) H5A_t * H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr) { - H5A_t * new_attr = NULL; + H5A_t *new_attr = NULL; hbool_t allocated_attr = FALSE; /* Whether the attribute was allocated */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1270,12 +1270,13 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type, atable->nattrs = 0; /* Set up user data for iteration */ - udata.f = f; - udata.dxpl_id = dxpl_id; - udata.atable = atable; - udata.curr_attr = 0; - udata.bogus_crt_idx = (hbool_t)( - (oh->version == H5O_VERSION_1 || !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE); + udata.f = f; + udata.dxpl_id = dxpl_id; + udata.atable = atable; + udata.curr_attr = 0; + udata.bogus_crt_idx = + (hbool_t)((oh->version == H5O_VERSION_1 || !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE + : FALSE); /* Iterate over existing attributes, checking for attribute with same name */ op.op_type = H5O_MESG_OP_LIB; @@ -1957,11 +1958,11 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si /* Check if we need to convert data */ if (H5T_detect_class(attr_src->shared->dt, H5T_VLEN, FALSE) > 0) { H5T_path_t *tpath_src_mem, *tpath_mem_dst; /* Datatype conversion paths */ - H5T_t * dt_mem; /* Memory datatype */ + H5T_t *dt_mem; /* Memory datatype */ size_t src_dt_size; /* Source datatype size */ size_t tmp_dt_size; /* Temp. datatype size */ size_t max_dt_size; /* Max atatype size */ - H5S_t * buf_space; /* Dataspace describing buffer */ + H5S_t *buf_space; /* Dataspace describing buffer */ hsize_t buf_dim; /* Dimension for buffer */ size_t nelmts; /* Number of elements in buffer */ size_t buf_size; /* Size of copy buffer */ @@ -2224,7 +2225,7 @@ static herr_t H5A_dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata) { H5A_dense_file_cp_ud_t *udata = (H5A_dense_file_cp_ud_t *)_udata; - H5A_t * attr_dst = NULL; + H5A_t *attr_dst = NULL; herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Apkg.h b/src/H5Apkg.h index 3e1a190..1da0207 100644 --- a/src/H5Apkg.h +++ b/src/H5Apkg.h @@ -72,7 +72,7 @@ typedef struct H5A_shared_t { uint8_t version; /* Version to encode attribute with */ - char * name; /* Attribute's name */ + char *name; /* Attribute's name */ H5T_cset_t encoding; /* Character encoding of attribute name */ H5T_t *dt; /* Attribute's datatype */ @@ -81,7 +81,7 @@ typedef struct H5A_shared_t { H5S_t *ds; /* Attribute's dataspace */ size_t ds_size; /* Size of dataspace on disk */ - void * data; /* Attribute data (on a temporary basis) */ + void *data; /* Attribute data (on a temporary basis) */ size_t data_size; /* Size of data on disk */ H5O_msg_crt_idx_t crt_idx; /* Attribute's creation index in the object header */ unsigned nrefs; /* Ref count for times this object is referred */ @@ -126,16 +126,16 @@ typedef herr_t (*H5A_bt2_found_t)(const H5A_t *attr, hbool_t *took_ownership, vo */ typedef struct H5A_bt2_ud_common_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - H5HF_t * fheap; /* Fractal heap handle */ - H5HF_t * shared_fheap; /* Fractal heap handle for shared messages */ - const char * name; /* Name of attribute to compare */ + H5HF_t *fheap; /* Fractal heap handle */ + H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */ + const char *name; /* Name of attribute to compare */ uint32_t name_hash; /* Hash of name of attribute to compare */ uint8_t flags; /* Flags for attribute storage location */ H5O_msg_crt_idx_t corder; /* Creation order value of attribute to compare */ H5A_bt2_found_t found_op; /* Callback when correct attribute is found */ - void * found_op_data; /* Callback data when correct attribute is found */ + void *found_op_data; /* Callback data when correct attribute is found */ } H5A_bt2_ud_common_t; /* @@ -178,29 +178,29 @@ H5_DLLVAR const H5B2_class_t H5A_BT2_CORDER[1]; /******************************/ /* Function prototypes for H5A package scope */ -H5_DLL herr_t H5A_init(void); -H5_DLL herr_t H5A__term_deprec_interface(void); -H5_DLL H5A_t *H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space, - hid_t acpl_id, hid_t dxpl_id); -H5_DLL H5A_t *H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_name, - hid_t lapl_id, hid_t dxpl_id); -H5_DLL H5A_t * H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, +H5_DLL herr_t H5A_init(void); +H5_DLL herr_t H5A__term_deprec_interface(void); +H5_DLL H5A_t *H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type, const H5S_t *space, + hid_t acpl_id, hid_t dxpl_id); +H5_DLL H5A_t *H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_name, + hid_t lapl_id, hid_t dxpl_id); +H5_DLL H5A_t *H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t dxpl_id); H5_DLL herr_t H5A_open_common(const H5G_loc_t *loc, H5A_t *attr); H5_DLL herr_t H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id); H5_DLL herr_t H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id); H5_DLL ssize_t H5A_get_name(H5A_t *attr, size_t buf_size, char *buf); -H5_DLL H5A_t *H5A_copy(H5A_t *new_attr, const H5A_t *old_attr); -H5_DLL herr_t H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo); -H5_DLL hid_t H5A_get_create_plist(H5A_t *attr); -H5_DLL herr_t H5A_free(H5A_t *attr); -H5_DLL herr_t H5A_close(H5A_t *attr); -H5_DLL htri_t H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo); -H5_DLL herr_t H5A_set_version(const H5F_t *f, H5A_t *attr); -H5_DLL herr_t H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name, - const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id); -H5_DLL htri_t H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, hid_t lapl_id, - hid_t dxpl_id); +H5_DLL H5A_t *H5A_copy(H5A_t *new_attr, const H5A_t *old_attr); +H5_DLL herr_t H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo); +H5_DLL hid_t H5A_get_create_plist(H5A_t *attr); +H5_DLL herr_t H5A_free(H5A_t *attr); +H5_DLL herr_t H5A_close(H5A_t *attr); +H5_DLL htri_t H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo); +H5_DLL herr_t H5A_set_version(const H5F_t *f, H5A_t *attr); +H5_DLL herr_t H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name, + const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id); +H5_DLL htri_t H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, hid_t lapl_id, + hid_t dxpl_id); /* Attribute "dense" storage routines */ H5_DLL herr_t H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo); diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h index 646b78f..7762c54 100644 --- a/src/H5Aprivate.h +++ b/src/H5Aprivate.h @@ -70,10 +70,10 @@ typedef struct H5A_attr_iter_op_t { /* General attribute routines */ H5_DLL struct H5O_loc_t *H5A_oloc(H5A_t *attr); -H5_DLL H5G_name_t *H5A_nameof(H5A_t *attr); -H5_DLL H5T_t *H5A_type(const H5A_t *attr); -H5_DLL H5T_t *H5A_get_type(H5A_t *attr); -H5_DLL H5S_t *H5A_get_space(H5A_t *attr); +H5_DLL H5G_name_t *H5A_nameof(H5A_t *attr); +H5_DLL H5T_t *H5A_type(const H5A_t *attr); +H5_DLL H5T_t *H5A_get_type(H5A_t *attr); +H5_DLL H5S_t *H5A_get_space(H5A_t *attr); H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data); @@ -129,13 +129,13 @@ /* "user data" for iterating over B-tree (collects B-tree metadata size) */ typedef struct H5B_iter_ud_t { H5B_info_t *bt_info; /* Information about B-tree */ - void * udata; /* Node type's 'udata' for loading & iterator callback */ + void *udata; /* Node type's 'udata' for loading & iterator callback */ } H5B_info_ud_t; /* Convenience struct for the arguments needed to unprotect a b-tree after a * call to H5B_iterate_helper() or H5B_split() */ typedef struct H5B_ins_ud_t { - H5B_t * bt; /* B-tree */ + H5B_t *bt; /* B-tree */ haddr_t addr; /* B-tree address */ unsigned cache_flags; /* Cache flags for H5AC_unprotect() */ } H5B_ins_ud_t; @@ -203,7 +203,7 @@ H5FL_SEQ_DEFINE_STATIC(size_t); herr_t H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata, haddr_t *addr_p /*out*/) { - H5B_t * bt = NULL; + H5B_t *bt = NULL; H5B_shared_t *shared = NULL; /* Pointer to shared B-tree info */ herr_t ret_value = SUCCEED; @@ -286,9 +286,9 @@ done: htri_t H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata) { - H5B_t * bt = NULL; - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned idx = 0, lt = 0, rt; /* Final, left & right key indices */ int cmp = 1; /* Key comparison value */ @@ -382,7 +382,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx, void *udat H5B_ins_ud_t *split_bt_ud /*out*/) { H5P_genplist_t *dx_plist; /* Data transfer property list */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned nleft, nright; /* Number of keys in left & right halves */ double split_ratios[3]; /* B-tree split ratios */ @@ -550,9 +550,9 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void unsigned level; H5B_ins_ud_t bt_ud = H5B_INS_UD_T_NULL; /* (Old) root node */ H5B_ins_ud_t split_bt_ud = H5B_INS_UD_T_NULL; /* Split B-tree node */ - H5B_t * new_root_bt = NULL; /* New root node */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *new_root_bt = NULL; /* New root node */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ H5B_ins_t my_ins = H5B_INS_ERROR; herr_t ret_value = SUCCEED; @@ -695,7 +695,7 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5B const void *md_key) { H5B_shared_t *shared; /* Pointer to shared B-tree info */ - uint8_t * base; /* Base offset for move */ + uint8_t *base; /* Base offset for move */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -780,9 +780,9 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, const H5B_class_ hbool_t *lt_key_changed, uint8_t *md_key, void *udata, uint8_t *rt_key, hbool_t *rt_key_changed, H5B_ins_ud_t *split_bt_ud /*out*/) { - H5B_t * bt; /* Convenience pointer to B-tree */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt; /* Convenience pointer to B-tree */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned lt = 0, idx = 0, rt; /* Left, final & right index values */ int cmp = -1; /* Key comparison value */ @@ -1040,7 +1040,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, const H5B_class_ } else if (H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) { hbool_t *tmp_bt_flags_ptr = NULL; - H5B_t * tmp_bt; + H5B_t *tmp_bt; /* * If this node is full then split it before inserting the new child. @@ -1118,9 +1118,9 @@ static herr_t H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, H5B_operator_t op, void *udata) { - H5B_t * bt = NULL; /* Pointer to current B-tree node */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; /* Pointer to current B-tree node */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned u; /* Local index variable */ herr_t ret_value = H5_ITER_CONT; /* Return value */ @@ -1232,10 +1232,10 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type uint8_t *lt_key /*out*/, hbool_t *lt_key_changed /*out*/, void *udata, uint8_t *rt_key /*out*/, hbool_t *rt_key_changed /*out*/) { - H5B_t * bt = NULL, *sibling = NULL; + H5B_t *bt = NULL, *sibling = NULL; unsigned bt_flags = H5AC__NO_FLAGS_SET; - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned idx = 0, lt = 0, rt; /* Final, left & right indices */ int cmp = 1; /* Key comparison value */ @@ -1605,9 +1605,9 @@ done: herr_t H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *udata) { - H5B_t * bt = NULL; /* B-tree node being operated on */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; /* B-tree node being operated on */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1784,9 +1784,9 @@ H5B_shared_free(void *_shared) static H5B_t * H5B_copy(const H5B_t *old_bt) { - H5B_t * new_node = NULL; + H5B_t *new_node = NULL; H5B_shared_t *shared; /* Pointer to shared B-tree info */ - H5B_t * ret_value = NULL; /* Return value */ + H5B_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1849,9 +1849,9 @@ static herr_t H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, const H5B_info_ud_t *info_udata) { - H5B_t * bt = NULL; /* Pointer to current B-tree node */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; /* Pointer to current B-tree node */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned level; /* Node level */ size_t sizeof_rnode; /* Size of raw (disk) node */ @@ -2004,9 +2004,9 @@ done: htri_t H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr) { - H5B_t * bt = NULL; /* The B-tree */ - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; /* The B-tree */ + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ htri_t ret_value = SUCCEED; /* Return value */ @@ -116,11 +116,11 @@ H5FL_DEFINE_STATIC(H5B2_t); H5B2_t * H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udata) { - H5B2_t * bt2 = NULL; /* Pointer to the B-tree */ - H5B2_hdr_t * hdr = NULL; /* Pointer to the B-tree header */ + H5B2_t *bt2 = NULL; /* Pointer to the B-tree */ + H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ haddr_t hdr_addr; /* B-tree header address */ - H5B2_t * ret_value = NULL; /* Return value */ + H5B2_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -191,10 +191,10 @@ done: H5B2_t * H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata) { - H5B2_t * bt2 = NULL; /* Pointer to the B-tree */ - H5B2_hdr_t * hdr = NULL; /* Pointer to the B-tree header */ + H5B2_t *bt2 = NULL; /* Pointer to the B-tree */ + H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ - H5B2_t * ret_value; /* Return value */ + H5B2_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -401,7 +401,7 @@ H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data) htri_t H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op, void *op_data) { - H5B2_hdr_t * hdr; /* Pointer to the B-tree header */ + H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ H5B2_node_ptr_t curr_node_ptr; /* Node pointer info for current node */ unsigned depth; /* Current depth of the tree */ int cmp; /* Comparison value of records */ @@ -625,7 +625,7 @@ done: herr_t H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_found_t op, void *op_data) { - H5B2_hdr_t * hdr; /* Pointer to the B-tree header */ + H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ H5B2_node_ptr_t curr_node_ptr; /* Node pointer info for current node */ unsigned depth; /* Current depth of the tree */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1036,7 +1036,7 @@ done: herr_t H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op, void *op_data) { - H5B2_hdr_t * hdr; /* Pointer to the B-tree header */ + H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ H5B2_node_ptr_t curr_node_ptr; /* Node pointer info for current node */ H5B2_nodepos_t curr_pos; /* Position of current node */ unsigned depth; /* Current depth of the tree */ @@ -1363,7 +1363,7 @@ done: herr_t H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata, H5B2_remove_t op, void *op_data) { - H5B2_hdr_t * hdr = NULL; /* Pointer to the B-tree header */ + H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 9d81161..e4a3403 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -74,7 +74,7 @@ static herr_t H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hboo static herr_t H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal); static herr_t H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *i, hbool_t destroy); static herr_t H5B2__cache_internal_size(const H5F_t *f, const H5B2_internal_t *i, size_t *size_ptr); -static H5B2_leaf_t * H5B2__cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static H5B2_leaf_t *H5B2__cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); static herr_t H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *l, unsigned H5_ATTR_UNUSED *flags_ptr); static herr_t H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf); @@ -139,18 +139,18 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{ static H5B2_hdr_t * H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5B2_hdr_t * hdr = NULL; /* B-tree header */ + H5B2_hdr_t *hdr = NULL; /* B-tree header */ H5B2_hdr_cache_ud_t *udata = (H5B2_hdr_cache_ud_t *)_udata; H5B2_create_t cparam; /* B-tree creation parameters */ H5B2_subid_t id; /* ID of B-tree class, as found in file */ uint16_t depth; /* Depth of B-tree */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ - H5WB_t * wb = NULL; /* Wrapped buffer for header data */ + H5WB_t *wb = NULL; /* Wrapped buffer for header data */ uint8_t hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */ - uint8_t * buf; /* Pointer to header buffer */ - const uint8_t * p; /* Pointer into raw data buffer */ - H5B2_hdr_t * ret_value; /* Return value */ + uint8_t *buf; /* Pointer to header buffer */ + const uint8_t *p; /* Pointer into raw data buffer */ + H5B2_hdr_t *ret_value; /* Return value */ FUNC_ENTER_STATIC @@ -474,14 +474,14 @@ static H5B2_internal_t * H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B2_internal_cache_ud_t *udata = (H5B2_internal_cache_ud_t *)_udata; /* Pointer to user data */ - H5B2_internal_t * internal = NULL; /* Internal node read */ - const uint8_t * p; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native record info */ - H5B2_node_ptr_t * int_node_ptr; /* Pointer to node pointer info */ + H5B2_internal_t *internal = NULL; /* Internal node read */ + const uint8_t *p; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native record info */ + H5B2_node_ptr_t *int_node_ptr; /* Pointer to node pointer info */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ unsigned u; /* Local index variable */ - H5B2_internal_t * ret_value; /* Return value */ + H5B2_internal_t *ret_value; /* Return value */ FUNC_ENTER_STATIC @@ -620,8 +620,8 @@ H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t add HDassert(internal->hdr); if (internal->cache_info.is_dirty) { - uint8_t * p; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native record info */ + uint8_t *p; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native record info */ H5B2_node_ptr_t *int_node_ptr; /* Pointer to node pointer info */ uint32_t metadata_chksum; /* Computed metadata checksum value */ unsigned u; /* Local index variable */ @@ -818,13 +818,13 @@ static H5B2_leaf_t * H5B2__cache_leaf_load(H5F_t H5_ATTR_UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B2_leaf_cache_ud_t *udata = (H5B2_leaf_cache_ud_t *)_udata; - H5B2_leaf_t * leaf = NULL; /* Pointer to lead node loaded */ - const uint8_t * p; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native keys */ + H5B2_leaf_t *leaf = NULL; /* Pointer to lead node loaded */ + const uint8_t *p; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native keys */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ unsigned u; /* Local index variable */ - H5B2_leaf_t * ret_value; /* Return value */ + H5B2_leaf_t *ret_value; /* Return value */ FUNC_ENTER_STATIC diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c index 155202f..3caba9b 100644 --- a/src/H5B2dbg.c +++ b/src/H5B2dbg.c @@ -80,8 +80,8 @@ herr_t H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t obj_addr) { - H5B2_hdr_t * hdr = NULL; /* B-tree header info */ - void * dbg_ctx = NULL; /* v2 B-tree debugging context */ + H5B2_hdr_t *hdr = NULL; /* B-tree header info */ + void *dbg_ctx = NULL; /* v2 B-tree debugging context */ unsigned u; /* Local index variable */ char temp_str[128]; /* Temporary string, for formatting */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ @@ -179,9 +179,9 @@ herr_t H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, unsigned depth, haddr_t obj_addr) { - H5B2_hdr_t * hdr = NULL; /* B-tree header */ - H5B2_internal_t * internal = NULL; /* B-tree internal node */ - void * dbg_ctx = NULL; /* v2 B-tree debugging context */ + H5B2_hdr_t *hdr = NULL; /* B-tree header */ + H5B2_internal_t *internal = NULL; /* B-tree internal node */ + void *dbg_ctx = NULL; /* v2 B-tree debugging context */ unsigned u; /* Local index variable */ char temp_str[128]; /* Temporary string, for formatting */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ @@ -299,10 +299,10 @@ herr_t H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, haddr_t obj_addr) { - H5B2_hdr_t * hdr = NULL; /* B-tree header */ - H5B2_leaf_t * leaf = NULL; /* B-tree leaf node */ + H5B2_hdr_t *hdr = NULL; /* B-tree header */ + H5B2_leaf_t *leaf = NULL; /* B-tree leaf node */ H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */ - void * dbg_ctx = NULL; /* v2 B-tree debugging context */ + void *dbg_ctx = NULL; /* v2 B-tree debugging context */ unsigned u; /* Local index variable */ char temp_str[128]; /* Temporary string, for formatting */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5B2int.c b/src/H5B2int.c index e153063..570483a 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -172,9 +172,9 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur { const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */ - void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ + void *left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */ - uint8_t * left_native, *right_native; /* Pointers to childs' native records */ + uint8_t *left_native, *right_native; /* Pointers to childs' native records */ H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */ uint16_t mid_record; /* Index of "middle" record in current node */ @@ -452,9 +452,9 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal { const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */ - void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ + void *left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */ - uint8_t * left_native, *right_native; /* Pointers to childs' native records */ + uint8_t *left_native, *right_native; /* Pointers to childs' native records */ H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */ hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal redistrib */ @@ -710,16 +710,16 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal { H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */ - H5B2_node_ptr_t * middle_node_ptrs = NULL; /* Pointers to childs' node pointer info */ + H5B2_node_ptr_t *middle_node_ptrs = NULL; /* Pointers to childs' node pointer info */ const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */ haddr_t middle_addr = HADDR_UNDEF; /* Address of middle child node */ - void * left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ - void * middle_child = NULL; /* Pointers to middle child node */ + void *left_child = NULL, *right_child = NULL; /* Pointers to child nodes */ + void *middle_child = NULL; /* Pointers to middle child node */ uint16_t *left_nrec, *right_nrec; /* Pointers to child # of records */ uint16_t *middle_nrec; /* Pointers to middle child # of records */ - uint8_t * left_native, *right_native; /* Pointers to childs' native records */ - uint8_t * middle_native; /* Pointers to middle child's native records */ + uint8_t *left_native, *right_native; /* Pointers to childs' native records */ + uint8_t *middle_native; /* Pointers to middle child's native records */ hssize_t left_moved_nrec = 0, right_moved_nrec = 0; /* Number of records moved, for internal split */ hssize_t middle_moved_nrec = 0; /* Number of records moved, for internal split */ unsigned left_child_flags = H5AC__NO_FLAGS_SET, @@ -1109,9 +1109,9 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur { const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */ - void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */ + void *left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */ uint16_t *left_nrec, *right_nrec; /* Pointers to left & right child # of records */ - uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */ + uint8_t *left_native, *right_native; /* Pointers to left & right children's native records */ H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */ unsigned left_child_flags = H5AC__NO_FLAGS_SET, @@ -1276,12 +1276,12 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t left_addr = HADDR_UNDEF, right_addr = HADDR_UNDEF; /* Addresses of left & right child nodes */ haddr_t middle_addr = HADDR_UNDEF; /* Address of middle child node */ - void * left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */ - void * middle_child = NULL; /* Pointer to middle child node */ + void *left_child = NULL, *right_child = NULL; /* Pointers to left & right child nodes */ + void *middle_child = NULL; /* Pointer to middle child node */ uint16_t *left_nrec, *right_nrec; /* Pointers to left & right child # of records */ uint16_t *middle_nrec; /* Pointer to middle child # of records */ - uint8_t * left_native, *right_native; /* Pointers to left & right children's native records */ - uint8_t * middle_native; /* Pointer to middle child's native records */ + uint8_t *left_native, *right_native; /* Pointers to left & right children's native records */ + uint8_t *middle_native; /* Pointer to middle child's native records */ H5B2_node_ptr_t *left_node_ptrs = NULL, *right_node_ptrs = NULL; /* Pointers to childs' node pointer info */ H5B2_node_ptr_t *middle_node_ptrs = NULL; /* Pointer to child's node pointer info */ @@ -1527,8 +1527,8 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_internal_t * { const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t child_addr; /* Address of child node */ - void * child = NULL; /* Pointer to child node */ - uint8_t * child_native; /* Pointer to child's native records */ + void *child = NULL; /* Pointer to child node */ + uint8_t *child_native; /* Pointer to child's native records */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1943,7 +1943,7 @@ H5B2_leaf_t * H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec, H5AC_protect_t rw) { H5B2_leaf_cache_ud_t udata; /* User-data for callback */ - H5B2_leaf_t * ret_value; /* Return value */ + H5B2_leaf_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -2063,7 +2063,7 @@ H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nre H5AC_protect_t rw) { H5B2_internal_cache_ud_t udata; /* User data to pass through to cache 'deserialize' callback */ - H5B2_internal_t * ret_value; /* Return value */ + H5B2_internal_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -2108,10 +2108,10 @@ H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_nod H5B2_operator_t op, void *op_data) { const H5AC_class_t *curr_node_class = NULL; /* Pointer to current node's class info */ - void * node = NULL; /* Pointers to current node */ - uint8_t * node_native; /* Pointers to node's native records */ - uint8_t * native = NULL; /* Pointers to copy of node's native records */ - H5B2_node_ptr_t * node_ptrs = NULL; /* Pointers to node's node pointers */ + void *node = NULL; /* Pointers to current node */ + uint8_t *node_native; /* Pointers to node's native records */ + uint8_t *native = NULL; /* Pointers to copy of node's native records */ + H5B2_node_ptr_t *node_ptrs = NULL; /* Pointers to node's node pointers */ unsigned u; /* Local index */ herr_t ret_value = H5_ITER_CONT; /* Iterator return value */ @@ -2325,8 +2325,8 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased, v H5B2_nodepos_t curr_pos, H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op, void *op_data) { - H5AC_info_t * new_cache_info; /* Pointer to new cache info */ - unsigned * new_cache_info_flags_ptr = NULL; + H5AC_info_t *new_cache_info; /* Pointer to new cache info */ + unsigned *new_cache_info_flags_ptr = NULL; H5B2_node_ptr_t *new_node_ptr; /* Pointer to new node pointer */ H5B2_internal_t *internal; /* Pointer to internal node */ H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE; /* Position of next node */ @@ -2650,8 +2650,8 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decre unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, hsize_t n, H5B2_remove_t op, void *op_data) { - H5AC_info_t * new_cache_info; /* Pointer to new cache info */ - unsigned * new_cache_info_flags_ptr = NULL; + H5AC_info_t *new_cache_info; /* Pointer to new cache info */ + unsigned *new_cache_info_flags_ptr = NULL; H5B2_node_ptr_t *new_node_ptr; /* Pointer to new node pointer */ H5B2_internal_t *internal; /* Pointer to internal node */ H5B2_nodepos_t next_pos = H5B2_POS_MIDDLE; /* Position of next node */ @@ -3103,8 +3103,8 @@ H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, const H5B2_node H5B2_remove_t op, void *op_data) { const H5AC_class_t *curr_node_class = NULL; /* Pointer to current node's class info */ - void * node = NULL; /* Pointers to current node */ - uint8_t * native; /* Pointers to node's native records */ + void *node = NULL; /* Pointers to current node */ + uint8_t *native; /* Pointers to node's native records */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 9762e1e..d2b4ae8 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -150,7 +150,7 @@ typedef struct H5B2_hdr_t { uint8_t max_nrec_size; /* Size to store max. # of records in any node (in bytes) */ /* Shared internal data structures (not stored) */ - H5F_t * f; /* Pointer to the file that the B-tree is in */ + H5F_t *f; /* Pointer to the file that the B-tree is in */ haddr_t addr; /* Address of B-tree header in the file */ size_t hdr_size; /* Size of the B-tree header on disk */ size_t rc; /* Reference count of nodes using this header */ @@ -159,16 +159,16 @@ typedef struct H5B2_hdr_t { uint8_t sizeof_size; /* Size of file sizes */ uint8_t sizeof_addr; /* Size of file addresses */ H5B2_remove_t remove_op; /* Callback operator for deleting B-tree */ - void * remove_op_data; /* B-tree deletion callback's context */ - uint8_t * page; /* Common disk page for I/O */ - size_t * nat_off; /* Array of offsets of native records */ + void *remove_op_data; /* B-tree deletion callback's context */ + uint8_t *page; /* Common disk page for I/O */ + size_t *nat_off; /* Array of offsets of native records */ H5B2_node_info_t *node_info; /* Table of node info structs for current depth of B-tree */ - uint8_t * min_native_rec; /* Pointer to minimum native record */ - uint8_t * max_native_rec; /* Pointer to maximum native record */ + uint8_t *min_native_rec; /* Pointer to minimum native record */ + uint8_t *max_native_rec; /* Pointer to maximum native record */ /* Client information (not stored) */ const H5B2_class_t *cls; /* Class of B-tree client */ - void * cb_ctx; /* Client callback context */ + void *cb_ctx; /* Client callback context */ } H5B2_hdr_t; /* B-tree leaf node information */ @@ -178,7 +178,7 @@ typedef struct H5B2_leaf_t { /* Internal B-tree information */ H5B2_hdr_t *hdr; /* Pointer to the [pinned] v2 B-tree header */ - uint8_t * leaf_native; /* Pointer to native records */ + uint8_t *leaf_native; /* Pointer to native records */ uint16_t nrec; /* Number of records in node */ } H5B2_leaf_t; @@ -188,8 +188,8 @@ typedef struct H5B2_internal_t { H5AC_info_t cache_info; /* Internal B-tree information */ - H5B2_hdr_t * hdr; /* Pointer to the [pinned] v2 B-tree header */ - uint8_t * int_native; /* Pointer to native records */ + H5B2_hdr_t *hdr; /* Pointer to the [pinned] v2 B-tree header */ + uint8_t *int_native; /* Pointer to native records */ H5B2_node_ptr_t *node_ptrs; /* Pointer to node pointers */ uint16_t nrec; /* Number of records in node */ uint16_t depth; /* Depth of this node in the B-tree */ @@ -198,7 +198,7 @@ typedef struct H5B2_internal_t { /* v2 B-tree */ struct H5B2_t { H5B2_hdr_t *hdr; /* Pointer to internal v2 B-tree header info */ - H5F_t * f; /* Pointer to file for v2 B-tree */ + H5F_t *f; /* Pointer to file for v2 B-tree */ }; /* Node position, for min/max determination */ @@ -212,12 +212,12 @@ typedef enum H5B2_nodepos_t { /* Callback info for loading a free space header into the cache */ typedef struct H5B2_hdr_cache_ud_t { H5F_t *f; /* File that v2 b-tree header is within */ - void * ctx_udata; /* User-data for protecting */ + void *ctx_udata; /* User-data for protecting */ } H5B2_hdr_cache_ud_t; /* Callback info for loading a free space internal node into the cache */ typedef struct H5B2_internal_cache_ud_t { - H5F_t * f; /* File that v2 b-tree header is within */ + H5F_t *f; /* File that v2 b-tree header is within */ H5B2_hdr_t *hdr; /* v2 B-tree header */ unsigned nrec; /* Number of records in node to load */ unsigned depth; /* Depth of node to load */ @@ -225,7 +225,7 @@ typedef struct H5B2_internal_cache_ud_t { /* Callback info for loading a free space leaf node into the cache */ typedef struct H5B2_leaf_cache_ud_t { - H5F_t * f; /* File that v2 b-tree header is within */ + H5F_t *f; /* File that v2 b-tree header is within */ H5B2_hdr_t *hdr; /* v2 B-tree header */ unsigned nrec; /* Number of records in node to load */ } H5B2_leaf_cache_ud_t; @@ -330,7 +330,7 @@ H5_DLL herr_t H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t * H5B2_nodepos_t curr_pos, void *udata, H5B2_remove_t op, void *op_data); H5_DLL herr_t H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info, - unsigned * parent_cache_info_flags_ptr, + unsigned *parent_cache_info_flags_ptr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_t curr_pos, hsize_t n, H5B2_remove_t op, void *op_data); H5_DLL herr_t H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr, diff --git a/src/H5B2private.h b/src/H5B2private.h index 1a7d0c8..e802b63 100644 --- a/src/H5B2private.h +++ b/src/H5B2private.h @@ -84,7 +84,7 @@ typedef enum H5B2_compare_t { typedef struct H5B2_class_t H5B2_class_t; struct H5B2_class_t { H5B2_subid_t id; /* ID of B-tree class, as found in file */ - const char * name; /* Name of B-tree class, for debugging */ + const char *name; /* Name of B-tree class, for debugging */ size_t nrec_size; /* Size of native (memory) record */ /* Extensible array client callback methods */ diff --git a/src/H5B2stat.c b/src/H5B2stat.c index df7303e..709f5bd 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -128,7 +128,7 @@ H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size) else /* Iterate through nodes */ if (H5B2_node_size(hdr, dxpl_id, hdr->depth, &hdr->root, btree_size) < 0) - HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node iteration failed") + HGOTO_ERROR(H5E_BTREE, H5E_CANTLIST, FAIL, "node iteration failed") } /* end if */ done: diff --git a/src/H5B2test.c b/src/H5B2test.c index fdd64a2..e3cf626 100644 --- a/src/H5B2test.c +++ b/src/H5B2test.c @@ -53,7 +53,7 @@ typedef struct H5B2_test_ctx_t { /* Local Prototypes */ /********************/ -static void * H5B2_test_crt_context(void *udata); +static void *H5B2_test_crt_context(void *udata); static herr_t H5B2_test_dst_context(void *ctx); static herr_t H5B2_test_store(void *nrecord, const void *udata); static herr_t H5B2_test_compare(const void *rec1, const void *rec2, int *result); @@ -61,7 +61,7 @@ static herr_t H5B2_test_encode(uint8_t *raw, const void *nrecord, void *ctx); static herr_t H5B2_test_decode(const uint8_t *raw, void *nrecord, void *ctx); static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth, const void *record, const void *_udata); -static void * H5B2_test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); +static void *H5B2_test_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); /*********************/ /* Package Variables */ @@ -110,9 +110,9 @@ H5FL_DEFINE_STATIC(H5B2_test_ctx_t); static void * H5B2_test_crt_context(void *_f) { - H5F_t * f = (H5F_t *)_f; /* User data for building callback context */ + H5F_t *f = (H5F_t *)_f; /* User data for building callback context */ H5B2_test_ctx_t *ctx; /* Callback context structure */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -308,7 +308,7 @@ static void * H5B2_test_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr) { H5B2_test_ctx_t *ctx; /* Callback context structure */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -372,7 +372,7 @@ H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr) herr_t H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_node_info_test_t *ninfo) { - H5B2_hdr_t * hdr; /* Pointer to the B-tree header */ + H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ H5B2_node_ptr_t curr_node_ptr; /* Node pointer info for current node */ unsigned depth; /* Current depth of the tree */ int cmp; /* Comparison value of records */ diff --git a/src/H5Bcache.c b/src/H5Bcache.c index b1af62d..cc9a48b 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -91,13 +91,13 @@ const H5AC_class_t H5AC_BT[1] = {{ static H5B_t * H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5B_t * bt = NULL; /* Pointer to the deserialized B-tree node */ + H5B_t *bt = NULL; /* Pointer to the deserialized B-tree node */ H5B_cache_ud_t *udata = (H5B_cache_ud_t *)_udata; /* User data for callback */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ - const uint8_t * p; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native keys */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ + const uint8_t *p; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native keys */ unsigned u; /* Local index variable */ - H5B_t * ret_value; /* Return value */ + H5B_t *ret_value; /* Return value */ FUNC_ENTER_STATIC diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c index f30e2a2..64fd714 100644 --- a/src/H5Bdbg.c +++ b/src/H5Bdbg.c @@ -52,9 +52,9 @@ herr_t H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B_class_t *type, void *udata) { - H5B_t * bt = NULL; - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -151,9 +151,9 @@ done: herr_t H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void *udata) { - H5B_t * bt = NULL; - H5RC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5RC_t *rc_shared; /* Ref-counted shared info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ int ncell, cmp; static int ncalls = 0; diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h index 9b9e97e..77f6437 100644 --- a/src/H5Bpkg.h +++ b/src/H5Bpkg.h @@ -48,7 +48,7 @@ typedef struct H5B_t { H5AC_info_t cache_info; /* Information for H5AC cache functions */ /* _must_ be first field in structure */ - H5RC_t * rc_shared; /*ref-counted shared info */ + H5RC_t *rc_shared; /*ref-counted shared info */ unsigned level; /*node level */ unsigned nchildren; /*number of child pointers */ haddr_t left; /*address of left sibling */ @@ -59,9 +59,9 @@ typedef struct H5B_t { /* Callback info for loading a B-tree node into the cache */ typedef struct H5B_cache_ud_t { - H5F_t * f; /* File that B-tree node is within */ + H5F_t *f; /* File that B-tree node is within */ const struct H5B_class_t *type; /* Type of tree */ - H5RC_t * rc_shared; /* Ref-counted shared info */ + H5RC_t *rc_shared; /* Ref-counted shared info */ } H5B_cache_ud_t; /*****************************/ diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index fc337b1..7e33103 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -93,8 +93,8 @@ typedef struct H5B_shared_t { size_t sizeof_keys; /* Size of native (memory) key node */ size_t sizeof_addr; /* Size of file address (in bytes) */ size_t sizeof_len; /* Size of file lengths (in bytes) */ - uint8_t * page; /* Disk page */ - size_t * nkey; /* Offsets of each native key in native key buffer */ + uint8_t *page; /* Disk page */ + size_t *nkey; /* Offsets of each native key in native key buffer */ } H5B_shared_t; /* @@ -153,7 +153,7 @@ static herr_t H5C_verify_not_in_index(H5C_t *cache_ptr, H5C_cache_entry_t *entry #define H5C__EPOCH_MARKER_TYPE H5C__MAX_NUM_TYPE_IDS -static void * H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static void *H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); static herr_t H5C_epoch_marker_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing, unsigned *flags_ptr); static herr_t H5C_epoch_marker_dest(H5F_t *f, void *thing); @@ -372,7 +372,7 @@ H5C_apply_candidate_list(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_i int entries_flushed = 0; int entries_examined = 0; int initial_list_len; - int * candidate_assignment_table = NULL; + int *candidate_assignment_table = NULL; haddr_t addr; H5C_cache_entry_t *clear_ptr = NULL; H5C_cache_entry_t *entry_ptr = NULL; @@ -1282,7 +1282,7 @@ herr_t H5C_expunge_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type, haddr_t addr, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t result; hbool_t first_flush = TRUE; H5C_cache_entry_t *entry_ptr = NULL; @@ -1388,7 +1388,7 @@ done: herr_t H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsigned flags) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; herr_t status; herr_t ret_value = SUCCEED; hbool_t destroy; @@ -1399,7 +1399,7 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign hbool_t tried_to_flush_protected_entry = FALSE; int32_t passes = 0; int32_t protected_entries = 0; - H5SL_node_t * node_ptr = NULL; + H5SL_node_t *node_ptr = NULL; H5C_cache_entry_t *entry_ptr = NULL; H5C_cache_entry_t *next_entry_ptr = NULL; #if H5C_DO_SANITY_CHECKS @@ -1557,12 +1557,12 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign #endif /* NDEBUG */ if ((!entry_ptr->is_dirty) || (!entry_ptr->in_slist)) { - /* the s-list has been modified out from under us. - * set node_ptr to NULL and break out of the loop. - */ - node_ptr = NULL; - break; - } + /* the s-list has been modified out from under us. + * set node_ptr to NULL and break out of the loop. + */ + node_ptr = NULL; + break; + } /* increment node pointer now, before we delete its target * from the slist. @@ -1715,7 +1715,7 @@ done: herr_t H5C_flush_to_min_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t result; hbool_t first_flush = TRUE; hbool_t write_permitted; @@ -2038,7 +2038,7 @@ herr_t H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_ptr, hbool_t *in_cache_ptr, hbool_t *is_dirty_ptr, hbool_t *is_protected_ptr, hbool_t *is_pinned_ptr) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -2231,7 +2231,7 @@ herr_t H5C_insert_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t result; herr_t ret_value = SUCCEED; /* Return value */ hbool_t first_flush = TRUE; @@ -2504,7 +2504,7 @@ herr_t H5C_mark_entries_as_clean(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, int32_t ce_array_len, haddr_t *ce_array_ptr) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t first_flush = TRUE; int entries_cleared; int entries_examined; @@ -2762,7 +2762,7 @@ done: */ herr_t H5C_mark_entry_dirty(void *thing) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing; herr_t ret_value = SUCCEED; /* Return value */ @@ -2995,7 +2995,7 @@ done: */ herr_t H5C_resize_entry(void *thing, size_t new_size) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing; herr_t ret_value = SUCCEED; /* Return value */ @@ -3092,7 +3092,7 @@ done: */ herr_t H5C_pin_protected_entry(void *thing) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3178,7 +3178,7 @@ done: void *H5C_protect(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type, haddr_t addr, void *udata, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t hit; hbool_t first_flush; hbool_t have_write_permitted = FALSE; @@ -3186,9 +3186,9 @@ done: hbool_t write_permitted = FALSE; herr_t result; size_t empty_space; - void * thing; + void *thing; H5C_cache_entry_t *entry_ptr; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3779,9 +3779,10 @@ done: break; case H5C_flash_incr__add_space: - cache_ptr->flash_size_increase_possible = TRUE; - cache_ptr->flash_size_increase_threshold = (size_t)( - ((double)(cache_ptr->max_cache_size)) * ((cache_ptr->resize_ctl).flash_threshold)); + cache_ptr->flash_size_increase_possible = TRUE; + cache_ptr->flash_size_increase_threshold = + (size_t)(((double)(cache_ptr->max_cache_size)) * + ((cache_ptr->resize_ctl).flash_threshold)); break; default: /* should be unreachable */ @@ -4268,7 +4269,7 @@ done: */ void #ifndef NDEBUG - H5C_stats__reset(H5C_t * cache_ptr) + H5C_stats__reset(H5C_t * cache_ptr) #else /* NDEBUG */ #if H5C_COLLECT_CACHE_STATS H5C_stats__reset(H5C_t *cache_ptr) @@ -4374,8 +4375,8 @@ H5C_stats__reset(H5C_t H5_ATTR_UNUSED *cache_ptr) herr_t ret_value = SUCCEED; /* Return value */ int i; H5C_cache_entry_t *entry_ptr = NULL; - H5SL_t * slist_ptr = NULL; - H5SL_node_t * node_ptr = NULL; + H5SL_t *slist_ptr = NULL; + H5SL_node_t *node_ptr = NULL; FUNC_ENTER_NOAPI(FAIL) @@ -4497,7 +4498,7 @@ done: */ herr_t H5C_unpin_entry(void *_entry_ptr) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */ herr_t ret_value = SUCCEED; /* Return value */ @@ -4569,7 +4570,7 @@ done: herr_t H5C_unprotect(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t deleted; hbool_t dirtied; hbool_t set_flush_marker; @@ -5116,7 +5117,7 @@ done: static herr_t H5C__auto_adjust_cache_size(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, hbool_t write_permitted, hbool_t * first_flush_ptr) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; herr_t result; hbool_t inserted_epoch_marker = FALSE; size_t new_max_cache_size = 0; @@ -5639,7 +5640,7 @@ done: H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, hbool_t write_permitted, hbool_t * first_flush_ptr) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; herr_t result; size_t eviction_size_limit; size_t bytes_evicted = 0; @@ -5720,15 +5721,15 @@ done: if ((prev_ptr->is_dirty != prev_is_dirty) || (prev_ptr->next != next_ptr) || (prev_ptr->is_protected) || (prev_ptr->is_pinned)) { - /* something has happened to the LRU -- start over - * from the tail. - */ - entry_ptr = cache_ptr->LRU_tail_ptr; - } - else { + /* something has happened to the LRU -- start over + * from the tail. + */ + entry_ptr = cache_ptr->LRU_tail_ptr; + } + else { - entry_ptr = prev_ptr; - } + entry_ptr = prev_ptr; + } } else { @@ -6124,8 +6125,9 @@ done: break; case H5C_flash_incr__add_space: - cache_ptr->flash_size_increase_threshold = (size_t)( - ((double)(cache_ptr->max_cache_size)) * ((cache_ptr->resize_ctl).flash_threshold)); + cache_ptr->flash_size_increase_threshold = + (size_t)(((double)(cache_ptr->max_cache_size)) * + ((cache_ptr->resize_ctl).flash_threshold)); break; default: /* should be unreachable */ @@ -6206,7 +6208,7 @@ done: static herr_t H5C_flush_invalidate_cache(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsigned flags) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; herr_t status; hbool_t first_flush = TRUE; int32_t protected_entries = 0; @@ -6215,7 +6217,7 @@ done: int32_t old_pel_len; int32_t passes = 0; unsigned cooked_flags; - H5SL_node_t * node_ptr = NULL; + H5SL_node_t *node_ptr = NULL; H5C_cache_entry_t *entry_ptr = NULL; H5C_cache_entry_t *next_entry_ptr = NULL; #if H5C_DO_SANITY_CHECKS @@ -6384,11 +6386,11 @@ done: #endif /* NDEBUG */ if ((!entry_ptr->is_dirty) || (!entry_ptr->in_slist)) { - /* the s-list has been modified out from under us. - * break out of the loop. - */ - break; - } + /* the s-list has been modified out from under us. + * break out of the loop. + */ + break; + } /* increment node pointer now, before we delete its target * from the slist. @@ -6698,7 +6700,7 @@ done: const H5C_class_t *type_ptr, haddr_t addr, unsigned flags, hbool_t *first_flush_ptr, hbool_t del_entry_from_slist_on_destroy) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; hbool_t destroy; hbool_t clear_only; hbool_t take_ownership; @@ -7076,9 +7078,9 @@ done: */ static void *H5C_load_entry(H5F_t * f, hid_t dxpl_id, const H5C_class_t *type, haddr_t addr, void *udata) { - void * thing = NULL; /* Pointer to thing loaded */ + void *thing = NULL; /* Pointer to thing loaded */ H5C_cache_entry_t *entry; /* Alias for thing loaded, as cache entry */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -252,7 +252,7 @@ H5CS_pop(void) herr_t H5CS_copy_stack(H5CS_t *new_stack) { - H5CS_t * old_stack = H5CS_get_my_stack(); + H5CS_t *old_stack = H5CS_get_my_stack(); unsigned u; /* Local index variable */ /* Don't push this function on the function stack... :-) */ diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index d7a1949..3e87c98 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -494,7 +494,7 @@ typedef struct H5C_cache_entry_t { #ifndef NDEBUG uint32_t magic; #endif /* NDEBUG */ - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t addr; size_t size; const H5C_class_t *type; @@ -986,7 +986,7 @@ H5_DLL herr_t H5C_get_evictions_enabled(const H5C_t *cache_ptr, hbool_t *evictio H5_DLL herr_t H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr); H5_DLL herr_t H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr, - FILE ** trace_file_ptr_ptr); + FILE **trace_file_ptr_ptr); H5_DLL herr_t H5C_insert_entry(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags); @@ -136,7 +136,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t hid_t dapl_id) { H5G_loc_t loc; /* Object location to insert dataset into */ - H5D_t * dset = NULL; /* New dataset's info */ + H5D_t *dset = NULL; /* New dataset's info */ const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -223,7 +223,7 @@ hid_t H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id) { H5G_loc_t loc; /* Object location to insert dataset into */ - H5D_t * dset = NULL; /* New dataset's info */ + H5D_t *dset = NULL; /* New dataset's info */ const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -297,7 +297,7 @@ done: hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5G_loc_t loc; /* Object location of group */ H5G_loc_t dset_loc; /* Object location of dataset */ H5G_name_t path; /* Dataset group hier. path */ @@ -603,7 +603,7 @@ done: hsize_t H5Dget_storage_size(hid_t dset_id) { - H5D_t * dset; /* Dataset to query */ + H5D_t *dset; /* Dataset to query */ hsize_t ret_value = 0; /* Return value */ FUNC_ENTER_API(0) @@ -635,7 +635,7 @@ done: haddr_t H5Dget_offset(hid_t dset_id) { - H5D_t * dset; /* Dataset to query */ + H5D_t *dset; /* Dataset to query */ haddr_t ret_value = HADDR_UNDEF; /* Return value */ FUNC_ENTER_API(HADDR_UNDEF) @@ -714,8 +714,8 @@ done: herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data) { - H5T_t * type; /* Datatype */ - H5S_t * space; /* Dataspace for iteration */ + H5T_t *type; /* Datatype */ + H5S_t *space; /* Dataspace for iteration */ H5S_sel_iter_op_t dset_op; /* Operator for iteration */ herr_t ret_value; /* Return value */ @@ -819,13 +819,13 @@ herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size) { H5D_vlen_bufsize_t vlen_bufsize = {0, 0, 0, 0, 0, 0, 0}; - H5D_t * dset; /* Dataset for operation */ - H5S_t * fspace = NULL; /* Dataset's dataspace */ - H5S_t * mspace = NULL; /* Memory dataspace */ + H5D_t *dset; /* Dataset for operation */ + H5S_t *fspace = NULL; /* Dataset's dataspace */ + H5S_t *mspace = NULL; /* Memory dataspace */ char bogus; /* bogus value to pass to H5Diterate() */ - H5S_t * space; /* Dataspace for iteration */ - H5P_genplist_t * plist; /* Property list */ - H5T_t * type; /* Datatype */ + H5S_t *space; /* Dataspace for iteration */ + H5P_genplist_t *plist; /* Property list */ + H5T_t *type; /* Datatype */ H5S_sel_iter_op_t dset_op; /* Operator for iteration */ herr_t ret_value; /* Return value */ diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index 9e0d134..53148e1 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -80,7 +80,7 @@ typedef struct H5D_btree_key_t { typedef struct H5D_btree_it_ud_t { H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */ H5D_chunk_cb_func_t cb; /* Chunk callback routine */ - void * udata; /* User data for chunk callback routine */ + void *udata; /* User data for chunk callback routine */ } H5D_btree_it_ud_t; /* B-tree callback info for debugging */ @@ -100,7 +100,7 @@ static int H5D__btree_idx_iterate_cb(H5F_t *f, hid_t dxpl_id, const void *left_k const void *right_key, void *_udata); /* B-tree callbacks */ -static H5RC_t * H5D__btree_get_shared(const H5F_t *f, const void *_udata); +static H5RC_t *H5D__btree_get_shared(const H5F_t *f, const void *_udata); static herr_t H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t, void *_lt_key, void *_udata, void *_rt_key, haddr_t *addr_p /*out*/); static int H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key); @@ -229,7 +229,7 @@ H5D__btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op, void *_lt_key, void * { H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key; H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key; - H5D_chunk_ud_t * udata = (H5D_chunk_ud_t *)_udata; + H5D_chunk_ud_t *udata = (H5D_chunk_ud_t *)_udata; unsigned u; herr_t ret_value = SUCCEED; /* Return value */ @@ -298,8 +298,8 @@ done: static int H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key) { - H5D_btree_key_t * lt_key = (H5D_btree_key_t *)_lt_key; - H5D_btree_key_t * rt_key = (H5D_btree_key_t *)_rt_key; + H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key; + H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key; H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *)_udata; int ret_value = -1; /* Return value */ @@ -346,8 +346,8 @@ H5D__btree_cmp2(void *_lt_key, void *_udata, void *_rt_key) static int H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key) { - H5D_btree_key_t * lt_key = (H5D_btree_key_t *)_lt_key; - H5D_btree_key_t * rt_key = (H5D_btree_key_t *)_rt_key; + H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key; + H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key; H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *)_udata; int ret_value = 0; @@ -410,7 +410,7 @@ static htri_t H5D__btree_found(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, const void *_lt_key, void *_udata) { - H5D_chunk_ud_t * udata = (H5D_chunk_ud_t *)_udata; + H5D_chunk_ud_t *udata = (H5D_chunk_ud_t *)_udata; const H5D_btree_key_t *lt_key = (const H5D_btree_key_t *)_lt_key; unsigned u; htri_t ret_value = TRUE; /* Return value */ @@ -474,7 +474,7 @@ H5D__btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key, hbool_t H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key; H5D_btree_key_t *md_key = (H5D_btree_key_t *)_md_key; H5D_btree_key_t *rt_key = (H5D_btree_key_t *)_rt_key; - H5D_chunk_ud_t * udata = (H5D_chunk_ud_t *)_udata; + H5D_chunk_ud_t *udata = (H5D_chunk_ud_t *)_udata; int cmp; unsigned u; H5B_ins_t ret_value = H5B_INS_ERROR; /* Return value */ @@ -960,7 +960,7 @@ static int H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_lt_key, haddr_t addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata) { - H5D_btree_it_ud_t * udata = (H5D_btree_it_ud_t *)_udata; /* User data */ + H5D_btree_it_ud_t *udata = (H5D_btree_it_ud_t *)_udata; /* User data */ const H5D_btree_key_t *lt_key = (const H5D_btree_key_t *)_lt_key; /* B-tree key for chunk */ H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */ int ret_value = -1; /* Return value */ diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 1996135..334db78 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -102,12 +102,12 @@ typedef struct H5D_chunk_it_ud1_t { H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */ const H5D_chk_idx_info_t *idx_info; /* Chunked index info */ - const H5D_io_info_t * io_info; /* I/O info for dataset operation */ - const hsize_t * space_dim; /* New dataset dimensions */ - const hbool_t * shrunk_dim; /* Dimensions which have been shrunk */ - H5S_t * chunk_space; /* Dataspace for a chunk */ + const H5D_io_info_t *io_info; /* I/O info for dataset operation */ + const hsize_t *space_dim; /* New dataset dimensions */ + const hbool_t *shrunk_dim; /* Dimensions which have been shrunk */ + H5S_t *chunk_space; /* Dataspace for a chunk */ uint32_t elmts_per_chunk; /* Elements in chunk */ - hsize_t * hyper_start; /* Starting location of hyperslab */ + hsize_t *hyper_start; /* Starting location of hyperslab */ H5D_fill_buf_info_t fb_info; /* Dataset's fill buffer info */ hbool_t fb_info_init; /* Whether the fill value buffer has been initialized */ } H5D_chunk_it_ud1_t; @@ -125,10 +125,10 @@ typedef struct H5D_chunk_it_ud2_t { /* Callback info for iteration to copy data */ typedef struct H5D_chunk_it_ud3_t { H5D_chunk_common_ud_t common; /* Common info for B-tree user data (must be first) */ - H5F_t * file_src; /* Source file for copy */ - H5D_chk_idx_info_t * idx_info_dst; /* Dest. chunk index info object */ - void * buf; /* Buffer to hold chunk data for read/write */ - void * bkg; /* Buffer for background information during type conversion */ + H5F_t *file_src; /* Source file for copy */ + H5D_chk_idx_info_t *idx_info_dst; /* Dest. chunk index info object */ + void *buf; /* Buffer to hold chunk data for read/write */ + void *bkg; /* Buffer for background information during type conversion */ size_t buf_size; /* Buffer size */ hbool_t do_convert; /* Whether to perform type conversions */ @@ -137,12 +137,12 @@ typedef struct H5D_chunk_it_ud3_t { hid_t tid_dst; /* Datatype ID for destination datatype */ hid_t tid_mem; /* Datatype ID for memory datatype */ const H5T_t *dt_src; /* Source datatype */ - H5T_path_t * tpath_src_mem; /* Datatype conversion path from source file to memory */ - H5T_path_t * tpath_mem_dst; /* Datatype conversion path from memory to dest. file */ - void * reclaim_buf; /* Buffer for reclaiming data */ + H5T_path_t *tpath_src_mem; /* Datatype conversion path from source file to memory */ + H5T_path_t *tpath_mem_dst; /* Datatype conversion path from memory to dest. file */ + void *reclaim_buf; /* Buffer for reclaiming data */ size_t reclaim_buf_size; /* Reclaim buffer size */ uint32_t nelmts; /* Number of elements in buffer */ - H5S_t * buf_space; /* Dataspace describing buffer */ + H5S_t *buf_space; /* Dataspace describing buffer */ /* needed for compressed variable-length data */ const H5O_pline_t *pline; /* Filter pipeline */ @@ -157,7 +157,7 @@ typedef struct H5D_chunk_it_ud3_t { /* Callback info for iteration to dump index */ typedef struct H5D_chunk_it_ud4_t { - FILE * stream; /* Output stream */ + FILE *stream; /* Output stream */ hbool_t header_displayed; /* Node's header is displayed? */ unsigned ndims; /* Number of dimensions for chunk/dataset */ } H5D_chunk_it_ud4_t; @@ -165,7 +165,7 @@ typedef struct H5D_chunk_it_ud4_t { /* Callback info for nonexistent readvv operation */ typedef struct H5D_chunk_readvv_ud_t { unsigned char *rbuf; /* Read buffer to initialize */ - const H5D_t * dset; /* Dataset to operate on */ + const H5D_t *dset; /* Dataset to operate on */ hid_t dxpl_id; /* DXPL for operation */ } H5D_chunk_readvv_ud_t; @@ -210,9 +210,9 @@ static ssize_t H5D__nonexistent_readvv(const H5D_io_info_t *io_info, size_t chun /* Helper routines */ static herr_t H5D__chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize_t *curr_dims); -static void * H5D__chunk_alloc(size_t size, const H5O_pline_t *pline); -static void * H5D__chunk_xfree(void *chk, const H5O_pline_t *pline); -static void * H5D__chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline); +static void *H5D__chunk_alloc(size_t size, const H5O_pline_t *pline); +static void *H5D__chunk_xfree(void *chk, const H5O_pline_t *pline); +static void *H5D__chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline); static herr_t H5D__chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *udata); static hbool_t H5D__chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *udata); static herr_t H5D__free_chunk_info(void *item, void *key, void *opdata); @@ -293,8 +293,8 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz H5D_chunk_ud_t udata; /* User data for querying chunk info */ hsize_t chunk_idx; /* Index of chunk cache entry */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ - const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ unsigned space_ndims; /* Dataset's space rank */ herr_t ret_value = SUCCEED; /* Return value */ @@ -387,13 +387,13 @@ herr_t H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset, uint32_t *filters, void *buf) { const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ - const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */ + const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */ H5D_chunk_ud_t udata; /* User data for querying chunk info */ unsigned space_ndims; /* Dataset's space rank */ hsize_t chunk_offset[H5O_LAYOUT_NDIMS]; /* Dataset's chunk offset */ hsize_t chunk_idx; /* Index of chunk cache entry */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -493,13 +493,13 @@ herr_t H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, hsize_t *storage_size) { const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ - const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */ + const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /* raw data chunk cache */ H5D_chunk_ud_t udata; /* User data for querying chunk info */ unsigned space_ndims; /* Dataset's space rank */ hsize_t chunk_offset[H5O_LAYOUT_NDIMS]; /* Dataset's chunk offset */ hsize_t chunk_idx; /* Index of chunk cache entry */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ hbool_t flush; /* Flush cache or not */ herr_t ret_value = SUCCEED; /* Return value */ @@ -779,8 +779,8 @@ herr_t H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* Convenience pointer to dataset's chunk cache */ - H5P_genplist_t * dapl; /* Data access property list object pointer */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /* Convenience pointer to dataset's chunk cache */ + H5P_genplist_t *dapl; /* Data access property list object pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -909,10 +909,10 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf { const H5D_t *dataset = io_info->dset; /* Local pointer to dataset info */ const H5T_t *mem_type = type_info->mem_type; /* Local pointer to memory datatype */ - H5S_t * tmp_mspace = NULL; /* Temporary memory dataspace */ + H5S_t *tmp_mspace = NULL; /* Temporary memory dataspace */ hssize_t old_offset[H5O_LAYOUT_NDIMS]; /* Old selection offset */ htri_t file_space_normalized = FALSE; /* File dataspace was normalized */ - H5T_t * file_type = NULL; /* Temporary copy of file datatype for iteration */ + H5T_t *file_type = NULL; /* Temporary copy of file datatype for iteration */ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ unsigned f_ndims; /* The number of dimensions of the file's dataspace */ int sm_ndims; /* The number of dimensions of the memory buffer's dataspace (signed) */ @@ -1462,7 +1462,7 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t /* Check for intersection of temporary chunk and file selection */ /* (Casting away const OK - QAK) */ if (TRUE == H5S_hyper_intersect_block((H5S_t *)fm->file_space, coords, end)) { - H5S_t * tmp_fchunk; /* Temporary file dataspace */ + H5S_t *tmp_fchunk; /* Temporary file dataspace */ H5D_chunk_info_t *new_chunk_info; /* chunk information to insert into skip list */ hssize_t schunk_points; /* Number of elements in chunk selection */ @@ -1715,8 +1715,8 @@ H5D__chunk_file_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, const hsize_t *coords, void *_udata) { H5D_chunk_file_iter_ud_t *udata = (H5D_chunk_file_iter_ud_t *)_udata; /* User data for operation */ - H5D_chunk_map_t * fm = udata->fm; /* File<->memory chunk mapping info */ - H5D_chunk_info_t * chunk_info; /* Chunk information for current chunk */ + H5D_chunk_map_t *fm = udata->fm; /* File<->memory chunk mapping info */ + H5D_chunk_info_t *chunk_info; /* Chunk information for current chunk */ hsize_t coords_in_chunk[H5O_LAYOUT_NDIMS]; /* Coordinates of element in chunk */ hsize_t chunk_index; /* Chunk index */ unsigned u; /* Local index variable */ @@ -1835,7 +1835,7 @@ static herr_t H5D__chunk_mem_cb(void H5_ATTR_UNUSED *elem, const H5T_t H5_ATTR_UNUSED *type, unsigned ndims, const hsize_t *coords, void *_fm) { - H5D_chunk_map_t * fm = (H5D_chunk_map_t *)_fm; /* File<->memory chunk mapping info */ + H5D_chunk_map_t *fm = (H5D_chunk_map_t *)_fm; /* File<->memory chunk mapping info */ H5D_chunk_info_t *chunk_info; /* Chunk information for current chunk */ hsize_t coords_in_mem[H5O_LAYOUT_NDIMS]; /* Coordinates of element in memory */ hsize_t chunk_index; /* Chunk index */ @@ -1989,7 +1989,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_ const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t *fm) { - H5SL_node_t * chunk_node; /* Current node in chunk skip list */ + H5SL_node_t *chunk_node; /* Current node in chunk skip list */ H5D_io_info_t nonexistent_io_info; /* "nonexistent" I/O info object */ H5D_io_info_t ctg_io_info; /* Contiguous I/O info object */ H5D_storage_t ctg_store; /* Chunk storage information as contiguous dataset */ @@ -2050,8 +2050,8 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_ chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm); while (chunk_node) { H5D_chunk_info_t *chunk_info; /* Chunk information */ - H5D_io_info_t * chk_io_info; /* Pointer to I/O info object for this chunk */ - void * chunk; /* Pointer to locked chunk buffer */ + H5D_io_info_t *chk_io_info; /* Pointer to I/O info object for this chunk */ + void *chunk; /* Pointer to locked chunk buffer */ H5D_chunk_ud_t udata; /* B-tree pass-through */ htri_t cacheable; /* Whether the chunk is cacheable */ @@ -2140,7 +2140,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t *fm) { - H5SL_node_t * chunk_node; /* Current node in chunk skip list */ + H5SL_node_t *chunk_node; /* Current node in chunk skip list */ H5D_io_info_t ctg_io_info; /* Contiguous I/O info object */ H5D_storage_t ctg_store; /* Chunk storage information as contiguous dataset */ H5D_io_info_t cpt_io_info; /* Compact I/O info object */ @@ -2178,8 +2178,8 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm); while (chunk_node) { H5D_chunk_info_t *chunk_info; /* Chunk information */ - H5D_io_info_t * chk_io_info; /* Pointer to I/O info object for this chunk */ - void * chunk; /* Pointer to locked chunk buffer */ + H5D_io_info_t *chk_io_info; /* Pointer to I/O info object for this chunk */ + void *chunk; /* Pointer to locked chunk buffer */ H5D_chunk_ud_t udata; /* Index pass-through */ htri_t cacheable; /* Whether the chunk is cacheable */ @@ -2291,8 +2291,8 @@ H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id) { H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); - H5D_rdcc_ent_t * ent, *next; + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); + H5D_rdcc_ent_t *ent, *next; unsigned nerrors = 0; /* Count of any errors encountered when flushing chunks */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2668,7 +2668,7 @@ static herr_t H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache, H5D_rdcc_ent_t *ent, hbool_t reset) { - void * buf = NULL; /* Temporary buffer */ + void *buf = NULL; /* Temporary buffer */ hbool_t point_of_no_return = FALSE; herr_t ret_value = SUCCEED; /* Return value */ @@ -2888,8 +2888,8 @@ H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t size_t total = rdcc->nbytes_max; const int nmeth = 2; /* Number of methods */ int w[1]; /* Weighting as an interval */ - H5D_rdcc_ent_t * p[2], *cur; /* List pointers */ - H5D_rdcc_ent_t * n[2]; /* List next pointers */ + H5D_rdcc_ent_t *p[2], *cur; /* List pointers */ + H5D_rdcc_ent_t *n[2]; /* List next pointers */ int nerrors = 0; /* Accumulated error count during preemptions */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3005,20 +3005,20 @@ done: void * H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax) { - const H5D_t * dset = io_info->dset; /* Local pointer to the dataset info */ + const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */ const H5O_pline_t *pline = &(dset->shared->dcpl_cache .pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_alloc */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ - const H5O_fill_t * fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */ + const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */ H5D_fill_buf_info_t fb_info; /* Dataset's fill buffer info */ hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */ - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/ - H5D_rdcc_ent_t * ent = NULL; /*cache entry */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/ + H5D_rdcc_ent_t *ent = NULL; /*cache entry */ haddr_t chunk_addr = HADDR_UNDEF; /* Address of chunk on disk */ size_t chunk_size; /*size of a chunk */ - void * chunk = NULL; /*the file chunk */ - void * ret_value; /*return value */ + void *chunk = NULL; /*the file chunk */ + void *ret_value; /*return value */ FUNC_ENTER_PACKAGE @@ -3283,7 +3283,7 @@ H5D__chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata, hbo uint32_t naccessed) { const H5O_layout_t *layout = &(io_info->dset->shared->layout); /* Dataset layout */ - const H5D_rdcc_t * rdcc = &(io_info->dset->shared->cache.chunk); + const H5D_rdcc_t *rdcc = &(io_info->dset->shared->cache.chunk); herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3388,10 +3388,10 @@ herr_t H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* Raw data chunk cache */ - H5D_rdcc_ent_t * ent; /* Cache entry */ + const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /* Raw data chunk cache */ + H5D_rdcc_ent_t *ent; /* Cache entry */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ hsize_t chunk_bytes = 0; /* Number of bytes allocated for chunks */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3456,12 +3456,12 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite, hs size_t chunk_size; /* Actual size of chunk in bytes, possibly filtered */ unsigned filter_mask = 0; /* Filter mask for chunks that have them */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ - const H5O_pline_t * pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */ - const H5O_fill_t * fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */ + const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */ + const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */ H5D_fill_value_t fill_status; /* The fill value status */ hbool_t should_fill = FALSE; /* Whether fill values should be written */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ #ifdef H5_HAVE_PARALLEL hbool_t blocks_written = FALSE; /* Flag to indicate that chunk was actually written */ hbool_t using_mpi = @@ -3471,7 +3471,7 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite, hs hbool_t carry; /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */ int space_ndims; /* Dataset's space rank */ hsize_t space_dim[H5O_LAYOUT_NDIMS]; /* Dataset's dataspace dimensions */ - const uint32_t * chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */ + const uint32_t *chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */ int op_dim; /* Current operationg dimension */ H5D_fill_buf_info_t fb_info; /* Dataset's fill buffer info */ hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */ @@ -3824,8 +3824,8 @@ H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id, H5D_chunk_coll_info size_t num_blocks; /* Number of blocks between processes. */ size_t leftover_blocks; /* Number of leftover blocks to handle */ int blocks, leftover, block_len; /* converted to int for MPI */ - MPI_Aint * chunk_disp_array = NULL; - int * block_lens = NULL; + MPI_Aint *chunk_disp_array = NULL; + int *block_lens = NULL; MPI_Datatype mem_type, file_type; hid_t data_dxpl_id = -1; /* DXPL ID to use for raw data I/O operations */ int i; /* Local index variable */ @@ -3924,7 +3924,7 @@ H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id, H5D_chunk_coll_info /* set MPI-IO VFD properties */ { H5FD_mpio_xfer_t xfer_mode = H5FD_MPIO_COLLECTIVE; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ if (NULL == (plist = H5P_object_verify(data_dxpl_id, H5P_DATASET_XFER))) HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dataset transfer list") @@ -3984,15 +3984,15 @@ static herr_t H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata) { const H5D_io_info_t *io_info = udata->io_info; /* Local pointer to I/O info */ - const H5D_t * dset = io_info->dset; /* Local pointer to the dataset info */ - const H5O_layout_t * layout = &(dset->shared->layout); /* Dataset's layout */ + const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */ + const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset's layout */ unsigned rank = udata->common.layout->ndims - 1; /* Dataset rank */ - const hsize_t * chunk_offset = io_info->store->chunk.offset; /* Chunk offset */ + const hsize_t *chunk_offset = io_info->store->chunk.offset; /* Chunk offset */ H5S_sel_iter_t chunk_iter; /* Memory selection iteration info */ hssize_t sel_nelmts; /* Number of elements in selection */ hsize_t count[H5O_LAYOUT_NDIMS]; /* Element count of hyperslab */ size_t chunk_size; /*size of a chunk */ - void * chunk; /* The file chunk */ + void *chunk; /* The file chunk */ H5D_chunk_ud_t chk_udata; /* User data for locking chunk */ uint32_t bytes_accessed; /* Bytes accessed in chunk */ hbool_t chunk_iter_init = FALSE; /* Whether the chunk iterator has been initialized */ @@ -4200,10 +4200,10 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim) H5D_io_info_t chk_io_info; /* Chunked I/O info object */ H5D_storage_t chk_store; /* Chunk storage information */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset's layout */ - const H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ - H5D_rdcc_ent_t * ent = NULL; /* Cache entry */ + const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ + H5D_rdcc_ent_t *ent = NULL; /* Cache entry */ int space_ndims; /* Dataset's space rank */ hsize_t space_dim[H5O_LAYOUT_NDIMS]; /* Current dataspace dimensions */ int op_dim; /* Current operationg dimension */ @@ -4212,7 +4212,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim) hbool_t udata_init = FALSE; /* Whether the chunk index iterator user data has been initialized */ H5D_chunk_common_ud_t idx_udata; /* User data for index removal routine */ H5D_chunk_ud_t chk_udata; /* User data for getting chunk info */ - H5S_t * chunk_space = NULL; /* Dataspace for a chunk */ + H5S_t *chunk_space = NULL; /* Dataspace for a chunk */ hsize_t chunk_dim[H5O_LAYOUT_NDIMS]; /* Chunk dimensions */ hsize_t chunk_offset[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */ hsize_t hyper_start[H5O_LAYOUT_NDIMS]; /* Starting location of hyperslab */ @@ -4314,8 +4314,9 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim) if (0 == space_dim[op_dim]) max_fill_chunk_off[op_dim] = -1; else - max_fill_chunk_off[op_dim] = (hssize_t)( - chunk_dim[op_dim] * ((MIN(space_dim[op_dim], old_dim[op_dim]) - 1) / chunk_dim[op_dim])); + max_fill_chunk_off[op_dim] = + (hssize_t)(chunk_dim[op_dim] * + ((MIN(space_dim[op_dim], old_dim[op_dim]) - 1) / chunk_dim[op_dim])); if (shrunk_dim[op_dim]) { /* Calculate the smallest offset of chunks that might need to be @@ -4542,7 +4543,7 @@ herr_t H5D__chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[]) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - const H5D_t * dset = io_info->dset; /* Local pointer to dataset info */ + const H5D_t *dset = io_info->dset; /* Local pointer to dataset info */ H5D_chunk_it_ud2_t udata; /* User data for iteration callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -4668,9 +4669,9 @@ done: herr_t H5D__chunk_update_cache(H5D_t *dset, hid_t dxpl_id) { - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ - H5D_rdcc_ent_t * ent, *next; /*cache entry */ - H5D_rdcc_ent_t * old_ent; /* Old cache entry */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ + H5D_rdcc_ent_t *ent, *next; /*cache entry */ + H5D_rdcc_ent_t *old_ent; /* Old cache entry */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ unsigned rank; /* Current # of dimensions */ @@ -4761,8 +4762,8 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) hbool_t fix_ref = FALSE; /* Whether to fix up references in the dest. file */ /* General information about chunk copy */ - void * bkg = udata->bkg; /* Background buffer for datatype conversion */ - void * buf = udata->buf; /* Chunk buffer for I/O & datatype conversions */ + void *bkg = udata->bkg; /* Background buffer for datatype conversion */ + void *buf = udata->buf; /* Chunk buffer for I/O & datatype conversions */ size_t buf_size = udata->buf_size; /* Size of chunk buffer */ const H5O_pline_t *pline = udata->pline; /* I/O pipeline for applying filters */ @@ -4828,7 +4829,7 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) H5D_rdcc_ent_t *ent = NULL; /* Cache entry */ unsigned idx; /* Index of chunk in cache, if present */ unsigned u; /* Counter */ - H5D_shared_t * shared_fo = udata->cpy_info->shared_fo; + H5D_shared_t *shared_fo = udata->cpy_info->shared_fo; /* See if the written chunk is in the chunk cache */ if (shared_fo && shared_fo->cache.chunk.nslots > 0) { @@ -4884,11 +4885,11 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) if (is_vlen) { H5T_path_t *tpath_src_mem = udata->tpath_src_mem; H5T_path_t *tpath_mem_dst = udata->tpath_mem_dst; - H5S_t * buf_space = udata->buf_space; + H5S_t *buf_space = udata->buf_space; hid_t tid_src = udata->tid_src; hid_t tid_dst = udata->tid_dst; hid_t tid_mem = udata->tid_mem; - void * reclaim_buf = udata->reclaim_buf; + void *reclaim_buf = udata->reclaim_buf; size_t reclaim_buf_size = udata->reclaim_buf_size; /* Convert from source file to memory */ @@ -4993,21 +4994,21 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk H5D_chk_idx_info_t idx_info_src; /* Source chunked index info */ H5O_pline_t _pline; /* Temporary pipeline info */ const H5O_pline_t *pline; /* Pointer to pipeline info to use */ - H5T_path_t * tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */ + H5T_path_t *tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */ hid_t tid_src = -1; /* Datatype ID for source datatype */ hid_t tid_dst = -1; /* Datatype ID for destination datatype */ hid_t tid_mem = -1; /* Datatype ID for memory datatype */ size_t buf_size; /* Size of copy buffer */ size_t reclaim_buf_size; /* Size of reclaim buffer */ - void * buf = NULL; /* Buffer for copying data */ - void * bkg = NULL; /* Buffer for background during type conversion */ - void * reclaim_buf = NULL; /* Buffer for reclaiming data */ - H5S_t * buf_space = NULL; /* Dataspace describing buffer */ + void *buf = NULL; /* Buffer for copying data */ + void *bkg = NULL; /* Buffer for background during type conversion */ + void *reclaim_buf = NULL; /* Buffer for reclaiming data */ + H5S_t *buf_space = NULL; /* Dataspace describing buffer */ hid_t sid_buf = -1; /* ID for buffer dataspace */ uint32_t nelmts = 0; /* Number of elements in buffer */ hbool_t do_convert = FALSE; /* Indicate that type conversions should be performed */ hbool_t copy_setup_done = FALSE; /* Indicate that 'copy setup' is done */ - H5D_shared_t * shared_fo = (H5D_shared_t *)cpy_info->shared_fo; + H5D_shared_t *shared_fo = (H5D_shared_t *)cpy_info->shared_fo; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -5074,8 +5075,8 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk /* If there's a VLEN source datatype, set up type conversion information */ if (H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) { - H5T_t * dt_dst; /* Destination datatype */ - H5T_t * dt_mem; /* Memory datatype */ + H5T_t *dt_dst; /* Destination datatype */ + H5T_t *dt_mem; /* Memory datatype */ size_t mem_dt_size; /* Memory datatype size */ size_t tmp_dt_size; /* Temp. datatype size */ size_t max_dt_size; /* Max atatype size */ @@ -5419,9 +5420,9 @@ H5D__chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ - H5D_dxpl_cache_t * dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /* Dataset's chunk cache */ - H5D_rdcc_ent_t * ent = NULL, *next = NULL; /* Pointer to current & next cache entries */ + H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /* Dataset's chunk cache */ + H5D_rdcc_ent_t *ent = NULL, *next = NULL; /* Pointer to current & next cache entries */ int nerrors = 0; /* Accumulated count of errors */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 3f89adb..0db7a35 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -383,9 +383,9 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds hid_t tid_src = -1; /* Datatype ID for source datatype */ hid_t tid_dst = -1; /* Datatype ID for destination datatype */ hid_t tid_mem = -1; /* Datatype ID for memory datatype */ - void * buf = NULL; /* Buffer for copying data */ - void * bkg = NULL; /* Temporary buffer for copying data */ - void * reclaim_buf = NULL; /* Buffer for reclaiming data */ + void *buf = NULL; /* Buffer for copying data */ + void *bkg = NULL; /* Temporary buffer for copying data */ + void *reclaim_buf = NULL; /* Buffer for reclaiming data */ hid_t buf_sid = -1; /* ID for buffer dataspace */ H5D_shared_t *shared_fo = cpy_info->shared_fo; /* Pointer to the shared struct for dataset object */ H5O_storage_compact_t *storage_src = _storage_src; /* Pointer to storage_src */ @@ -415,9 +415,9 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds /* If there's a VLEN source datatype, do type conversion information */ if (H5T_detect_class(dt_src, H5T_VLEN, FALSE) > 0) { H5T_path_t *tpath_src_mem, *tpath_mem_dst; /* Datatype conversion paths */ - H5T_t * dt_dst; /* Destination datatype */ - H5T_t * dt_mem; /* Memory datatype */ - H5S_t * buf_space; /* Dataspace describing buffer */ + H5T_t *dt_dst; /* Destination datatype */ + H5T_t *dt_mem; /* Memory datatype */ + H5S_t *buf_space; /* Dataspace describing buffer */ size_t buf_size; /* Size of copy buffer */ size_t nelmts; /* Number of elements in buffer */ size_t src_dt_size; /* Source datatype size */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 915b6cc..c947fbb 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -52,16 +52,16 @@ /* Callback info for sieve buffer readvv operation */ typedef struct H5D_contig_readvv_sieve_ud_t { - H5F_t * file; /* File for dataset */ - H5D_rdcdc_t * dset_contig; /* Cached information about contiguous data */ + H5F_t *file; /* File for dataset */ + H5D_rdcdc_t *dset_contig; /* Cached information about contiguous data */ const H5D_contig_storage_t *store_contig; /* Contiguous storage info for this I/O operation */ - unsigned char * rbuf; /* Pointer to buffer to fill */ + unsigned char *rbuf; /* Pointer to buffer to fill */ hid_t dxpl_id; /* DXPL for operation */ } H5D_contig_readvv_sieve_ud_t; /* Callback info for [plain] readvv operation */ typedef struct H5D_contig_readvv_ud_t { - H5F_t * file; /* File for dataset */ + H5F_t *file; /* File for dataset */ haddr_t dset_addr; /* Address of dataset */ unsigned char *rbuf; /* Pointer to buffer to fill */ hid_t dxpl_id; /* DXPL for operation */ @@ -69,16 +69,16 @@ typedef struct H5D_contig_readvv_ud_t { /* Callback info for sieve buffer writevv operation */ typedef struct H5D_contig_writevv_sieve_ud_t { - H5F_t * file; /* File for dataset */ - H5D_rdcdc_t * dset_contig; /* Cached information about contiguous data */ + H5F_t *file; /* File for dataset */ + H5D_rdcdc_t *dset_contig; /* Cached information about contiguous data */ const H5D_contig_storage_t *store_contig; /* Contiguous storage info for this I/O operation */ - const unsigned char * wbuf; /* Pointer to buffer to write */ + const unsigned char *wbuf; /* Pointer to buffer to write */ hid_t dxpl_id; /* DXPL for operation */ } H5D_contig_writevv_sieve_ud_t; /* Callback info for [plain] writevv operation */ typedef struct H5D_contig_writevv_ud_t { - H5F_t * file; /* File for dataset */ + H5F_t *file; /* File for dataset */ haddr_t dset_addr; /* Address of dataset */ const unsigned char *wbuf; /* Pointer to buffer to write */ hid_t dxpl_id; /* DXPL for operation */ @@ -630,7 +630,7 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void * { H5D_contig_readvv_sieve_ud_t *udata = (H5D_contig_readvv_sieve_ud_t *)_udata; /* User data for H5VM_opvv() operator */ - H5F_t * file = udata->file; /* File for dataset */ + H5F_t *file = udata->file; /* File for dataset */ H5D_rdcdc_t *dset_contig = udata->dset_contig; /* Cached information about contiguous data */ const H5D_contig_storage_t *store_contig = udata->store_contig; /* Contiguous storage info for this I/O operation */ @@ -909,7 +909,7 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void { H5D_contig_writevv_sieve_ud_t *udata = (H5D_contig_writevv_sieve_ud_t *)_udata; /* User data for H5VM_opvv() operator */ - H5F_t * file = udata->file; /* File for dataset */ + H5F_t *file = udata->file; /* File for dataset */ H5D_rdcdc_t *dset_contig = udata->dset_contig; /* Cached information about contiguous data */ const H5D_contig_storage_t *store_contig = udata->store_contig; /* Contiguous storage info for this I/O operation */ @@ -1272,9 +1272,9 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f { haddr_t addr_src; /* File offset in source dataset */ haddr_t addr_dst; /* File offset in destination dataset */ - H5T_path_t * tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */ - H5T_t * dt_dst = NULL; /* Destination datatype */ - H5T_t * dt_mem = NULL; /* Memory datatype */ + H5T_path_t *tpath_src_mem = NULL, *tpath_mem_dst = NULL; /* Datatype conversion paths */ + H5T_t *dt_dst = NULL; /* Destination datatype */ + H5T_t *dt_mem = NULL; /* Memory datatype */ hid_t tid_src = -1; /* Datatype ID for source datatype */ hid_t tid_dst = -1; /* Datatype ID for destination datatype */ hid_t tid_mem = -1; /* Datatype ID for memory datatype */ @@ -1288,10 +1288,10 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f size_t dst_nbytes; /* Number of bytes to write to destination */ hsize_t total_src_nbytes; /* Total number of bytes to copy */ size_t buf_size; /* Size of copy buffer */ - void * buf = NULL; /* Buffer for copying data */ - void * bkg = NULL; /* Temporary buffer for copying data */ - void * reclaim_buf = NULL; /* Buffer for reclaiming data */ - H5S_t * buf_space = NULL; /* Dataspace describing buffer */ + void *buf = NULL; /* Buffer for copying data */ + void *bkg = NULL; /* Temporary buffer for copying data */ + void *reclaim_buf = NULL; /* Buffer for reclaiming data */ + H5S_t *buf_space = NULL; /* Dataspace describing buffer */ hid_t buf_sid = -1; /* ID for buffer dataspace */ hsize_t buf_dim[1] = {0}; /* Dimension for buffer */ hbool_t is_vlen = FALSE; /* Flag to indicate that VL type conversion should occur */ @@ -1480,7 +1480,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f else /* Read raw data from source file */ if (H5F_block_read(f_src, H5FD_MEM_DRAW, addr_src, src_nbytes, H5P_DATASET_XFER_DEFAULT, buf) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read raw data") + HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read raw data") /* Perform datatype conversion, if necessary */ if (is_vlen) { diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index 5297cc0..c69f3c1 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -152,7 +152,7 @@ hid_t H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id) { H5G_loc_t loc; /* Object location to insert dataset into */ - H5D_t * dset = NULL; /* New dataset's info */ + H5D_t *dset = NULL; /* New dataset's info */ const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -210,7 +210,7 @@ done: hid_t H5Dopen1(hid_t loc_id, const char *name) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5G_loc_t loc; /* Object location of group */ H5G_loc_t dset_loc; /* Object location of dataset */ H5G_name_t path; /* Dataset group hier. path */ @@ -324,7 +324,7 @@ static herr_t H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id) { htri_t changed; /* Flag to indicate that the dataspace was successfully extended */ - H5S_t * space; /* Dataset's dataspace */ + H5S_t *space; /* Dataset's dataspace */ int rank; /* Dataspace # of dimensions */ hsize_t curr_dims[H5O_LAYOUT_NDIMS]; /* Current dimension sizes */ H5O_fill_t *fill; /* Dataset's fill value */ diff --git a/src/H5Defl.c b/src/H5Defl.c index 9f484a5..21da3fd 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -44,14 +44,14 @@ /* Callback info for readvv operation */ typedef struct H5D_efl_readvv_ud_t { const H5O_efl_t *efl; /* Pointer to efl info */ - const H5D_t * dset; /* The dataset */ - unsigned char * rbuf; /* Read buffer */ + const H5D_t *dset; /* The dataset */ + unsigned char *rbuf; /* Read buffer */ } H5D_efl_readvv_ud_t; /* Callback info for writevv operation */ typedef struct H5D_efl_writevv_ud_t { - const H5O_efl_t * efl; /* Pointer to efl info */ - const H5D_t * dset; /* The dataset */ + const H5O_efl_t *efl; /* Pointer to efl info */ + const H5D_t *dset; /* The dataset */ const unsigned char *wbuf; /* Write buffer */ } H5D_efl_writevv_ud_t; @@ -240,7 +240,7 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size haddr_t cur; ssize_t n; size_t u; /* Local index variable */ - char * full_name = NULL; /* File name with prefix */ + char *full_name = NULL; /* File name with prefix */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -328,7 +328,7 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz haddr_t cur; hsize_t skip = 0; size_t u; /* Local index variable */ - char * full_name = NULL; /* File name with prefix */ + char *full_name = NULL; /* File name with prefix */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC diff --git a/src/H5Dfill.c b/src/H5Dfill.c index 4221173..9769558 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -162,9 +162,9 @@ herr_t H5D__fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_type, const H5S_t *space, hid_t dxpl_id) { - H5WB_t * elem_wb = NULL; /* Wrapped buffer for element data */ + H5WB_t *elem_wb = NULL; /* Wrapped buffer for element data */ uint8_t elem_buf[H5T_ELEM_BUF_SIZE]; /* Buffer for element data */ - H5WB_t * bkg_elem_wb = NULL; /* Wrapped buffer for background data */ + H5WB_t *bkg_elem_wb = NULL; /* Wrapped buffer for background data */ uint8_t bkg_elem_buf[H5T_ELEM_BUF_SIZE]; /* Buffer for background data */ uint8_t *bkg_buf = NULL; /* Background conversion buffer */ uint8_t *tmp_buf = NULL; /* Temp conversion buffer */ @@ -562,7 +562,7 @@ herr_t H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id) { herr_t ret_value = SUCCEED; /* Return value */ - void * buf = NULL; /* Temporary fill buffer */ + void *buf = NULL; /* Temporary fill buffer */ FUNC_ENTER_PACKAGE diff --git a/src/H5Dint.c b/src/H5Dint.c index 82fca79..378948c 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -393,7 +393,7 @@ H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H { H5O_obj_create_t ocrt_info; /* Information for object creation */ H5D_obj_create_t dcrt_info; /* Information for dataset creation */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -505,9 +505,9 @@ done: static H5D_shared_t * H5D__new(hid_t dcpl_id, hid_t dapl_id, hbool_t creating, hbool_t vl_type) { - H5D_shared_t * new_dset = NULL; /* New dataset object */ + H5D_shared_t *new_dset = NULL; /* New dataset object */ H5P_genplist_t *plist; /* Property list created */ - H5D_shared_t * ret_value = NULL; /* Return value */ + H5D_shared_t *ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC @@ -693,13 +693,13 @@ done: static herr_t H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id) { - H5O_t * oh = NULL; /* Pointer to dataset's object header */ + H5O_t *oh = NULL; /* Pointer to dataset's object header */ size_t ohdr_size = H5D_MINHDR_SIZE; /* Size of dataset's object header */ - H5O_loc_t * oloc = NULL; /* Dataset's object location */ - H5O_layout_t * layout; /* Dataset's layout information */ - H5T_t * type; /* Dataset's datatype */ + H5O_loc_t *oloc = NULL; /* Dataset's object location */ + H5O_layout_t *layout; /* Dataset's layout information */ + H5T_t *type; /* Dataset's datatype */ hbool_t use_latest_format; /* Flag indicating the newest file format should be used */ - H5O_fill_t * fill_prop; /* Pointer to dataset's fill value information */ + H5O_fill_t *fill_prop; /* Pointer to dataset's fill value information */ H5D_fill_value_t fill_status; /* Fill value status */ hbool_t fill_changed = FALSE; /* Flag indicating the fill value was changed */ hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ @@ -890,8 +890,8 @@ done: static herr_t H5D_build_extfile_prefix(const H5D_t *dset, hid_t dapl_id, char **extfile_prefix /*out*/) { - char * prefix = NULL; /* prefix used to look for the file */ - char * extpath = NULL; /* absolute path of directory the HDF5 file is in */ + char *prefix = NULL; /* prefix used to look for the file */ + char *extpath = NULL; /* absolute path of directory the HDF5 file is in */ size_t extpath_len; /* length of extpath */ size_t prefix_len; /* length of prefix */ size_t extfile_prefix_len; /* length of expanded prefix */ @@ -973,13 +973,13 @@ done: H5D_t * H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id) { - const H5T_t * type; /* Datatype for dataset */ - H5D_t * new_dset = NULL; + const H5T_t *type; /* Datatype for dataset */ + H5D_t *new_dset = NULL; H5P_genplist_t *dc_plist = NULL; /* New Property list */ hbool_t has_vl_type = FALSE; /* Flag to indicate a VL-type for dataset */ hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ H5G_loc_t dset_loc; /* Dataset location */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1033,8 +1033,8 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t /* Check if the dataset has a non-default DCPL & get important values, if so */ if (new_dset->shared->dcpl_id != H5P_DATASET_CREATE_DEFAULT) { H5O_layout_t *layout; /* Dataset's layout information */ - H5O_pline_t * pline; /* Dataset's I/O pipeline information */ - H5O_fill_t * fill; /* Dataset's fill value info */ + H5O_pline_t *pline; /* Dataset's I/O pipeline information */ + H5O_fill_t *fill; /* Dataset's fill value info */ /* Check if the filters in the DCPL can be applied to this dataset */ if (H5Z_can_apply(new_dset->shared->dcpl_id, new_dset->shared->type_id) < 0) @@ -1181,9 +1181,9 @@ H5D_t * H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id) { H5D_shared_t *shared_fo = NULL; - H5D_t * dataset = NULL; - char * extfile_prefix = NULL; /* Expanded external file prefix */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *dataset = NULL; + char *extfile_prefix = NULL; /* Expanded external file prefix */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1297,7 +1297,7 @@ static herr_t H5D__open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id) { H5P_genplist_t *plist; /* Property list */ - H5O_fill_t * fill_prop; /* Pointer to dataset's fill value info */ + H5O_fill_t *fill_prop; /* Pointer to dataset's fill value info */ unsigned alloc_time_state; /* Allocation time state */ htri_t msg_exists; /* Whether a particular type of message exists */ hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ @@ -1574,7 +1574,7 @@ H5D_close(H5D_t *dataset) else /* Free object location (i.e. "unhold" the file if appropriate) */ if (H5O_loc_free(&(dataset->oloc)) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "problem attempting to free location") + HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "problem attempting to free location") } /* end else */ /* Release the dataset's path info */ @@ -1664,7 +1664,7 @@ herr_t H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc, hbool_t full_overwrite, hsize_t old_dim[]) { - H5F_t * f = dset->oloc.file; /* The dataset's file pointer */ + H5F_t *f = dset->oloc.file; /* The dataset's file pointer */ H5O_layout_t *layout; /* The dataset's layout information */ hbool_t must_init_space = FALSE; /* Flag to indicate that space should be initialized */ hbool_t addr_set = FALSE; /* Flag to indicate that the dataset's storage address was set */ @@ -1993,7 +1993,7 @@ done: herr_t H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf) { - H5T_t * type; /* Datatype */ + H5T_t *type; /* Datatype */ H5S_sel_iter_op_t dset_op; /* Operator for iteration */ H5T_vlen_alloc_info_t _vl_alloc_info; /* VL allocation info buffer */ H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */ @@ -2040,7 +2040,7 @@ void * H5D__vlen_get_buf_size_alloc(size_t size, void *info) { H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)info; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -2080,7 +2080,7 @@ H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATT const hsize_t *point, void *op_data) { H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)op_data; - H5T_t * dt; /* Datatype for operation */ + H5T_t *dt; /* Datatype for operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -2171,7 +2171,7 @@ done: herr_t H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id) { - H5S_t * space; /* Dataset's dataspace */ + H5S_t *space; /* Dataset's dataspace */ int rank; /* Dataspace # of dimensions */ hsize_t curr_dims[H5O_LAYOUT_NDIMS]; /* Current dimension sizes */ htri_t changed; /* Whether the dataspace changed size */ @@ -2412,7 +2412,7 @@ H5D__mark(const H5D_t *dataset, hid_t H5_ATTR_UNUSED dxpl_id, unsigned flags) static int H5D__flush_cb(void *_dataset, hid_t H5_ATTR_UNUSED id, void *_udata) { - H5D_t * dataset = (H5D_t *)_dataset; /* Dataset pointer */ + H5D_t *dataset = (H5D_t *)_dataset; /* Dataset pointer */ H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata; /* User data for callback */ int ret_value = H5_ITER_CONT; /* Return value */ diff --git a/src/H5Dio.c b/src/H5Dio.c index e0b7efb..391a872 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -115,12 +115,12 @@ herr_t H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf /*out*/) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5P_genplist_t *plist; /* Property list pointer */ - const H5S_t * mem_space = NULL; - const H5S_t * file_space = NULL; + const H5S_t *mem_space = NULL; + const H5S_t *file_space = NULL; herr_t ret_value = SUCCEED; /* Return value */ - hsize_t * direct_offset = NULL; + hsize_t *direct_offset = NULL; hbool_t direct_read = FALSE; uint32_t direct_filters = 0; @@ -251,10 +251,10 @@ herr_t H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5P_genplist_t *plist; /* Property list pointer */ - const H5S_t * mem_space = NULL; - const H5S_t * file_space = NULL; + const H5S_t *mem_space = NULL; + const H5S_t *file_space = NULL; hbool_t direct_write = FALSE; herr_t ret_value = SUCCEED; /* Return value */ @@ -335,7 +335,7 @@ H5D__pre_write(H5D_t *dset, hbool_t direct_write, hid_t mem_type_id, const H5S_t if (direct_write) { H5P_genplist_t *plist; /* Property list pointer */ uint32_t direct_filters; - hsize_t * direct_offset; + hsize_t *direct_offset; uint32_t direct_datasize; int ndims = 0; hsize_t dims[H5O_LAYOUT_NDIMS]; @@ -412,7 +412,7 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t H5D_io_info_t io_info; /* Dataset I/O info */ H5D_type_info_t type_info; /* Datatype info for operation */ hbool_t type_info_init = FALSE; /* Whether the datatype info has been initialized */ - H5S_t * projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a */ + H5S_t *projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a */ /* projection of the supplied mem_space to a new */ /* data space with rank equal to that of */ /* file_space. */ @@ -637,7 +637,7 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_ H5D_io_info_t io_info; /* Dataset I/O info */ H5D_type_info_t type_info; /* Datatype info for operation */ hbool_t type_info_init = FALSE; /* Whether the datatype info has been initialized */ - H5S_t * projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a */ + H5S_t *projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a */ /* projection of the supplied mem_space to a new */ /* data space with rank equal to that of */ /* file_space. */ @@ -1117,7 +1117,7 @@ static herr_t H5D__ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id, const H5S_t *file_space, const H5S_t *mem_space, const H5D_type_info_t *type_info, const H5D_chunk_map_t *fm) { - H5P_genplist_t * dx_plist; /* Data transer property list */ + H5P_genplist_t *dx_plist; /* Data transer property list */ H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode; /* performed chunk optimization */ H5D_mpio_actual_io_mode_t actual_io_mode; /* performed io mode */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index 9990db1..c9bbb01 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -185,7 +185,7 @@ done: herr_t H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset, hid_t dapl_id) { - H5O_layout_t * layout; /* Dataset's layout information */ + H5O_layout_t *layout; /* Dataset's layout information */ const H5O_fill_t *fill_prop; /* Pointer to dataset's fill value information */ hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ herr_t ret_value = SUCCEED; /* Return value */ @@ -229,7 +229,7 @@ H5D__layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset, hid_t /* Update external storage message, if it's used */ if (dset->shared->dcpl_cache.efl.nused > 0) { H5O_efl_t *efl = &dset->shared->dcpl_cache.efl; /* Dataset's external file list */ - H5HL_t * heap; /* Pointer to local heap for EFL file names */ + H5HL_t *heap; /* Pointer to local heap for EFL file names */ size_t heap_size = H5HL_ALIGN(1); size_t u; diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 28fe736..1a3b36b 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -454,7 +454,7 @@ H5D__contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_ H5D_chunk_map_t H5_ATTR_UNUSED *fm) { H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_CONTIGUOUS_COLLECTIVE; - H5P_genplist_t * dx_plist; /* Pointer to DXPL */ + H5P_genplist_t *dx_plist; /* Pointer to DXPL */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -500,7 +500,7 @@ H5D__contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type H5D_chunk_map_t H5_ATTR_UNUSED *fm) { H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_CONTIGUOUS_COLLECTIVE; - H5P_genplist_t * dx_plist; /* Pointer to DXPL */ + H5P_genplist_t *dx_plist; /* Pointer to DXPL */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -566,7 +566,7 @@ done: static herr_t H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm) { - H5P_genplist_t * dx_plist; /* Pointer to DXPL */ + H5P_genplist_t *dx_plist; /* Pointer to DXPL */ H5FD_mpio_chunk_opt_t chunk_opt_mode; int io_option = H5D_MULTI_CHUNK_IO_MORE_OPT; int sum_chunk = -1; @@ -771,12 +771,12 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ hbool_t chunk_final_ftype_is_derived = FALSE; H5D_storage_t ctg_store; /* Storage info for "fake" contiguous dataset */ size_t total_chunks; - haddr_t * total_chunk_addr_array = NULL; - MPI_Datatype * chunk_mtype = NULL; - MPI_Datatype * chunk_ftype = NULL; - MPI_Aint * chunk_disp_array = NULL; - MPI_Aint * chunk_mem_disp_array = NULL; - hbool_t * chunk_mft_is_derived_array = + haddr_t *total_chunk_addr_array = NULL; + MPI_Datatype *chunk_mtype = NULL; + MPI_Datatype *chunk_ftype = NULL; + MPI_Aint *chunk_disp_array = NULL; + MPI_Aint *chunk_mem_disp_array = NULL; + hbool_t *chunk_mft_is_derived_array = NULL; /* Flags to indicate each chunk's MPI file datatype is derived */ hbool_t *chunk_mbt_is_derived_array = NULL; /* Flags to indicate each chunk's MPI memory datatype is derived */ @@ -814,8 +814,8 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ */ if (total_chunks == 1) { H5SL_node_t *chunk_node; /* Pointer to chunk node for selection */ - H5S_t * fspace; /* Dataspace describing chunk & selection in it */ - H5S_t * mspace; /* Dataspace describing selection in memory corresponding to this chunk */ + H5S_t *fspace; /* Dataspace describing chunk & selection in it */ + H5S_t *mspace; /* Dataspace describing selection in memory corresponding to this chunk */ /* Check for this process having selection in this chunk */ chunk_node = H5SL_first(fm->sel_chunks); @@ -1107,8 +1107,8 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *ty H5D_io_info_t cpt_io_info; /* Compact I/O info object */ H5D_storage_t cpt_store; /* Chunk storage information as compact dataset */ hbool_t cpt_dirty; /* Temporary placeholder for compact storage "dirty" flag */ - uint8_t * chunk_io_option = NULL; - haddr_t * chunk_addr = NULL; + uint8_t *chunk_io_option = NULL; + haddr_t *chunk_addr = NULL; H5D_storage_t store; /* union of EFL and chunk pointer in file space */ H5FD_mpio_xfer_t last_xfer_mode = H5FD_MPIO_COLLECTIVE; /* Last parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */ @@ -1174,8 +1174,8 @@ H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *ty /* Loop over _all_ the chunks */ for (u = 0; u < total_chunk; u++) { H5D_chunk_info_t *chunk_info; /* Chunk info for current chunk */ - H5S_t * fspace; /* Dataspace describing chunk & selection in it */ - H5S_t * mspace; /* Dataspace describing selection in memory corresponding to this chunk */ + H5S_t *fspace; /* Dataspace describing chunk & selection in it */ + H5S_t *mspace; /* Dataspace describing selection in memory corresponding to this chunk */ #ifdef H5D_DEBUG if (H5DEBUG(D)) @@ -1501,7 +1501,7 @@ static herr_t H5D__sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk) { - H5SL_node_t * chunk_node; /* Current node in chunk skip list */ + H5SL_node_t *chunk_node; /* Current node in chunk skip list */ H5D_chunk_info_t *chunk_info; /* Current chunking info. of this node. */ haddr_t chunk_addr; /* Current chunking address of this node */ haddr_t *total_chunk_addr_array = NULL; /* The array of chunk address for the total number of chunk */ @@ -1661,11 +1661,11 @@ H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm, H5P_genplist_ { int total_chunks; unsigned percent_nproc_per_chunk, threshold_nproc_per_chunk; - uint8_t * io_mode_info = NULL; - uint8_t * recv_io_mode_info = NULL; - uint8_t * mergebuf = NULL; - uint8_t * tempbuf; - H5SL_node_t * chunk_node; + uint8_t *io_mode_info = NULL; + uint8_t *recv_io_mode_info = NULL; + uint8_t *mergebuf = NULL; + uint8_t *tempbuf; + H5SL_node_t *chunk_node; H5D_chunk_info_t *chunk_info; int mpi_size, mpi_rank; MPI_Comm comm; diff --git a/src/H5Doh.c b/src/H5Doh.c index cfbfa84..069fdc9 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -39,11 +39,11 @@ /********************/ /* Local Prototypes */ /********************/ -static void * H5O__dset_get_copy_file_udata(void); +static void *H5O__dset_get_copy_file_udata(void); static void H5O__dset_free_copy_file_udata(void *); static htri_t H5O__dset_isa(H5O_t *loc); static hid_t H5O__dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref); -static void * H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); +static void *H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); static H5O_loc_t *H5O__dset_get_oloc(hid_t obj_id); static herr_t H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info); static herr_t H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id); @@ -260,8 +260,8 @@ static void * H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) { H5D_obj_create_t *crt_info = (H5D_obj_create_t *)_crt_info; /* Dataset creation parameters */ - H5D_t * dset = NULL; /* New dataset created */ - void * ret_value = NULL; /* Return value */ + H5D_t *dset = NULL; /* New dataset created */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC @@ -308,7 +308,7 @@ done: static H5O_loc_t * H5O__dset_get_oloc(hid_t obj_id) { - H5D_t * dset; /* Dataset opened */ + H5D_t *dset; /* Dataset opened */ H5O_loc_t *ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC @@ -426,7 +426,7 @@ done: static herr_t H5O__dset_flush(H5G_loc_t *obj_loc, hid_t dxpl_id) { - H5D_t * dset = NULL; /* Dataset opened */ + H5D_t *dset = NULL; /* Dataset opened */ H5O_type_t obj_type; /* Type of object at location */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index 04e02e9..1a0ba64 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -73,7 +73,7 @@ typedef struct H5D_type_info_t { /* Initial values */ const H5T_t *mem_type; /* Pointer to memory datatype */ const H5T_t *dset_type; /* Pointer to dataset datatype */ - H5T_path_t * tpath; /* Datatype conversion path */ + H5T_path_t *tpath; /* Datatype conversion path */ hid_t src_type_id; /* Source datatype ID */ hid_t dst_type_id; /* Destination datatype ID */ @@ -86,9 +86,9 @@ typedef struct H5D_type_info_t { const H5T_subset_info_t *cmpd_subset; /* Info related to the compound subset conversion functions */ H5T_bkg_t need_bkg; /* Type of background buf needed */ size_t request_nelmts; /* Requested strip mine */ - uint8_t * tconv_buf; /* Datatype conv buffer */ + uint8_t *tconv_buf; /* Datatype conv buffer */ hbool_t tconv_buf_allocated; /* Whether the type conversion buffer was allocated */ - uint8_t * bkg_buf; /* Background buffer */ + uint8_t *bkg_buf; /* Background buffer */ hbool_t bkg_buf_allocated; /* Whether the background buffer was allocated */ } H5D_type_info_t; @@ -174,7 +174,7 @@ typedef struct { } H5D_chunk_storage_t; typedef struct { - void * buf; /* Buffer for compact dataset */ + void *buf; /* Buffer for compact dataset */ hbool_t *dirty; /* Pointer to dirty flag to mark */ } H5D_compact_storage_t; @@ -204,16 +204,16 @@ typedef struct H5D_io_info_t { struct { H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */ H5FD_mpio_collective_opt_t - coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */ - H5D_io_ops_t io_ops; /* I/O operation function pointers */ + coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */ + H5D_io_ops_t io_ops; /* I/O operation function pointers */ } orig; #endif /* H5_HAVE_PARALLEL */ - H5D_storage_t * store; /* Dataset storage info */ + H5D_storage_t *store; /* Dataset storage info */ H5D_layout_ops_t layout_ops; /* Dataset layout I/O operation function pointers */ H5D_io_ops_t io_ops; /* I/O operation function pointers */ H5D_io_op_type_t op_type; union { - void * rbuf; /* Pointer to buffer for read */ + void *rbuf; /* Pointer to buffer for read */ const void *wbuf; /* Pointer to buffer to write */ } u; } H5D_io_info_t; @@ -224,10 +224,10 @@ typedef struct H5D_io_info_t { /* Typedef for chunked dataset index operation info */ typedef struct H5D_chk_idx_info_t { - H5F_t * f; /* File pointer for operation */ + H5F_t *f; /* File pointer for operation */ hid_t dxpl_id; /* DXPL ID for operation */ - const H5O_pline_t * pline; /* I/O pipeline info */ - H5O_layout_chunk_t * layout; /* Chunk layout description */ + const H5O_pline_t *pline; /* I/O pipeline info */ + H5O_layout_chunk_t *layout; /* Chunk layout description */ H5O_storage_chunk_t *storage; /* Chunk storage description */ } H5D_chk_idx_info_t; @@ -256,10 +256,10 @@ typedef struct H5D_chunk_rec_t { */ typedef struct H5D_chunk_common_ud_t { /* downward */ - const H5O_layout_chunk_t * layout; /* Chunk layout description */ + const H5O_layout_chunk_t *layout; /* Chunk layout description */ const H5O_storage_chunk_t *storage; /* Chunk storage description */ - const hsize_t * offset; /* Logical offset of chunk */ - const struct H5D_rdcc_t * rdcc; /* Chunk cache. Only necessary if the index may + const hsize_t *offset; /* Logical offset of chunk */ + const struct H5D_rdcc_t *rdcc; /* Chunk cache. Only necessary if the index may * be modified, and if any chunks in the dset * may be cached */ } H5D_chunk_common_ud_t; @@ -325,9 +325,9 @@ typedef struct H5D_chunk_info_t { hsize_t index; /* "Index" of chunk in dataset */ uint32_t chunk_points; /* Number of elements selected in chunk */ hsize_t coords[H5O_LAYOUT_NDIMS]; /* Coordinates of chunk in file dataset's dataspace */ - H5S_t * fspace; /* Dataspace describing chunk & selection in it */ + H5S_t *fspace; /* Dataspace describing chunk & selection in it */ unsigned fspace_shared; /* Indicate that the file space for a chunk is shared and shouldn't be freed */ - H5S_t * mspace; /* Dataspace describing selection in memory corresponding to this chunk */ + H5S_t *mspace; /* Dataspace describing selection in memory corresponding to this chunk */ unsigned mspace_shared; /* Indicate that the memory space for a chunk is shared and shouldn't be freed */ } H5D_chunk_info_t; @@ -340,15 +340,15 @@ typedef struct H5D_chunk_map_t { unsigned f_ndims; /* Number of dimensions for file dataspace */ hsize_t f_dims[H5O_LAYOUT_NDIMS]; /* File dataspace dimensions */ - const H5S_t * mem_space; /* Pointer to the memory dataspace */ - H5S_t * mchunk_tmpl; /* Dataspace template for new memory chunks */ + const H5S_t *mem_space; /* Pointer to the memory dataspace */ + H5S_t *mchunk_tmpl; /* Dataspace template for new memory chunks */ H5S_sel_iter_t mem_iter; /* Iterator for elements in memory selection */ unsigned m_ndims; /* Number of dimensions for memory dataspace */ H5S_sel_type msel_type; /* Selection type in memory */ H5SL_t *sel_chunks; /* Skip list containing information for each chunk selected */ - H5S_t * single_space; /* Dataspace for single chunk */ + H5S_t *single_space; /* Dataspace for single chunk */ H5D_chunk_info_t *single_chunk_info; /* Pointer to single chunk's info */ hbool_t use_single; /* Whether I/O is on a single element */ @@ -382,15 +382,15 @@ typedef struct H5D_rdcc_t { size_t nbytes_max; /* Maximum cached raw data in bytes */ size_t nslots; /* Number of chunk slots allocated */ double w0; /* Chunk preemption policy */ - struct H5D_rdcc_ent_t * head; /* Head of doubly linked list */ - struct H5D_rdcc_ent_t * tail; /* Tail of doubly linked list */ + struct H5D_rdcc_ent_t *head; /* Head of doubly linked list */ + struct H5D_rdcc_ent_t *tail; /* Tail of doubly linked list */ size_t nbytes_used; /* Current cached raw data in bytes */ int nused; /* Number of chunk slots in use */ H5D_chunk_cached_t last; /* Cached copy of last chunk information */ struct H5D_rdcc_ent_t **slot; /* Chunk slots, each points to a chunk*/ - H5SL_t * sel_chunks; /* Skip list containing information for each chunk selected */ - H5S_t * single_space; /* Dataspace for single element I/O on chunks */ - H5D_chunk_info_t * single_chunk_info; /* Pointer to single chunk's info */ + H5SL_t *sel_chunks; /* Skip list containing information for each chunk selected */ + H5S_t *single_space; /* Dataspace for single element I/O on chunks */ + H5D_chunk_info_t *single_chunk_info; /* Pointer to single chunk's info */ } H5D_rdcc_t; /* The raw data contiguous data cache */ @@ -411,8 +411,8 @@ typedef struct H5D_rdcdc_t { struct H5D_shared_t { size_t fo_count; /* Reference count */ hid_t type_id; /* ID for dataset's datatype */ - H5T_t * type; /* Datatype for this dataset */ - H5S_t * space; /* Dataspace of this dataset */ + H5T_t *type; /* Datatype for this dataset */ + H5S_t *space; /* Dataspace of this dataset */ hbool_t space_dirty; /* Whether the dataspace info needs to be flushed to the file */ hbool_t layout_dirty; /* Whether the layout info needs to be flushed to the file */ hid_t dcpl_id; /* Dataset creation property id */ @@ -459,21 +459,21 @@ typedef struct { /* Typedef for filling a buffer with a fill value */ typedef struct H5D_fill_buf_info_t { H5MM_allocate_t fill_alloc_func; /* Routine to call for allocating fill buffer */ - void * fill_alloc_info; /* Extra info for allocation routine */ + void *fill_alloc_info; /* Extra info for allocation routine */ H5MM_free_t fill_free_func; /* Routine to call for freeing fill buffer */ - void * fill_free_info; /* Extra info for free routine */ + void *fill_free_info; /* Extra info for free routine */ H5T_path_t *fill_to_mem_tpath; /* Datatype conversion path for converting the fill value to the memory buffer */ H5T_path_t *mem_to_dset_tpath; /* Datatype conversion path for converting the memory buffer to the dataset elements */ const H5O_fill_t *fill; /* Pointer to fill value */ - void * fill_buf; /* Fill buffer */ + void *fill_buf; /* Fill buffer */ size_t fill_buf_size; /* Size of fill buffer */ hbool_t use_caller_fill_buf; /* Whether the caller provided the fill buffer */ - void * bkg_buf; /* Background conversion buffer */ + void *bkg_buf; /* Background conversion buffer */ size_t bkg_buf_size; /* Size of background buffer */ - H5T_t * mem_type; /* Pointer to memory datatype */ - const H5T_t * file_type; /* Pointer to file datatype */ + H5T_t *mem_type; /* Pointer to memory datatype */ + const H5T_t *file_type; /* Pointer to file datatype */ hid_t mem_tid; /* ID for memory version of disk datatype */ hid_t file_tid; /* ID for disk datatype */ size_t mem_elmt_size, file_elmt_size; /* Size of element in memory and on disk */ @@ -484,11 +484,11 @@ typedef struct H5D_fill_buf_info_t { /* Internal data structure for computing variable-length dataset's total size */ typedef struct { - H5D_t * dset; /* Dataset for operation */ - H5S_t * fspace; /* Dataset's dataspace for operation */ - H5S_t * mspace; /* Memory dataspace for operation */ - void * fl_tbuf; /* Ptr to the temporary buffer we are using for fixed-length data */ - void * vl_tbuf; /* Ptr to the temporary buffer we are using for VL data */ + H5D_t *dset; /* Dataset for operation */ + H5S_t *fspace; /* Dataset's dataspace for operation */ + H5S_t *mspace; /* Memory dataspace for operation */ + void *fl_tbuf; /* Ptr to the temporary buffer we are using for fixed-length data */ + void *vl_tbuf; /* Ptr to the temporary buffer we are using for VL data */ hid_t xfer_pid; /* ID of the dataset xfer property list */ hsize_t size; /* Accumulated number of bytes for the selection */ } H5D_vlen_bufsize_t; @@ -502,7 +502,7 @@ typedef struct H5D_rdcc_ent_t { uint32_t rd_count; /*bytes remaining to be read */ uint32_t wr_count; /*bytes remaining to be written */ haddr_t chunk_addr; /*address of chunk in file */ - uint8_t * chunk; /*the unfiltered chunk data */ + uint8_t *chunk; /*the unfiltered chunk data */ unsigned idx; /*index in hash table */ struct H5D_rdcc_ent_t *next; /*next item in doubly-linked list */ struct H5D_rdcc_ent_t *prev; /*previous item in doubly-linked list */ @@ -527,11 +527,11 @@ H5_DLLVAR const H5D_chunk_ops_t H5D_COPS_BTREE[1]; /* Package Private Prototypes */ /******************************/ -H5_DLL herr_t H5D__term_pub_interface(void); -H5_DLL herr_t H5D__term_deprec_interface(void); -H5_DLL H5D_t *H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id, - hid_t dxpl_id); -H5_DLL H5D_t * H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space, +H5_DLL herr_t H5D__term_pub_interface(void); +H5_DLL herr_t H5D__term_deprec_interface(void); +H5_DLL H5D_t *H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id, + hid_t dxpl_id); +H5_DLL H5D_t *H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id, const H5S_t *space, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id); H5_DLL herr_t H5D__get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id); H5_DLL herr_t H5D__alloc_storage(const H5D_t *dset, hid_t dxpl_id, H5D_time_alloc_t time_alloc, @@ -540,7 +540,7 @@ H5_DLL herr_t H5D__get_storage_size(H5D_t *dset, hid_t dxpl_id, hsize_t *storag H5_DLL herr_t H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, hsize_t *storage_size); H5_DLL haddr_t H5D__get_offset(const H5D_t *dset); -H5_DLL void * H5D__vlen_get_buf_size_alloc(size_t size, void *info); +H5_DLL void *H5D__vlen_get_buf_size_alloc(size_t size, void *info); H5_DLL herr_t H5D__vlen_get_buf_size(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point, void *op_data); H5_DLL herr_t H5D__check_filters(H5D_t *dataset); @@ -598,7 +598,7 @@ H5_DLL hbool_t H5D__chunk_is_space_alloc(const H5O_storage_t *storage); H5_DLL hbool_t H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset); H5_DLL herr_t H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset, hsize_t chunk_idx, H5D_chunk_ud_t *udata); -H5_DLL void * H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax); +H5_DLL void *H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax); H5_DLL herr_t H5D__chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata, hbool_t dirty, void *chunk, uint32_t naccessed); H5_DLL herr_t H5D__chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes); diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 1b61f61..0ab75b6 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -118,8 +118,8 @@ typedef struct H5D_t H5D_t; /* Typedef for cached dataset transfer property list information */ typedef struct H5D_dxpl_cache_t { size_t max_temp_buf; /* Maximum temporary buffer size (H5D_XFER_MAX_TEMP_BUF_NAME) */ - void * tconv_buf; /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */ - void * bkgr_buf; /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */ + void *tconv_buf; /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */ + void *bkgr_buf; /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */ H5T_bkg_t bkgr_buf_type; /* Background buffer type (H5D_XFER_BKGR_BUF_NAME) */ H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */ double btree_split_ratio[3]; /* B-tree split ratios (H5D_XFER_BTREE_SPLIT_RATIO_NAME) */ @@ -143,8 +143,8 @@ typedef struct H5D_dcpl_cache_t { /* Callback information for copying datasets */ typedef struct H5D_copy_file_ud_t { H5O_copy_file_ud_common_t common; /* Shared information (must be first) */ - struct H5S_extent_t * src_space_extent; /* Copy of dataspace extent for dataset */ - H5T_t * src_dtype; /* Copy of datatype for dataset */ + struct H5S_extent_t *src_space_extent; /* Copy of dataspace extent for dataset */ + H5T_t *src_dtype; /* Copy of datatype for dataset */ } H5D_copy_file_ud_t; /*****************************/ @@ -155,17 +155,17 @@ typedef struct H5D_copy_file_ud_t { /* Library Private Prototypes */ /******************************/ -H5_DLL herr_t H5D_init(void); -H5_DLL H5D_t *H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id); -H5_DLL herr_t H5D_close(H5D_t *dataset); -H5_DLL H5O_loc_t *H5D_oloc(H5D_t *dataset); +H5_DLL herr_t H5D_init(void); +H5_DLL H5D_t *H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id); +H5_DLL herr_t H5D_close(H5D_t *dataset); +H5_DLL H5O_loc_t *H5D_oloc(H5D_t *dataset); H5_DLL H5G_name_t *H5D_nameof(H5D_t *dataset); -H5_DLL H5T_t *H5D_typeof(const H5D_t *dset); -H5_DLL herr_t H5D_flush(const H5F_t *f, hid_t dxpl_id); -H5_DLL hid_t H5D_get_create_plist(H5D_t *dset); -H5_DLL hid_t H5D_get_access_plist(H5D_t *dset); -H5_DLL hid_t H5D_get_space(H5D_t *dset); -H5_DLL hid_t H5D_get_type(H5D_t *dset); +H5_DLL H5T_t *H5D_typeof(const H5D_t *dset); +H5_DLL herr_t H5D_flush(const H5F_t *f, hid_t dxpl_id); +H5_DLL hid_t H5D_get_create_plist(H5D_t *dset); +H5_DLL hid_t H5D_get_access_plist(H5D_t *dset); +H5_DLL hid_t H5D_get_space(H5D_t *dset); +H5_DLL hid_t H5D_get_type(H5D_t *dset); /* Functions that operate on vlen data */ H5_DLL herr_t H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf); diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 95d5a3f..9137614 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -84,12 +84,12 @@ H5D__scatter_file(const H5D_io_info_t *_io_info, const H5S_t *space, H5S_sel_ite { H5D_io_info_t tmp_io_info; /* Temporary I/O info object */ hsize_t _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ - hsize_t * off = NULL; /* Pointer to sequence offsets */ + hsize_t *off = NULL; /* Pointer to sequence offsets */ hsize_t mem_off; /* Offset in memory */ size_t mem_curr_seq; /* "Current sequence" in memory */ size_t dset_curr_seq; /* "Current sequence" in dataset */ size_t _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */ - size_t * len = NULL; /* Array to store sequence lengths */ + size_t *len = NULL; /* Array to store sequence lengths */ size_t orig_mem_len, mem_len; /* Length of sequence in memory */ size_t nseq; /* Number of sequences generated */ size_t nelem; /* Number of elements used in sequences */ @@ -182,12 +182,12 @@ H5D__gather_file(const H5D_io_info_t *_io_info, const H5S_t *space, H5S_sel_iter { H5D_io_info_t tmp_io_info; /* Temporary I/O info object */ hsize_t _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ - hsize_t * off = NULL; /* Pointer to sequence offsets */ + hsize_t *off = NULL; /* Pointer to sequence offsets */ hsize_t mem_off; /* Offset in memory */ size_t mem_curr_seq; /* "Current sequence" in memory */ size_t dset_curr_seq; /* "Current sequence" in dataset */ size_t _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */ - size_t * len = NULL; /* Pointer to sequence lengths */ + size_t *len = NULL; /* Pointer to sequence lengths */ size_t orig_mem_len, mem_len; /* Length of sequence in memory */ size_t nseq; /* Number of sequences generated */ size_t nelem; /* Number of elements used in sequences */ @@ -274,12 +274,12 @@ herr_t H5D__scatter_mem(const void *_tscat_buf, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache, void *_buf /*out*/) { - uint8_t * buf = (uint8_t *)_buf; /* Get local copies for address arithmetic */ + uint8_t *buf = (uint8_t *)_buf; /* Get local copies for address arithmetic */ const uint8_t *tscat_buf = (const uint8_t *)_tscat_buf; hsize_t _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ - hsize_t * off = NULL; /* Pointer to sequence offsets */ + hsize_t *off = NULL; /* Pointer to sequence offsets */ size_t _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */ - size_t * len = NULL; /* Pointer to sequence lengths */ + size_t *len = NULL; /* Pointer to sequence lengths */ size_t curr_len; /* Length of bytes left to process in sequence */ size_t nseq; /* Number of sequences generated */ size_t curr_seq; /* Current sequence being processed */ @@ -361,11 +361,11 @@ H5D__gather_mem(const void *_buf, const H5S_t *space, H5S_sel_iter_t *iter, size const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf /*out*/) { const uint8_t *buf = (const uint8_t *)_buf; /* Get local copies for address arithmetic */ - uint8_t * tgath_buf = (uint8_t *)_tgath_buf; + uint8_t *tgath_buf = (uint8_t *)_tgath_buf; hsize_t _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ - hsize_t * off = NULL; /* Pointer to sequence offsets */ + hsize_t *off = NULL; /* Pointer to sequence offsets */ size_t _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */ - size_t * len = NULL; /* Pointer to sequence lengths */ + size_t *len = NULL; /* Pointer to sequence lengths */ size_t curr_len; /* Length of bytes left to process in sequence */ size_t nseq; /* Number of sequences generated */ size_t curr_seq; /* Current sequence being processed */ @@ -442,7 +442,7 @@ H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf const H5S_t *file_space, const H5S_t *mem_space) { const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache; /* Local pointer to dataset transfer info */ - void * buf = io_info->u.rbuf; /* Local pointer to application buffer */ + void *buf = io_info->u.rbuf; /* Local pointer to application buffer */ H5S_sel_iter_t mem_iter; /*memory selection iteration info*/ hbool_t mem_iter_init = FALSE; /*memory selection iteration info has been initialized */ H5S_sel_iter_t bkg_iter; /*background iteration info*/ @@ -573,7 +573,7 @@ H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_in const H5S_t *file_space, const H5S_t *mem_space) { const H5D_dxpl_cache_t *dxpl_cache = io_info->dxpl_cache; /* Local pointer to dataset transfer info */ - const void * buf = io_info->u.wbuf; /* Local pointer to application buffer */ + const void *buf = io_info->u.wbuf; /* Local pointer to application buffer */ H5S_sel_iter_t mem_iter; /*memory selection iteration info*/ hbool_t mem_iter_init = FALSE; /*memory selection iteration info has been initialized */ H5S_sel_iter_t bkg_iter; /*background iteration info*/ @@ -728,7 +728,7 @@ H5D__compound_opt_read(size_t nelmts, const H5S_t *space, H5S_sel_iter_t *iter, hsize_t _off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ hsize_t *off = NULL; /* Pointer to sequence offsets */ size_t _len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths */ - size_t * len = NULL; /* Pointer to sequence lengths */ + size_t *len = NULL; /* Pointer to sequence lengths */ size_t src_stride, dst_stride, copy_size; herr_t ret_value = SUCCEED; /*return value */ @@ -900,11 +900,11 @@ H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info) herr_t H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id, void *dst_buf) { - H5T_t * type; /* Datatype */ - H5S_t * dst_space; /* Dataspace */ + H5T_t *type; /* Datatype */ + H5S_t *dst_space; /* Dataspace */ H5S_sel_iter_t iter; /* Selection iteration info*/ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ - const void * src_buf = NULL; /* Source (contiguous) data buffer */ + const void *src_buf = NULL; /* Source (contiguous) data buffer */ size_t src_buf_nbytes = 0; /* Size of src_buf */ size_t type_size; /* Datatype element size */ hssize_t nelmts; /* Number of remaining elements in selection */ @@ -999,8 +999,8 @@ herr_t H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size, void *dst_buf, H5D_gather_func_t op, void *op_data) { - H5T_t * type; /* Datatype */ - H5S_t * src_space; /* Dataspace */ + H5T_t *type; /* Datatype */ + H5S_t *src_space; /* Dataspace */ H5S_sel_iter_t iter; /* Selection iteration info*/ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ size_t type_size; /* Datatype element size */ diff --git a/src/H5Dselect.c b/src/H5Dselect.c index 53a3fe7..8507a43 100644 --- a/src/H5Dselect.c +++ b/src/H5Dselect.c @@ -81,13 +81,13 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size, size_t nelmts, co H5S_sel_iter_t file_iter; /* File selection iteration info */ hbool_t file_iter_init = 0; /* File selection iteration info has been initialized */ hsize_t _mem_off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets in memory */ - hsize_t * mem_off = NULL; /* Pointer to sequence offsets in memory */ + hsize_t *mem_off = NULL; /* Pointer to sequence offsets in memory */ hsize_t _file_off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets in the file */ - hsize_t * file_off = NULL; /* Pointer to sequence offsets in the file */ + hsize_t *file_off = NULL; /* Pointer to sequence offsets in the file */ size_t _mem_len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths in memory */ - size_t * mem_len = NULL; /* Pointer to sequence lengths in memory */ + size_t *mem_len = NULL; /* Pointer to sequence lengths in memory */ size_t _file_len[H5D_IO_VECTOR_SIZE]; /* Array to store sequence lengths in the file */ - size_t * file_len = NULL; /* Pointer to sequence lengths in the file */ + size_t *file_len = NULL; /* Pointer to sequence lengths in the file */ size_t curr_mem_seq; /* Current memory sequence to operate on */ size_t curr_file_seq; /* Current file sequence to operate on */ size_t mem_nseq; /* Number of sequences generated in the file */ @@ -83,7 +83,7 @@ static ssize_t H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t si static int H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *udata); static herr_t H5E_close_msg(H5E_msg_t *err); static H5E_msg_t *H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg); -static H5E_t * H5E_get_current_stack(void); +static H5E_t *H5E_get_current_stack(void); static herr_t H5E_set_current_stack(H5E_t *estack); static herr_t H5E_close_stack(H5E_t *err_stack); static ssize_t H5E_get_num(const H5E_t *err_stack); @@ -946,10 +946,10 @@ done: static H5E_t * H5E_get_current_stack(void) { - H5E_t * current_stack; /* Pointer to the current error stack */ - H5E_t * estack_copy = NULL; /* Pointer to new error stack to return */ + H5E_t *current_stack; /* Pointer to the current error stack */ + H5E_t *estack_copy = NULL; /* Pointer to new error stack to return */ unsigned u; /* Local index variable */ - H5E_t * ret_value = NULL; /* Return value */ + H5E_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1065,7 +1065,7 @@ done: static herr_t H5E_set_current_stack(H5E_t *estack) { - H5E_t * current_stack; /* Default error stack */ + H5E_t *current_stack; /* Default error stack */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1196,7 +1196,7 @@ H5E_close_stack(H5E_t *estack) ssize_t H5Eget_num(hid_t error_stack_id) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ ssize_t ret_value; /* Return value */ /* Don't clear the error stack! :-) */ @@ -1324,12 +1324,12 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, hid hid_t min_id, const char *fmt, ...) { va_list ap; /* Varargs info */ - H5E_t * estack; /* Pointer to error stack to modify */ + H5E_t *estack; /* Pointer to error stack to modify */ #ifndef H5_HAVE_VASPRINTF int tmp_len; /* Current size of description buffer */ int desc_len; /* Actual length of description when formatted */ #endif /* H5_HAVE_VASPRINTF */ - char * tmp = NULL; /* Buffer to place formatted description in */ + char *tmp = NULL; /* Buffer to place formatted description in */ hbool_t va_started = FALSE; /* Whether the variable argument list is open */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1508,7 +1508,7 @@ done: herr_t H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t stack_func, void *client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_walk_op_t op; /* Operator for walking error stack */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1558,7 +1558,7 @@ done: herr_t H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_auto_op_t op; /* Error stack function */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1615,7 +1615,7 @@ done: herr_t H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_auto_op_t op; /* Error stack operator */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index e6a6bb6..021837d 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -135,8 +135,8 @@ H5Eget_major(H5E_major_t maj) H5E_msg_t *msg; /* Pointer to error message */ ssize_t size; H5E_type_t type; - char * msg_str = NULL; - char * ret_value; /* Return value */ + char *msg_str = NULL; + char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) H5TRACE1("*s", "i", maj); @@ -187,8 +187,8 @@ H5Eget_minor(H5E_minor_t min) H5E_msg_t *msg; /* Pointer to error message */ ssize_t size; H5E_type_t type; - char * msg_str = NULL; - char * ret_value; /* Return value */ + char *msg_str = NULL; + char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) H5TRACE1("*s", "i", min); @@ -342,7 +342,7 @@ done: herr_t H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_walk_op_t walk_op; /* Error stack walking callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -383,7 +383,7 @@ done: herr_t H5Eget_auto1(H5E_auto1_t *func, void **client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_auto_op_t auto_op; /* Error stack operator */ herr_t ret_value = SUCCEED; /* Return value */ @@ -436,7 +436,7 @@ done: herr_t H5Eset_auto1(H5E_auto1_t func, void *client_data) { - H5E_t * estack; /* Error stack to operate on */ + H5E_t *estack; /* Error stack to operate on */ H5E_auto_op_t auto_op; /* Error stack operator */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Eint.c b/src/H5Eint.c index ea6b767..1414de0 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -50,7 +50,7 @@ /* Printing information */ typedef struct H5E_print_t { - FILE * stream; + FILE *stream; H5E_cls_t cls; } H5E_print_t; @@ -204,12 +204,12 @@ static herr_t H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data) { H5E_print_t *eprint = (H5E_print_t *)client_data; - FILE * stream; /* I/O stream to print output to */ - H5E_cls_t * cls_ptr; /* Pointer to error class */ - H5E_msg_t * maj_ptr; /* Pointer to major error info */ - H5E_msg_t * min_ptr; /* Pointer to minor error info */ - const char * maj_str = "No major description"; /* Major error description */ - const char * min_str = "No minor description"; /* Minor error description */ + FILE *stream; /* I/O stream to print output to */ + H5E_cls_t *cls_ptr; /* Pointer to error class */ + H5E_msg_t *maj_ptr; /* Pointer to major error info */ + H5E_msg_t *min_ptr; /* Pointer to minor error info */ + const char *maj_str = "No major description"; /* Major error description */ + const char *min_str = "No minor description"; /* Minor error description */ unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */ herr_t ret_value = SUCCEED; @@ -327,12 +327,12 @@ static herr_t H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) { H5E_print_t *eprint = (H5E_print_t *)client_data; - FILE * stream; /* I/O stream to print output to */ - H5E_cls_t * cls_ptr; /* Pointer to error class */ - H5E_msg_t * maj_ptr; /* Pointer to major error info */ - H5E_msg_t * min_ptr; /* Pointer to minor error info */ - const char * maj_str = "No major description"; /* Major error description */ - const char * min_str = "No minor description"; /* Minor error description */ + FILE *stream; /* I/O stream to print output to */ + H5E_cls_t *cls_ptr; /* Pointer to error class */ + H5E_msg_t *maj_ptr; /* Pointer to major error info */ + H5E_msg_t *min_ptr; /* Pointer to minor error info */ + const char *maj_str = "No major description"; /* Major error description */ + const char *min_str = "No minor description"; /* Minor error description */ unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */ herr_t ret_value = SUCCEED; @@ -680,7 +680,7 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin int tmp_len; /* Current size of description buffer */ int desc_len; /* Actual length of description when formatted */ #endif /* H5_HAVE_VASPRINTF */ - char * tmp = NULL; /* Buffer to place formatted description in */ + char *tmp = NULL; /* Buffer to place formatted description in */ hbool_t va_started = FALSE; /* Whether the variable argument list is open */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Epkg.h b/src/H5Epkg.h index 801e4f3..022349b 100644 --- a/src/H5Epkg.h +++ b/src/H5Epkg.h @@ -99,7 +99,7 @@ typedef struct H5E_cls_t { /* Major or minor message */ typedef struct H5E_msg_t { - char * msg; /* Message for error */ + char *msg; /* Message for error */ H5E_type_t type; /* Type of error (major or minor) */ H5E_cls_t *cls; /* Which error class this message belongs to */ } H5E_msg_t; @@ -109,7 +109,7 @@ struct H5E_t { size_t nused; /* Num slots currently used in stack */ H5E_error2_t slot[H5E_NSLOTS]; /* Array of error records */ H5E_auto_op_t auto_op; /* Operator for 'automatic' error reporting */ - void * auto_data; /* Callback data for 'automatic error reporting */ + void *auto_data; /* Callback data for 'automatic error reporting */ }; /*****************************/ diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 9ec9d32..c5f8942 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -162,7 +162,7 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g; #define H5E_BEGIN_TRY \ { \ H5E_auto_t saved_efunc; \ - void * H5E_saved_edata; \ + void *H5E_saved_edata; \ \ (void)H5Eget_auto(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata); \ (void)H5Eset_auto(H5E_DEFAULT, NULL, NULL); @@ -189,7 +189,7 @@ H5F_term_interface(void) hid_t H5Fget_create_plist(hid_t file_id) { - H5F_t * file; /* File info */ + H5F_t *file; /* File info */ H5P_genplist_t *plist; /* Property list */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -260,7 +260,7 @@ done: ssize_t H5Fget_obj_count(hid_t file_id, unsigned types) { - H5F_t * f = NULL; /* File to query */ + H5F_t *f = NULL; /* File to query */ size_t obj_count = 0; /* Number of opened objects */ ssize_t ret_value = 0; /* Return value */ @@ -296,7 +296,7 @@ done: ssize_t H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list) { - H5F_t * f = NULL; /* File to query */ + H5F_t *f = NULL; /* File to query */ size_t obj_id_count = 0; /* Number of open objects */ ssize_t ret_value = 0; /* Return value */ @@ -544,7 +544,7 @@ done: herr_t H5Fflush(hid_t object_id, H5F_scope_t scope) { - H5F_t * f = NULL; /* File to flush */ + H5F_t *f = NULL; /* File to flush */ H5O_loc_t *oloc = NULL; /* Object location for ID */ herr_t ret_value = SUCCEED; /* Return value */ @@ -794,7 +794,7 @@ done: hssize_t H5Fget_freespace(hid_t file_id) { - H5F_t * file; /* File object for file ID */ + H5F_t *file; /* File object for file ID */ hsize_t tot_space; /* Amount of free space in the file */ hssize_t ret_value; /* Return value */ @@ -829,7 +829,7 @@ done: herr_t H5Fget_filesize(hid_t file_id, hsize_t *size) { - H5F_t * file; /* File object for file ID */ + H5F_t *file; /* File object for file ID */ haddr_t eof; /* End of file address */ haddr_t base_addr; /* Base address for the file */ herr_t ret_value = SUCCEED; /* Return value */ @@ -894,7 +894,7 @@ done: ssize_t H5Fget_file_image(hid_t file_id, void *buf_ptr, size_t buf_len) { - H5F_t * file; /* File object for file ID */ + H5F_t *file; /* File object for file ID */ ssize_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) @@ -1033,7 +1033,7 @@ herr_t H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, size_t *cur_size_ptr, int *cur_num_entries_ptr) { - H5F_t * file; /* File object for file ID */ + H5F_t *file; /* File object for file ID */ int32_t cur_num_entries; herr_t ret_value = SUCCEED; /* Return value */ @@ -1114,7 +1114,7 @@ done: ssize_t H5Fget_name(hid_t obj_id, char *name /*out*/, size_t size) { - H5F_t * f; /* Top file in mount hierarchy */ + H5F_t *f; /* Top file in mount hierarchy */ size_t len; ssize_t ret_value = -1; /* Return value */ @@ -319,7 +319,7 @@ hid_t H5FD_register(const void *_cls, size_t size, hbool_t app_ref) { const H5FD_class_t *cls = (const H5FD_class_t *)_cls; - H5FD_class_t * saved = NULL; + H5FD_class_t *saved = NULL; H5FD_mem_t type; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -547,7 +547,7 @@ done: static herr_t H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_pl, void **copied_pl) { - void * new_pl = NULL; /* Copy of property list */ + void *new_pl = NULL; /* Copy of property list */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -674,7 +674,7 @@ done: herr_t H5FD_fapl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info) { - void * copied_driver_info = NULL; /* Temporary VFL driver info */ + void *copied_driver_info = NULL; /* Temporary VFL driver info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -858,13 +858,13 @@ done: H5FD_t * H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_class_t * driver; /* VFD for file */ - H5FD_t * file = NULL; /* VFD file struct */ + H5FD_class_t *driver; /* VFD for file */ + H5FD_t *file = NULL; /* VFD file struct */ hid_t driver_id = -1; /* VFD ID */ - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ unsigned long driver_flags = 0; /* File-inspecific driver feature flags */ H5FD_file_image_info_t file_image_info; /* Initial file image */ - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 462f715..24cb548 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -49,7 +49,7 @@ typedef struct H5FD_core_region_t { */ typedef struct H5FD_core_t { H5FD_t pub; /* public stuff, must be first */ - char * name; /* for equivalence testing */ + char *name; /* for equivalence testing */ unsigned char *mem; /* the underlying memory */ haddr_t eoa; /* end of allocated region */ haddr_t eof; /* current allocated size */ @@ -87,7 +87,7 @@ typedef struct H5FD_core_t { #endif /* H5_HAVE_WIN32_API */ hbool_t dirty; /* changes not saved? */ H5FD_file_image_callbacks_t fi_callbacks; /* file image callbacks */ - H5SL_t * dirty_list; /* dirty parts of the file */ + H5SL_t *dirty_list; /* dirty parts of the file */ } H5FD_core_t; /* Driver-specific file access properties */ @@ -122,7 +122,7 @@ typedef struct H5FD_core_fapl_t { static herr_t H5FD_core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end); static herr_t H5FD_core_destroy_dirty_list(H5FD_core_t *file); static herr_t H5FD_core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size); -static void * H5FD_core_fapl_get(H5FD_t *_file); +static void *H5FD_core_fapl_get(H5FD_t *_file); static H5FD_t *H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_core_close(H5FD_t *_file); static int H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2); @@ -472,7 +472,7 @@ herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) { H5FD_core_fapl_t fa; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value; FUNC_ENTER_API(FAIL) @@ -506,7 +506,7 @@ done: herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_core_fapl_t *fa; herr_t ret_value = SUCCEED; /* Return value */ @@ -545,9 +545,9 @@ done: static void * H5FD_core_fapl_get(H5FD_t *_file) { - H5FD_core_t * file = (H5FD_core_t *)_file; + H5FD_core_t *file = (H5FD_core_t *)_file; H5FD_core_fapl_t *fa; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -583,16 +583,16 @@ static H5FD_t * H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { int o_flags; - H5FD_core_t * file = NULL; + H5FD_core_t *file = NULL; const H5FD_core_fapl_t *fa = NULL; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ #ifdef H5_HAVE_WIN32_API struct _BY_HANDLE_FILE_INFORMATION fileinfo; #endif h5_stat_t sb; int fd = -1; H5FD_file_image_info_t file_image_info; - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index e60ca5c..7f3a325 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -120,8 +120,8 @@ typedef struct H5FD_direct_t { (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A)) /* Prototypes */ -static void * H5FD_direct_fapl_get(H5FD_t *file); -static void * H5FD_direct_fapl_copy(const void *_old_fa); +static void *H5FD_direct_fapl_get(H5FD_t *file); +static void *H5FD_direct_fapl_copy(const void *_old_fa); static H5FD_t *H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_direct_close(H5FD_t *_file); static int H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2); @@ -265,7 +265,7 @@ H5FD_direct_term(void) herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbuf_size) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5FD_direct_fapl_t fa; herr_t ret_value; @@ -321,7 +321,7 @@ herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size /*out*/, size_t *cbuf_size /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_direct_fapl_t *fa; herr_t ret_value = SUCCEED; /* Return value */ @@ -366,7 +366,7 @@ static void * H5FD_direct_fapl_get(H5FD_t *_file) { H5FD_direct_t *file = (H5FD_direct_t *)_file; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -395,7 +395,7 @@ static void * H5FD_direct_fapl_copy(const void *_old_fa) { const H5FD_direct_fapl_t *old_fa = (const H5FD_direct_fapl_t *)_old_fa; - H5FD_direct_fapl_t * new_fa = H5MM_malloc(sizeof(H5FD_direct_fapl_t)); + H5FD_direct_fapl_t *new_fa = H5MM_malloc(sizeof(H5FD_direct_fapl_t)); FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -428,7 +428,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd { int o_flags; int fd = (-1); - H5FD_direct_t * file = NULL; + H5FD_direct_t *file = NULL; H5FD_direct_fapl_t *fa; #ifdef H5_HAVE_WIN32_API HFILE filehandle; @@ -436,8 +436,8 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd #endif h5_stat_t sb; H5P_genplist_t *plist; /* Property list */ - void * buf1, *buf2; - H5FD_t * ret_value = NULL; + void *buf1, *buf2; + H5FD_t *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -819,7 +819,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN hbool_t _must_align = TRUE; herr_t ret_value = SUCCEED; /* Return value */ size_t alloc_size; - void * copy_buf = NULL, *p2; + void *copy_buf = NULL, *p2; size_t _boundary; size_t _fbsize; size_t _cbsize; @@ -999,8 +999,8 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U hbool_t _must_align = TRUE; herr_t ret_value = SUCCEED; /* Return value */ size_t alloc_size; - void * copy_buf = NULL, *p1; - const void * p3; + void *copy_buf = NULL, *p1; + const void *p3; size_t _boundary; size_t _fbsize; size_t _cbsize; diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 6c3af6a..7420c45 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -62,7 +62,7 @@ typedef struct H5FD_family_t { unsigned amembs; /*number of member slots allocated */ H5FD_t **memb; /*dynamic array of member pointers */ haddr_t eoa; /*end of allocated addresses */ - char * name; /*name generator printf format */ + char *name; /*name generator printf format */ unsigned flags; /*flags for opening additional members */ /* Information from properties set by 'h5repart' tool */ @@ -80,8 +80,8 @@ typedef struct H5FD_family_fapl_t { } H5FD_family_fapl_t; /* Callback prototypes */ -static void * H5FD_family_fapl_get(H5FD_t *_file); -static void * H5FD_family_fapl_copy(const void *_old_fa); +static void *H5FD_family_fapl_get(H5FD_t *_file); +static void *H5FD_family_fapl_copy(const void *_old_fa); static herr_t H5FD_family_fapl_free(void *_fa); static hsize_t H5FD_family_sb_size(H5FD_t *_file); static herr_t H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/); @@ -234,7 +234,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id) { herr_t ret_value; H5FD_family_fapl_t fa = {0, -1}; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ FUNC_ENTER_API(FAIL) H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id); @@ -280,7 +280,7 @@ done: herr_t H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize /*out*/, hid_t *memb_fapl_id /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_family_fapl_t *fa; herr_t ret_value = SUCCEED; /* Return value */ @@ -323,10 +323,10 @@ done: static void * H5FD_family_fapl_get(H5FD_t *_file) { - H5FD_family_t * file = (H5FD_family_t *)_file; + H5FD_family_t *file = (H5FD_family_t *)_file; H5FD_family_fapl_t *fa = NULL; - H5P_genplist_t * plist; /* Property list pointer */ - void * ret_value = NULL; /* Return value */ + H5P_genplist_t *plist; /* Property list pointer */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -367,9 +367,9 @@ static void * H5FD_family_fapl_copy(const void *_old_fa) { const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t *)_old_fa; - H5FD_family_fapl_t * new_fa = NULL; - H5P_genplist_t * plist; /* Property list pointer */ - void * ret_value = NULL; /* Return value */ + H5FD_family_fapl_t *new_fa = NULL; + H5P_genplist_t *plist; /* Property list pointer */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -581,7 +581,7 @@ static H5FD_t * H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { H5FD_family_t *file = NULL; - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; char memb_name[4096], temp[4096]; hsize_t eof = HADDR_UNDEF; unsigned t_flags = flags & ~H5F_ACC_CREAT; @@ -606,7 +606,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd file->mem_newsize = 0; /*New member size used by h5repart only */ } /* end if */ else { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_family_fapl_t *fa; if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) @@ -1024,7 +1024,7 @@ H5FD_family_get_eof(const H5FD_t *_file) static herr_t H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle) { - H5FD_family_t * file = (H5FD_family_t *)_file; + H5FD_family_t *file = (H5FD_family_t *)_file; H5P_genplist_t *plist; hsize_t offset; int memb; @@ -1068,8 +1068,8 @@ done: static herr_t H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *_buf /*out*/) { - H5FD_family_t * file = (H5FD_family_t *)_file; - unsigned char * buf = (unsigned char *)_buf; + H5FD_family_t *file = (H5FD_family_t *)_file; + unsigned char *buf = (unsigned char *)_buf; haddr_t sub; size_t req; hsize_t tempreq; @@ -1133,13 +1133,13 @@ done: static herr_t H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf) { - H5FD_family_t * file = (H5FD_family_t *)_file; + H5FD_family_t *file = (H5FD_family_t *)_file; const unsigned char *buf = (const unsigned char *)_buf; haddr_t sub; size_t req; hsize_t tempreq; unsigned u; /* Local index variable */ - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 6196291..13f142e 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -247,7 +247,7 @@ typedef struct H5FD_hdfs_t { H5FD_t pub; H5FD_hdfs_fapl_t fa; haddr_t eoa; - hdfs_t * hdfs_handle; + hdfs_t *hdfs_handle; #if HDFS_STATS hdfs_statsbin meta[HDFS_STATS_BIN_COUNT + 1]; hdfs_statsbin raw[HDFS_STATS_BIN_COUNT + 1]; @@ -268,8 +268,8 @@ typedef struct H5FD_hdfs_t { #define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR)) /* Prototypes */ -static void * H5FD_hdfs_fapl_get(H5FD_t *_file); -static void * H5FD_hdfs_fapl_copy(const void *_old_fa); +static void *H5FD_hdfs_fapl_get(H5FD_t *_file); +static void *H5FD_hdfs_fapl_copy(const void *_old_fa); static herr_t H5FD_hdfs_fapl_free(void *_fa); static H5FD_t *H5FD_hdfs_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_hdfs_close(H5FD_t *_file); @@ -433,8 +433,8 @@ H5FD_hdfs_handle_open(const char *path, const char *namenode_name, const int32_t const int32_t stream_buffer_size) { struct hdfsBuilder *builder = NULL; - hdfs_t * handle = NULL; - hdfs_t * ret_value = NULL; + hdfs_t *handle = NULL; + hdfs_t *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -648,7 +648,7 @@ herr_t H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out) { const H5FD_hdfs_fapl_t *fa = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -697,9 +697,9 @@ done: static void * H5FD_hdfs_fapl_get(H5FD_t *_file) { - H5FD_hdfs_t * file = (H5FD_hdfs_t *)_file; + H5FD_hdfs_t *file = (H5FD_hdfs_t *)_file; H5FD_hdfs_fapl_t *fa = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -737,8 +737,8 @@ static void * H5FD_hdfs_fapl_copy(const void *_old_fa) { const H5FD_hdfs_fapl_t *old_fa = (const H5FD_hdfs_fapl_t *)_old_fa; - H5FD_hdfs_fapl_t * new_fa = NULL; - void * ret_value = NULL; + H5FD_hdfs_fapl_t *new_fa = NULL; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -862,9 +862,9 @@ done: static H5FD_t * H5FD_hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_t * ret_value = NULL; - H5FD_hdfs_t * file = NULL; - hdfs_t * handle = NULL; + H5FD_t *ret_value = NULL; + H5FD_hdfs_t *file = NULL; + hdfs_t *handle = NULL; H5FD_hdfs_fapl_t fa; FUNC_ENTER_NOAPI_NOINIT @@ -983,7 +983,7 @@ static herr_t hdfs_fprint_stats(FILE *stream, const H5FD_hdfs_t *file) { herr_t ret_value = SUCCEED; - parsed_url_t * purl = NULL; + parsed_url_t *purl = NULL; unsigned i = 0; unsigned long count_meta = 0; unsigned long count_raw = 0; @@ -1258,8 +1258,8 @@ H5FD_hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2) int ret_value = 0; const H5FD_hdfs_t *f1 = (const H5FD_hdfs_t *)_f1; const H5FD_hdfs_t *f2 = (const H5FD_hdfs_t *)_f2; - hdfsFileInfo * finfo1 = NULL; - hdfsFileInfo * finfo2 = NULL; + hdfsFileInfo *finfo1 = NULL; + hdfsFileInfo *finfo2 = NULL; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 2449126..8ada56d 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -42,7 +42,7 @@ static hid_t H5FD_LOG_g = 0; /* Driver-specific file access properties */ typedef struct H5FD_log_fapl_t { - char * logfile; /* Allocated log file name */ + char *logfile; /* Allocated log file name */ unsigned long long flags; /* Flags for logging behavior */ size_t buf_size; /* Size of buffers for track flavor and number of times each byte is accessed */ } H5FD_log_fapl_t; @@ -115,9 +115,9 @@ typedef struct H5FD_log_t { hbool_t fam_to_sec2; /* Fields for tracking I/O operations */ - unsigned char * nread; /* Number of reads from a file location */ - unsigned char * nwrite; /* Number of write to a file location */ - unsigned char * flavor; /* Flavor of information written to file location */ + unsigned char *nread; /* Number of reads from a file location */ + unsigned char *nwrite; /* Number of write to a file location */ + unsigned char *flavor; /* Flavor of information written to file location */ unsigned long long total_read_ops; /* Total number of read operations */ unsigned long long total_write_ops; /* Total number of write operations */ unsigned long long total_seek_ops; /* Total number of seek operations */ @@ -126,7 +126,7 @@ typedef struct H5FD_log_t { double total_write_time; /* Total time spent in write operations */ double total_seek_time; /* Total time spent in seek operations */ size_t iosize; /* Size of I/O information buffers */ - FILE * logfp; /* Log file pointer */ + FILE *logfp; /* Log file pointer */ H5FD_log_fapl_t fa; /* Driver-specific file access properties */ } H5FD_log_t; @@ -152,8 +152,8 @@ typedef struct H5FD_log_t { (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A)) /* Prototypes */ -static void * H5FD_log_fapl_get(H5FD_t *file); -static void * H5FD_log_fapl_copy(const void *_old_fa); +static void *H5FD_log_fapl_get(H5FD_t *file); +static void *H5FD_log_fapl_copy(const void *_old_fa); static herr_t H5FD_log_fapl_free(void *_fa); static H5FD_t *H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_log_close(H5FD_t *_file); @@ -339,7 +339,7 @@ static void * H5FD_log_fapl_get(H5FD_t *_file) { H5FD_log_t *file = (H5FD_log_t *)_file; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -366,8 +366,8 @@ static void * H5FD_log_fapl_copy(const void *_old_fa) { const H5FD_log_fapl_t *old_fa = (const H5FD_log_fapl_t *)_old_fa; - H5FD_log_fapl_t * new_fa = NULL; /* New FAPL info */ - void * ret_value = NULL; /* Return value */ + H5FD_log_fapl_t *new_fa = NULL; /* New FAPL info */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -444,8 +444,8 @@ H5FD_log_fapl_free(void *_fa) static H5FD_t * H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_log_t * file = NULL; - H5P_genplist_t * plist; /* Property list */ + H5FD_log_t *file = NULL; + H5P_genplist_t *plist; /* Property list */ const H5FD_log_fapl_t *fa; /* File access property list information */ int fd = -1; /* File descriptor */ int o_flags; /* Flags for open() call */ @@ -458,7 +458,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) struct timeval stat_timeval_diff; #endif /* H5_HAVE_GETTIMEOFDAY */ h5_stat_t sb; - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 8f129f2..2717406 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -71,10 +71,10 @@ typedef struct H5FD_mpio_t { /* Private Prototypes */ /* Callbacks */ -static void * H5FD_mpio_fapl_get(H5FD_t *_file); -static void * H5FD_mpio_fapl_copy(const void *_old_fa); +static void *H5FD_mpio_fapl_get(H5FD_t *_file); +static void *H5FD_mpio_fapl_copy(const void *_old_fa); static herr_t H5FD_mpio_fapl_free(void *_fa); -static H5FD_t * H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); +static H5FD_t *H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_mpio_close(H5FD_t *_file); static herr_t H5FD_mpio_query(const H5FD_t *_f1, unsigned long *flags); static haddr_t H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t type); @@ -293,7 +293,7 @@ herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info) { H5FD_mpio_fapl_t fa; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value; FUNC_ENTER_API(FAIL) @@ -345,7 +345,7 @@ herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/) { H5FD_mpio_fapl_t *fa; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ MPI_Comm comm_tmp = MPI_COMM_NULL; int mpi_code; /* mpi return code */ herr_t ret_value = SUCCEED; /* Return value */ @@ -661,9 +661,9 @@ done: static void * H5FD_mpio_fapl_get(H5FD_t *_file) { - H5FD_mpio_t * file = (H5FD_mpio_t *)_file; + H5FD_mpio_t *file = (H5FD_mpio_t *)_file; H5FD_mpio_fapl_t *fa = NULL; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -701,9 +701,9 @@ done: static void * H5FD_mpio_fapl_copy(const void *_old_fa) { - void * ret_value = NULL; + void *ret_value = NULL; const H5FD_mpio_fapl_t *old_fa = (const H5FD_mpio_fapl_t *)_old_fa; - H5FD_mpio_fapl_t * new_fa = NULL; + H5FD_mpio_fapl_t *new_fa = NULL; FUNC_ENTER_NOAPI_NOINIT #ifdef H5FDmpio_DEBUG @@ -886,7 +886,7 @@ done: static H5FD_t * H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR_UNUSED maxaddr) { - H5FD_mpio_t * file = NULL; + H5FD_mpio_t *file = NULL; MPI_File fh; unsigned file_opened = 0; /* Flag to indicate that the file was successfully opened */ int mpi_amode; @@ -896,10 +896,10 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR_ MPI_Offset size; const H5FD_mpio_fapl_t *fa = NULL; H5FD_mpio_fapl_t _fa; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ MPI_Comm comm_dup = MPI_COMM_NULL; MPI_Info info_dup = MPI_INFO_NULL; - H5FD_t * ret_value; /* Return value */ + H5FD_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1299,7 +1299,7 @@ static herr_t H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf /*out*/) { - H5FD_mpio_t * file = (H5FD_mpio_t *)_file; + H5FD_mpio_t *file = (H5FD_mpio_t *)_file; MPI_Offset mpi_off; MPI_Status mpi_stat; /* Status from I/O operation */ int mpi_code; /* mpi return code */ @@ -1493,7 +1493,7 @@ done: static herr_t H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf) { - H5FD_mpio_t * file = (H5FD_mpio_t *)_file; + H5FD_mpio_t *file = (H5FD_mpio_t *)_file; MPI_Offset mpi_off; MPI_Status mpi_stat; /* Status from I/O operation */ MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */ diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 04560c1..b4549a4 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -76,7 +76,7 @@ static hid_t H5FD_MULTI_g = 0; typedef struct H5FD_multi_fapl_t { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; /*memory usage map */ hid_t memb_fapl[H5FD_MEM_NTYPES]; /*member access properties */ - char * memb_name[H5FD_MEM_NTYPES]; /*name generators */ + char *memb_name[H5FD_MEM_NTYPES]; /*name generators */ haddr_t memb_addr[H5FD_MEM_NTYPES]; /*starting addr per member */ hbool_t relax; /*less stringent error checking */ } H5FD_multi_fapl_t; @@ -91,14 +91,14 @@ typedef struct H5FD_multi_t { H5FD_t pub; /*public stuff, must be first */ H5FD_multi_fapl_t fa; /*driver-specific file access properties */ haddr_t memb_next[H5FD_MEM_NTYPES]; /*addr of next member */ - H5FD_t * memb[H5FD_MEM_NTYPES]; /*member pointers */ + H5FD_t *memb[H5FD_MEM_NTYPES]; /*member pointers */ haddr_t memb_eoa[H5FD_MEM_NTYPES]; /*EOA for individual files, *end of allocated addresses. v1.6 library *have the EOA for the entire file. But it's *meaningless for MULTI file. We replaced it *with the EOAs for individual files */ unsigned flags; /*file open flags saved for debugging */ - char * name; /*name passed to H5Fopen or H5Fcreate */ + char *name; /*name passed to H5Fopen or H5Fcreate */ } H5FD_multi_t; /* Driver specific data transfer properties */ @@ -115,8 +115,8 @@ static int open_members(H5FD_multi_t *file); static hsize_t H5FD_multi_sb_size(H5FD_t *file); static herr_t H5FD_multi_sb_encode(H5FD_t *file, char *name /*out*/, unsigned char *buf /*out*/); static herr_t H5FD_multi_sb_decode(H5FD_t *file, const char *name, const unsigned char *buf); -static void * H5FD_multi_fapl_get(H5FD_t *file); -static void * H5FD_multi_fapl_copy(const void *_old_fa); +static void *H5FD_multi_fapl_get(H5FD_t *file); +static void *H5FD_multi_fapl_copy(const void *_old_fa); static herr_t H5FD_multi_fapl_free(void *_fa); static H5FD_t *H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD_multi_close(H5FD_t *_file); @@ -188,7 +188,7 @@ static const H5FD_class_t H5FD_multi_g = { static char * my_strdup(const char *s) { - char * x; + char *x; size_t str_len; if (!s) @@ -422,7 +422,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_f H5FD_mem_t _memb_map[H5FD_MEM_NTYPES]; hid_t _memb_fapl[H5FD_MEM_NTYPES]; char _memb_name[H5FD_MEM_NTYPES][16]; - const char * _memb_name_ptrs[H5FD_MEM_NTYPES]; + const char *_memb_name_ptrs[H5FD_MEM_NTYPES]; haddr_t _memb_addr[H5FD_MEM_NTYPES]; static const char *letters = "Xsbrglo"; static const char *func = "H5FDset_fapl_multi"; /* Function Name for error reporting */ @@ -519,7 +519,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl { const H5FD_multi_fapl_t *fa; H5FD_mem_t mt; - static const char * func = "H5FDget_fapl_multi"; /* Function Name for error reporting */ + static const char *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */ /*NO TRACE*/ @@ -629,9 +629,9 @@ H5FD_multi_sb_size(H5FD_t *_file) static herr_t H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; haddr_t memb_eoa; - unsigned char * p; + unsigned char *p; size_t nseen; size_t i; H5FD_mem_t m; @@ -710,17 +710,17 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out static herr_t H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; char x[2 * H5FD_MEM_NTYPES * 8]; H5FD_mem_t map[H5FD_MEM_NTYPES]; int i; size_t nseen = 0; hbool_t map_changed = FALSE; hbool_t in_use[H5FD_MEM_NTYPES]; - const char * memb_name[H5FD_MEM_NTYPES]; + const char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; haddr_t memb_eoa[H5FD_MEM_NTYPES]; - haddr_t * ap; + haddr_t *ap; static const char *func = "H5FD_multi_sb_decode"; /* Function Name for error reporting */ /* Clear the error stack */ @@ -884,9 +884,9 @@ static void * H5FD_multi_fapl_copy(const void *_old_fa) { const H5FD_multi_fapl_t *old_fa = (const H5FD_multi_fapl_t *)_old_fa; - H5FD_multi_fapl_t * new_fa = (H5FD_multi_fapl_t *)malloc(sizeof(H5FD_multi_fapl_t)); + H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)malloc(sizeof(H5FD_multi_fapl_t)); int nerrors = 0; - static const char * func = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */ + static const char *func = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */ assert(new_fa); @@ -976,11 +976,11 @@ H5FD_multi_fapl_free(void *_fa) static H5FD_t * H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_multi_t * file = NULL; + H5FD_multi_t *file = NULL; hid_t close_fapl = -1; const H5FD_multi_fapl_t *fa; H5FD_mem_t m; - static const char * func = "H5FD_multi_open"; /* Function Name for error reporting */ + static const char *func = "H5FD_multi_open"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -1078,7 +1078,7 @@ error: static herr_t H5FD_multi_close(H5FD_t *_file) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; int nerrors = 0; static const char *func = "H5FD_multi_close"; /* Function Name for error reporting */ @@ -1239,7 +1239,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type) const H5FD_multi_t *file = (const H5FD_multi_t *)_file; haddr_t eoa = 0; haddr_t memb_eoa = 0; - static const char * func = "H5FD_multi_get_eoa"; /* Function Name for error reporting */ + static const char *func = "H5FD_multi_get_eoa"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -1336,7 +1336,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type) static herr_t H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_mem_t mmt; herr_t status; static const char *func = "H5FD_multi_set_eoa"; /* Function Name for error reporting */ @@ -1398,7 +1398,7 @@ H5FD_multi_get_eof(const H5FD_t *_file) const H5FD_multi_t *file = (const H5FD_multi_t *)_file; haddr_t eof = 0, tmp_eof; haddr_t eoa = 0, tmp_eoa; - static const char * func = "H5FD_multi_get_eof"; /* Function Name for error reporting */ + static const char *func = "H5FD_multi_get_eof"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -1471,7 +1471,7 @@ H5FD_multi_get_eof(const H5FD_t *_file) static herr_t H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_mem_t type, mmt; static const char *func = "H5FD_multi_get_handle"; /* Function Name for error reporting */ @@ -1505,7 +1505,7 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle) static haddr_t H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_mem_t mmt; haddr_t addr; static const char *func = "H5FD_multi_alloc"; /* Function Name for error reporting */ @@ -1587,7 +1587,7 @@ H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsi static herr_t H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *_buf /*out*/) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_multi_dxpl_t dx; htri_t prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */ H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT; @@ -1636,7 +1636,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz static herr_t H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_multi_dxpl_t dx; htri_t prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */ H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT; @@ -1683,7 +1683,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si static herr_t H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_mem_t mt; int nerrors = 0; static const char *func = "H5FD_multi_flush"; /* Function Name for error reporting */ @@ -1756,7 +1756,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) static herr_t H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; H5FD_mem_t mt; int nerrors = 0; static const char *func = "H5FD_multi_truncate"; /* Function Name for error reporting */ diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index bde4c74..5407a6f 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -66,7 +66,7 @@ typedef enum { /* Define structure to hold initial file image and other relevant information */ typedef struct { - void * buffer; + void *buffer; size_t size; H5FD_file_image_callbacks_t callbacks; } H5FD_file_image_info_t; @@ -105,33 +105,33 @@ typedef struct { struct H5P_genplist_t; struct H5F_t; -H5_DLL int H5FD_term_interface(void); -H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_addr); +H5_DLL int H5FD_term_interface(void); +H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, const H5P_genplist_t *dxpl, haddr_t *sig_addr); H5_DLL H5FD_class_t *H5FD_get_class(hid_t id); H5_DLL hsize_t H5FD_sb_size(H5FD_t *file); H5_DLL herr_t H5FD_sb_encode(H5FD_t *file, char *name /*out*/, uint8_t *buf); H5_DLL herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf); -H5_DLL void * H5FD_fapl_get(H5FD_t *file); +H5_DLL void *H5FD_fapl_get(H5FD_t *file); H5_DLL herr_t H5FD_fapl_open(struct H5P_genplist_t *plist, hid_t driver_id, const void *driver_info); H5_DLL herr_t H5FD_fapl_close(hid_t driver_id, void *fapl); H5_DLL hid_t H5FD_register(const void *cls, size_t size, hbool_t app_ref); -H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); -H5_DLL herr_t H5FD_close(H5FD_t *file); -H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2); -H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, hsize_t size, - haddr_t *align_addr, hsize_t *align_size); -H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, haddr_t addr, - hsize_t size); -H5_DLL htri_t H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, struct H5F_t *f, haddr_t blk_end, - hsize_t extra_requested); -H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type); -H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr); -H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file); -H5_DLL haddr_t H5FD_get_maxaddr(const H5FD_t *file); -H5_DLL herr_t H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags); -H5_DLL herr_t H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map); -H5_DLL herr_t H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size, - void *buf /*out*/); +H5_DLL H5FD_t *H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); +H5_DLL herr_t H5FD_close(H5FD_t *file); +H5_DLL int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2); +H5_DLL haddr_t H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, hsize_t size, + haddr_t *align_addr, hsize_t *align_size); +H5_DLL herr_t H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, struct H5F_t *f, haddr_t addr, + hsize_t size); +H5_DLL htri_t H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, struct H5F_t *f, haddr_t blk_end, + hsize_t extra_requested); +H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type); +H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr); +H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file); +H5_DLL haddr_t H5FD_get_maxaddr(const H5FD_t *file); +H5_DLL herr_t H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags); +H5_DLL herr_t H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map); +H5_DLL herr_t H5FD_read(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size, + void *buf /*out*/); H5_DLL herr_t H5FD_write(H5FD_t *file, const H5P_genplist_t *dxpl, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf); H5_DLL herr_t H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing); diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index ff0f54a9..aa10ab5 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -208,7 +208,7 @@ typedef struct H5FD_t H5FD_t; /* Class information for each file driver */ typedef struct H5FD_class_t { - const char * name; + const char *name; haddr_t maxaddr; H5F_close_degree_t fc_degree; hsize_t (*sb_size)(H5FD_t *file); @@ -378,8 +378,8 @@ extern "C" { #endif /* Function prototypes */ -H5_DLL hid_t H5FDregister(const H5FD_class_t *cls); -H5_DLL herr_t H5FDunregister(hid_t driver_id); +H5_DLL hid_t H5FDregister(const H5FD_class_t *cls); +H5_DLL herr_t H5FDunregister(hid_t driver_id); H5_DLL H5FD_t *H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); H5_DLL herr_t H5FDclose(H5FD_t *file); H5_DLL int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2); diff --git a/src/H5FDros3.c b/src/H5FDros3.c index 237dd8f..c218edf 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -195,7 +195,7 @@ typedef struct H5FD_ros3_t { H5FD_t pub; H5FD_ros3_fapl_t fa; haddr_t eoa; - s3r_t * s3r_handle; + s3r_t *s3r_handle; #if ROS3_STATS ros3_statsbin meta[ROS3_STATS_BIN_COUNT + 1]; ros3_statsbin raw[ROS3_STATS_BIN_COUNT + 1]; @@ -230,8 +230,8 @@ static herr_t H5FD_ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, ha const void *buf); static herr_t H5FD_ros3_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing); static herr_t H5FD_ros3_validate_config(const H5FD_ros3_fapl_t *fa); -static void * H5FD_ros3_fapl_get(H5FD_t *_file); -static void * H5FD_ros3_fapl_copy(const void *_old_fa); +static void *H5FD_ros3_fapl_get(H5FD_t *_file); +static void *H5FD_ros3_fapl_copy(const void *_old_fa); static herr_t H5FD_ros3_fapl_free(void *_fa); static const H5FD_class_t H5FD_ros3_g = { @@ -468,7 +468,7 @@ herr_t H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out) { const H5FD_ros3_fapl_t *fa = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -517,9 +517,9 @@ done: static void * H5FD_ros3_fapl_get(H5FD_t *_file) { - H5FD_ros3_t * file = (H5FD_ros3_t *)_file; + H5FD_ros3_t *file = (H5FD_ros3_t *)_file; H5FD_ros3_fapl_t *fa = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -559,8 +559,8 @@ static void * H5FD_ros3_fapl_copy(const void *_old_fa) { const H5FD_ros3_fapl_t *old_fa = (const H5FD_ros3_fapl_t *)_old_fa; - H5FD_ros3_fapl_t * new_fa = NULL; - void * ret_value = NULL; + H5FD_ros3_fapl_t *new_fa = NULL; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -693,13 +693,13 @@ done: static H5FD_t * H5FD_ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_ros3_t * file = NULL; - struct tm * now = NULL; + H5FD_ros3_t *file = NULL; + struct tm *now = NULL; char iso8601now[ISO8601_SIZE]; unsigned char signing_key[SHA256_DIGEST_LENGTH]; - s3r_t * handle = NULL; + s3r_t *handle = NULL; H5FD_ros3_fapl_t fa; - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -842,7 +842,7 @@ static herr_t ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file) { herr_t ret_value = SUCCEED; - parsed_url_t * purl = NULL; + parsed_url_t *purl = NULL; unsigned i = 0; unsigned long count_meta = 0; unsigned long count_raw = 0; @@ -1149,8 +1149,8 @@ done: static int H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2) { - const H5FD_ros3_t * f1 = (const H5FD_ros3_t *)_f1; - const H5FD_ros3_t * f2 = (const H5FD_ros3_t *)_f2; + const H5FD_ros3_t *f1 = (const H5FD_ros3_t *)_f1; + const H5FD_ros3_t *f2 = (const H5FD_ros3_t *)_f2; const parsed_url_t *purl1 = NULL; const parsed_url_t *purl2 = NULL; int ret_value = 0; diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c index 38700b4..6ee4402 100644 --- a/src/H5FDs3comms.c +++ b/src/H5FDs3comms.c @@ -81,7 +81,7 @@ */ struct s3r_datastruct { unsigned long magic; - char * data; + char *data; size_t size; }; #define S3COMMS_CALLBACK_DATASTRUCT_MAGIC 0x28c2b2ul @@ -209,11 +209,11 @@ herr_t H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value) { size_t i = 0; - char * valuecpy = NULL; - char * namecpy = NULL; + char *valuecpy = NULL; + char *namecpy = NULL; size_t namelen = 0; - char * lowername = NULL; - char * nvcat = NULL; + char *lowername = NULL; + char *nvcat = NULL; hrb_node_t *node_ptr = NULL; hrb_node_t *new_node = NULL; hbool_t is_looking = TRUE; @@ -662,12 +662,12 @@ hrb_t * H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const char *_http_version) { hrb_t *request = NULL; - char * res = NULL; + char *res = NULL; size_t reslen = 0; hrb_t *ret_value = NULL; - char * verb = NULL; + char *verb = NULL; size_t verblen = 0; - char * vrsn = NULL; + char *vrsn = NULL; size_t vrsnlen = 0; FUNC_ENTER_NOAPI_NOINIT @@ -875,11 +875,11 @@ herr_t H5FD_s3comms_s3r_getsize(s3r_t *handle) { uintmax_t content_length = 0; - CURL * curlh = NULL; - char * end = NULL; - char * headerresponse = NULL; + CURL *curlh = NULL; + char *end = NULL; + char *headerresponse = NULL; struct s3r_datastruct sds = {S3COMMS_CALLBACK_DATASTRUCT_MAGIC, NULL, 0}; - char * start = NULL; + char *start = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT @@ -1026,10 +1026,10 @@ s3r_t * H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const unsigned char *signing_key) { size_t tmplen = 0; - CURL * curlh = NULL; - s3r_t * handle = NULL; + CURL *curlh = NULL; + s3r_t *handle = NULL; parsed_url_t *purl = NULL; - s3r_t * ret_value = NULL; + s3r_t *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -1205,14 +1205,14 @@ done: herr_t H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest) { - CURL * curlh = NULL; + CURL *curlh = NULL; CURLcode p_status = CURLE_OK; struct curl_slist *curlheaders = NULL; - hrb_node_t * headers = NULL; - hrb_node_t * node = NULL; - struct tm * now = NULL; - char * rangebytesstr = NULL; - hrb_t * request = NULL; + hrb_node_t *headers = NULL; + hrb_node_t *node = NULL; + struct tm *now = NULL; + char *rangebytesstr = NULL; + hrb_t *request = NULL; int ret = 0; /* working variable to check */ /* return value of HDsnprintf */ struct s3r_datastruct *sds = NULL; @@ -1554,7 +1554,7 @@ struct tm * gmnow(void) { time_t now; - time_t * now_ptr = &now; + time_t *now_ptr = &now; struct tm *ret_value = NULL; /* Doctor assert, checks against error in time() */ @@ -1932,7 +1932,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha unsigned buffer_i = 0; unsigned setting_i = 0; int found_setting = 0; - char * line_buffer = &(buffer[0]); + char *line_buffer = &(buffer[0]); FUNC_ENTER_NOAPI_NOINIT @@ -2049,7 +2049,7 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char * char *aws_region_out) { herr_t ret_value = SUCCEED; - FILE * credfile = NULL; + FILE *credfile = NULL; char awspath[117]; char filepath[128]; int ret = 0; @@ -2195,8 +2195,8 @@ herr_t H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl) { parsed_url_t *purl = NULL; /* pointer to new structure */ - const char * tmpstr = NULL; /* working pointer in string */ - const char * curstr = str; /* "start" pointer in string */ + const char *tmpstr = NULL; /* working pointer in string */ + const char *curstr = str; /* "start" pointer in string */ long int len = 0; /* substring length */ long int urllen = 0; /* length of passed-in url string */ unsigned int i = 0; @@ -2558,7 +2558,7 @@ done: herr_t H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *region, const char *iso8601now) { - char * AWS4_secret = NULL; + char *AWS4_secret = NULL; size_t AWS4_secret_len = 0; unsigned char datekey[SHA256_DIGEST_LENGTH]; unsigned char dateregionkey[SHA256_DIGEST_LENGTH]; diff --git a/src/H5FDs3comms.h b/src/H5FDs3comms.h index b81bfae..aa354d9 100644 --- a/src/H5FDs3comms.h +++ b/src/H5FDs3comms.h @@ -249,10 +249,10 @@ */ typedef struct hrb_node_t { unsigned long magic; - char * name; - char * value; - char * cat; - char * lowername; + char *name; + char *value; + char *cat; + char *lowername; struct hrb_node_t *next; } hrb_node_t; #define S3COMMS_HRB_NODE_MAGIC 0x7F5757UL @@ -325,12 +325,12 @@ typedef struct hrb_node_t { */ typedef struct { unsigned long magic; - char * body; + char *body; size_t body_len; - hrb_node_t * first_header; - char * resource; - char * verb; - char * version; + hrb_node_t *first_header; + char *resource; + char *verb; + char *version; } hrb_t; #define S3COMMS_HRB_MAGIC 0x6DCC84UL @@ -388,11 +388,11 @@ typedef struct { */ typedef struct { unsigned long magic; - char * scheme; /* required */ - char * host; /* required */ - char * port; - char * path; - char * query; + char *scheme; /* required */ + char *host; /* required */ + char *port; + char *path; + char *query; } parsed_url_t; #define S3COMMS_PARSED_URL_MAGIC 0x21D0DFUL @@ -476,12 +476,12 @@ typedef struct { */ typedef struct { unsigned long magic; - CURL * curlhandle; + CURL *curlhandle; size_t filesize; - char * httpverb; - parsed_url_t * purl; - char * region; - char * secret_id; + char *httpverb; + parsed_url_t *purl; + char *region; + char *secret_id; unsigned char *signing_key; } s3r_t; diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 72772c4..bbb1871 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -299,7 +299,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) struct _BY_HANDLE_FILE_INFORMATION fileinfo; #endif h5_stat_t sb; - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index 67b7c5a..0f8566a 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -80,7 +80,7 @@ typedef enum { */ typedef struct H5FD_stdio_t { H5FD_t pub; /* public stuff, must be first */ - FILE * fp; /* the file handle */ + FILE *fp; /* the file handle */ int fd; /* file descriptor (for truncate) */ haddr_t eoa; /* end of allocated region */ haddr_t eof; /* end of file; current file size */ @@ -317,9 +317,9 @@ H5Pset_fapl_stdio(hid_t fapl_id) static H5FD_t * H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - FILE * f = NULL; + FILE *f = NULL; unsigned write_access = 0; /* File opened with write access? */ - H5FD_stdio_t * file = NULL; + H5FD_stdio_t *file = NULL; static const char *func = "H5FD_stdio_open"; /* Function Name for error reporting */ #ifdef H5_HAVE_WIN32_API struct _BY_HANDLE_FILE_INFORMATION fileinfo; @@ -458,7 +458,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr static herr_t H5FD_stdio_close(H5FD_t *_file) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_close"; /* Function Name for error reporting */ /* Clear the error stack */ @@ -723,7 +723,7 @@ H5FD_stdio_get_eof(const H5FD_t *_file) static herr_t H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_get_handle"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -760,7 +760,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle) static herr_t H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf /*out*/) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_read"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -862,7 +862,7 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz static herr_t H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_write"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -949,7 +949,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si static herr_t H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_flush"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -993,7 +993,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) static herr_t H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing) { - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; static const char *func = "H5FD_stdio_truncate"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -55,7 +55,7 @@ static size_t H5FL_fac_lst_mem_lim = /* A garbage collection node for regular free lists */ typedef struct H5FL_reg_gc_node_t { - H5FL_reg_head_t * list; /* Pointer to the head of the list to garbage collect */ + H5FL_reg_head_t *list; /* Pointer to the head of the list to garbage collect */ struct H5FL_reg_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */ } H5FL_reg_gc_node_t; @@ -70,7 +70,7 @@ static H5FL_reg_gc_list_t H5FL_reg_gc_head = {0, NULL}; /* A garbage collection node for array free lists */ typedef struct H5FL_gc_arr_node_t { - H5FL_arr_head_t * list; /* Pointer to the head of the list to garbage collect */ + H5FL_arr_head_t *list; /* Pointer to the head of the list to garbage collect */ struct H5FL_gc_arr_node_t *next; /* Pointer to the next node in the list of things to garbage collect */ } H5FL_gc_arr_node_t; @@ -85,7 +85,7 @@ static H5FL_gc_arr_list_t H5FL_arr_gc_head = {0, NULL}; /* A garbage collection node for blocks */ typedef struct H5FL_blk_gc_node_t { - H5FL_blk_head_t * pq; /* Pointer to the head of the PQ to garbage collect */ + H5FL_blk_head_t *pq; /* Pointer to the head of the PQ to garbage collect */ struct H5FL_blk_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */ } H5FL_blk_gc_node_t; @@ -100,7 +100,7 @@ static H5FL_blk_gc_list_t H5FL_blk_gc_head = {0, NULL}; /* A garbage collection node for factory free lists */ struct H5FL_fac_gc_node_t { - H5FL_fac_head_t * list; /* Pointer to the head of the list to garbage collect */ + H5FL_fac_head_t *list; /* Pointer to the head of the list to garbage collect */ struct H5FL_fac_gc_node_t *next; /* Pointer to the next node in the list of things to garbage collect */ }; @@ -462,7 +462,7 @@ static herr_t H5FL_reg_gc_list(H5FL_reg_head_t *head) { H5FL_reg_node_t *free_list; /* Pointer to nodes in free list being garbage collected */ - void * tmp; /* Temporary node pointer */ + void *tmp; /* Temporary node pointer */ size_t total_mem; /* Total memory used on list */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -809,7 +809,7 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS) { H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */ H5FL_blk_list_t *temp; /* Temp. ptr to the new native list allocated */ - void * ret_value = NULL; /* Pointer to the block to return to the user */ + void *ret_value = NULL; /* Pointer to the block to return to the user */ FUNC_ENTER_NOAPI(NULL) @@ -936,7 +936,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block) H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */ H5FL_blk_list_t *temp; /* Temp. ptr to the new free list node allocated */ size_t free_size; /* Size of the block freed */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ /* NOINIT OK here because this must be called after H5FL_blk_malloc/calloc * -NAF */ @@ -1109,8 +1109,8 @@ static herr_t H5FL_blk_gc_list(H5FL_blk_head_t *head) { H5FL_blk_list_t *list; /* The free list of native nodes of a particular size */ - void * next; /* Temp. ptr to the free list list node */ - void * temp; /* Temp. ptr to the free list page node */ + void *next; /* Temp. ptr to the free list list node */ + void *temp; /* Temp. ptr to the free list page node */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1322,7 +1322,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) H5FL_arr_list_t *temp; /* Temp. ptr to the new free list node allocated */ size_t mem_size; /* Size of memory being freed */ size_t free_nelem; /* Number of elements in node being free'd */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ /* NOINIT OK here because this must be called after H5FL_arr_malloc/calloc * -NAF */ @@ -1399,7 +1399,7 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem) { H5FL_arr_list_t *new_obj; /* Pointer to the new free list node allocated */ size_t mem_size; /* Size of memory block being recycled */ - void * ret_value = NULL; /* Pointer to the block to return */ + void *ret_value = NULL; /* Pointer to the block to return */ FUNC_ENTER_NOAPI(NULL) @@ -1565,7 +1565,7 @@ static herr_t H5FL_arr_gc_list(H5FL_arr_head_t *head) { H5FL_arr_list_t *arr_free_list; /* Pointer to nodes in free list being garbage collected */ - void * tmp; /* Temporary node pointer */ + void *tmp; /* Temporary node pointer */ unsigned u; /* Counter for array of free lists */ size_t total_mem; /* Total memory used on list */ @@ -1852,8 +1852,8 @@ H5FL_fac_head_t * H5FL_fac_init(size_t size) { H5FL_fac_gc_node_t *new_node = NULL; /* Pointer to the node for the new list to garbage collect */ - H5FL_fac_head_t * factory = NULL; /* Pointer to new block factory */ - H5FL_fac_head_t * ret_value = NULL; /* Return value */ + H5FL_fac_head_t *factory = NULL; /* Pointer to new block factory */ + H5FL_fac_head_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2113,7 +2113,7 @@ static herr_t H5FL_fac_gc_list(H5FL_fac_head_t *head) { H5FL_fac_node_t *free_list; /* Pointer to nodes in free list being garbage collected */ - void * tmp; /* Temporary node pointer */ + void *tmp; /* Temporary node pointer */ size_t total_mem; /* Total memory used on list */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index 7bedfe7..a892bcd 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -64,9 +64,9 @@ struct H5CS_t; /* Tracking information for each block */ typedef struct H5FL_track_t { - struct H5CS_t * stack; /* Function stack */ - char * file; /* Name of file containing calling function */ - char * func; /* Name of calling function */ + struct H5CS_t *stack; /* Function stack */ + char *file; /* Name of file containing calling function */ + char *func; /* Name of calling function */ int line; /* Line # within calling function */ struct H5FL_track_t *next; /* Pointer to next tracking block */ struct H5FL_track_t *prev; /* Pointer to previous tracking block */ @@ -96,7 +96,7 @@ typedef struct H5FL_reg_head_t { unsigned init; /* Whether the free list has been initialized */ unsigned allocated; /* Number of blocks allocated */ unsigned onlist; /* Number of blocks on free list */ - const char * name; /* Name of the type */ + const char *name; /* Name of the type */ size_t size; /* Size of the blocks in the list */ H5FL_reg_node_t *list; /* List of free blocks */ } H5FL_reg_head_t; @@ -155,7 +155,7 @@ typedef union H5FL_blk_list_t { /* Data structure for priority queue node of block free lists */ typedef struct H5FL_blk_node_t { size_t size; /* Size of the blocks in the list */ - H5FL_blk_list_t * list; /* List of free blocks */ + H5FL_blk_list_t *list; /* List of free blocks */ struct H5FL_blk_node_t *next; /* Pointer to next free list in queue */ struct H5FL_blk_node_t *prev; /* Pointer to previous free list in queue */ } H5FL_blk_node_t; @@ -166,7 +166,7 @@ typedef struct H5FL_blk_head_t { unsigned allocated; /* Total number of blocks allocated */ unsigned onlist; /* Total number of blocks on free list */ size_t list_mem; /* Total amount of memory in blocks on free list */ - const char * name; /* Name of the type */ + const char *name; /* Name of the type */ H5FL_blk_node_t *head; /* Pointer to first free list in queue */ } H5FL_blk_head_t; @@ -237,7 +237,7 @@ typedef struct H5FL_arr_head_t { unsigned init; /* Whether the free list has been initialized */ unsigned allocated; /* Total number of blocks allocated */ size_t list_mem; /* Amount of memory in block on free list */ - const char * name; /* Name of the type */ + const char *name; /* Name of the type */ int maxelem; /* Maximum number of elements in an array */ size_t base_size; /* Size of the "base" object in the list */ size_t elem_size; /* Size of the array elements in the list */ @@ -358,7 +358,7 @@ typedef struct H5FL_fac_head_t { unsigned allocated; /* Number of blocks allocated */ unsigned onlist; /* Number of blocks on free list */ size_t size; /* Size of the blocks in the list */ - H5FL_fac_node_t * list; /* List of free blocks */ + H5FL_fac_node_t *list; /* List of free blocks */ H5FL_fac_gc_node_t *prev_gc; /* Previous garbage collection node in list */ } H5FL_fac_head_t; @@ -389,10 +389,10 @@ typedef struct H5FL_fac_head_t { * Library prototypes. */ /* Block free lists */ -H5_DLL void * H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS); -H5_DLL void * H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS); -H5_DLL void * H5FL_blk_free(H5FL_blk_head_t *head, void *block); -H5_DLL void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_PARAMS); +H5_DLL void *H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS); +H5_DLL void *H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS); +H5_DLL void *H5FL_blk_free(H5FL_blk_head_t *head, void *block); +H5_DLL void *H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_PARAMS); H5_DLL htri_t H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size); /* Regular free lists */ @@ -414,9 +414,9 @@ H5_DLL void *H5FL_seq_realloc(H5FL_seq_head_t *head, void *obj, size_t new_elem /* Factory free lists */ H5_DLL H5FL_fac_head_t *H5FL_fac_init(size_t size); -H5_DLL void * H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS); -H5_DLL void * H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS); -H5_DLL void * H5FL_fac_free(H5FL_fac_head_t *head, void *obj); +H5_DLL void *H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS); +H5_DLL void *H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS); +H5_DLL void *H5FL_fac_free(H5FL_fac_head_t *head, void *obj); H5_DLL herr_t H5FL_fac_term(H5FL_fac_head_t *head); /* General free list routines */ @@ -32,7 +32,7 @@ /* Information about open objects in a file */ typedef struct H5FO_open_obj_t { haddr_t addr; /* Address of object header for object */ - void * obj; /* Pointer to the object */ + void *obj; /* Pointer to the object */ hbool_t deleted; /* Flag to indicate that the object was deleted from the file */ } H5FO_open_obj_t; @@ -109,7 +109,7 @@ void * H5FO_opened(const H5F_t *f, haddr_t addr) { H5FO_open_obj_t *open_obj; /* Information about open object */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOERR diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h index e2250e3..61103cb 100644 --- a/src/H5FOprivate.h +++ b/src/H5FOprivate.h @@ -35,7 +35,7 @@ typedef H5SL_t H5FO_t; /* Currently, all open objects are stored in skip list */ /* Private routines */ H5_DLL herr_t H5FO_create(const H5F_t *f); -H5_DLL void * H5FO_opened(const H5F_t *f, haddr_t addr); +H5_DLL void *H5FO_opened(const H5F_t *f, haddr_t addr); H5_DLL herr_t H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag); H5_DLL herr_t H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr); H5_DLL herr_t H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted); @@ -173,9 +173,9 @@ H5FS_t * H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment, hsize_t threshold) { - H5FS_t * fspace = NULL; /* New free space structure */ + H5FS_t *fspace = NULL; /* New free space structure */ H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */ - H5FS_t * ret_value = NULL; /* Return value */ + H5FS_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) #ifdef H5FS_DEBUG @@ -241,7 +241,7 @@ done: herr_t H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr) { - H5FS_t * fspace = NULL; /* Free space header loaded from file */ + H5FS_t *fspace = NULL; /* Free space header loaded from file */ H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -782,7 +782,7 @@ static herr_t H5FS_sinfo_free_sect_cb(void *_sect, void H5_ATTR_UNUSED *key, void *op_data) { H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect; /* Section to free */ - const H5FS_sinfo_t * sinfo = (const H5FS_sinfo_t *)op_data; /* Free space manager for section */ + const H5FS_sinfo_t *sinfo = (const H5FS_sinfo_t *)op_data; /* Free space manager for section */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5FScache.c b/src/H5FScache.c index d9a76b3..52902df 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -57,7 +57,7 @@ /* User data for skip list iterator callback for iterating over section size nodes when syncing */ typedef struct { H5FS_sinfo_t *sinfo; /* Free space section info */ - uint8_t ** p; /* Pointer to address of buffer pointer to serialize with */ + uint8_t **p; /* Pointer to address of buffer pointer to serialize with */ unsigned sect_cnt_size; /* # of bytes to encode section size counts in */ } H5FS_iter_ud_t; @@ -139,16 +139,16 @@ H5FL_BLK_DEFINE_STATIC(sect_block); static H5FS_t * H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5FS_t * fspace = NULL; /* Free space header info */ + H5FS_t *fspace = NULL; /* Free space header info */ H5FS_hdr_cache_ud_t *udata = (H5FS_hdr_cache_ud_t *)_udata; /* user data for callback */ - H5WB_t * wb = NULL; /* Wrapped buffer for header data */ + H5WB_t *wb = NULL; /* Wrapped buffer for header data */ uint8_t hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */ - uint8_t * hdr; /* Pointer to header buffer */ - const uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *hdr; /* Pointer to header buffer */ + const uint8_t *p; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ unsigned nclasses; /* Number of section classes */ - H5FS_t * ret_value; /* Return value */ + H5FS_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -557,15 +557,15 @@ H5FS_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5FS_t *fspace, size_t static H5FS_sinfo_t * H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_udata) { - H5FS_sinfo_t * sinfo = NULL; /* Free space section info */ + H5FS_sinfo_t *sinfo = NULL; /* Free space section info */ H5FS_sinfo_cache_ud_t *udata = (H5FS_sinfo_cache_ud_t *)_udata; /* user data for callback */ haddr_t fs_addr; /* Free space header address */ size_t old_sect_size; /* Old section size */ - uint8_t * buf = NULL; /* Temporary buffer */ - const uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf = NULL; /* Temporary buffer */ + const uint8_t *p; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ - H5FS_sinfo_t * ret_value; /* Return value */ + H5FS_sinfo_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -725,8 +725,8 @@ static herr_t H5FS_sinfo_serialize_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata) { H5FS_section_class_t *sect_cls; /* Class of section */ - H5FS_section_info_t * sect = (H5FS_section_info_t *)_item; /* Free space section to work on */ - H5FS_iter_ud_t * udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ + H5FS_section_info_t *sect = (H5FS_section_info_t *)_item; /* Free space section to work on */ + H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -779,7 +779,7 @@ done: static herr_t H5FS_sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata) { - H5FS_node_t * fspace_node = (H5FS_node_t *)_item; /* Free space size node to work on */ + H5FS_node_t *fspace_node = (H5FS_node_t *)_item; /* Free space size node to work on */ H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -838,8 +838,8 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H if (sinfo->cache_info.is_dirty || sinfo->dirty) { H5FS_iter_ud_t udata; /* User data for callbacks */ - uint8_t * buf = NULL; /* Temporary raw data buffer */ - uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf = NULL; /* Temporary raw data buffer */ + uint8_t *p; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ unsigned bin; /* Current bin we are on */ diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c index b5601ee..2a8bfbf 100644 --- a/src/H5FSdbg.c +++ b/src/H5FSdbg.c @@ -82,7 +82,7 @@ herr_t H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth) { - H5FS_t * fspace = NULL; /* Free space header info */ + H5FS_t *fspace = NULL; /* Free space header info */ H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -203,7 +203,7 @@ herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int indent, int fwidth, haddr_t fs_addr, haddr_t client_addr) { - H5FS_t * fspace = NULL; /* Free space header info */ + H5FS_t *fspace = NULL; /* Free space header info */ H5FS_client_t client; /* The client of the free space */ H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h index 167f503..23dc943 100644 --- a/src/H5FSpkg.h +++ b/src/H5FSpkg.h @@ -92,16 +92,16 @@ /* Callback info for loading a free space header into the cache */ typedef struct H5FS_hdr_cache_ud_t { - H5F_t * f; /* File that free space header is within */ + H5F_t *f; /* File that free space header is within */ size_t nclasses; /* Number of section classes */ const H5FS_section_class_t **classes; /* Array of section class info */ - void * cls_init_udata; /* Pointer to class init user data */ + void *cls_init_udata; /* Pointer to class init user data */ haddr_t addr; /* Address of header */ } H5FS_hdr_cache_ud_t; /* Callback info for loading free space section info into the cache */ typedef struct H5FS_sinfo_cache_ud_t { - H5F_t * f; /* File that free space section info is within */ + H5F_t *f; /* File that free space section info is within */ H5FS_t *fspace; /* free space manager */ hid_t dxpl_id; } H5FS_sinfo_cache_ud_t; @@ -140,7 +140,7 @@ typedef struct H5FS_sinfo_t { unsigned sect_prefix_size; /* Size of the section serialization prefix (in bytes) */ unsigned sect_off_size; /* Size of a section offset (in bytes) */ unsigned sect_len_size; /* Size of a section length (in bytes) */ - H5FS_t * fspace; /* Pointer to free space manager that owns sections */ + H5FS_t *fspace; /* Pointer to free space manager that owns sections */ /* Memory data structures (not stored directly) */ H5SL_t *merge_list; /* Skip list to hold sections for detecting merges */ @@ -175,7 +175,7 @@ struct H5FS_t { unsigned rc; /* Count of outstanding references to struct */ haddr_t addr; /* Address of free space header on disk */ size_t hdr_size; /* Size of free space header on disk */ - H5FS_sinfo_t * sinfo; /* Section information */ + H5FS_sinfo_t *sinfo; /* Section information */ unsigned sinfo_lock_count; /* # of times the section info has been locked */ hbool_t sinfo_protected; /* Whether the section info was protected when locked */ hbool_t sinfo_modified; /* Whether the section info has been modified while locked */ diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h index 3d59d61..9fcbb4f 100644 --- a/src/H5FSprivate.h +++ b/src/H5FSprivate.h @@ -96,7 +96,7 @@ typedef struct H5FS_section_class_t { const unsigned type; /* Type of free space section */ size_t serial_size; /* Size of serialized form of section */ unsigned flags; /* Class flags */ - void * cls_private; /* Class private information */ + void *cls_private; /* Class private information */ /* Class methods */ herr_t (*init_cls)(struct H5FS_section_class_t *, diff --git a/src/H5FSsection.c b/src/H5FSsection.c index caa53d2..5914825 100644 --- a/src/H5FSsection.c +++ b/src/H5FSsection.c @@ -44,9 +44,9 @@ /* User data for skip list iterator callback for iterating over section size nodes */ typedef struct { - H5FS_t * fspace; /* Free space manager info */ + H5FS_t *fspace; /* Free space manager info */ H5FS_operator_t op; /* Operator for the iteration */ - void * op_data; /* Information to pass to the operator */ + void *op_data; /* Information to pass to the operator */ } H5FS_iter_ud_t; /********************/ @@ -719,7 +719,7 @@ done: static herr_t H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls, H5FS_section_info_t *sect) { - H5FS_node_t * fspace_node; /* Free list size node */ + H5FS_node_t *fspace_node; /* Free list size node */ H5FS_section_info_t *tmp_sect_node; /* Temporary section node */ unsigned bin; /* Bin to put the free space section in */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1108,7 +1108,7 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data) do { H5SL_node_t *less_sect_node; /* Skip list node for section less than new section */ H5SL_node_t *greater_sect_node = NULL; /* Skip list node for section greater than new section */ - H5FS_section_info_t * tmp_sect; /* Temporary free space section */ + H5FS_section_info_t *tmp_sect; /* Temporary free space section */ H5FS_section_class_t *tmp_sect_cls; /* Temporary section's class */ hbool_t greater_sect_node_valid = FALSE; /* Indicate if 'greater than' section node is valid */ @@ -1503,7 +1503,7 @@ H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node) unsigned bin; /* Bin to put the free space section in */ htri_t ret_value = FALSE; /* Return value */ - H5SL_node_t * curr_size_node = NULL; + H5SL_node_t *curr_size_node = NULL; const H5FS_section_class_t *cls; /* Class of section */ hsize_t alignment; @@ -1710,7 +1710,7 @@ static herr_t H5FS_iterate_sect_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata) { H5FS_section_info_t *sect_info = (H5FS_section_info_t *)_item; /* Free space section to work on */ - H5FS_iter_ud_t * udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ + H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1744,7 +1744,7 @@ done: static herr_t H5FS_iterate_node_cb(void *_item, void H5_ATTR_UNUSED *key, void *_udata) { - H5FS_node_t * fspace_node = (H5FS_node_t *)_item; /* Free space size node to work on */ + H5FS_node_t *fspace_node = (H5FS_node_t *)_item; /* Free space size node to work on */ H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2075,7 +2075,7 @@ H5FS_sect_assert(const H5FS_t *fspace) size_ghost_count = 0; while (curr_sect_node != NULL) { H5FS_section_class_t *cls; /* Class of section */ - H5FS_section_info_t * sect; /* Section */ + H5FS_section_info_t *sect; /* Section */ /* Get section node & it's class */ sect = H5SL_item(curr_sect_node); @@ -2182,7 +2182,7 @@ H5FS_sect_try_shrink_eoa(const H5F_t *f, hid_t dxpl_id, const H5FS_t *fspace, vo /* Check for last node in the merge list */ if (NULL != (last_node = H5SL_last(fspace->sinfo->merge_list))) { - H5FS_section_info_t * tmp_sect; /* Temporary free space section */ + H5FS_section_info_t *tmp_sect; /* Temporary free space section */ H5FS_section_class_t *tmp_sect_cls; /* Temporary section's class */ /* Get the pointer to the last section, from the last node */ diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c index 8862a81..b2462d3 100644 --- a/src/H5Fdbg.c +++ b/src/H5Fdbg.c @@ -116,7 +116,7 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth) if (f->shared->sblock->root_ent) /* Use real root group symbol table entry */ H5G__ent_debug(f->shared->sblock->root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL); else { - H5O_loc_t * root_oloc; /* Root object location */ + H5O_loc_t *root_oloc; /* Root object location */ H5G_entry_t root_ent; /* Constructed root symbol table entry */ /* Reset the root group entry */ diff --git a/src/H5Fefc.c b/src/H5Fefc.c index d9b6e39..3c0c54e 100644 --- a/src/H5Fefc.c +++ b/src/H5Fefc.c @@ -41,8 +41,8 @@ /* Structure for each entry in a file's external file cache */ typedef struct H5F_efc_ent_t { - char * name; /* Name of the file */ - H5F_t * file; /* File object */ + char *name; /* Name of the file */ + H5F_t *file; /* File object */ struct H5F_efc_ent_t *LRU_next; /* Next item in LRU list */ struct H5F_efc_ent_t *LRU_prev; /* Previous item in LRU list */ unsigned nopen; /* Number of times this file is currently opened by an EFC client */ @@ -50,14 +50,14 @@ typedef struct H5F_efc_ent_t { /* Structure for a shared file struct's external file cache */ struct H5F_efc_t { - H5SL_t * slist; /* Skip list of cached external files */ + H5SL_t *slist; /* Skip list of cached external files */ H5F_efc_ent_t *LRU_head; /* Head of LRU list. This is the least recently used file */ H5F_efc_ent_t *LRU_tail; /* Tail of LRU list. This is the most recently used file */ unsigned nfiles; /* Size of the external file cache */ unsigned max_nfiles; /* Maximum size of the external file cache */ unsigned nrefs; /* Number of times this file appears in another file's EFC */ int tag; /* Temporary variable used by H5F_efc_try_close() */ - H5F_file_t * tmp_next; /* Next file in temporary list used by H5F_efc_try_close() */ + H5F_file_t *tmp_next; /* Next file in temporary list used by H5F_efc_try_close() */ }; /* Private prototypes */ @@ -137,10 +137,10 @@ done: H5F_t * H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id) { - H5F_efc_t * efc = NULL; /* External file cache for parent file */ + H5F_efc_t *efc = NULL; /* External file cache for parent file */ H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */ hbool_t open_file = FALSE; /* Whether ent->file needs to be closed in case of error */ - H5F_t * ret_value = NULL; /* Return value */ + H5F_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -243,7 +243,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid else /* Allocate new entry */ if (NULL == (ent = H5FL_MALLOC(H5F_efc_ent_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Build new entry */ if (NULL == (ent->name = H5MM_strdup(name))) @@ -324,7 +324,7 @@ done: herr_t H5F_efc_close(H5F_t *parent, H5F_t *file) { - H5F_efc_t * efc = NULL; /* External file cache for parent file */ + H5F_efc_t *efc = NULL; /* External file cache for parent file */ H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */ herr_t ret_value = SUCCEED; /* Return value */ @@ -588,7 +588,7 @@ static void H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail) { H5F_efc_ent_t *ent = NULL; /* EFC entry */ - H5F_file_t * esf; /* Convenience pointer to ent->file->shared */ + H5F_file_t *esf; /* Convenience pointer to ent->file->shared */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -661,7 +661,7 @@ static void H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail) { H5F_efc_ent_t *ent = NULL; /* EFC entry */ - H5F_file_t * esf; /* Convenience pointer to ent->file->shared */ + H5F_file_t *esf; /* Convenience pointer to ent->file->shared */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5Fint.c b/src/H5Fint.c index 83f672f..232b9e2 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -62,12 +62,12 @@ /* Struct only used by functions H5F_get_objects and H5F_get_objects_cb */ typedef struct H5F_olist_t { H5I_type_t obj_type; /* Type of object to look for */ - hid_t * obj_id_list; /* Pointer to the list of open IDs to return */ - size_t * obj_id_count; /* Number of open IDs */ + hid_t *obj_id_list; /* Pointer to the list of open IDs to return */ + size_t *obj_id_count; /* Number of open IDs */ struct { hbool_t local; /* Set flag for "local" file searches */ union { - H5F_file_t * shared; /* Pointer to shared file to look inside */ + H5F_file_t *shared; /* Pointer to shared file to look inside */ const H5F_t *file; /* Pointer to file to look inside */ } ptr; } file_info; @@ -150,7 +150,7 @@ H5F_get_access_plist(H5F_t *f, hbool_t app_ref) { H5P_genplist_t *new_plist; /* New property list */ H5P_genplist_t *old_plist; /* Old property list */ - void * driver_info = NULL; + void *driver_info = NULL; unsigned efc_size = 0; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -894,14 +894,14 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush) H5F_t * H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id) { - H5F_t * file = NULL; /*the success return value */ - H5F_file_t * shared = NULL; /*shared part of `file' */ - H5FD_t * lf = NULL; /*file driver part of `shared' */ + H5F_t *file = NULL; /*the success return value */ + H5F_file_t *shared = NULL; /*shared part of `file' */ + H5FD_t *lf = NULL; /*file driver part of `shared' */ unsigned tent_flags; /*tentative flags */ - H5FD_class_t * drvr; /*file driver class info */ - H5P_genplist_t * a_plist; /*file access property list */ + H5FD_class_t *drvr; /*file driver class info */ + H5P_genplist_t *a_plist; /*file access property list */ H5F_close_degree_t fc_degree; /*file close degree */ - H5F_t * ret_value; /*actual return value */ + H5F_t *ret_value; /*actual return value */ FUNC_ENTER_NOAPI(NULL) @@ -1499,7 +1499,7 @@ H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *na /* Check for symbolic link */ if (S_IFLNK == (lst.st_mode & S_IFMT)) { H5P_genplist_t *new_fapl; /* Duplicated FAPL */ - int * fd; /* POSIX I/O file descriptor */ + int *fd; /* POSIX I/O file descriptor */ h5_stat_t st; /* Stat info from stat() call */ h5_stat_t fst; /* Stat info from fstat() call */ char realname[PATH_MAX]; /* Fully resolved path name of file */ diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 6543dd5..a1cc4fd 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -123,9 +123,9 @@ done: static herr_t H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UNUSED plist_id, hid_t dxpl_id) { - H5G_t * mount_point = NULL; /*mount point group */ - H5F_t * ancestor = NULL; /*ancestor files */ - H5F_t * parent = NULL; /*file containing mount point */ + H5G_t *mount_point = NULL; /*mount point group */ + H5F_t *ancestor = NULL; /*ancestor files */ + H5F_t *parent = NULL; /*file containing mount point */ unsigned lt, rt, md; /*binary search indices */ int cmp; /*binary search comparison value*/ H5G_loc_t mp_loc; /* entry of moint point to be opened */ @@ -287,9 +287,9 @@ done: static herr_t H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id) { - H5G_t * child_group = NULL; /* Child's group in parent mtab */ - H5F_t * child = NULL; /*mounted file */ - H5F_t * parent = NULL; /*file where mounted */ + H5G_t *child_group = NULL; /* Child's group in parent mtab */ + H5F_t *child = NULL; /*mounted file */ + H5F_t *parent = NULL; /*file where mounted */ H5O_loc_t *mnt_oloc; /* symbol table entry for root of mounted file */ H5G_name_t mp_path; /* Mount point group hier. path */ H5O_loc_t mp_oloc; /* Mount point object location */ @@ -461,7 +461,7 @@ herr_t H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) { H5G_loc_t loc; - H5F_t * child = NULL; + H5F_t *child = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 528ba86..97e97f9 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -186,12 +186,12 @@ typedef struct H5F_super_t { * pointing to this struct. */ struct H5F_file_t { - H5FD_t * lf; /* Lower level file handle for I/O */ + H5FD_t *lf; /* Lower level file handle for I/O */ H5F_super_t *sblock; /* Pointer to (pinned) superblock for file */ unsigned nrefs; /* Ref count for times file is opened */ unsigned flags; /* Access Permissions for file */ H5F_mtab_t mtab; /* File mount table */ - H5F_efc_t * efc; /* External file cache */ + H5F_efc_t *efc; /* External file cache */ /* Cached values from FCPL/superblock */ uint8_t sizeof_addr; /* Size of addresses in file */ @@ -202,7 +202,7 @@ struct H5F_file_t { unsigned long feature_flags; /* VFL Driver feature Flags */ haddr_t maxaddr; /* Maximum address for file */ - H5AC_t * cache; /* The object cache */ + H5AC_t *cache; /* The object cache */ H5AC_cache_config_t mdc_initCacheCfg; /* initial configuration for the */ /* metadata cache. This structure is */ /* fixed at creation time and should */ @@ -220,9 +220,9 @@ struct H5F_file_t { hbool_t store_msg_crt_idx; /* Store creation index for object header messages? */ unsigned ncwfs; /* Num entries on cwfs list */ struct H5HG_heap_t **cwfs; /* Global heap cache */ - struct H5G_t * root_grp; /* Open root group */ - H5FO_t * open_objs; /* Open objects in file */ - H5RC_t * grp_btree_shared; /* Ref-counted group B-tree node info */ + struct H5G_t *root_grp; /* Open root group */ + H5FO_t *open_objs; /* Open objects in file */ + H5RC_t *grp_btree_shared; /* Ref-counted group B-tree node info */ /* File space allocation information */ hbool_t use_tmp_space; /* Whether temp. file space allocation is allowed */ @@ -230,7 +230,7 @@ struct H5F_file_t { unsigned fs_aggr_merge[H5FD_MEM_NTYPES]; /* Flags for whether free space can merge with aggregator(s) */ H5F_fs_state_t fs_state[H5FD_MEM_NTYPES]; /* State of free space manager for each type */ haddr_t fs_addr[H5FD_MEM_NTYPES]; /* Address of free space manager info for each type */ - H5FS_t * fs_man[H5FD_MEM_NTYPES]; /* Free space manager for each file space type */ + H5FS_t *fs_man[H5FD_MEM_NTYPES]; /* Free space manager for each file space type */ H5FD_mem_t fs_type_map[H5FD_MEM_NTYPES]; /* Mapping of "real" file space type into tracked type */ H5F_blk_aggr_t meta_aggr; /* Metadata aggregation info */ /* (if aggregating metadata allocations) */ @@ -247,12 +247,12 @@ struct H5F_file_t { * to shared H5F_file_t structs. */ struct H5F_t { - char * open_name; /* Name used to open file */ - char * actual_name; /* Actual name of the file, after resolving symlinks, etc. */ - char * extpath; /* Path for searching target external link file */ - H5F_file_t * shared; /* The shared file info */ + char *open_name; /* Name used to open file */ + char *actual_name; /* Actual name of the file, after resolving symlinks, etc. */ + char *extpath; /* Path for searching target external link file */ + H5F_file_t *shared; /* The shared file info */ unsigned nopen_objs; /* Number of open object headers*/ - H5FO_t * obj_count; /* # of time each object is opened through top file structure */ + H5FO_t *obj_count; /* # of time each object is opened through top file structure */ hid_t file_id; /* ID of this file */ hbool_t closing; /* File is in the process of being closed */ struct H5F_t *parent; /* Parent file that this file is mounted to */ @@ -278,7 +278,7 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1]; /* General routines */ H5_DLL herr_t H5F_init(void); H5_DLL herr_t H5F__term_deprec_interface(void); -H5F_t * H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf); +H5F_t *H5F_new(H5F_file_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf); herr_t H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush); H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing); H5_DLL htri_t H5F_is_hdf5(const char *name); @@ -312,7 +312,7 @@ H5_DLL herr_t H5F__accum_flush(const H5F_io_info_t *fio_info); H5_DLL herr_t H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush); /* Shared file list related routines */ -H5_DLL herr_t H5F_sfile_add(H5F_file_t *shared); +H5_DLL herr_t H5F_sfile_add(H5F_file_t *shared); H5_DLL H5F_file_t *H5F_sfile_search(H5FD_t *lf); H5_DLL herr_t H5F_sfile_remove(H5F_file_t *shared); diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index fdd7641..7f14259 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -573,7 +573,7 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t; /* I/O Info for an operation */ typedef struct H5F_io_info_t { - const H5F_t * f; /* File object */ + const H5F_t *f; /* File object */ const struct H5P_genplist_t *dxpl; /* DXPL object */ } H5F_io_info_t; @@ -590,10 +590,10 @@ H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fa H5_DLL herr_t H5F_try_close(H5F_t *f); /* Functions than retrieve values from the file struct */ -H5_DLL unsigned H5F_get_intent(const H5F_t *f); -H5_DLL char * H5F_get_open_name(const H5F_t *f); -H5_DLL char * H5F_get_actual_name(const H5F_t *f); -H5_DLL char * H5F_get_extpath(const H5F_t *f); +H5_DLL unsigned H5F_get_intent(const H5F_t *f); +H5_DLL char *H5F_get_open_name(const H5F_t *f); +H5_DLL char *H5F_get_actual_name(const H5F_t *f); +H5_DLL char *H5F_get_extpath(const H5F_t *f); H5_DLL H5F_file_t *H5F_get_shared(const H5F_t *f); H5_DLL hbool_t H5F_same_shared(const H5F_t *f1, const H5F_t *f2); H5_DLL unsigned H5F_get_nopen_objs(const H5F_t *f); @@ -601,13 +601,13 @@ H5_DLL unsigned H5F_incr_nopen_objs(H5F_t *f); H5_DLL unsigned H5F_decr_nopen_objs(H5F_t *f); H5_DLL hid_t H5F_get_file_id(const H5F_t *f); H5_DLL ssize_t H5F_get_file_image(H5F_t *f, void *buf_ptr, size_t buf_len); -H5_DLL H5F_t * H5F_get_parent(const H5F_t *f); -H5_DLL unsigned H5F_get_nmounts(const H5F_t *f); -H5_DLL hid_t H5F_get_access_plist(H5F_t *f, hbool_t app_ref); -H5_DLL hid_t H5F_get_id(H5F_t *file, hbool_t app_ref); -H5_DLL herr_t H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_id_count_ptr); -H5_DLL herr_t H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list, - hbool_t app_ref, size_t *obj_id_count_ptr); +H5_DLL H5F_t *H5F_get_parent(const H5F_t *f); +H5_DLL unsigned H5F_get_nmounts(const H5F_t *f); +H5_DLL hid_t H5F_get_access_plist(H5F_t *f, hbool_t app_ref); +H5_DLL hid_t H5F_get_id(H5F_t *file, hbool_t app_ref); +H5_DLL herr_t H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref, size_t *obj_id_count_ptr); +H5_DLL herr_t H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list, + hbool_t app_ref, size_t *obj_id_count_ptr); /* Functions than retrieve values set/cached from the superblock/FCPL */ H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f); @@ -632,7 +632,7 @@ H5_DLL unsigned H5F_gc_ref(const H5F_t *f); H5_DLL hbool_t H5F_use_latest_format(const H5F_t *f); H5_DLL hbool_t H5F_store_msg_crt_idx(const H5F_t *f); H5_DLL herr_t H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag); -H5_DLL struct H5RC_t * H5F_grp_btree_shared(const H5F_t *f); +H5_DLL struct H5RC_t *H5F_grp_btree_shared(const H5F_t *f); H5_DLL herr_t H5F_set_grp_btree_shared(H5F_t *f, struct H5RC_t *rc); H5_DLL hbool_t H5F_use_tmp_space(const H5F_t *f); H5_DLL hbool_t H5F_is_tmp_addr(const H5F_t *f, haddr_t addr); diff --git a/src/H5Fsfile.c b/src/H5Fsfile.c index b25e32d..1b5a3ea 100644 --- a/src/H5Fsfile.c +++ b/src/H5Fsfile.c @@ -24,7 +24,7 @@ /* Struct for tracking "shared" file structs */ typedef struct H5F_sfile_node_t { - H5F_file_t * shared; /* Pointer to "shared" file struct */ + H5F_file_t *shared; /* Pointer to "shared" file struct */ struct H5F_sfile_node_t *next; /* Pointer to next node */ } H5F_sfile_node_t; @@ -136,7 +136,7 @@ H5F_file_t * H5F_sfile_search(H5FD_t *lf) { H5F_sfile_node_t *curr; /* Current shared file node */ - H5F_file_t * ret_value = NULL; /* Return value */ + H5F_file_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 62c2f47..78b847c 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -241,7 +241,7 @@ herr_t H5F_super_read(H5F_t *f, hid_t dxpl_id) { H5P_genplist_t *dxpl; /* DXPL object */ - H5F_super_t * sblock = NULL; /* superblock structure */ + H5F_super_t *sblock = NULL; /* superblock structure */ unsigned sblock_flags = H5AC__NO_FLAGS_SET; /* flags used in superblock unprotect call */ haddr_t super_addr; /* Absolute address of superblock */ H5AC_protect_t rw; /* read/write permissions for file */ @@ -553,7 +553,7 @@ done: else /* Free superblock */ if (H5F_super_free(sblock) < 0) - HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock") + HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock") /* Reset variables in file structure */ f->shared->sblock = NULL; diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index b06e508..da2ea6a 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -112,23 +112,23 @@ H5FL_EXTERN(H5F_super_t); static H5F_super_t * H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t H5_ATTR_UNUSED addr, void *_udata) { - H5F_super_t * sblock = NULL; /* File's superblock */ + H5F_super_t *sblock = NULL; /* File's superblock */ haddr_t base_addr = HADDR_UNDEF; /* Base address of file */ uint8_t sbuf[H5F_MAX_SUPERBLOCK_SIZE]; /* Buffer for superblock */ H5P_genplist_t *dxpl; /* DXPL object */ H5P_genplist_t *c_plist; /* File creation property list */ - H5F_file_t * shared; /* shared part of `file' */ - H5FD_t * lf; /* file driver part of `shared' */ + H5F_file_t *shared; /* shared part of `file' */ + H5FD_t *lf; /* file driver part of `shared' */ haddr_t stored_eoa; /*relative end-of-addr in file */ haddr_t eof; /*end of file address */ uint8_t sizeof_addr; /* Size of offsets in the file (in bytes) */ uint8_t sizeof_size; /* Size of lengths in the file (in bytes) */ const size_t fixed_size = H5F_SUPERBLOCK_FIXED_SIZE; /*fixed sizeof superblock */ size_t variable_size; /*variable sizeof superblock */ - uint8_t * p; /* Temporary pointer into encoding buffer */ + uint8_t *p; /* Temporary pointer into encoding buffer */ unsigned super_vers; /* Superblock version */ - hbool_t * dirtied = (hbool_t *)_udata; /* Set up dirtied out value */ - H5F_super_t * ret_value; /* Return value */ + hbool_t *dirtied = (hbool_t *)_udata; /* Set up dirtied out value */ + H5F_super_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -621,7 +621,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSE H5P_genplist_t *dxpl; /* DXPL object */ uint8_t buf[H5F_MAX_SUPERBLOCK_SIZE + H5F_MAX_DRVINFOBLOCK_SIZE]; /* Superblock & driver info blockencoding buffer */ - uint8_t * p; /* Ptr into encoding buffer */ + uint8_t *p; /* Ptr into encoding buffer */ haddr_t rel_eoa; /* Relative EOA for file */ size_t superblock_size; /* Size of superblock, in bytes */ size_t driver_size; /* Size of driver info block (bytes)*/ @@ -254,7 +254,7 @@ hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id) { H5G_loc_t loc; /* Location to create group */ - H5G_t * grp = NULL; /* New group created */ + H5G_t *grp = NULL; /* New group created */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -334,7 +334,7 @@ hid_t H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) { H5G_loc_t loc; - H5G_t * grp = NULL; + H5G_t *grp = NULL; H5G_obj_create_t gcrt_info; /* Information for group creation */ hid_t ret_value; @@ -409,7 +409,7 @@ done: hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id) { - H5G_t * grp = NULL; /* Group opened */ + H5G_t *grp = NULL; /* Group opened */ H5G_loc_t loc; /* Location of parent for group */ hid_t ret_value; /* Return value */ diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c index 70574c5..1622cb0 100644 --- a/src/H5Gbtree2.c +++ b/src/H5Gbtree2.c @@ -49,11 +49,11 @@ */ typedef struct H5G_fh_ud_cmp_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - const char * name; /* Name of link to compare */ + const char *name; /* Name of link to compare */ H5B2_found_t found_op; /* Callback when correct link is found */ - void * found_op_data; /* Callback data when correct link is found */ + void *found_op_data; /* Callback data when correct link is found */ /* upward */ int cmp; /* Comparison of two link names */ @@ -150,7 +150,7 @@ static herr_t H5G_dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata) { H5G_fh_ud_cmp_t *udata = (H5G_fh_ud_cmp_t *)_udata; /* User data for 'op' callback */ - H5O_link_t * lnk; /* Pointer to link created from heap object */ + H5O_link_t *lnk; /* Pointer to link created from heap object */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -192,7 +192,7 @@ done: static herr_t H5G_dense_btree2_name_store(void *_nrecord, const void *_udata) { - const H5G_bt2_ud_ins_t * udata = (const H5G_bt2_ud_ins_t *)_udata; + const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata; H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -221,7 +221,7 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata) static herr_t H5G_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result) { - const H5G_bt2_ud_common_t * bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata; + const H5G_bt2_ud_common_t *bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata; const H5G_dense_bt2_name_rec_t *bt2_rec = (const H5G_dense_bt2_name_rec_t *)_bt2_rec; herr_t ret_value = SUCCEED; /* Return value */ @@ -364,7 +364,7 @@ H5G_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H static herr_t H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata) { - const H5G_bt2_ud_ins_t * udata = (const H5G_bt2_ud_ins_t *)_udata; + const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata; H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -393,7 +393,7 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata) static herr_t H5G_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, int *result) { - const H5G_bt2_ud_common_t * bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata; + const H5G_bt2_ud_common_t *bt2_udata = (const H5G_bt2_ud_common_t *)_bt2_udata; const H5G_dense_bt2_corder_rec_t *bt2_rec = (const H5G_dense_bt2_corder_rec_t *)_bt2_rec; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5Gcache.c b/src/H5Gcache.c index 3b4af3d..ea62535 100644 --- a/src/H5Gcache.c +++ b/src/H5Gcache.c @@ -108,13 +108,13 @@ H5FL_SEQ_EXTERN(H5G_entry_t); static H5G_node_t * H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata) { - H5G_node_t * sym = NULL; - H5WB_t * wb = NULL; /* Wrapped buffer for node data */ + H5G_node_t *sym = NULL; + H5WB_t *wb = NULL; /* Wrapped buffer for node data */ uint8_t node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */ - uint8_t * node; /* Pointer to node buffer */ + uint8_t *node; /* Pointer to node buffer */ const uint8_t *p; const uint8_t *p_end; - H5G_node_t * ret_value; /* Return value */ + H5G_node_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c index 32e1e17..8681433 100644 --- a/src/H5Gcompact.c +++ b/src/H5Gcompact.c @@ -40,7 +40,7 @@ typedef struct { /* User data for deleting a link in the link messages */ typedef struct { /* downward */ - H5F_t * file; /* File that object header is located within */ + H5F_t *file; /* File that object header is located within */ hid_t dxpl_id; /* DXPL during insertion */ H5RS_str_t *grp_full_path_r; /* Full path for group of link */ const char *name; /* Link name to search for */ @@ -80,7 +80,7 @@ static herr_t H5G_compact_build_table_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata) { const H5O_link_t *lnk = (const H5O_link_t *)_mesg; /* Pointer to link */ - H5G_iter_bt_t * udata = (H5G_iter_bt_t *)_udata; /* 'User data' passed in */ + H5G_iter_bt_t *udata = (H5G_iter_bt_t *)_udata; /* 'User data' passed in */ herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -263,7 +263,7 @@ static herr_t H5G_compact_remove_common_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata) { const H5O_link_t *lnk = (const H5O_link_t *)_mesg; /* Pointer to link */ - H5G_iter_rm_t * udata = (H5G_iter_rm_t *)_udata; /* 'User data' passed in */ + H5G_iter_rm_t *udata = (H5G_iter_rm_t *)_udata; /* 'User data' passed in */ herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -436,7 +436,7 @@ static herr_t H5G_compact_lookup_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata) { const H5O_link_t *lnk = (const H5O_link_t *)_mesg; /* Pointer to link */ - H5G_iter_lkp_t * udata = (H5G_iter_lkp_t *)_udata; /* 'User data' passed in */ + H5G_iter_lkp_t *udata = (H5G_iter_lkp_t *)_udata; /* 'User data' passed in */ herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Gdense.c b/src/H5Gdense.c index f6cbe46..9aca709 100644 --- a/src/H5Gdense.c +++ b/src/H5Gdense.c @@ -80,7 +80,7 @@ typedef struct { */ typedef struct { /* downward (internal) */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5HF_t *fheap; /* Fractal heap handle */ hsize_t count; /* # of links examined */ @@ -88,7 +88,7 @@ typedef struct { /* downward (from application) */ hsize_t skip; /* Number of links to skip */ H5G_lib_iterate_t op; /* Callback for each link */ - void * op_data; /* Callback data for each link */ + void *op_data; /* Callback data for each link */ /* upward */ int op_ret; /* Return value from callback */ @@ -116,7 +116,7 @@ typedef struct { H5G_bt2_ud_common_t common; /* Common info for B-tree user data (must be first) */ hbool_t rem_from_fheap; /* Whether to remove the link from the fractal heap */ haddr_t corder_bt2_addr; /* Address of v2 B-tree indexing creation order */ - H5RS_str_t * grp_full_path_r; /* Full path of group where link is removed */ + H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */ hbool_t replace_names; /* Whether to replace the names of open objects */ } H5G_bt2_ud_rm_t; @@ -126,7 +126,7 @@ typedef struct { */ typedef struct { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ haddr_t corder_bt2_addr; /* Address of v2 B-tree indexing creation order */ H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */ @@ -139,9 +139,9 @@ typedef struct { */ typedef struct { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - H5HF_t * fheap; /* Fractal heap handle */ + H5HF_t *fheap; /* Fractal heap handle */ H5_index_t idx_type; /* Primary index for removing link */ haddr_t other_bt2_addr; /* Address of "other" v2 B-tree indexing link */ H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */ @@ -166,12 +166,12 @@ typedef struct { */ typedef struct { /* downward (internal) */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5HF_t *fheap; /* Fractal heap handle */ /* downward (from application) */ - char * name; /* Name buffer to fill */ + char *name; /* Name buffer to fill */ size_t name_size; /* Size of name buffer to fill */ /* upward */ @@ -188,7 +188,7 @@ typedef struct { hid_t dxpl_id; /* DXPL for operation */ /* downward (from application) */ - char * name; /* Name buffer to fill */ + char *name; /* Name buffer to fill */ size_t name_size; /* Size of name buffer to fill */ /* upward */ @@ -201,7 +201,7 @@ typedef struct { */ typedef struct { /* downward (internal) */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ H5HF_t *fheap; /* Fractal heap handle */ @@ -259,9 +259,9 @@ H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, const H5O_pline_t { H5HF_create_t fheap_cparam; /* Fractal heap creation parameters */ H5B2_create_t bt2_cparam; /* v2 B-tree creation parameters */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for names */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for names */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order */ size_t fheap_id_len; /* Fractal heap ID length */ herr_t ret_value = SUCCEED; /* Return value */ @@ -360,13 +360,13 @@ herr_t H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const H5O_link_t *lnk) { H5G_bt2_ud_ins_t udata; /* User data for v2 B-tree insertion */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ size_t link_size; /* Size of serialized link in the heap */ - H5WB_t * wb = NULL; /* Wrapped buffer for link data */ + H5WB_t *wb = NULL; /* Wrapped buffer for link data */ uint8_t link_buf[H5G_LINK_BUF_SIZE]; /* Buffer for serializing link */ - void * link_ptr = NULL; /* Pointer to serialized link */ + void *link_ptr = NULL; /* Pointer to serialized link */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -463,7 +463,7 @@ static herr_t H5G_dense_lookup_cb(const void *_lnk, void *_user_lnk) { const H5O_link_t *lnk = (const H5O_link_t *)_lnk; /* Record from B-tree */ - H5O_link_t * user_lnk = (H5O_link_t *)_user_lnk; /* User data from v2 B-tree link lookup */ + H5O_link_t *user_lnk = (H5O_link_t *)_user_lnk; /* User data from v2 B-tree link lookup */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -498,8 +498,8 @@ htri_t H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, const char *name, H5O_link_t *lnk) { H5G_bt2_ud_common_t udata; /* User data for v2 B-tree link lookup */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_PACKAGE @@ -560,7 +560,7 @@ static herr_t H5G_dense_lookup_by_idx_fh_cb(const void *obj, size_t obj_len, void *_udata) { H5G_fh_ud_lbi_t *udata = (H5G_fh_ud_lbi_t *)_udata; /* User data for fractal heap 'op' callback */ - H5O_link_t * tmp_lnk = NULL; /* Temporary pointer to link */ + H5O_link_t *tmp_lnk = NULL; /* Temporary pointer to link */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -598,7 +598,7 @@ static herr_t H5G_dense_lookup_by_idx_bt2_cb(const void *_record, void *_bt2_udata) { const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record; - H5G_bt2_ud_lbi_t * bt2_udata = (H5G_bt2_ud_lbi_t *)_bt2_udata; /* User data for callback */ + H5G_bt2_ud_lbi_t *bt2_udata = (H5G_bt2_ud_lbi_t *)_bt2_udata; /* User data for callback */ H5G_fh_ud_lbi_t fh_udata; /* User data for fractal heap 'op' callback */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -636,9 +636,9 @@ herr_t H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_link_table_t ltable = {0, NULL}; /* Table of links */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */ herr_t ret_value = SUCCEED; /* Return value */ @@ -878,7 +878,7 @@ static herr_t H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) { const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record; - H5G_bt2_ud_it_t * bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata; /* User data for callback */ + H5G_bt2_ud_it_t *bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata; /* User data for callback */ herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -934,9 +934,9 @@ H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_link_table_t ltable = {0, NULL}; /* Table of links */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */ herr_t ret_value = FAIL; /* Return value */ @@ -1049,7 +1049,7 @@ static herr_t H5G_dense_get_name_by_idx_fh_cb(const void *obj, size_t obj_len, void *_udata) { H5G_fh_ud_gnbi_t *udata = (H5G_fh_ud_gnbi_t *)_udata; /* User data for fractal heap 'op' callback */ - H5O_link_t * lnk; /* Pointer to link created from heap object */ + H5O_link_t *lnk; /* Pointer to link created from heap object */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1092,7 +1092,7 @@ static herr_t H5G_dense_get_name_by_idx_bt2_cb(const void *_record, void *_bt2_udata) { const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record; - H5G_bt2_ud_gnbi_t * bt2_udata = (H5G_bt2_ud_gnbi_t *)_bt2_udata; /* User data for callback */ + H5G_bt2_ud_gnbi_t *bt2_udata = (H5G_bt2_ud_gnbi_t *)_bt2_udata; /* User data for callback */ H5G_fh_ud_gnbi_t fh_udata; /* User data for fractal heap 'op' callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1134,9 +1134,9 @@ ssize_t H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name, size_t size) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_link_table_t ltable = {0, NULL}; /* Table of links */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */ ssize_t ret_value = -1; /* Return value */ @@ -1250,8 +1250,8 @@ static herr_t H5G_dense_remove_fh_cb(const void *obj, size_t obj_len, void *_udata) { H5G_fh_ud_rm_t *udata = (H5G_fh_ud_rm_t *)_udata; /* User data for fractal heap 'op' callback */ - H5O_link_t * lnk = NULL; /* Pointer to link created from heap object */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5O_link_t *lnk = NULL; /* Pointer to link created from heap object */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1315,7 +1315,7 @@ static herr_t H5G_dense_remove_bt2_cb(const void *_record, void *_bt2_udata) { const H5G_dense_bt2_name_rec_t *record = (const H5G_dense_bt2_name_rec_t *)_record; - H5G_bt2_ud_rm_t * bt2_udata = (H5G_bt2_ud_rm_t *)_bt2_udata; /* User data for callback */ + H5G_bt2_ud_rm_t *bt2_udata = (H5G_bt2_ud_rm_t *)_bt2_udata; /* User data for callback */ H5G_fh_ud_rm_t fh_udata; /* User data for fractal heap 'op' callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1358,9 +1358,9 @@ herr_t H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, const char *name) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_bt2_ud_rm_t udata; /* User data for v2 B-tree record removal */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1455,8 +1455,8 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) { H5G_bt2_ud_rmbi_t *bt2_udata = (H5G_bt2_ud_rmbi_t *)_bt2_udata; /* User data for callback */ H5G_fh_ud_rmbi_t fh_udata; /* User data for fractal heap 'op' callback */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ - const uint8_t * heap_id; /* Heap ID for link */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ + const uint8_t *heap_id; /* Heap ID for link */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1564,9 +1564,9 @@ herr_t H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type, H5_iter_order_t order, hsize_t n) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_link_table_t ltable = {0, NULL}; /* Table of links */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1686,7 +1686,7 @@ H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link) * the ref. count when transitioning back to compact storage) */ if (adj_link) { - H5HF_t * fheap = NULL; /* Fractal heap handle */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ H5G_bt2_ud_rm_t udata; /* User data for v2 B-tree record removal */ /* Open the fractal heap */ diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 248843c..008c0f6 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -58,7 +58,7 @@ typedef struct { H5G_stat_t *statbuf; /* Stat buffer about object */ hbool_t follow_link; /* Whether we are following a link or not */ - H5F_t * loc_file; /* Pointer to the file the location is in */ + H5F_t *loc_file; /* Pointer to the file the location is in */ hid_t dxpl_id; /* Dataset transfer property list */ } H5G_trav_goi_t; @@ -208,7 +208,7 @@ hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) { H5G_loc_t loc; /* Location to create group */ - H5G_t * grp = NULL; /* New group created */ + H5G_t *grp = NULL; /* New group created */ hid_t tmp_gcpl = (-1); /* Temporary group creation property list */ hid_t ret_value; /* Return value */ @@ -289,7 +289,7 @@ done: hid_t H5Gopen1(hid_t loc_id, const char *name) { - H5G_t * grp = NULL; /* Group opened */ + H5G_t *grp = NULL; /* Group opened */ H5G_loc_t loc; /* Location of parent for group */ hid_t ret_value; /* Return value */ diff --git a/src/H5Gent.c b/src/H5Gent.c index 00283d2..1edc0ce 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -427,7 +427,7 @@ H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name, const else if (obj_type == H5O_TYPE_UNKNOWN) { /* Try to retrieve symbol table information for caching */ H5O_loc_t targ_oloc; /* Location of link target */ - H5O_t * oh; /* Link target object header */ + H5O_t *oh; /* Link target object header */ H5O_stab_t stab; /* Link target symbol table */ htri_t stab_exists; /* Whether the target symbol table exists */ diff --git a/src/H5Gint.c b/src/H5Gint.c index cab9924..b1f94c3 100644 --- a/src/H5Gint.c +++ b/src/H5Gint.c @@ -59,23 +59,23 @@ typedef struct { typedef struct { hid_t gid; /* The group ID for the application callback */ H5G_link_iterate_t lnk_op; /* Application callback */ - void * op_data; /* Application's op data */ + void *op_data; /* Application's op data */ } H5G_iter_appcall_ud_t; /* User data for recursive traversal over links from a group */ typedef struct { hid_t gid; /* The group ID for the starting group */ - H5G_loc_t * curr_loc; /* Location of starting group */ + H5G_loc_t *curr_loc; /* Location of starting group */ hid_t lapl_id; /* LAPL for walking across links */ hid_t dxpl_id; /* DXPL for operations */ H5_index_t idx_type; /* Index to use */ H5_iter_order_t order; /* Iteration order within index */ - H5SL_t * visited; /* Skip list for tracking visited nodes */ - char * path; /* Path name of the link */ + H5SL_t *visited; /* Skip list for tracking visited nodes */ + char *path; /* Path name of the link */ size_t curr_path_len; /* Current length of the path in the buffer */ size_t path_buf_size; /* Size of path buffer */ H5L_iterate_t op; /* Application callback */ - void * op_data; /* Application's op data */ + void *op_data; /* Application's op data */ } H5G_iter_visit_ud_t; /********************/ @@ -154,7 +154,7 @@ H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id, hid_t g { H5O_obj_create_t ocrt_info; /* Information for object creation */ H5G_obj_create_t gcrt_info; /* Information for group creation */ - H5G_t * ret_value = NULL; /* Return value */ + H5G_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -208,9 +208,9 @@ done: H5G_t * H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id) { - H5G_t * grp = NULL; /*new group */ + H5G_t *grp = NULL; /*new group */ unsigned oloc_init = 0; /* Flag to indicate that the group object location was created successfully */ - H5G_t * ret_value = NULL; /* Return value */ + H5G_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -280,13 +280,13 @@ done: H5G_t * H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id, hid_t dxpl_id) { - H5G_t * grp = NULL; /* Group to open */ + H5G_t *grp = NULL; /* Group to open */ H5G_loc_t grp_loc; /* Location used to open group */ H5G_name_t grp_path; /* Opened object group hier. path */ H5O_loc_t grp_oloc; /* Opened object object location */ hbool_t loc_found = FALSE; /* Location at 'name' found */ H5O_type_t obj_type; /* Type of object at location */ - H5G_t * ret_value = NULL; /* Return value */ + H5G_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -343,9 +343,9 @@ done: H5G_t * H5G_open(const H5G_loc_t *loc, hid_t dxpl_id) { - H5G_t * grp = NULL; /* Group opened */ + H5G_t *grp = NULL; /* Group opened */ H5G_shared_t *shared_fo; /* Shared group object */ - H5G_t * ret_value = NULL; /* Return value */ + H5G_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -518,7 +518,7 @@ H5G_close(H5G_t *grp) else /* Free object location (i.e. "unhold" the file if appropriate) */ if (H5O_loc_free(&(grp->oloc)) < 0) - HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location") + HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location") /* If this group is a mount point and the mount point is the last open * reference to the group, then attempt to close down the file hierarchy @@ -780,7 +780,7 @@ H5G_iterate(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_o { H5G_loc_t loc; /* Location of parent for group */ hid_t gid = H5I_INVALID_HID; /* ID of group to iterate over */ - H5G_t * grp = NULL; /* Pointer to group data structure to iterate over */ + H5G_t *grp = NULL; /* Pointer to group data structure to iterate over */ H5G_iter_appcall_ud_t udata; /* User data for callback */ herr_t ret_value = FAIL; /* Return value */ @@ -952,7 +952,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata) /* If it's a group, we recurse into it */ if (otype == H5O_TYPE_GROUP) { - H5G_loc_t * old_loc = udata->curr_loc; /* Pointer to previous group location info */ + H5G_loc_t *old_loc = udata->curr_loc; /* Pointer to previous group location info */ H5_index_t idx_type = udata->idx_type; /* Type of index to use */ H5O_linfo_t linfo; /* Link info message */ htri_t linfo_exists; /* Whether the link info message exists */ @@ -1041,7 +1041,7 @@ H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_ord H5O_linfo_t linfo; /* Link info message */ htri_t linfo_exists; /* Whether the link info message exists */ hid_t gid = H5I_INVALID_HID; /* Group ID */ - H5G_t * grp = NULL; /* Group opened */ + H5G_t *grp = NULL; /* Group opened */ H5G_loc_t loc; /* Location of group passed in */ H5G_loc_t start_loc; /* Location of starting group */ unsigned rc; /* Reference count of object */ diff --git a/src/H5Gloc.c b/src/H5Gloc.c index c9fb857..a8adf28 100644 --- a/src/H5Gloc.c +++ b/src/H5Gloc.c @@ -95,7 +95,7 @@ typedef struct { typedef struct { /* downward */ hid_t dxpl_id; /* DXPL to use for operation */ - char * comment; /* Object comment buffer */ + char *comment; /* Object comment buffer */ size_t bufsize; /* Size of object comment buffer */ /* upward */ diff --git a/src/H5Gname.c b/src/H5Gname.c index cd3b94c..9a1e551 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -52,10 +52,10 @@ /* Struct used by change name callback function */ typedef struct H5G_names_t { H5G_names_op_t op; /* Operation performed on file */ - H5F_t * src_file; /* Top file in src location's mounted file hier. */ - H5RS_str_t * src_full_path_r; /* Source location's full path */ - H5F_t * dst_file; /* Destination location's file */ - H5RS_str_t * dst_full_path_r; /* Destination location's full path */ + H5F_t *src_file; /* Top file in src location's mounted file hier. */ + H5RS_str_t *src_full_path_r; /* Source location's full path */ + H5F_t *dst_file; /* Destination location's file */ + H5RS_str_t *dst_full_path_r; /* Destination location's full path */ } H5G_names_t; /* Info to pass to the iteration function when building name */ @@ -150,10 +150,10 @@ H5G__component(const char *name, size_t *size_p) char * H5G_normalize(const char *name) { - char * norm; /* Pointer to the normalized string */ + char *norm; /* Pointer to the normalized string */ size_t s, d; /* Positions within the strings */ unsigned last_slash; /* Flag to indicate last character was a slash */ - char * ret_value = NULL; /* Return value */ + char *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -277,7 +277,7 @@ done: static H5RS_str_t * H5G_build_fullpath(const char *prefix, const char *name) { - char * full_path; /* Full user path built */ + char *full_path; /* Full user path built */ size_t orig_path_len; /* Original length of the path */ size_t path_len; /* Length of the path */ size_t name_len; /* Length of the name */ @@ -701,7 +701,7 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char size_t path_prefix2_len; /* Length of 2nd path prefix */ const char *common_prefix; /* Common prefix for src & dst paths */ size_t common_prefix_len; /* Length of common prefix */ - char * new_path; /* Pointer to new path */ + char *new_path; /* Pointer to new path */ size_t new_path_len; /* Length of new path */ /* Compute path prefix before full suffix*/ @@ -773,9 +773,9 @@ static int H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) { const H5G_names_t *names = (const H5G_names_t *)key; /* Get operation's information */ - H5O_loc_t * oloc; /* Object location for object that the ID refers to */ - H5G_name_t * obj_path; /* Pointer to group hier. path for obj */ - H5F_t * top_obj_file; /* Top file in object's mounted file hier. */ + H5O_loc_t *oloc; /* Object location for object that the ID refers to */ + H5G_name_t *obj_path; /* Pointer to group hier. path for obj */ + H5F_t *top_obj_file; /* Top file in object's mounted file hier. */ hbool_t obj_in_child = FALSE; /* Flag to indicate that the object is in the child mount hier. */ herr_t ret_value = SUCCEED; /* Return value */ @@ -865,7 +865,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) const char *full_path; /* Full path of current object */ const char *src_path; /* Full path of source object */ size_t src_path_len; /* Length of source full path */ - char * new_full_path; /* New full path of object */ + char *new_full_path; /* New full path of object */ size_t new_full_len; /* Length of new full path */ /* Get pointers to paths of interest */ @@ -912,7 +912,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) const char *full_suffix; /* Full path after source path */ size_t full_suffix_len; /* Length of full path after source path */ const char *src_path; /* Full path of source object */ - char * new_full_path; /* New full path of object */ + char *new_full_path; /* New full path of object */ /* Get pointers to paths of interest */ full_path = H5RS_get_str(obj_path->full_path_r); @@ -975,7 +975,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) const char *full_path; /* Full path of current object */ const char *full_suffix; /* Suffix of full path, after src_path */ size_t full_suffix_len; /* Length of suffix of full path after src_path*/ - char * new_full_path; /* New full path of object */ + char *new_full_path; /* New full path of object */ size_t new_full_len; /* Length of new full path */ const char *src_path; /* Full path of source object */ const char *dst_path; /* Full path of destination object */ diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 45735c8..20ef022 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -70,7 +70,7 @@ typedef struct H5G_node_key_t { /********************/ /* B-tree callbacks */ -static H5RC_t * H5G_node_get_shared(const H5F_t *f, const void *_udata); +static H5RC_t *H5G_node_get_shared(const H5F_t *f, const void *_udata); static herr_t H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t op, void *_lt_key, void *_udata, void *_rt_key, haddr_t *addr_p /*out*/); static int H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key); @@ -218,7 +218,7 @@ H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key) static herr_t H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key, const void *_udata) { - const H5G_node_key_t * key = (const H5G_node_key_t *)_key; + const H5G_node_key_t *key = (const H5G_node_key_t *)_key; const H5G_bt_common_t *udata = (const H5G_bt_common_t *)_udata; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -297,7 +297,7 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t H5_ATTR_UNUSED op, void *_lt_ { H5G_node_key_t *lt_key = (H5G_node_key_t *)_lt_key; H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key; - H5G_node_t * sym = NULL; + H5G_node_t *sym = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -365,9 +365,9 @@ static herr_t H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key) { H5G_bt_common_t *udata = (H5G_bt_common_t *)_udata; - H5G_node_key_t * lt_key = (H5G_node_key_t *)_lt_key; - H5G_node_key_t * rt_key = (H5G_node_key_t *)_rt_key; - const char * s1, *s2; + H5G_node_key_t *lt_key = (H5G_node_key_t *)_lt_key; + H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key; + const char *s1, *s2; int ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -418,9 +418,9 @@ static herr_t H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key) { H5G_bt_common_t *udata = (H5G_bt_common_t *)_udata; - H5G_node_key_t * lt_key = (H5G_node_key_t *)_lt_key; - H5G_node_key_t * rt_key = (H5G_node_key_t *)_rt_key; - const char * s; + H5G_node_key_t *lt_key = (H5G_node_key_t *)_lt_key; + H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key; + const char *s; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -476,10 +476,10 @@ static htri_t H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void H5_ATTR_UNUSED *_lt_key, void *_udata) { H5G_bt_lkp_t *udata = (H5G_bt_lkp_t *)_udata; - H5G_node_t * sn = NULL; + H5G_node_t *sn = NULL; unsigned lt = 0, idx = 0, rt; int cmp = 1; - const char * s; + const char *s; htri_t ret_value = TRUE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -566,13 +566,13 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *_lt_ { H5G_node_key_t *md_key = (H5G_node_key_t *)_md_key; H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key; - H5G_bt_ins_t * udata = (H5G_bt_ins_t *)_udata; - H5G_node_t * sn = NULL, *snrt = NULL; + H5G_bt_ins_t *udata = (H5G_bt_ins_t *)_udata; + H5G_node_t *sn = NULL, *snrt = NULL; unsigned sn_flags = H5AC__NO_FLAGS_SET, snrt_flags = H5AC__NO_FLAGS_SET; - const char * s; + const char *s; unsigned lt = 0, rt; /* Binary search cntrs */ int cmp = 1, idx = -1; - H5G_node_t * insert_into = NULL; /*node that gets new entry*/ + H5G_node_t *insert_into = NULL; /*node that gets new entry*/ H5G_entry_t ent; /* Entry to insert in node */ H5B_ins_t ret_value = H5B_INS_ERROR; @@ -728,8 +728,8 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out*/, { H5G_node_key_t *lt_key = (H5G_node_key_t *)_lt_key; H5G_node_key_t *rt_key = (H5G_node_key_t *)_rt_key; - H5G_bt_rm_t * udata = (H5G_bt_rm_t *)_udata; - H5G_node_t * sn = NULL; + H5G_bt_rm_t *udata = (H5G_bt_rm_t *)_udata; + H5G_node_t *sn = NULL; unsigned sn_flags = H5AC__NO_FLAGS_SET; unsigned lt = 0, rt, idx = 0; int cmp = 1; @@ -924,8 +924,8 @@ H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, h const void H5_ATTR_UNUSED *_rt_key, void *_udata) { H5G_bt_it_it_t *udata = (H5G_bt_it_it_t *)_udata; - H5G_node_t * sn = NULL; - H5G_entry_t * ents; /* Pointer to entries in this node */ + H5G_node_t *sn = NULL; + H5G_entry_t *ents; /* Pointer to entries in this node */ unsigned u; /* Local index variable */ int ret_value = H5_ITER_CONT; @@ -1002,7 +1002,7 @@ int H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata) { - hsize_t * num_objs = (hsize_t *)_udata; + hsize_t *num_objs = (hsize_t *)_udata; H5G_node_t *sn = NULL; int ret_value = H5_ITER_CONT; @@ -1047,7 +1047,7 @@ H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, ha const void H5_ATTR_UNUSED *_rt_key, void *_udata) { H5G_bt_it_idx_common_t *udata = (H5G_bt_it_idx_common_t *)_udata; - H5G_node_t * sn = NULL; + H5G_node_t *sn = NULL; int ret_value = H5_ITER_CONT; FUNC_ENTER_PACKAGE @@ -1181,9 +1181,9 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd { H5G_bt_it_cpy_t *udata = (H5G_bt_it_cpy_t *)_udata; const H5O_loc_t *src_oloc = udata->src_oloc; - H5O_copy_t * cpy_info = udata->cpy_info; - H5HL_t * heap = NULL; - H5G_node_t * sn = NULL; + H5O_copy_t *cpy_info = udata->cpy_info; + H5HL_t *heap = NULL; + H5G_node_t *sn = NULL; unsigned int i; /* Local index variable */ int ret_value = H5_ITER_CONT; @@ -1207,7 +1207,7 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd H5G_entry_t *src_ent = &(sn->entry[i]); /* Convenience variable to refer to current source group entry */ H5O_link_t lnk; /* Link to insert */ - const char * name; /* Name of source object */ + const char *name; /* Name of source object */ H5G_entry_t tmp_src_ent; /* Temperary copy. Change will not affect the cache */ H5O_type_t obj_type = H5O_TYPE_UNKNOWN; /* Target object type */ H5G_copy_file_ud_t *cpy_udata; /* Copy file udata */ @@ -1218,7 +1218,7 @@ H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_key, hadd H5O_info_t oinfo; /* Information about object pointed to by soft link */ H5G_loc_t grp_loc; /* Group location holding soft link */ H5G_name_t grp_path; /* Path for group holding soft link */ - char * link_name; /* Pointer to value of soft link */ + char *link_name; /* Pointer to value of soft link */ /* Make a temporary copy, so that it will not change the info in the cache */ HDmemcpy(&tmp_src_ent, src_ent, sizeof(H5G_entry_t)); @@ -1330,7 +1330,7 @@ H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_ke const void H5_ATTR_UNUSED *_rt_key, void *_udata) { H5G_bt_it_bt_t *udata = (H5G_bt_it_bt_t *)_udata; - H5G_node_t * sn = NULL; /* Symbol table node */ + H5G_node_t *sn = NULL; /* Symbol table node */ unsigned u; /* Local index variable */ int ret_value = H5_ITER_CONT; @@ -1353,7 +1353,7 @@ H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUSED *_lt_ke /* Check if the link table needs to be extended */ if ((udata->ltable->nlinks + sn->nsyms) >= udata->alloc_nlinks) { size_t na = MAX((udata->ltable->nlinks + sn->nsyms), - (udata->alloc_nlinks * 2)); /* Double # of links allocated */ + (udata->alloc_nlinks * 2)); /* Double # of links allocated */ H5O_link_t *x; /* Pointer to larger array of links */ /* Re-allocate the link table */ @@ -1435,7 +1435,7 @@ herr_t H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t heap_addr) { H5G_node_t *sn = NULL; - H5HL_t * heap = NULL; + H5HL_t *heap = NULL; unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Gobj.c b/src/H5Gobj.c index 8b05d25..978c7c3 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -53,7 +53,7 @@ * link storage */ typedef struct { - H5F_t * f; /* Pointer to file for insertion */ + H5F_t *f; /* Pointer to file for insertion */ hid_t dxpl_id; /* DXPL during insertion */ H5O_linfo_t *linfo; /* Pointer to link info */ } H5G_obj_oh_it_ud1_t; @@ -356,7 +356,7 @@ done: static herr_t H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata) { - const H5O_link_t * lnk = (const H5O_link_t *)_mesg; /* Pointer to link */ + const H5O_link_t *lnk = (const H5O_link_t *)_mesg; /* Pointer to link */ H5G_obj_oh_it_ud1_t *udata = (H5G_obj_oh_it_ud1_t *)_udata; /* 'User data' passed in */ herr_t ret_value = H5_ITER_CONT; /* Return value */ @@ -696,7 +696,7 @@ done: herr_t H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id) { - H5G_t * grp = NULL; /* Group to query */ + H5G_t *grp = NULL; /* Group to query */ H5G_loc_t grp_loc; /* Entry of group to be queried */ H5G_name_t grp_path; /* Group hier. path */ H5O_loc_t grp_oloc; /* Group object location */ @@ -872,7 +872,7 @@ H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxp /* Check if we should switch from dense storage back to link messages */ if (linfo->nlinks < ginfo.min_dense) { - struct H5O_t * oh = NULL; /* Pointer to group's object header */ + struct H5O_t *oh = NULL; /* Pointer to group's object header */ H5G_link_table_t ltable; /* Table of links */ hbool_t can_convert = TRUE; /* Whether converting to link messages is possible */ size_t u; /* Local index */ @@ -1120,7 +1120,7 @@ H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hi else /* Get the object's info from the symbol table */ if ((ret_value = H5G__stab_lookup(grp_oloc, name, lnk, dxpl_id)) < 0) - HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object") + HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object") done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Goh.c b/src/H5Goh.c index 3bb437a..1e25ae3 100644 --- a/src/H5Goh.c +++ b/src/H5Goh.c @@ -39,11 +39,11 @@ /* Local Prototypes */ /********************/ -static void * H5O_group_get_copy_file_udata(void); +static void *H5O_group_get_copy_file_udata(void); static void H5O_group_free_copy_file_udata(void *udata); static htri_t H5O_group_isa(H5O_t *loc); static hid_t H5O_group_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref); -static void * H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); +static void *H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); static H5O_loc_t *H5O_group_get_oloc(hid_t obj_id); static herr_t H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info); @@ -236,8 +236,8 @@ static void * H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) { H5G_obj_create_t *crt_info = (H5G_obj_create_t *)_crt_info; /* Group creation parameters */ - H5G_t * grp = NULL; /* New group created */ - void * ret_value = NULL; /* Return value */ + H5G_t *grp = NULL; /* New group created */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -283,7 +283,7 @@ done: static H5O_loc_t * H5O_group_get_oloc(hid_t obj_id) { - H5G_t * grp; /* Group opened */ + H5G_t *grp; /* Group opened */ H5O_loc_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 3d7c118..4caff31 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -157,7 +157,7 @@ typedef struct { typedef struct H5G_bt_common_t { /* downward */ const char *name; /*points to temporary memory */ - H5HL_t * heap; /*symbol table heap */ + H5HL_t *heap; /*symbol table heap */ } H5G_bt_common_t; /* @@ -169,7 +169,7 @@ typedef struct H5G_bt_ins_t { H5G_bt_common_t common; /* Common info for B-tree user data (must be first) */ const H5O_link_t *lnk; /* Link to insert into table */ H5O_type_t obj_type; /* Type of object being inserted */ - const void * crt_info; /* Creation info for object being inserted */ + const void *crt_info; /* Creation info for object being inserted */ } H5G_bt_ins_t; /* @@ -179,7 +179,7 @@ typedef struct H5G_bt_ins_t { typedef struct H5G_bt_rm_t { /* downward */ H5G_bt_common_t common; /* Common info for B-tree user data (must be first) */ - H5RS_str_t * grp_full_path_r; /* Full path of group where link is removed */ + H5RS_str_t *grp_full_path_r; /* Full path of group where link is removed */ } H5G_bt_rm_t; /* Typedef for B-tree 'find' operation */ @@ -193,7 +193,7 @@ typedef struct H5G_bt_lkp_t { /* downward */ H5G_bt_common_t common; /* Common info for B-tree user data (must be first) */ H5G_bt_find_op_t op; /* Operator to call when correct entry is found */ - void * op_data; /* Data to pass to operator */ + void *op_data; /* Data to pass to operator */ /* upward */ } H5G_bt_lkp_t; @@ -204,10 +204,10 @@ typedef struct H5G_bt_lkp_t { */ typedef struct H5G_bt_it_it_t { /* downward */ - H5HL_t * heap; /*symbol table heap */ + H5HL_t *heap; /*symbol table heap */ hsize_t skip; /*initial entries to skip */ H5G_lib_iterate_t op; /*iteration operator */ - void * op_data; /*user-defined operator data */ + void *op_data; /*user-defined operator data */ /* upward */ hsize_t *final_ent; /*final entry looked at */ @@ -215,11 +215,11 @@ typedef struct H5G_bt_it_it_t { /* Data passed through B-tree iteration for copying copy symbol table content */ typedef struct H5G_bt_it_cpy_t { - const H5O_loc_t * src_oloc; /* Source object location */ + const H5O_loc_t *src_oloc; /* Source object location */ haddr_t src_heap_addr; /* Heap address of the source symbol table */ - H5F_t * dst_file; /* File of destination group */ + H5F_t *dst_file; /* File of destination group */ const H5O_stab_t *dst_stab; /* Symbol table message for destination group */ - H5O_copy_t * cpy_info; /* Information for copy operation */ + H5O_copy_t *cpy_info; /* Information for copy operation */ } H5G_bt_it_cpy_t; /* Common information for "by index" lookups in symbol tables */ @@ -264,14 +264,14 @@ typedef struct H5G_dense_bt2_corder_rec_t { */ typedef struct H5G_bt2_ud_common_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ + H5F_t *f; /* Pointer to file that fractal heap is in */ hid_t dxpl_id; /* DXPL for operation */ - H5HF_t * fheap; /* Fractal heap handle */ - const char * name; /* Name of link to compare */ + H5HF_t *fheap; /* Fractal heap handle */ + const char *name; /* Name of link to compare */ uint32_t name_hash; /* Hash of name of link to compare */ int64_t corder; /* Creation order value of link to compare */ H5B2_found_t found_op; /* Callback when correct link is found */ - void * found_op_data; /* Callback data when correct link is found */ + void *found_op_data; /* Callback data when correct link is found */ } H5G_bt2_ud_common_t; /* diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index 902c310..8b26e6c 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -145,7 +145,7 @@ struct H5O_link_t; */ typedef struct { struct H5O_loc_t *oloc; /* Object header location */ - H5G_name_t * path; /* Group hierarchy path */ + H5G_name_t *path; /* Group hierarchy path */ } H5G_loc_t; /* Typedef for path traversal operations */ @@ -189,14 +189,14 @@ typedef struct H5G_entry_t H5G_entry_t; * call. */ H5_DLL struct H5O_loc_t *H5G_oloc(H5G_t *grp); -H5_DLL H5G_name_t *H5G_nameof(H5G_t *grp); -H5_DLL H5F_t *H5G_fileof(H5G_t *grp); -H5_DLL H5G_t * H5G_open(const H5G_loc_t *loc, hid_t dxpl_id); -H5_DLL herr_t H5G_close(H5G_t *grp); -H5_DLL herr_t H5G_get_shared_count(H5G_t *grp); -H5_DLL herr_t H5G_mount(H5G_t *grp); -H5_DLL hbool_t H5G_mounted(H5G_t *grp); -H5_DLL herr_t H5G_unmount(H5G_t *grp); +H5_DLL H5G_name_t *H5G_nameof(H5G_t *grp); +H5_DLL H5F_t *H5G_fileof(H5G_t *grp); +H5_DLL H5G_t *H5G_open(const H5G_loc_t *loc, hid_t dxpl_id); +H5_DLL herr_t H5G_close(H5G_t *grp); +H5_DLL herr_t H5G_get_shared_count(H5G_t *grp); +H5_DLL herr_t H5G_mount(H5G_t *grp); +H5_DLL hbool_t H5G_mounted(H5G_t *grp); +H5_DLL herr_t H5G_unmount(H5G_t *grp); #ifndef H5_NO_DEPRECATED_SYMBOLS H5_DLL H5G_obj_t H5G_map_obj_type(H5O_type_t obj_type); #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -254,17 +254,17 @@ H5_DLL herr_t H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *en /* * These functions operate on group hierarchy names. */ -H5_DLL herr_t H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name); -H5_DLL herr_t H5G_name_replace(const struct H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file, - H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, - hid_t dxpl_id); -H5_DLL herr_t H5G_name_reset(H5G_name_t *name); -H5_DLL herr_t H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth); -H5_DLL herr_t H5G_name_free(H5G_name_t *name); -H5_DLL ssize_t H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, hbool_t *cached, - hid_t lapl_id, hid_t dxpl_id); -H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id, const struct H5O_loc_t *loc, - char *name, size_t size); +H5_DLL herr_t H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name); +H5_DLL herr_t H5G_name_replace(const struct H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file, + H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, + hid_t dxpl_id); +H5_DLL herr_t H5G_name_reset(H5G_name_t *name); +H5_DLL herr_t H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth); +H5_DLL herr_t H5G_name_free(H5G_name_t *name); +H5_DLL ssize_t H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, hbool_t *cached, + hid_t lapl_id, hid_t dxpl_id); +H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id, const struct H5O_loc_t *loc, + char *name, size_t size); H5_DLL H5RS_str_t *H5G_build_fullpath_refstr_str(H5RS_str_t *path_r, const char *name); /* diff --git a/src/H5Gstab.c b/src/H5Gstab.c index 6d1193d..e09ffb1 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -44,7 +44,7 @@ typedef struct { /* downward */ const char *name; /* Name to search for */ - H5HL_t * heap; /* Local heap for group */ + H5HL_t *heap; /* Local heap for group */ /* upward */ H5O_link_t *lnk; /* Caller's link location */ @@ -54,7 +54,7 @@ typedef struct { typedef struct H5G_bt_it_gnbi_t { /* downward */ H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup */ - H5HL_t * heap; /*symbol table heap */ + H5HL_t *heap; /*symbol table heap */ /* upward */ char *name; /*member name to be returned */ @@ -65,7 +65,7 @@ typedef struct H5G_bt_it_gnbi_t { typedef struct H5G_bt_it_gtbi_t { /* downward */ H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup */ - H5F_t * f; /* Pointer to file that symbol table is in */ + H5F_t *f; /* Pointer to file that symbol table is in */ hid_t dxpl_id; /* DXPL for operation */ /* upward */ @@ -77,7 +77,7 @@ typedef struct H5G_bt_it_gtbi_t { typedef struct H5G_bt_it_lbi_t { /* downward */ H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup */ - H5HL_t * heap; /*symbol table heap */ + H5HL_t *heap; /*symbol table heap */ /* upward */ H5O_link_t *lnk; /*link to be returned */ @@ -247,7 +247,7 @@ herr_t H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name, H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5G_bt_ins_t udata; /* Data to pass through B-tree */ herr_t ret_value = SUCCEED; /* Return value */ @@ -336,7 +336,7 @@ done: herr_t H5G__stab_remove(const H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, const char *name) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5O_stab_t stab; /*symbol table message */ H5G_bt_rm_t udata; /*data to pass through B-tree */ herr_t ret_value = SUCCEED; /* Return value */ @@ -387,7 +387,7 @@ herr_t H5G__stab_remove_by_idx(const H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r, H5_iter_order_t order, hsize_t n) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5O_stab_t stab; /* Symbol table message */ H5G_bt_rm_t udata; /* Data to pass through B-tree */ H5O_link_t obj_lnk; /* Object's link within group */ @@ -447,7 +447,7 @@ done: herr_t H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5G_bt_rm_t udata; /*data to pass through B-tree */ herr_t ret_value = SUCCEED; /* Return value */ @@ -503,7 +503,7 @@ herr_t H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data) { - H5HL_t * heap = NULL; /* Local heap for group */ + H5HL_t *heap = NULL; /* Local heap for group */ H5O_stab_t stab; /* Info about symbol table */ H5G_link_table_t ltable = {0, NULL}; /* Link table */ herr_t ret_value = FAIL; /* Return value */ @@ -682,7 +682,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata) { H5G_bt_it_gnbi_t *udata = (H5G_bt_it_gnbi_t *)_udata; size_t name_off; /* Offset of name in heap */ - const char * name; /* Pointer to name string in heap */ + const char *name; /* Pointer to name string in heap */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -721,7 +721,7 @@ ssize_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n, char *name, size_t size, hid_t dxpl_id) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5O_stab_t stab; /* Info about local heap & B-tree */ H5G_bt_it_gnbi_t udata; /* Iteration information */ hbool_t udata_valid = FALSE; /* Whether iteration information is valid */ @@ -840,7 +840,7 @@ done: htri_t H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk, hid_t dxpl_id) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5G_bt_lkp_t bt_udata; /* Data to pass through B-tree */ H5G_stab_fnd_ud_t udata; /* 'User data' to give to callback */ H5O_stab_t stab; /* Symbol table message */ @@ -902,7 +902,7 @@ static herr_t H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata) { H5G_bt_it_lbi_t *udata = (H5G_bt_it_lbi_t *)_udata; - const char * name; /* Pointer to name string in heap */ + const char *name; /* Pointer to name string in heap */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -940,7 +940,7 @@ herr_t H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk, hid_t dxpl_id) { - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ H5G_bt_it_lbi_t udata; /* Iteration information */ H5O_stab_t stab; /* Symbol table message */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1022,7 +1022,7 @@ herr_t H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab) { H5O_stab_t stab; /* Current symbol table */ - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ hbool_t changed = FALSE; /* Whether stab has been modified */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Gtest.c b/src/H5Gtest.c index 053e977..b9c3ccc 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -372,10 +372,10 @@ done: herr_t H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count) { - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order index */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ H5O_linfo_t linfo; /* Link info message */ - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ hid_t dxpl_id = H5AC_ind_dxpl_id; /* transfer property list used for this operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -449,7 +449,7 @@ done: herr_t H5G__lheap_size_test(hid_t gid, size_t *lheap_size) { - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ H5O_stab_t stab; /* Symbol table message */ hid_t dxpl_id = H5AC_ind_dxpl_id; /* transfer property list used for this operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -497,7 +497,7 @@ done: herr_t H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *obj_hidden) { - void * obj_ptr; /* Pointer to object for ID */ + void *obj_ptr; /* Pointer to object for ID */ H5G_name_t *obj_path; /* Pointer to group hier. path for obj */ herr_t ret_value = SUCCEED; /* Return value */ @@ -589,7 +589,7 @@ herr_t H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent) { H5O_stab_t stab; /* Symbol table */ - H5HL_t * heap = NULL; /* Pointer to local heap */ + H5HL_t *heap = NULL; /* Pointer to local heap */ hid_t dxpl_id = H5AC_ind_dxpl_id; /* transfer property list used for this operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -645,7 +645,7 @@ H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id, const void H5_ATTR_UNUS { H5G_node_t *sn = NULL; H5O_loc_t targ_oloc; - H5O_t * targ_oh = NULL; + H5O_t *targ_oh = NULL; htri_t stab_exists; H5O_stab_t stab; unsigned i; @@ -736,7 +736,7 @@ done: herr_t H5G__verify_cached_stabs_test(hid_t gid) { - H5G_t * grp = NULL; /* Group */ + H5G_t *grp = NULL; /* Group */ htri_t stab_exists; H5O_stab_t stab; /* Symbol table message */ H5G_bt_common_t udata = {NULL, NULL}; /* Dummy udata so H5B_iterate doesn't freak out */ diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c index 4fb6749..9555862 100644 --- a/src/H5Gtraverse.c +++ b/src/H5Gtraverse.c @@ -162,9 +162,9 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc /*in,out*/, const H5O_link_t *lnk, H5G_ H5G_name_t grp_path_copy; H5O_loc_t grp_oloc_copy; H5G_loc_t new_loc; /* Group location for newly opened external object */ - H5G_t * grp; + H5G_t *grp; hid_t lapl_id = (-1); /* LAPL local to this routine */ - H5P_genplist_t * lapl; /* LAPL with nlinks set */ + H5P_genplist_t *lapl; /* LAPL with nlinks set */ hid_t cur_grp = (-1); herr_t ret_value = SUCCEED; /* Return value */ @@ -477,8 +477,8 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, size H5G_own_loc_t own_loc = H5G_OWN_NONE; /* Enum to indicate whether callback took ownership of locations*/ hbool_t group_copy = FALSE; /* Flag to indicate that the group entry is copied */ char comp_buf[1024]; /* Temporary buffer for path components */ - char * comp; /* Pointer to buffer for path components */ - H5WB_t * wb = NULL; /* Wrapped buffer for temporary buffer */ + char *comp; /* Pointer to buffer for path components */ + H5WB_t *wb = NULL; /* Wrapped buffer for temporary buffer */ hbool_t last_comp = FALSE; /* Flag to indicate that a component is the last component in the name */ herr_t ret_value = SUCCEED; /* Return value */ @@ -601,7 +601,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, size /* Check for last component in name provided */ if (last_comp) { H5O_link_t *cb_lnk; /* Pointer to link info for callback */ - H5G_loc_t * cb_loc; /* Pointer to object location for callback */ + H5G_loc_t *cb_loc; /* Pointer to object location for callback */ /* Set callback parameters appropriately, based on link being found */ if (lookup_status) { @@ -135,10 +135,10 @@ H5HF_op_write(const void *obj, size_t obj_len, void *op_data) H5HF_t * H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam) { - H5HF_t * fh = NULL; /* Pointer to new fractal heap */ + H5HF_t *fh = NULL; /* Pointer to new fractal heap */ H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */ haddr_t fh_addr; /* Heap header address */ - H5HF_t * ret_value = NULL; /* Return value */ + H5HF_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -201,9 +201,9 @@ done: H5HF_t * H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr) { - H5HF_t * fh = NULL; /* Pointer to new fractal heap */ + H5HF_t *fh = NULL; /* Pointer to new fractal heap */ H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */ - H5HF_t * ret_value = NULL; /* Return value */ + H5HF_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c index a9b266b..4e7e14c 100644 --- a/src/H5HFbtree2.c +++ b/src/H5HFbtree2.c @@ -60,9 +60,9 @@ typedef struct H5HF_huge_bt2_ctx_t { /* v2 B-tree driver callbacks */ -static void * H5HF_huge_bt2_crt_context(void *udata); +static void *H5HF_huge_bt2_crt_context(void *udata); static herr_t H5HF_huge_bt2_dst_context(void *ctx); -static void * H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); +static void *H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); static herr_t H5HF_huge_bt2_indir_store(void *native, const void *udata); static herr_t H5HF_huge_bt2_indir_compare(const void *rec1, const void *rec2, int *result); @@ -192,9 +192,9 @@ H5FL_DEFINE_STATIC(H5HF_huge_bt2_ctx_t); static void * H5HF_huge_bt2_crt_context(void *_f) { - H5F_t * f = (H5F_t *)_f; /* User data for building callback context */ + H5F_t *f = (H5F_t *)_f; /* User data for building callback context */ H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -264,7 +264,7 @@ static void * H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr) { H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -409,7 +409,7 @@ H5HF_huge_bt2_indir_compare(const void *_rec1, const void *_rec2, int *result) static herr_t H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -441,7 +441,7 @@ H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) static herr_t H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ H5HF_huge_bt2_indir_rec_t *nrecord = (H5HF_huge_bt2_indir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -607,7 +607,7 @@ H5HF_huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2, int *resu static herr_t H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -641,7 +641,7 @@ H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) static herr_t H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ H5HF_huge_bt2_filt_indir_rec_t *nrecord = (H5HF_huge_bt2_filt_indir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -798,7 +798,7 @@ H5HF_huge_bt2_dir_compare(const void *_rec1, const void *_rec2, int *result) static herr_t H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -829,7 +829,7 @@ H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) static herr_t H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ H5HF_huge_bt2_dir_rec_t *nrecord = (H5HF_huge_bt2_dir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1005,7 +1005,7 @@ H5HF_huge_bt2_filt_dir_compare(const void *_rec1, const void *_rec2, int *result static herr_t H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1038,7 +1038,7 @@ H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx) static herr_t H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx) { - H5HF_huge_bt2_ctx_t * ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */ H5HF_huge_bt2_filt_dir_rec_t *nrecord = (H5HF_huge_bt2_filt_dir_rec_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5HFcache.c b/src/H5HFcache.c index ba91158..e8ef0e5 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -248,17 +248,17 @@ H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable) static H5HF_hdr_t * H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5HF_hdr_t * hdr = NULL; /* Fractal heap info */ + H5HF_hdr_t *hdr = NULL; /* Fractal heap info */ H5HF_hdr_cache_ud_t *udata = (H5HF_hdr_cache_ud_t *)_udata; size_t size; /* Header size */ - H5WB_t * wb = NULL; /* Wrapped buffer for header data */ + H5WB_t *wb = NULL; /* Wrapped buffer for header data */ uint8_t hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */ - uint8_t * buf; /* Pointer to header buffer */ - const uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf; /* Pointer to header buffer */ + const uint8_t *p; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ uint8_t heap_flags; /* Status flags for heap */ - H5HF_hdr_t * ret_value; /* Return value */ + H5HF_hdr_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -682,18 +682,18 @@ H5HF_cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5HF_hdr_t *hdr, size_t static H5HF_indirect_t * H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5HF_hdr_t * hdr; /* Shared fractal heap information */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ H5HF_iblock_cache_ud_t *udata = (H5HF_iblock_cache_ud_t *)_udata; /* user data for callback */ - H5HF_indirect_t * iblock = NULL; /* Indirect block info */ - H5WB_t * wb = NULL; /* Wrapped buffer for indirect block data */ + H5HF_indirect_t *iblock = NULL; /* Indirect block info */ + H5WB_t *wb = NULL; /* Wrapped buffer for indirect block data */ uint8_t iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */ - uint8_t * buf; /* Temporary buffer */ - const uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf; /* Temporary buffer */ + const uint8_t *p; /* Pointer into raw data buffer */ haddr_t heap_addr; /* Address of heap header in the file */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ unsigned u; /* Local index variable */ - H5HF_indirect_t * ret_value; /* Return value */ + H5HF_indirect_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -900,8 +900,8 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, if (iblock->cache_info.is_dirty) { H5HF_hdr_t *hdr; /* Shared fractal heap information */ - uint8_t * buf; /* Temporary buffer */ - uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf; /* Temporary buffer */ + uint8_t *p; /* Pointer into raw data buffer */ #ifndef NDEBUG unsigned nchildren = 0; /* Track # of children */ unsigned max_child = 0; /* Track max. child entry used */ @@ -1190,12 +1190,12 @@ static H5HF_direct_t * H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5HF_dblock_cache_ud_t *udata = (H5HF_dblock_cache_ud_t *)_udata; /* pointer to user data */ - H5HF_hdr_t * hdr; /* Shared fractal heap information */ - H5HF_parent_t * par_info; /* Pointer to parent information */ - H5HF_direct_t * dblock = NULL; /* Direct block info */ - const uint8_t * p; /* Pointer into raw data buffer */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ + H5HF_parent_t *par_info; /* Pointer to parent information */ + H5HF_direct_t *dblock = NULL; /* Direct block info */ + const uint8_t *p; /* Pointer into raw data buffer */ haddr_t heap_addr; /* Address of heap header in the file */ - H5HF_direct_t * ret_value; /* Return value */ + H5HF_direct_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1237,7 +1237,7 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) if (hdr->filter_len > 0) { H5Z_cb_t filter_cb = {NULL, NULL}; /* Filter callback structure */ size_t nbytes; /* Number of bytes used in buffer, after applying reverse filters */ - void * read_buf; /* Pointer to buffer to read in */ + void *read_buf; /* Pointer to buffer to read in */ size_t read_size; /* Size of filtered direct block to read */ unsigned filter_mask; /* Excluded filters for direct block */ @@ -1381,7 +1381,7 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HF_hdr_t *hdr; /* Shared fractal heap information */ hbool_t at_tmp_addr = H5F_IS_TMP_ADDR(f, addr); /* Flag to indicate direct block is at temporary address */ - void * write_buf; /* Pointer to buffer to write out */ + void *write_buf; /* Pointer to buffer to write out */ size_t write_size; /* Size of buffer to write out */ uint8_t *p; /* Pointer into raw data buffer */ diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 3e067a7..665504b 100644 --- a/src/H5HFdbg.c +++ b/src/H5HFdbg.c @@ -49,7 +49,7 @@ /* User data for direct block debugging iterator callback */ typedef struct { - FILE * stream; /* Stream for output */ + FILE *stream; /* Stream for output */ int indent; /* Indention amount */ int fwidth; /* Field width mount */ haddr_t dblock_addr; /* Direct block's address */ @@ -62,7 +62,7 @@ typedef struct { /* User data for free space section iterator callback */ typedef struct { H5FS_t *fspace; /* Free space manager */ - FILE * stream; /* Stream for output */ + FILE *stream; /* Stream for output */ int indent; /* Indention amount */ int fwidth; /* Field width mount */ } H5HF_debug_iter_ud2_t; @@ -303,7 +303,7 @@ done: static herr_t H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata) { - H5HF_free_section_t * sect = (H5HF_free_section_t *)_sect; /* Section to dump info */ + H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Section to dump info */ H5HF_debug_iter_ud1_t *udata = (H5HF_debug_iter_ud1_t *)_udata; /* User data for callbacks */ haddr_t sect_start, sect_end; /* Section's beginning and ending offsets */ haddr_t dblock_start, dblock_end; /* Direct block's beginning and ending offsets */ @@ -386,11 +386,11 @@ herr_t H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t hdr_addr, size_t block_size) { - H5HF_hdr_t * hdr = NULL; /* Fractal heap header info */ + H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */ H5HF_direct_t *dblock = NULL; /* Fractal heap direct block info */ size_t blk_prefix_size; /* Size of prefix for block */ size_t amount_free; /* Amount of free space in block */ - uint8_t * marker = NULL; /* Track free space for block */ + uint8_t *marker = NULL; /* Track free space for block */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -621,7 +621,7 @@ herr_t H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t hdr_addr, unsigned nrows) { - H5HF_hdr_t * hdr = NULL; /* Fractal heap header info */ + H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */ H5HF_indirect_t *iblock = NULL; /* Fractal heap direct block info */ hbool_t did_protect = FALSE; /* Whether we protected the indirect block or not */ herr_t ret_value = SUCCEED; /* Return value */ @@ -677,7 +677,7 @@ done: static herr_t H5HF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata) { - H5HF_free_section_t * sect = (H5HF_free_section_t *)_sect; /* Section to dump info */ + H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Section to dump info */ H5HF_debug_iter_ud2_t *udata = (H5HF_debug_iter_ud2_t *)_udata; /* User data for callbacks */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index f62bb7f..d470ff8 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -86,7 +86,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo haddr_t *addr_p, H5HF_free_section_t **ret_sec_node) { H5HF_free_section_t *sec_node; /* Pointer to free space section for block */ - H5HF_direct_t * dblock = NULL; /* Pointer to direct block */ + H5HF_direct_t *dblock = NULL; /* Pointer to direct block */ haddr_t dblock_addr; /* Direct block's address */ size_t free_space; /* Free space in new block */ herr_t ret_value = SUCCEED; /* Return value */ @@ -427,9 +427,9 @@ H5HF_direct_t * H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry, H5AC_protect_t rw) { - H5HF_direct_t * dblock; /* Direct block from cache */ + H5HF_direct_t *dblock; /* Direct block from cache */ H5HF_dblock_cache_ud_t udata; /* parent and other infor for deserializing direct block */ - H5HF_direct_t * ret_value = NULL; /* Return value */ + H5HF_direct_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index 3069077..4a14564 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -517,8 +517,8 @@ H5HF_hdr_t * H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw) { H5HF_hdr_cache_ud_t cache_udata; /* User-data for callback */ - H5HF_hdr_t * hdr; /* Fractal heap header */ - H5HF_hdr_t * ret_value = NULL; /* Return value */ + H5HF_hdr_t *hdr; /* Fractal heap header */ + H5HF_hdr_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c index 3519e22..e73d08d 100644 --- a/src/H5HFhuge.c +++ b/src/H5HFhuge.c @@ -289,7 +289,7 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi { uint8_t *id = (uint8_t *)_id; /* Pointer to ID buffer */ haddr_t obj_addr; /* Address of object in the file */ - void * write_buf; /* Pointer to buffer to write */ + void *write_buf; /* Pointer to buffer to write */ size_t write_size; /* Size of [possibly filtered] object written to file */ unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */ herr_t ret_value = SUCCEED; /* Return value */ @@ -408,7 +408,7 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi else { H5HF_huge_bt2_filt_indir_rec_t filt_indir_rec; /* Record for tracking filtered object */ H5HF_huge_bt2_indir_rec_t indir_rec; /* Record for tracking non-filtered object */ - void * ins_rec; /* Pointer to record to insert */ + void *ins_rec; /* Pointer to record to insert */ hsize_t new_id; /* New ID for object */ /* Get new ID for object */ @@ -564,7 +564,7 @@ static herr_t H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, hbool_t is_read, H5HF_operator_t op, void *op_data) { - void * read_buf = NULL; /* Pointer to buffer for reading */ + void *read_buf = NULL; /* Pointer to buffer for reading */ haddr_t obj_addr; /* Object's address in the file */ size_t obj_size = 0; /* Object's size in the file */ unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */ diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index 80b9f7a..d95d8d0 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -827,7 +827,7 @@ done: static herr_t H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id) { - H5HF_hdr_t * hdr; /* Pointer to heap's header */ + H5HF_hdr_t *hdr; /* Pointer to heap's header */ H5HF_direct_t *dblock = NULL; /* Pointer to new root indirect block */ haddr_t dblock_addr; /* Direct block's address in the file */ size_t dblock_size; /* Direct block's size */ @@ -908,7 +908,7 @@ done: herr_t H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t **sec_node) { - H5HF_indirect_t * iblock = NULL; /* Pointer to indirect block */ + H5HF_indirect_t *iblock = NULL; /* Pointer to indirect block */ H5HF_free_section_t *old_sec_node = *sec_node; /* Pointer to old indirect section node */ unsigned dblock_entry; /* Entry for direct block */ hbool_t iblock_held = FALSE; /* Flag to indicate that indirect block is held */ diff --git a/src/H5HFman.c b/src/H5HFman.c index 612993d..452a7c7 100644 --- a/src/H5HFman.c +++ b/src/H5HFman.c @@ -97,10 +97,10 @@ herr_t H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj, void *_id) { H5HF_free_section_t *sec_node = NULL; /* Pointer to free space section */ - H5HF_direct_t * dblock = NULL; /* Pointer to direct block to modify */ + H5HF_direct_t *dblock = NULL; /* Pointer to direct block to modify */ haddr_t dblock_addr = HADDR_UNDEF; /* Direct block address */ size_t dblock_size; /* Direct block size */ - uint8_t * id = (uint8_t *)_id; /* Pointer to ID buffer */ + uint8_t *id = (uint8_t *)_id; /* Pointer to ID buffer */ size_t blk_off; /* Offset of object within block */ htri_t node_found; /* Whether an existing free list node was found */ herr_t ret_value = SUCCEED; /* Return value */ @@ -233,7 +233,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operato hsize_t obj_off; /* Object's offset in heap */ size_t obj_len; /* Object's length in heap */ size_t blk_off; /* Offset of object in block */ - uint8_t * p; /* Temporary pointer to obj info in block */ + uint8_t *p; /* Temporary pointer to obj info in block */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -477,7 +477,7 @@ herr_t H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id) { H5HF_free_section_t *sec_node = NULL; /* Pointer to free space section for block */ - H5HF_indirect_t * iblock = NULL; /* Pointer to indirect block */ + H5HF_indirect_t *iblock = NULL; /* Pointer to indirect block */ hbool_t did_protect = FALSE; /* Whether we protected the indirect block or not */ hsize_t obj_off; /* Object's offset in heap */ size_t obj_len; /* Object's length in heap */ diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h index 4b544c1..d7511a8 100644 --- a/src/H5HFpkg.h +++ b/src/H5HFpkg.h @@ -234,7 +234,7 @@ typedef struct H5HF_block_loc_t { unsigned entry; /* Entry of block in doubling table */ /* Infrastructure */ - H5HF_indirect_t * context; /* Pointer to the indirect block containing the block */ + H5HF_indirect_t *context; /* Pointer to the indirect block containing the block */ struct H5HF_block_loc_t *up; /* Pointer to next level up in the stack of levels */ } H5HF_block_loc_t; @@ -343,16 +343,16 @@ typedef struct H5HF_hdr_t { haddr_t heap_addr; /* Address of heap header in the file */ size_t heap_size; /* Size of heap header in the file */ H5AC_protect_t mode; /* Access mode for heap */ - H5F_t * f; /* Pointer to file for heap */ + H5F_t *f; /* Pointer to file for heap */ size_t file_rc; /* Reference count of files using heap header */ hbool_t pending_delete; /* Heap is pending deletion */ uint8_t sizeof_size; /* Size of file sizes */ uint8_t sizeof_addr; /* Size of file addresses */ struct H5HF_indirect_t *root_iblock; /* Pointer to root indirect block */ unsigned root_iblock_flags; /* Flags to indicate whether root indirect block is pinned/protected */ - H5FS_t * fspace; /* Free space list for objects in heap */ + H5FS_t *fspace; /* Free space list for objects in heap */ H5HF_block_iter_t next_block; /* Block iterator for searching for next block with space */ - H5B2_t * huge_bt2; /* v2 B-tree handle for huge objects */ + H5B2_t *huge_bt2; /* v2 B-tree handle for huge objects */ hsize_t huge_max_id; /* Max. 'huge' heap ID before rolling 'huge' heap IDs over */ uint8_t huge_id_size; /* Size of 'huge' heap IDs (in bytes) */ hbool_t huge_ids_direct; /* Flag to indicate that 'huge' object's offset & length are stored directly in @@ -385,8 +385,8 @@ struct H5HF_indirect_t { /* Internal heap information (not stored) */ size_t rc; /* Reference count of objects using this block */ - H5HF_hdr_t * hdr; /* Shared heap header info */ - struct H5HF_indirect_t * parent; /* Shared parent indirect block info */ + H5HF_hdr_t *hdr; /* Shared heap header info */ + struct H5HF_indirect_t *parent; /* Shared parent indirect block info */ unsigned par_entry; /* Entry in parent's table */ haddr_t addr; /* Address of this indirect block on disk */ size_t size; /* Size of indirect block on disk */ @@ -398,7 +398,7 @@ struct H5HF_indirect_t { /* Stored values */ hsize_t block_off; /* Offset of the block within the heap's address space */ - H5HF_indirect_ent_t * ents; /* Pointer to block entry table */ + H5HF_indirect_ent_t *ents; /* Pointer to block entry table */ H5HF_indirect_filt_ent_t *filt_ents; /* Pointer to filtered information for direct blocks */ }; @@ -408,7 +408,7 @@ typedef struct H5HF_direct_t { H5AC_info_t cache_info; /* Internal heap information */ - H5HF_hdr_t * hdr; /* Shared heap header info */ + H5HF_hdr_t *hdr; /* Shared heap header info */ H5HF_indirect_t *parent; /* Shared parent indirect block info */ unsigned par_entry; /* Entry in parent's table */ size_t size; /* Size of direct block */ @@ -423,12 +423,12 @@ typedef struct H5HF_direct_t { /* Fractal heap */ struct H5HF_t { H5HF_hdr_t *hdr; /* Pointer to internal fractal heap header info */ - H5F_t * f; /* Pointer to file for heap */ + H5F_t *f; /* Pointer to file for heap */ }; /* Fractal heap "parent info" (for loading a block) */ typedef struct H5HF_parent_t { - H5HF_hdr_t * hdr; /* Pointer to heap header info */ + H5HF_hdr_t *hdr; /* Pointer to heap header info */ H5HF_indirect_t *iblock; /* Pointer to parent indirect block */ unsigned entry; /* Location of block in parent's entry table */ } H5HF_parent_t; @@ -484,15 +484,15 @@ typedef struct H5HF_hdr_cache_ud_t { /* User data for fractal heap indirect block cache client callbacks */ typedef struct H5HF_iblock_cache_ud_t { - H5HF_parent_t * par_info; /* Parent info */ - H5F_t * f; /* File pointer */ + H5HF_parent_t *par_info; /* Parent info */ + H5F_t *f; /* File pointer */ const unsigned *nrows; /* Number of rows */ } H5HF_iblock_cache_ud_t; /* User data for fractal heap direct block cache client callbacks */ typedef struct H5HF_dblock_cache_ud_t { H5HF_parent_t par_info; /* Parent info */ - H5F_t * f; /* File pointer */ + H5F_t *f; /* File pointer */ size_t odi_size; /* On disk image size of the direct block. * Note that there is no necessary relation * between this value, and the actual @@ -635,12 +635,12 @@ H5_DLL herr_t H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, had H5_DLL herr_t H5HF_man_iblock_dest(H5HF_indirect_t *iblock); /* Direct block routines */ -H5_DLL herr_t H5HF_man_dblock_new(H5HF_hdr_t *fh, hid_t dxpl_id, size_t request, - H5HF_free_section_t **ret_sec_node); -H5_DLL herr_t H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, - unsigned par_entry, haddr_t *addr_p, H5HF_free_section_t **ret_sec_node); -H5_DLL herr_t H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock, - haddr_t dblock_addr); +H5_DLL herr_t H5HF_man_dblock_new(H5HF_hdr_t *fh, hid_t dxpl_id, size_t request, + H5HF_free_section_t **ret_sec_node); +H5_DLL herr_t H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, + unsigned par_entry, haddr_t *addr_p, H5HF_free_section_t **ret_sec_node); +H5_DLL herr_t H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock, + haddr_t dblock_addr); H5_DLL H5HF_direct_t *H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry, H5AC_protect_t rw); diff --git a/src/H5HFsection.c b/src/H5HFsection.c index 4352694..13d1c5b 100644 --- a/src/H5HFsection.c +++ b/src/H5HFsection.c @@ -132,7 +132,7 @@ static herr_t H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_fr unsigned child_entry); static herr_t H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect); static hbool_t H5HF_sect_indirect_is_first(H5HF_free_section_t *sect); -static H5HF_indirect_t * H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect); +static H5HF_indirect_t *H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect); static hsize_t H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect); static H5HF_free_section_t *H5HF_sect_indirect_top(H5HF_free_section_t *sect); static herr_t H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect1, @@ -776,8 +776,8 @@ H5HF_sect_single_add(H5FS_section_info_t *_sect, unsigned *flags, void *_udata) */ if (!(*flags & H5FS_ADD_DESERIALIZING)) { H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */ /* Sanity check */ @@ -905,8 +905,8 @@ H5HF_sect_single_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2, { H5HF_free_section_t *sect1 = (H5HF_free_section_t *)_sect1; /* Fractal heap free section */ H5HF_free_section_t *sect2 = (H5HF_free_section_t *)_sect2; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -962,8 +962,8 @@ static htri_t H5HF_sect_single_can_shrink(const H5FS_section_info_t *_sect, void *_udata) { const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ htri_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1016,10 +1016,10 @@ static herr_t H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void H5_ATTR_UNUSED *_udata) { H5HF_free_section_t **sect = (H5HF_free_section_t **)_sect; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */ - H5HF_direct_t * dblock; /* Pointer to direct block for section */ + H5HF_direct_t *dblock; /* Pointer to direct block for section */ haddr_t dblock_addr; /* Section's direct block's address */ size_t dblock_size; /* Section's direct block's size */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1083,7 +1083,7 @@ herr_t H5HF_sect_single_free(H5FS_section_info_t *_sect) { H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Pointer to section to free */ - H5HF_indirect_t * parent = NULL; /* Parent indirect block for section */ + H5HF_indirect_t *parent = NULL; /* Parent indirect block for section */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1565,7 +1565,7 @@ done: static herr_t H5HF_sect_row_serialize(const H5FS_section_class_t *cls, const H5FS_section_info_t *_sect, uint8_t *buf) { - H5HF_hdr_t * hdr; /* Fractal heap header */ + H5HF_hdr_t *hdr; /* Fractal heap header */ const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; herr_t ret_value = SUCCEED; /* Return value */ @@ -1609,7 +1609,7 @@ static H5FS_section_info_t * H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id, const uint8_t *buf, haddr_t sect_addr, hsize_t sect_size, unsigned *des_flags) { - H5HF_hdr_t * hdr; /* Fractal heap header */ + H5HF_hdr_t *hdr; /* Fractal heap header */ H5FS_section_info_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1653,7 +1653,7 @@ H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_in { const H5HF_free_section_t *sect1 = (const H5HF_free_section_t *)_sect1; /* Fractal heap free section */ const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2; /* Fractal heap free section */ - H5HF_free_section_t * top_indir_sect1, *top_indir_sect2; /* Top indirect section for each row */ + H5HF_free_section_t *top_indir_sect1, *top_indir_sect2; /* Top indirect section for each row */ htri_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1710,8 +1710,8 @@ H5HF_sect_row_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2, vo { H5HF_free_section_t *sect1 = (H5HF_free_section_t *)_sect1; /* Fractal heap free section */ H5HF_free_section_t *sect2 = (H5HF_free_section_t *)_sect2; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1776,8 +1776,8 @@ static htri_t H5HF_sect_row_can_shrink(const H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udata) { const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Fractal heap free section */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ htri_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1812,9 +1812,9 @@ static herr_t H5HF_sect_row_shrink(H5FS_section_info_t **_sect, void *_udata) { H5HF_free_section_t **sect = (H5HF_free_section_t **)_sect; /* Fractal heap free section */ - H5HF_free_section_t * top_indir_sect; /* Top indirect section for row */ - H5HF_sect_add_ud_t * udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ - H5HF_hdr_t * hdr = udata->hdr; /* Fractal heap header */ + H5HF_free_section_t *top_indir_sect; /* Top indirect section for row */ + H5HF_sect_add_ud_t *udata = (H5HF_sect_add_ud_t *)_udata; /* User callback data */ + H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */ hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1923,8 +1923,8 @@ done: static herr_t H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *_sect) { - H5HF_sect_private_t * cls_prvt; /* Pointer to class private info */ - const H5HF_hdr_t * hdr; /* Fractal heap header */ + H5HF_sect_private_t *cls_prvt; /* Pointer to class private info */ + const H5HF_hdr_t *hdr; /* Fractal heap header */ const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Pointer to section to check */ const H5HF_free_section_t *indir_sect; /* Pointer to underlying indirect section */ unsigned indir_idx; /* Index of row in underlying indirect section's row array */ @@ -2420,7 +2420,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t first_row_sect = NULL; } /* end if */ else { - H5HF_indirect_t * child_iblock; /* Child indirect block */ + H5HF_indirect_t *child_iblock; /* Child indirect block */ H5HF_free_section_t *child_sect; /* Child 'indirect' section to add */ unsigned child_nrows; /* Number of child rows in indirect blocks for this row */ unsigned child_nentries; /* Number of child entries in indirect blocks for this row */ @@ -3190,7 +3190,7 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s /* (Will use this to compute the section address for the peer section */ sect->u.indirect.num_entries = new_nentries; sect->u.indirect.span_size = H5HF_dtable_span_size(&hdr->man_dtable, sect->u.indirect.row, - sect->u.indirect.col, new_nentries); + sect->u.indirect.col, new_nentries); HDassert(sect->u.indirect.span_size > 0); /* Compute address of peer indirect section */ @@ -3654,7 +3654,7 @@ done: static herr_t H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect) { - H5HF_indirect_t * par_iblock; /* Indirect block for parent section */ + H5HF_indirect_t *par_iblock; /* Indirect block for parent section */ H5HF_free_section_t *par_sect = NULL; /* Parent indirect section */ unsigned par_row, par_col; /* Row & column in parent indirect section */ unsigned par_entry; /* Entry within parent indirect section */ diff --git a/src/H5HFspace.c b/src/H5HFspace.c index d08c270..d7650a4 100644 --- a/src/H5HFspace.c +++ b/src/H5HFspace.c @@ -322,7 +322,7 @@ static herr_t H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata) { H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Section to dump info */ - H5HF_indirect_t * root_iblock = (H5HF_indirect_t *)_udata; /* User data for callback */ + H5HF_indirect_t *root_iblock = (H5HF_indirect_t *)_udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5HFstat.c b/src/H5HFstat.c index 9f427ce..14d3a6b 100644 --- a/src/H5HFstat.c +++ b/src/H5HFstat.c @@ -116,7 +116,7 @@ herr_t H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size) { H5HF_hdr_t *hdr; /* Fractal heap header */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ hsize_t meta_size = 0; /* free space storage size */ herr_t ret_value = SUCCEED; /* Return value */ @@ -123,7 +123,7 @@ static haddr_t H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size) { H5HG_heap_t *heap = NULL; - uint8_t * p = NULL; + uint8_t *p = NULL; haddr_t addr = HADDR_UNDEF; size_t n; haddr_t ret_value = HADDR_UNDEF; /* Return value */ @@ -415,8 +415,8 @@ H5HG_extend(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t need) H5HG_heap_t *heap = NULL; /* Pointer to heap to extend */ unsigned heap_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting heap */ size_t old_size; /* Previous size of the heap's chunk */ - uint8_t * new_chunk; /* Pointer to new chunk information */ - uint8_t * p; /* Pointer to raw heap info */ + uint8_t *new_chunk; /* Pointer to new chunk information */ + uint8_t *p; /* Pointer to raw heap info */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -591,9 +591,9 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object /*out*/, size_t *b { H5HG_heap_t *heap = NULL; /* Pointer to global heap object */ size_t size; /* Size of the heap object */ - uint8_t * p; /* Pointer to object in heap buffer */ - void * orig_object = object; /* Keep a copy of the original object pointer */ - void * ret_value; /* Return value */ + uint8_t *p; /* Pointer to object in heap buffer */ + void *orig_object = object; /* Keep a copy of the original object pointer */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -715,7 +715,7 @@ herr_t H5HG_remove(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj) { H5HG_heap_t *heap = NULL; - uint8_t * p = NULL, *obj_start = NULL; + uint8_t *p = NULL, *obj_start = NULL; size_t need; unsigned u; unsigned flags = H5AC__NO_FLAGS_SET; /* Whether the heap gets deleted */ diff --git a/src/H5HGcache.c b/src/H5HGcache.c index 84247d6..faa2a50 100644 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -102,7 +102,7 @@ static H5HG_heap_t * H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata) { H5HG_heap_t *heap = NULL; - uint8_t * p; + uint8_t *p; size_t nalloc, need; size_t max_idx = 0; /* The maximum index seen */ H5HG_heap_t *ret_value = NULL; /* Return value */ diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c index 5da72f6..d66c29b 100644 --- a/src/H5HGdbg.c +++ b/src/H5HGdbg.c @@ -78,7 +78,7 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int unsigned u, nused, maxobj; unsigned j, k; H5HG_heap_t *h = NULL; - uint8_t * p = NULL; + uint8_t *p = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h index f5733d5..fc39f0e 100644 --- a/src/H5HGpkg.h +++ b/src/H5HGpkg.h @@ -130,13 +130,13 @@ struct H5HG_heap_t { /* have been used at some time and the */ /* correct new index should be searched for */ struct H5F_file_t *shared; /* shared file */ - H5HG_obj_t * obj; /*array of object descriptions */ + H5HG_obj_t *obj; /*array of object descriptions */ }; /******************************/ /* Package Private Prototypes */ /******************************/ -H5_DLL herr_t H5HG_free(H5HG_heap_t *heap); +H5_DLL herr_t H5HG_free(H5HG_heap_t *heap); H5_DLL H5HG_heap_t *H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw); #endif /* H5HGpkg_H */ diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h index 13c8cfb..4b9f182 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -53,7 +53,7 @@ typedef struct H5HG_heap_t H5HG_heap_t; /* Main global heap routines */ H5_DLL herr_t H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj /*out*/); -H5_DLL void * H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object, size_t *buf_size /*out*/); +H5_DLL void *H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object, size_t *buf_size /*out*/); H5_DLL int H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust); H5_DLL herr_t H5HG_remove(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj); @@ -99,7 +99,7 @@ H5FL_BLK_DEFINE(lheap_chunk); herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p /*out*/) { - H5HL_t * heap = NULL; /* Heap created */ + H5HL_t *heap = NULL; /* Heap created */ H5HL_prfx_t *prfx = NULL; /* Heap prefix */ hsize_t total_size; /* Total heap size on disk */ herr_t ret_value = SUCCEED; /* Return value */ @@ -423,12 +423,12 @@ H5HL_t * H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw) { H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */ - H5HL_prfx_t * prfx = NULL; /* Local heap prefix */ - H5HL_dblk_t * dblk = NULL; /* Local heap data block */ - H5HL_t * heap; /* Heap data structure */ + H5HL_prfx_t *prfx = NULL; /* Local heap prefix */ + H5HL_dblk_t *dblk = NULL; /* Local heap data block */ + H5HL_t *heap; /* Heap data structure */ unsigned prfx_cache_flags = H5AC__NO_FLAGS_SET; /* Cache flags for unprotecting prefix entry */ unsigned dblk_cache_flags = H5AC__NO_FLAGS_SET; /* Cache flags for unprotecting data block entry */ - H5HL_t * ret_value; /* Return value */ + H5HL_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1017,10 +1017,10 @@ done: herr_t H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr) { - H5HL_t * heap; /* Local heap to delete */ + H5HL_t *heap; /* Local heap to delete */ H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */ - H5HL_prfx_t * prfx = NULL; /* Local heap prefix */ - H5HL_dblk_t * dblk = NULL; /* Local heap data block */ + H5HL_prfx_t *prfx = NULL; /* Local heap prefix */ + H5HL_dblk_t *dblk = NULL; /* Local heap data block */ unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1095,8 +1095,8 @@ herr_t H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size) { H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */ - H5HL_prfx_t * prfx = NULL; /* Local heap prefix */ - H5HL_t * heap = NULL; /* Heap data structure */ + H5HL_prfx_t *prfx = NULL; /* Local heap prefix */ + H5HL_t *heap = NULL; /* Heap data structure */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1147,8 +1147,8 @@ herr_t H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size) { H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */ - H5HL_prfx_t * prfx = NULL; /* Local heap prefix */ - H5HL_t * heap = NULL; /* Heap data structure */ + H5HL_prfx_t *prfx = NULL; /* Local heap prefix */ + H5HL_t *heap = NULL; /* Heap data structure */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5HLcache.c b/src/H5HLcache.c index b1a08eb..d164d2f 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -63,13 +63,13 @@ /********************/ /* Metadata cache callbacks */ -static void * H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static void *H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); static herr_t H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing, unsigned *flags_ptr); static herr_t H5HL_prefix_dest(H5F_t *f, void *thing); static herr_t H5HL_prefix_clear(H5F_t *f, void *thing, hbool_t destroy); static herr_t H5HL_prefix_size(const H5F_t *f, const void *thing, size_t *size_ptr); -static void * H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static void *H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); static herr_t H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing, unsigned *flags_ptr); static herr_t H5HL_datablock_dest(H5F_t *f, void *thing); @@ -232,15 +232,15 @@ H5HL_fl_serialize(const H5HL_t *heap) static void * H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5HL_t * heap = NULL; /* Local heap */ - H5HL_prfx_t * prfx = NULL; /* Heap prefix deserialized */ + H5HL_t *heap = NULL; /* Local heap */ + H5HL_prfx_t *prfx = NULL; /* Heap prefix deserialized */ H5HL_cache_prfx_ud_t *udata = (H5HL_cache_prfx_ud_t *)_udata; /* User data for callback */ uint8_t buf[H5HL_SPEC_READ_SIZE]; /* Buffer for decoding */ size_t spec_read_size; /* Size of buffer to speculatively read in */ - const uint8_t * p; /* Pointer into decoding buffer */ + const uint8_t *p; /* Pointer into decoding buffer */ haddr_t eoa; /* Relative end of file address */ hsize_t min; /* temp min value to avoid macro nesting */ - H5HL_prfx_t * ret_value; /* Return value */ + H5HL_prfx_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -376,7 +376,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, void * unsigned H5_ATTR_UNUSED *flags_ptr) { H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* Local heap prefix to flush */ - H5WB_t * wb = NULL; /* Wrapped buffer for heap data */ + H5WB_t *wb = NULL; /* Wrapped buffer for heap data */ uint8_t heap_buf[H5HL_SPEC_READ_SIZE]; /* Buffer for heap */ herr_t ret_value = SUCCEED; /* Return value */ @@ -388,7 +388,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, void * HDassert(prfx); if (prfx->cache_info.is_dirty) { - H5HL_t * heap = prfx->heap; /* Pointer to the local heap */ + H5HL_t *heap = prfx->heap; /* Pointer to the local heap */ uint8_t *buf; /* Pointer to heap buffer */ size_t buf_size; /* Size of buffer for encoding & writing heap info */ uint8_t *p; /* Pointer into raw data buffer */ @@ -601,9 +601,9 @@ H5HL_prefix_size(const H5F_t H5_ATTR_UNUSED *f, const void *thing, size_t *size_ static void * H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5HL_dblk_t * dblk = NULL; /* Local heap data block deserialized */ + H5HL_dblk_t *dblk = NULL; /* Local heap data block deserialized */ H5HL_cache_dblk_ud_t *udata = (H5HL_cache_dblk_ud_t *)_udata; /* User data for callback */ - H5HL_dblk_t * ret_value; /* Return value */ + H5HL_dblk_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c index a85cf73..d06f0f0 100644 --- a/src/H5HLdbg.c +++ b/src/H5HLdbg.c @@ -39,10 +39,10 @@ herr_t H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth) { - H5HL_t * h = NULL; + H5HL_t *h = NULL; int free_block; H5HL_free_t *freelist; - uint8_t * marker = NULL; + uint8_t *marker = NULL; size_t amount_free = 0; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h index ad7daeb..a9dfb9e 100644 --- a/src/H5HLpkg.h +++ b/src/H5HLpkg.h @@ -97,7 +97,7 @@ struct H5HL_t { H5HL_dblk_t *dblk; /* The data block object for the heap */ haddr_t dblk_addr; /* address of data block */ size_t dblk_size; /* size of heap data block on disk and in mem */ - uint8_t * dblk_image; /* The data block image */ + uint8_t *dblk_image; /* The data block image */ }; /* Struct for heap data block */ diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index 186d3b4..091ec31 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -56,9 +56,9 @@ typedef struct H5HL_t H5HL_t; /* * Library prototypes */ -H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr /*out*/); +H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr /*out*/); H5_DLL H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw); -H5_DLL void * H5HL_offset_into(const H5HL_t *heap, size_t offset); +H5_DLL void *H5HL_offset_into(const H5HL_t *heap, size_t offset); H5_DLL herr_t H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size); H5_DLL herr_t H5HL_unprotect(H5HL_t *heap); H5_DLL size_t H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t size, const void *buf); @@ -195,7 +195,7 @@ static herr_t H5HP_sink_max(H5HP_t *heap, size_t loc) { int val; /* Temporary copy value of object to move in heap */ - void * obj; /* Temporary pointer to object to move in heap */ + void *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -263,7 +263,7 @@ static herr_t H5HP_sink_min(H5HP_t *heap, size_t loc) { int val; /* Temporary copy value of object to move in heap */ - void * obj; /* Temporary pointer to object to move in heap */ + void *obj; /* Temporary pointer to object to move in heap */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -76,17 +76,17 @@ typedef struct { hbool_t wrapped; /* Whether the id count has wrapped around */ unsigned id_count; /* Current number of IDs held */ hid_t nextid; /* ID to use for the next atom */ - H5SL_t * ids; /* Pointer to skip list that stores IDs */ + H5SL_t *ids; /* Pointer to skip list that stores IDs */ /* Fields for holding available IDs */ unsigned avail_count; /* # of available ID structures awaiting recycling */ - H5SL_t * avail_ids; /* pointer to skip list of available IDs */ + H5SL_t *avail_ids; /* pointer to skip list of available IDs */ } H5I_id_type_t; typedef struct { H5I_search_func_t app_cb; /* Application's callback routine */ - void * app_key; /* Application's "key" (user data) */ - void * ret_obj; /* Object to return */ + void *app_key; /* Application's "key" (user data) */ + void *ret_obj; /* Object to return */ } H5I_search_ud_t; /* User data for iterator callback when IDs have wrapped */ @@ -97,7 +97,7 @@ typedef struct { /* User data for iterator callback for ID iteration */ typedef struct { H5I_search_func_t user_func; /* 'User' function to invoke */ - void * user_udata; /* User data to pass to 'user' function */ + void *user_udata; /* User data to pass to 'user' function */ hbool_t app_ref; /* Whether this is an appl. ref. call */ } H5I_iterate_ud_t; @@ -134,8 +134,8 @@ H5FL_DEFINE_STATIC(H5I_class_t); static herr_t H5I__free_cb(void *_item, void *_key, void *_udata); static htri_t H5I__clear_type_cb(void *_id, void *key, void *udata); static int H5I__destroy_type(H5I_type_t type); -static void * H5I__remove_verify(hid_t id, H5I_type_t id_type); -static void * H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id); +static void *H5I__remove_verify(hid_t id, H5I_type_t id_type); +static void *H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id); static int H5I__inc_type_ref(H5I_type_t type); static int H5I__get_type_ref(H5I_type_t type); static H5I_id_info_t *H5I__find_id(hid_t id); @@ -595,7 +595,7 @@ done: static htri_t H5I__clear_type_cb(void *_id, void H5_ATTR_UNUSED *key, void *_udata) { - H5I_id_info_t * id = (H5I_id_info_t *)_id; /* Current ID being worked with */ + H5I_id_info_t *id = (H5I_id_info_t *)_id; /* Current ID being worked with */ H5I_clear_type_ud_t *udata = (H5I_clear_type_ud_t *)_udata; /* udata struct */ htri_t ret_value = FALSE; /* Return value */ @@ -926,7 +926,7 @@ void * H5I_subst(hid_t id, const void *new_object) { H5I_id_info_t *id_ptr; /* Pointer to the atom */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -960,7 +960,7 @@ void * H5I_object(hid_t id) { H5I_id_info_t *id_ptr; /* Pointer to the new atom */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1026,7 +1026,7 @@ void * H5I_object_verify(hid_t id, H5I_type_t id_type) { H5I_id_info_t *id_ptr = NULL; /* Pointer to the new atom */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1194,7 +1194,7 @@ static void * H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id) { H5I_id_info_t *curr_id; /* Pointer to the current atom */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC @@ -1266,7 +1266,7 @@ H5I_remove(hid_t id) { H5I_id_type_t *type_ptr; /* Pointer to the atomic type */ H5I_type_t type; /* Atom's atomic type */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1911,7 +1911,7 @@ void * H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key) { H5I_search_ud_t udata; /* Context for iteration */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_API(NULL) H5TRACE3("*x", "Itx*x", type, func, key); @@ -1952,7 +1952,7 @@ done: static int H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5I_id_info_t * item = (H5I_id_info_t *)_item; /* Pointer to the ID node */ + H5I_id_info_t *item = (H5I_id_info_t *)_item; /* Pointer to the ID node */ H5I_iterate_ud_t *udata = (H5I_iterate_ud_t *)_udata; /* User data for callback */ int ret_value = H5_ITER_CONT; /* Callback return value */ @@ -2207,7 +2207,7 @@ H5I__debug_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { H5I_id_info_t *item = (H5I_id_info_t *)_item; /* Pointer to the ID node */ H5I_type_t type = *(H5I_type_t *)_udata; /* User data */ - H5G_name_t * path = NULL; + H5G_name_t *path = NULL; int ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_STATIC_NOERR diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index 09ac2bf..eff0dde 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -65,12 +65,12 @@ H5_DLL herr_t H5I_register_type(const H5I_class_t *cls); H5_DLL int H5I_nmembers(H5I_type_t type); H5_DLL herr_t H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref); H5_DLL hid_t H5I_register(H5I_type_t type, const void *object, hbool_t app_ref); -H5_DLL void * H5I_subst(hid_t id, const void *new_object); -H5_DLL void * H5I_object(hid_t id); -H5_DLL void * H5I_object_verify(hid_t id, H5I_type_t id_type); +H5_DLL void *H5I_subst(hid_t id, const void *new_object); +H5_DLL void *H5I_object(hid_t id); +H5_DLL void *H5I_object_verify(hid_t id, H5I_type_t id_type); H5_DLL H5I_type_t H5I_get_type(hid_t id); H5_DLL hid_t H5I_get_file_id(hid_t obj_id, hbool_t app_ref); -H5_DLL void * H5I_remove(hid_t id); +H5_DLL void *H5I_remove(hid_t id); H5_DLL herr_t H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_ref); H5_DLL int H5I_get_ref(hid_t id, hbool_t app_ref); H5_DLL int H5I_inc_ref(hid_t id, hbool_t app_ref); @@ -65,19 +65,19 @@ typedef struct { /* User data for path traversal callback to creating a link */ typedef struct { - H5F_t * file; /* Pointer to the file */ - H5P_genplist_t * lc_plist; /* Link creation property list */ + H5F_t *file; /* Pointer to the file */ + H5P_genplist_t *lc_plist; /* Link creation property list */ hid_t dxpl_id; /* Dataset transfer property list */ - H5G_name_t * path; /* Path to object being linked */ + H5G_name_t *path; /* Path to object being linked */ H5O_obj_create_t *ocrt_info; /* Pointer to object creation info */ - H5O_link_t * lnk; /* Pointer to link information to insert */ + H5O_link_t *lnk; /* Pointer to link information to insert */ } H5L_trav_cr_t; /* User data for path traversal routine for moving and renaming a link */ typedef struct { const char *dst_name; /* Destination name for moving object */ H5T_cset_t cset; /* Char set for new name */ - H5G_loc_t * dst_loc; /* Destination location for moving object */ + H5G_loc_t *dst_loc; /* Destination location for moving object */ unsigned dst_target_flags; /* Target flags for destination object */ hbool_t copy; /* TRUE if this is a copy operation */ hid_t lapl_id; /* LAPL to use in callback */ @@ -86,7 +86,7 @@ typedef struct { /* User data for path traversal routine for moving and renaming an object */ typedef struct { - H5F_t * file; /* Pointer to the file */ + H5F_t *file; /* Pointer to the file */ H5O_link_t *lnk; /* Pointer to link information to insert */ hbool_t copy; /* TRUE if this is a copy operation */ hid_t dxpl_id; /* Dataset transfer property list */ @@ -95,7 +95,7 @@ typedef struct { /* User data for path traversal routine for getting link value */ typedef struct { size_t size; /* Size of user buffer */ - void * buf; /* User buffer */ + void *buf; /* User buffer */ } H5L_trav_gv_t; /* User data for path traversal routine for getting link value by index */ @@ -135,7 +135,7 @@ typedef struct { hid_t dxpl_id; /* DXPL to use in callback */ /* Out */ - char * name; /* Buffer to return name to user */ + char *name; /* Buffer to return name to user */ ssize_t name_len; /* Length of full name */ } H5L_trav_gnbi_t; @@ -1599,7 +1599,7 @@ H5L_link_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t H5_ATT H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/) { H5L_trav_cr_t *udata = (H5L_trav_cr_t *)_udata; /* User data passed in */ - H5G_t * grp = NULL; /* H5G_t for this group, opened to pass to user callback */ + H5G_t *grp = NULL; /* H5G_t for this group, opened to pass to user callback */ hid_t grp_id = FAIL; /* Id for this group (passed to user callback */ H5G_loc_t temp_loc; /* For UD callback */ hbool_t temp_loc_init = FALSE; /* Temporary location for UD callback (temp_loc) has been initialized */ @@ -1764,7 +1764,7 @@ static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name, H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id) { - char * norm_link_name = NULL; /* Pointer to normalized link name */ + char *norm_link_name = NULL; /* Pointer to normalized link name */ unsigned target_flags = H5G_TARGET_NORMAL; /* Flags to pass to group traversal function */ H5P_genplist_t *lc_plist = NULL; /* Link creation property list */ H5L_trav_cr_t udata; /* User data for callback */ @@ -1846,8 +1846,8 @@ herr_t H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name, const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id) { - char * norm_cur_name = NULL; /* Pointer to normalized current name */ - H5F_t * link_file = NULL; /* Pointer to file to link to */ + char *norm_cur_name = NULL; /* Pointer to normalized current name */ + H5F_t *link_file = NULL; /* Pointer to file to link to */ H5O_link_t lnk; /* Link to insert */ H5G_loc_t obj_loc; /* Location of object to link to */ H5G_name_t path; /* obj_loc's path*/ @@ -1918,7 +1918,7 @@ herr_t H5L_create_soft(const char *target_path, const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id) { - char * norm_target = NULL; /* Pointer to normalized current name */ + char *norm_target = NULL; /* Pointer to normalized current name */ H5O_link_t lnk; /* Link to insert */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2258,7 +2258,7 @@ herr_t H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id) { H5L_trav_rm_t udata; /* User data for callback */ - char * norm_name = NULL; /* Pointer to normalized name */ + char *norm_name = NULL; /* Pointer to normalized name */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -2343,7 +2343,7 @@ H5L_move_dest_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t H H5G_loc_t *obj_loc, void *_udata /*in,out*/, H5G_own_loc_t *own_loc /*out*/) { H5L_trav_mv2_t *udata = (H5L_trav_mv2_t *)_udata; /* User data passed in */ - H5G_t * grp = NULL; /* H5G_t for this group, opened to pass to user callback */ + H5G_t *grp = NULL; /* H5G_t for this group, opened to pass to user callback */ hid_t grp_id = FAIL; /* ID for this group (passed to user callback */ H5G_loc_t temp_loc; /* For UD callback */ hbool_t temp_loc_init = FALSE; @@ -2456,7 +2456,7 @@ H5L_move_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t *lnk, { H5L_trav_mv_t *udata = (H5L_trav_mv_t *)_udata; /* User data passed in */ H5L_trav_mv2_t udata_out; /* User data for H5L_move_dest_cb traversal */ - char * orig_name = NULL; /* The name of the link in this group */ + char *orig_name = NULL; /* The name of the link in this group */ hbool_t link_copied = FALSE; /* Has udata_out.lnk been allocated? */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index f620697..2a252d3 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -168,26 +168,26 @@ static hid_t H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, const void *_udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id) { - H5P_genplist_t * plist; /* Property list pointer */ - char * my_prefix; /* Library's copy of the prefix */ + H5P_genplist_t *plist; /* Property list pointer */ + char *my_prefix; /* Library's copy of the prefix */ H5G_loc_t root_loc; /* Location of root group in external file */ H5G_loc_t loc; /* Location of object */ - H5F_t * ext_file = NULL; /* File struct for external file */ - const uint8_t * p = (const uint8_t *)_udata; /* Pointer into external link buffer */ - const char * file_name; /* Name of file containing external link's object */ - char * full_name = NULL; /* File name with prefix */ - const char * obj_name; /* Name external link's object */ + H5F_t *ext_file = NULL; /* File struct for external file */ + const uint8_t *p = (const uint8_t *)_udata; /* Pointer into external link buffer */ + const char *file_name; /* Name of file containing external link's object */ + char *full_name = NULL; /* File name with prefix */ + const char *obj_name; /* Name external link's object */ size_t fname_len; /* Length of external link file name */ unsigned intent; /* File access permissions */ H5L_elink_cb_t cb_info; /* Callback info struct */ hid_t fapl_id = -1; /* File access property list for external link's file */ hid_t ext_obj = -1; /* ID for external link's object */ - char * parent_group_name = NULL; /* Temporary pointer to group name */ + char *parent_group_name = NULL; /* Temporary pointer to group name */ char local_group_name[H5L_EXT_TRAVERSE_BUF_SIZE]; /* Local buffer to hold group name */ - char * temp_file_name = NULL; /* Temporary pointer to file name */ + char *temp_file_name = NULL; /* Temporary pointer to file name */ size_t temp_file_name_len; /* Length of temporary file name */ - char * actual_file_name = NULL; /* Parent file's actual name */ - H5P_genplist_t * fa_plist; /* File access property list pointer */ + char *actual_file_name = NULL; /* Parent file's actual name */ + H5P_genplist_t *fa_plist; /* File access property list pointer */ H5F_close_degree_t fc_degree = H5F_CLOSE_WEAK; /* File close degree for target file */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -351,7 +351,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, const } /* end if */ ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, - fapl_id, H5AC_dxpl_id); + fapl_id, H5AC_dxpl_id); full_name = (char *)H5MM_xfree(full_name); if (ext_file != NULL) break; @@ -538,12 +538,12 @@ H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_i hid_t lcpl_id, hid_t lapl_id) { H5G_loc_t link_loc; /* Group location to create link */ - char * norm_obj_name = NULL; /* Pointer to normalized current name */ - void * ext_link_buf = NULL; /* Buffer to contain external link */ + char *norm_obj_name = NULL; /* Pointer to normalized current name */ + void *ext_link_buf = NULL; /* Buffer to contain external link */ size_t buf_size; /* Size of buffer to hold external link */ size_t file_name_len; /* Length of file name string */ size_t norm_obj_name_len; /* Length of normalized object name string */ - uint8_t * p; /* Pointer into external link buffer */ + uint8_t *p; /* Pointer into external link buffer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h index 14b58ee..30218c7 100644 --- a/src/H5Lprivate.h +++ b/src/H5Lprivate.h @@ -54,7 +54,7 @@ /* Structure for external link traversal callback property */ typedef struct H5L_elink_cb_t { H5L_elink_traverse_t func; - void * user_data; + void *user_data; } H5L_elink_cb_t; /*****************************/ @@ -86,8 +86,8 @@ H5_DLL herr_t H5L_get_val(H5G_loc_t *loc, const char *name, void *buf /*out*/, s H5_DLL herr_t H5L_register_external(void); /* User-defined link functions */ -H5_DLL herr_t H5L_register(const H5L_class_t *cls); -H5_DLL herr_t H5L_unregister(H5L_type_t id); +H5_DLL herr_t H5L_register(const H5L_class_t *cls); +H5_DLL herr_t H5L_unregister(H5L_type_t id); H5_DLL const H5L_class_t *H5L_find_class(H5L_type_t id); #endif /* H5Lprivate_H */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index a3a6b33..185aef7 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -182,7 +182,7 @@ typedef ssize_t (*H5L_query_func_t)(const char *link_name, const void *lnkdata, typedef struct { int version; /**< Version number of this struct */ H5L_type_t id; /**< Link type ID */ - const char * comment; /**< Comment for debugging */ + const char *comment; /**< Comment for debugging */ H5L_create_func_t create_func; /**< Callback during link creation */ H5L_move_func_t move_func; /**< Callback after moving link */ H5L_copy_func_t copy_func; /**< Callback after copying link */ diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c index 90a83c1..eeab2fb 100644 --- a/src/H5MFdbg.c +++ b/src/H5MFdbg.c @@ -51,7 +51,7 @@ /* User data for free space section iterator callback */ typedef struct { H5FS_t *fspace; /* Free space manager */ - FILE * stream; /* Stream for output */ + FILE *stream; /* Stream for output */ int indent; /* Indention amount */ int fwidth; /* Field width amount */ } H5MF_debug_iter_ud_t; @@ -91,7 +91,7 @@ typedef struct { static herr_t H5MF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata) { - H5MF_free_section_t * sect = (H5MF_free_section_t *)_sect; /* Section to dump info */ + H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect; /* Section to dump info */ H5MF_debug_iter_ud_t *udata = (H5MF_debug_iter_ud_t *)_udata; /* User data for callbacks */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5MFpkg.h b/src/H5MFpkg.h index cc90d72..63dae4f 100644 --- a/src/H5MFpkg.h +++ b/src/H5MFpkg.h @@ -116,7 +116,7 @@ typedef enum { /* User data for free space manager section callbacks */ typedef struct H5MF_sect_ud_t { /* Down */ - H5F_t * f; /* Pointer to file to operate on */ + H5F_t *f; /* Pointer to file to operate on */ hid_t dxpl_id; /* DXPL for VFD operations */ H5FD_mem_t alloc_type; /* Type of memory being allocated */ hbool_t allow_sect_absorb; /* Whether sections are allowed to absorb a block aggregator */ @@ -124,7 +124,7 @@ typedef struct H5MF_sect_ud_t { /* Up */ H5MF_shrink_type_t shrink; /* Type of shrink operation to perform */ - H5F_blk_aggr_t * aggr; /* Aggregator block to operate on */ + H5F_blk_aggr_t *aggr; /* Aggregator block to operate on */ } H5MF_sect_ud_t; /*****************************/ diff --git a/src/H5MFsection.c b/src/H5MFsection.c index 6d1772d..460962d 100644 --- a/src/H5MFsection.c +++ b/src/H5MFsection.c @@ -278,7 +278,7 @@ htri_t H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata) { const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect; /* File free section */ - H5MF_sect_ud_t * udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ + H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ haddr_t eoa; /* End of address space in the file */ haddr_t end; /* End of section to extend */ htri_t ret_value = FAIL; /* Return value */ @@ -381,7 +381,7 @@ herr_t H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata) { H5MF_free_section_t **sect = (H5MF_free_section_t **)_sect; /* File free section */ - H5MF_sect_ud_t * udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ + H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -128,9 +128,9 @@ done: static H5MP_page_t * H5MP_new_page(H5MP_pool_t *mp, size_t page_size) { - H5MP_page_t * new_page; /* New page created */ + H5MP_page_t *new_page; /* New page created */ H5MP_page_blk_t *first_blk; /* Pointer to first block in page */ - H5MP_page_t * ret_value = NULL; /* Return value */ + H5MP_page_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -193,10 +193,10 @@ done: void * H5MP_malloc(H5MP_pool_t *mp, size_t request) { - H5MP_page_t * alloc_page = NULL; /* Page to allocate space from */ + H5MP_page_t *alloc_page = NULL; /* Page to allocate space from */ H5MP_page_blk_t *alloc_free; /* Pointer to free space in page */ size_t needed; /* Size requested, plus block header and alignment */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -325,8 +325,8 @@ void * H5MP_free(H5MP_pool_t *mp, void *spc) { H5MP_page_blk_t *spc_blk; /* Block for space to free */ - H5MP_page_t * spc_page; /* Page containing block to free */ - void * ret_value = NULL; /* Return value */ + H5MP_page_t *spc_page; /* Page containing block to free */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5MPpkg.h b/src/H5MPpkg.h index 05c4bca..707227b 100644 --- a/src/H5MPpkg.h +++ b/src/H5MPpkg.h @@ -57,7 +57,7 @@ typedef struct H5MP_page_blk_t { size_t size; /* Size of block (includes this H5MP_page_blk_t info) */ unsigned is_free : 1; /* Flag to indicate the block is free */ - struct H5MP_page_t * page; /* Pointer to page block is located in */ + struct H5MP_page_t *page; /* Pointer to page block is located in */ struct H5MP_page_blk_t *prev; /* Pointer to previous block in page */ struct H5MP_page_blk_t *next; /* Pointer to next block in page */ } H5MP_page_blk_t; @@ -66,7 +66,7 @@ typedef struct H5MP_page_blk_t { typedef struct H5MP_page_t { size_t free_size; /* Total amount of free space in page */ unsigned fac_alloc : 1; /* Flag to indicate the page was allocated by the pool's factory */ - H5MP_page_blk_t * free_blk; /* Pointer to first free block in page */ + H5MP_page_blk_t *free_blk; /* Pointer to first free block in page */ struct H5MP_page_t *next; /* Pointer to next page in pool */ struct H5MP_page_t *prev; /* Pointer to previous page in pool */ } H5MP_page_t; @@ -77,7 +77,7 @@ struct H5MP_pool_t { size_t page_size; /* Page size for pool */ size_t free_size; /* Total amount of free space in pool */ size_t max_size; /* Maximum block that will fit in a standard page */ - H5MP_page_t * first; /* Pointer to first page in pool */ + H5MP_page_t *first; /* Pointer to first page in pool */ unsigned flags; /* Bit flags for pool settings */ }; diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h index 2b06650..d25ceff 100644 --- a/src/H5MPprivate.h +++ b/src/H5MPprivate.h @@ -50,8 +50,8 @@ typedef struct H5MP_pool_t H5MP_pool_t; /* Library-private Function Prototypes */ /***************************************/ H5_DLL H5MP_pool_t *H5MP_create(size_t page_size, unsigned flags); -H5_DLL void * H5MP_malloc(H5MP_pool_t *mp, size_t request); -H5_DLL void * H5MP_free(H5MP_pool_t *mp, void *spc); +H5_DLL void *H5MP_malloc(H5MP_pool_t *mp, size_t request); +H5_DLL void *H5MP_free(H5MP_pool_t *mp, void *spc); H5_DLL herr_t H5MP_close(H5MP_pool_t *mp); #endif /* H5MPprivate_H */ @@ -54,12 +54,12 @@ /* User data for recursive traversal over objects from a group */ typedef struct { hid_t obj_id; /* The ID for the starting group */ - H5G_loc_t * start_loc; /* Location of starting group */ + H5G_loc_t *start_loc; /* Location of starting group */ hid_t lapl_id; /* LAPL for walking across links */ hid_t dxpl_id; /* DXPL for operations */ - H5SL_t * visited; /* Skip list for tracking visited nodes */ + H5SL_t *visited; /* Skip list for tracking visited nodes */ H5O_iterate_t op; /* Application callback */ - void * op_data; /* Application's op data */ + void *op_data; /* Application's op data */ } H5O_iter_visit_ud_t; /********************/ @@ -1072,7 +1072,7 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc, hid_t o H5O_loc_t *loc /*out*/) { H5P_genplist_t *oc_plist; /* Object creation property list */ - H5O_t * oh = NULL; /* Object header created */ + H5O_t *oh = NULL; /* Object header created */ haddr_t oh_addr; /* Address of initial object header */ size_t oh_size; /* Size of initial object header */ uint8_t oh_flags; /* Object header's initial status flags */ @@ -1158,9 +1158,9 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc, hid_t o else #endif /* H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T */ if (size_hint > 65535) - oh->flags |= H5O_HDR_CHUNK0_4; - else if (size_hint > 255) - oh->flags |= H5O_HDR_CHUNK0_2; + oh->flags |= H5O_HDR_CHUNK0_4; + else if (size_hint > 255) + oh->flags |= H5O_HDR_CHUNK0_2; } /* end if */ else { /* Reset unused time fields */ @@ -1555,7 +1555,7 @@ done: int H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id) { - H5O_t * oh = NULL; + H5O_t *oh = NULL; hbool_t deleted = FALSE; /* Whether the object was deleted */ int ret_value; /* Return value */ @@ -1602,11 +1602,11 @@ done: H5O_t * H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot) { - H5O_t * oh = NULL; /* Object header protected */ + H5O_t *oh = NULL; /* Object header protected */ H5O_cache_ud_t udata; /* User data for protecting object header */ H5O_cont_msgs_t cont_msg_info; /* Continuation message info */ unsigned file_intent; /* R/W intent on file */ - H5O_t * ret_value; /* Return value */ + H5O_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2033,7 +2033,7 @@ done: herr_t H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to modify */ + H5O_t *oh = NULL; /* Object header to modify */ unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2147,7 +2147,7 @@ done: herr_t H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr) { - H5O_t * oh = NULL; /* Object header information */ + H5O_t *oh = NULL; /* Object header information */ H5O_loc_t loc; /* Object location for object to delete */ unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2316,7 +2316,7 @@ H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type) const H5O_obj_class_t * H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header for location */ + H5O_t *oh = NULL; /* Object header for location */ const H5O_obj_class_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -2642,7 +2642,7 @@ done: static herr_t H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr) { - const H5O_mesg_t * curr_msg; /* Pointer to current message being operated on */ + const H5O_mesg_t *curr_msg; /* Pointer to current message being operated on */ const H5O_chunk_t *curr_chunk; /* Pointer to current message being operated on */ unsigned u; /* Local index variable */ @@ -2720,7 +2720,7 @@ herr_t H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info_t *oinfo) { const H5O_obj_class_t *obj_class; /* Class of object for header */ - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -2936,7 +2936,7 @@ void * H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) { size_t u; /* Local index variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index 7768a2b..5057c12 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -35,13 +35,13 @@ static void *H5O_ainfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_ainfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_ainfo_copy(const void *_mesg, void *_dest); +static void *H5O_ainfo_copy(const void *_mesg, void *_dest); static size_t H5O_ainfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_ainfo_free(void *_mesg); static herr_t H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg); static herr_t H5O_ainfo_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata); -static void * H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id, @@ -102,9 +102,9 @@ H5O_ainfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - H5O_ainfo_t * ainfo = NULL; /* Attribute info */ + H5O_ainfo_t *ainfo = NULL; /* Attribute info */ unsigned char flags; /* Flags for encoding attribute info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -228,8 +228,8 @@ static void * H5O_ainfo_copy(const void *_mesg, void *_dest) { const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg; - H5O_ainfo_t * dest = (H5O_ainfo_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_ainfo_t *dest = (H5O_ainfo_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -395,7 +395,7 @@ H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t H5 { H5O_ainfo_t *ainfo_src = (H5O_ainfo_t *)mesg_src; H5O_ainfo_t *ainfo_dst = NULL; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index fe74ebe..5c7268f 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -323,7 +323,7 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t null_idx, const H5O_ms { H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk that message is in */ hbool_t chk_dirtied = FALSE; /* Flags for unprotecting chunk */ - H5O_mesg_t * alloc_msg; /* Pointer to null message to allocate out of */ + H5O_mesg_t *alloc_msg; /* Pointer to null message to allocate out of */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -493,7 +493,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, siz hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */ size_t delta; /* Change in chunk's size */ size_t aligned_size = H5O_ALIGN_OH(oh, size); - uint8_t * old_image; /* Old address of chunk's image in memory */ + uint8_t *old_image; /* Old address of chunk's image in memory */ size_t old_size; /* Old size of chunk */ htri_t was_extended; /* If chunk can be extended */ size_t extend_msg = 0; /* Index of null message to extend */ @@ -731,7 +731,7 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new unsigned null_msgno; /* Message index of null message immediately after message */ } alloc_info; - H5O_mesg_t * curr_msg; /* Pointer to current message to operate on */ + H5O_mesg_t *curr_msg; /* Pointer to current message to operate on */ H5O_chunk_proxy_t *chk_proxy; /* Chunk that message is in */ size_t cont_size; /*continuation message size */ size_t multi_size = 0; /* Size of all the messages in the last chunk */ @@ -739,8 +739,8 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size, size_t *new alloc_info found_attr = {-1, 0, 0, 0, 0}; /* Best fit attribute message */ alloc_info found_other = {-1, 0, 0, 0, 0}; /* Best fit other message */ size_t idx; /* Message number */ - uint8_t * p = NULL; /*ptr into new chunk */ - H5O_cont_t * cont = NULL; /*native continuation message */ + uint8_t *p = NULL; /*ptr into new chunk */ + H5O_cont_t *cont = NULL; /*native continuation message */ size_t chunkno; /* Chunk allocated */ haddr_t new_chunk_addr; unsigned u; /* Local index variable */ @@ -1260,7 +1260,7 @@ static htri_t H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u) { H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk that continuation message is in */ - H5O_mesg_t * cont_msg; /* Pointer to the continuation message */ + H5O_mesg_t *cont_msg; /* Pointer to the continuation message */ unsigned deleted_chunkno; /* Chunk # to delete */ hbool_t chk_dirtied = FALSE; /* Flags for unprotecting chunk */ htri_t ret_value = TRUE; /* Return value */ @@ -2138,10 +2138,10 @@ done: static herr_t H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno) { - H5O_chunk_t * chunk = &oh->chunk[chunkno]; /* Chunk to shrink */ + H5O_chunk_t *chunk = &oh->chunk[chunkno]; /* Chunk to shrink */ H5O_chunk_proxy_t *chk_proxy = NULL; /* Metadata cache proxy for chunk to shrink */ - H5O_mesg_t * curr_msg; /* Current message to examine */ - uint8_t * old_image = chunk->image; /* Old address of chunk's image in memory */ + H5O_mesg_t *curr_msg; /* Current message to examine */ + uint8_t *old_image = chunk->image; /* Old address of chunk's image in memory */ size_t old_size = chunk->size; /* Old size of chunk */ size_t new_size = chunk->size - chunk->gap; /* Size of shrunk chunk */ size_t total_msg_size; /* Size of the messages in this chunk */ @@ -2178,7 +2178,7 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno) if (curr_msg->raw + curr_msg->raw_size < old_image + new_size - sizeof_chksum) { unsigned v; /* Index */ H5O_mesg_t *curr_msg2; - uint8_t * src = curr_msg->raw + curr_msg->raw_size; /* Source location */ + uint8_t *src = curr_msg->raw + curr_msg->raw_size; /* Source location */ /* Slide down the raw data */ HDmemmove(curr_msg->raw - sizeof_msghdr, src, diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 03fd678..1bc916e 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -24,14 +24,14 @@ /* PRIVATE PROTOTYPES */ static herr_t H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg); -static void * H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); -static void * H5O_attr_copy(const void *_mesg, void *_dest); +static void *H5O_attr_copy(const void *_mesg, void *_dest); static size_t H5O_attr_size(const H5F_t *f, const void *_mesg); static herr_t H5O_attr_free(void *mesg); static herr_t H5O_attr_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata); -static void * H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src, +static void *H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, @@ -123,11 +123,11 @@ static void * H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p) { - H5A_t * attr = NULL; + H5A_t *attr = NULL; H5S_extent_t *extent; /*extent dimensionality information */ size_t name_len; /*attribute name length */ unsigned flags = 0; /* Attribute flags */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -773,7 +773,7 @@ static herr_t H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth) { const H5A_t *mesg = (const H5A_t *)_mesg; - const char * s; /* Temporary string pointer */ + const char *s; /* Temporary string pointer */ char buf[128]; /* Temporary string buffer */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c index fa78d9e..0218152 100644 --- a/src/H5Oattribute.c +++ b/src/H5Oattribute.c @@ -49,7 +49,7 @@ /* User data for iteration when converting attributes to dense storage */ typedef struct { - H5F_t * f; /* Pointer to file for insertion */ + H5F_t *f; /* Pointer to file for insertion */ hid_t dxpl_id; /* DXPL during iteration */ H5O_ainfo_t *ainfo; /* Attribute info struct */ } H5O_iter_cvt_t; @@ -77,7 +77,7 @@ typedef struct { /* User data for iteration when renaming an attribute */ typedef struct { /* down */ - H5F_t * f; /* Pointer to file attribute is in */ + H5F_t *f; /* Pointer to file attribute is in */ hid_t dxpl_id; /* DXPL for operation */ const char *old_name; /* Old name of attribute */ const char *new_name; /* New name of attribute */ @@ -89,12 +89,12 @@ typedef struct { /* User data for iteration when iterating over attributes */ typedef struct { /* down */ - H5F_t * f; /* Pointer to file attribute is in */ + H5F_t *f; /* Pointer to file attribute is in */ hid_t dxpl_id; /* DXPL for operation */ hid_t loc_id; /* ID of object being iterated over */ unsigned skip; /* # of attributes to skip over */ H5A_operator_t op; /* Callback routine for each attribute */ - void * op_data; /* User data for callback */ + void *op_data; /* User data for callback */ /* up */ unsigned count; /* Count of attributes examined */ @@ -103,7 +103,7 @@ typedef struct { /* User data for iteration when removing an attribute */ typedef struct { /* down */ - H5F_t * f; /* Pointer to file attribute is in */ + H5F_t *f; /* Pointer to file attribute is in */ hid_t dxpl_id; /* DXPL for operation */ const char *name; /* Name of attribute to open */ @@ -159,7 +159,7 @@ H5O_attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UN unsigned *oh_modified, void *_udata /*in,out*/) { H5O_iter_cvt_t *udata = (H5O_iter_cvt_t *)_udata; /* Operator user data */ - H5A_t * attr = (H5A_t *)mesg->native; /* Pointer to attribute to insert */ + H5A_t *attr = (H5A_t *)mesg->native; /* Pointer to attribute to insert */ herr_t ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -203,7 +203,7 @@ done: herr_t H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */ herr_t ret_value = SUCCEED; /* Return value */ @@ -448,12 +448,12 @@ done: H5A_t * 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_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ - H5A_t * exist_attr = NULL; /* Existing opened attribute object */ - H5A_t * opened_attr = NULL; /* Newly 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 */ + H5A_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -582,12 +582,12 @@ H5A_t * H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ H5A_attr_iter_op_t attr_op; /* Attribute operator */ - H5A_t * exist_attr = NULL; /* Existing opened attribute object */ - H5A_t * opened_attr = NULL; /* Newly 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 */ + H5A_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -662,7 +662,7 @@ done: static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char *name_to_open) { - hid_t * attr_id_list = NULL; /* List of IDs for opened attributes */ + hid_t *attr_id_list = NULL; /* List of IDs for opened attributes */ unsigned long loc_fnum; /* File serial # for object */ size_t num_open_attr; /* Number of opened attributes */ htri_t ret_value = FALSE; /* Return value */ @@ -818,7 +818,7 @@ static herr_t H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata /*in,out*/) { - H5O_iter_wrt_t * udata = (H5O_iter_wrt_t *)_udata; /* Operator user data */ + H5O_iter_wrt_t *udata = (H5O_iter_wrt_t *)_udata; /* Operator user data */ H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk that message is in */ hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */ herr_t ret_value = H5_ITER_CONT; /* Return value */ @@ -900,7 +900,7 @@ done: herr_t H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1022,7 +1022,7 @@ static herr_t H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_UNUSED sequence, unsigned *oh_modified, void *_udata /*in,out*/) { - H5O_iter_ren_t * udata = (H5O_iter_ren_t *)_udata; /* Operator user data */ + H5O_iter_ren_t *udata = (H5O_iter_ren_t *)_udata; /* Operator user data */ H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk that message is in */ hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */ herr_t ret_value = H5_ITER_CONT; /* Return value */ @@ -1146,7 +1146,7 @@ done: herr_t H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name, const char *new_name) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1235,7 +1235,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id, H5_inde H5_iter_order_t order, hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */ herr_t ret_value; /* Return value */ @@ -1529,7 +1529,7 @@ done: herr_t H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ htri_t ainfo_exists = FALSE; /* Whether the attribute info exists in the file */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1612,7 +1612,7 @@ herr_t H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ htri_t ainfo_exists = FALSE; /* Whether the attribute info exists in the file */ H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */ @@ -1794,7 +1794,7 @@ H5O_attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg /*in,out*/, unsign htri_t H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ htri_t ret_value; /* Return value */ @@ -1949,7 +1949,7 @@ done: int H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ hsize_t nattrs; /* Number of attributes */ int ret_value; /* Return value */ diff --git a/src/H5Obogus.c b/src/H5Obogus.c index ebb41c7..6c05fb3 100644 --- a/src/H5Obogus.c +++ b/src/H5Obogus.c @@ -112,7 +112,7 @@ H5O_bogus_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_bogus_t *mesg = NULL; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c index 15b56b1..63f1b46 100644 --- a/src/H5Obtreek.c +++ b/src/H5Obtreek.c @@ -25,10 +25,10 @@ #include "H5Opkg.h" /* Object headers */ #include "H5MMprivate.h" /* Memory management */ -static void * H5O_btreek_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_btreek_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_btreek_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_btreek_copy(const void *_mesg, void *_dest); +static void *H5O_btreek_copy(const void *_mesg, void *_dest); static size_t H5O_btreek_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_btreek_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -80,7 +80,7 @@ H5O_btreek_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_btreek_t *mesg; /* Native message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -160,8 +160,8 @@ static void * H5O_btreek_copy(const void *_mesg, void *_dest) { const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg; - H5O_btreek_t * dest = (H5O_btreek_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_btreek_t *dest = (H5O_btreek_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 9f1ed3f..5e8e120 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -144,17 +144,17 @@ H5FL_SEQ_DEFINE(H5O_cont_t); static H5O_t * H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5O_t * oh = NULL; /* Object header read in */ + H5O_t *oh = NULL; /* Object header read in */ H5O_cache_ud_t *udata = (H5O_cache_ud_t *)_udata; /* User data for callback */ - H5WB_t * wb = NULL; /* Wrapped buffer for prefix data */ + H5WB_t *wb = NULL; /* Wrapped buffer for prefix data */ uint8_t read_buf[H5O_SPEC_READ_SIZE]; /* Buffer for speculative read */ - const uint8_t * p; /* Pointer into buffer to decode */ - uint8_t * buf; /* Buffer to decode */ + const uint8_t *p; /* Pointer into buffer to decode */ + uint8_t *buf; /* Buffer to decode */ size_t spec_read_size; /* Size of buffer to speculatively read in */ size_t prefix_size; /* Size of object header prefix */ size_t buf_size; /* Size of prefix+chunk #0 buffer */ haddr_t eoa; /* Relative end of file address */ - H5O_t * ret_value; /* Return value */ + H5O_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -663,12 +663,12 @@ H5O_size(const H5F_t H5_ATTR_UNUSED *f, const H5O_t *oh, size_t *size_ptr) static H5O_chunk_proxy_t * H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5O_chunk_proxy_t * chk_proxy = NULL; /* Chunk proxy object */ + H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk proxy object */ H5O_chk_cache_ud_t *udata = (H5O_chk_cache_ud_t *)_udata; /* User data for callback */ - H5WB_t * wb = NULL; /* Wrapped buffer for prefix data */ + H5WB_t *wb = NULL; /* Wrapped buffer for prefix data */ uint8_t chunk_buf[H5O_SPEC_READ_SIZE]; /* Buffer for speculative read */ - uint8_t * buf; /* Buffer to decode */ - H5O_chunk_proxy_t * ret_value; /* Return value */ + uint8_t *buf; /* Buffer to decode */ + H5O_chunk_proxy_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1009,7 +1009,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, hbool_t *dirty) { const uint8_t *p; /* Pointer into buffer to decode */ - uint8_t * eom_ptr; /* Pointer to end of messages for a chunk */ + uint8_t *eom_ptr; /* Pointer to end of messages for a chunk */ size_t curmesg; /* Current message being decoded in object header */ unsigned merged_null_msgs = 0; /* Number of null messages merged together */ unsigned chunkno; /* Current chunk's index */ diff --git a/src/H5Ocont.c b/src/H5Ocont.c index d6f9939..5b95375 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -34,7 +34,7 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_cont_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_cont_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_cont_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static size_t H5O_cont_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -90,7 +90,7 @@ H5O_cont_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_cont_t *cont = NULL; - void * ret_value; + void *ret_value; FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index bb8dcc2..bfe75ca 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -54,13 +54,13 @@ /* Key object for skiplist of committed datatypes */ typedef struct H5O_copy_search_comm_dt_key_t { - H5T_t * dt; /* Datatype */ + H5T_t *dt; /* Datatype */ unsigned long fileno; /* File number */ } H5O_copy_search_comm_dt_key_t; /* Callback struct for building a list of committed datatypes */ typedef struct H5O_copy_search_comm_dt_ud_t { - H5SL_t * dst_dt_list; /* Skip list of committed datatypes */ + H5SL_t *dst_dt_list; /* Skip list of committed datatypes */ H5G_loc_t *dst_root_loc; /* Starting location for iteration */ H5O_loc_t obj_oloc; /* Object location (for attribute iteration callback) */ hid_t dxpl_id; /* Dataset transfer property list id */ @@ -303,11 +303,11 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid H5O_copy_t *cpy_info, H5O_type_t *obj_type, void **udata /*out*/) { H5O_addr_map_t *addr_map = NULL; /* Address mapping of object copied */ - H5O_t * oh_src = NULL; /* Object header for source object */ - H5O_t * oh_dst = NULL; /* Object header for destination object */ + H5O_t *oh_src = NULL; /* Object header for source object */ + H5O_t *oh_dst = NULL; /* Object header for destination object */ unsigned mesgno = 0; haddr_t addr_new = HADDR_UNDEF; - hbool_t * deleted = NULL; /* Array of flags indicating whether messages should be copied */ + hbool_t *deleted = NULL; /* Array of flags indicating whether messages should be copied */ hbool_t inserted = FALSE; /* Whether the destination object header has been inserted into the cache */ size_t null_msgs; /* Number of NULL messages found in each loop */ size_t orig_dst_msgs; /* Original # of messages in dest. object */ @@ -315,11 +315,11 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid H5O_mesg_t *mesg_dst; /* Message in source object header */ const H5O_msg_class_t *copy_type; /* Type of message to use for copying */ const H5O_obj_class_t *obj_class = NULL; /* Type of object we are copying */ - void * cpy_udata = NULL; /* User data for passing to message callbacks */ + void *cpy_udata = NULL; /* User data for passing to message callbacks */ uint64_t dst_oh_size; /* Total size of the destination OH */ size_t dst_oh_null; /* Size of the null message to add to destination OH */ size_t dst_oh_gap; /* Size of the gap in chunk #0 of destination OH */ - uint8_t * current_pos; /* Current position in destination image */ + uint8_t *current_pos; /* Current position in destination image */ size_t msghdr_size; herr_t ret_value = SUCCEED; @@ -365,7 +365,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, hid /* Search for a matching committed datatype, building the list if * necessary */ if ((merge = H5O_copy_search_comm_dt(oloc_src->file, oh_src, oloc_dst, dxpl_id, cpy_info)) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't search for matching committed datatype") + HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't search for matching committed datatype") if (merge) { /* Found a match, add to skip list and exit */ @@ -1000,7 +1000,7 @@ static herr_t H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t dxpl_id, hid_t ocpypl_id) { H5O_copy_t cpy_info; /* Information for copying object */ - H5P_genplist_t * ocpy_plist; /* Object copy property list created */ + H5P_genplist_t *ocpy_plist; /* Object copy property list created */ H5O_copy_dtype_merge_list_t *dt_list = NULL; /* List of datatype merge suggestions */ H5O_mcdt_cb_info_t cb_info; /* Callback info struct */ unsigned cpy_option = 0; /* Copy options */ @@ -1097,7 +1097,7 @@ H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_t H5G_name_t new_path; /* Copied object group hier. path */ H5O_loc_t new_oloc; /* Copied object object location */ H5G_loc_t new_loc; /* Group location of object copied */ - H5F_t * cached_dst_file; /* Cached destination file */ + H5F_t *cached_dst_file; /* Cached destination file */ hbool_t entry_inserted = FALSE; /* Flag to indicate that the new entry was inserted into a group */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1222,7 +1222,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id, H5F_t *file_ H5O_loc_t src_oloc; /* Temporary object location for source object */ H5G_loc_t dst_root_loc; /* The location of root group of the destination file */ const uint8_t *q; /* Pointer to source OID to store */ - uint8_t * p; /* Pointer to destination OID to store */ + uint8_t *p; /* Pointer to destination OID to store */ size_t i; /* Local index variable */ herr_t ret_value = SUCCEED; @@ -1278,7 +1278,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id, H5F_t *file_ else if (H5R_DATASET_REGION == ref_type) { hdset_reg_ref_t *src_ref = (hdset_reg_ref_t *)_src_ref; hdset_reg_ref_t *dst_ref = (hdset_reg_ref_t *)_dst_ref; - uint8_t * buf = NULL; /* Buffer to store serialized selection in */ + uint8_t *buf = NULL; /* Buffer to store serialized selection in */ H5HG_t hobjid; /* Heap object ID */ size_t buf_size; /* Length of object in heap */ @@ -1351,7 +1351,7 @@ done: static herr_t H5O_copy_free_comm_dt_cb(void *item, void *_key, void H5_ATTR_UNUSED *op_data) { - haddr_t * addr = (haddr_t *)item; + haddr_t *addr = (haddr_t *)item; H5O_copy_search_comm_dt_key_t *key = (H5O_copy_search_comm_dt_key_t *)_key; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1425,10 +1425,10 @@ done: static herr_t H5O_copy_search_comm_dt_attr_cb(const H5A_t *attr, void *_udata) { - H5O_copy_search_comm_dt_ud_t * udata = (H5O_copy_search_comm_dt_ud_t *)_udata; - H5T_t * dt = NULL; /* Datatype */ + H5O_copy_search_comm_dt_ud_t *udata = (H5O_copy_search_comm_dt_ud_t *)_udata; + H5T_t *dt = NULL; /* Datatype */ H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */ - haddr_t * addr = NULL; /* Destination address */ + haddr_t *addr = NULL; /* Destination address */ hbool_t obj_inserted = FALSE; /* Object inserted into skip list */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1506,10 +1506,10 @@ static herr_t H5O_copy_search_comm_dt_check(H5O_loc_t *obj_oloc, H5O_copy_search_comm_dt_ud_t *udata) { H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */ - haddr_t * addr = NULL; /* Destination address */ + haddr_t *addr = NULL; /* Destination address */ hbool_t obj_inserted = FALSE; /* Object inserted into skip list */ H5A_attr_iter_op_t attr_op; /* Attribute iteration operator */ - const H5O_obj_class_t * obj_class = NULL; /* Type of object */ + const H5O_obj_class_t *obj_class = NULL; /* Type of object */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1689,7 +1689,7 @@ H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*in H5O_copy_t *cpy_info) { H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */ - haddr_t * dst_addr; /* Destination datatype address */ + haddr_t *dst_addr; /* Destination datatype address */ H5G_loc_t dst_root_loc = {NULL, NULL}; /* Destination root group location */ H5O_copy_search_comm_dt_ud_t udata; /* Group iteration user data */ herr_t ret_value = FALSE; /* Return value */ @@ -1756,10 +1756,10 @@ H5O_copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*in else /* Check object and add to skip list if appropriate */ if (H5O_copy_search_comm_dt_check(&obj_oloc, &udata) < 0) { - if (H5G_loc_free(&obj_loc) < 0) - HERROR(H5E_OHDR, H5E_CANTRELEASE, "can't free location"); - HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't check object") - } /* end if */ + if (H5G_loc_free(&obj_loc) < 0) + HERROR(H5E_OHDR, H5E_CANTRELEASE, "can't free location"); + HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't check object") + } /* end if */ /* Free location */ if (H5G_loc_free(&obj_loc) < 0) @@ -1860,7 +1860,7 @@ H5O_copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst, hid H5O_copy_t *cpy_info) { H5O_copy_search_comm_dt_key_t *key = NULL; /* Skiplist key */ - haddr_t * addr = NULL; /* Destination object address */ + haddr_t *addr = NULL; /* Destination object address */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Odbg.c b/src/H5Odbg.c index eaf221a..7759860 100644 --- a/src/H5Odbg.c +++ b/src/H5Odbg.c @@ -495,7 +495,7 @@ done: herr_t H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth) { - H5O_t * oh = NULL; /* Object header to display */ + H5O_t *oh = NULL; /* Object header to display */ H5O_loc_t loc; /* Object location for object to delete */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c index df418ea..5ad982f 100644 --- a/src/H5Odrvinfo.c +++ b/src/H5Odrvinfo.c @@ -25,10 +25,10 @@ #include "H5Opkg.h" /* Object headers */ #include "H5MMprivate.h" /* Memory management */ -static void * H5O_drvinfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_drvinfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_drvinfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_drvinfo_copy(const void *_mesg, void *_dest); +static void *H5O_drvinfo_copy(const void *_mesg, void *_dest); static size_t H5O_drvinfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_drvinfo_reset(void *_mesg); static herr_t H5O_drvinfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, @@ -81,7 +81,7 @@ H5O_drvinfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_drvinfo_t *mesg; /* Native message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -176,8 +176,8 @@ static void * H5O_drvinfo_copy(const void *_mesg, void *_dest) { const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg; - H5O_drvinfo_t * dest = (H5O_drvinfo_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_drvinfo_t *dest = (H5O_drvinfo_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Odtype.c b/src/H5Odtype.c index c88d6f7..1da79dc 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -37,7 +37,7 @@ static herr_t H5O_dtype_set_share(void *_mesg, const H5O_shared_t *sh); static htri_t H5O_dtype_can_share(const void *_mesg); static herr_t H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata); -static void * H5O_dtype_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src, +static void *H5O_dtype_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_dtype_shared_post_copy_upd(const H5O_loc_t *src_oloc, const void *mesg_src, @@ -280,8 +280,8 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags /*in,out*/, const uint8_t ** unsigned ndims = 0; /* Number of dimensions of the array field */ htri_t can_upgrade; /* Whether we can upgrade this type's version */ hsize_t dim[H5O_LAYOUT_NDIMS]; /* Dimensions of the array */ - H5T_t * array_dt; /* Temporary pointer to the array datatype */ - H5T_t * temp_type; /* Temporary pointer to the field's datatype */ + H5T_t *array_dt; /* Temporary pointer to the array datatype */ + H5T_t *temp_type; /* Temporary pointer to the field's datatype */ /* Decode the field name */ dt->shared->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp); @@ -1108,7 +1108,7 @@ H5O_dtype_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5T_t *dt = NULL; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1189,8 +1189,8 @@ static void * H5O_dtype_copy(const void *_src, void *_dst) { const H5T_t *src = (const H5T_t *)_src; - H5T_t * dst; - void * ret_value; /* Return value */ + H5T_t *dst; + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1516,7 +1516,7 @@ static herr_t H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata) { - const H5T_t * dt_src = (const H5T_t *)mesg_src; /* Source datatype */ + const H5T_t *dt_src = (const H5T_t *)mesg_src; /* Source datatype */ H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1567,7 +1567,7 @@ H5O_dtype_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const H5O_msg_class_t *mesg_ hid_t H5_ATTR_UNUSED dxpl_id) { H5T_t *dst_mesg; /* Destination datatype */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1643,7 +1643,7 @@ static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth) { const H5T_t *dt = (const H5T_t *)mesg; - const char * s; + const char *s; char buf[256]; unsigned i; size_t k; diff --git a/src/H5Oefl.c b/src/H5Oefl.c index 1ae14da..0e43bcb 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -26,13 +26,13 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_efl_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_efl_copy(const void *_mesg, void *_dest); +static void *H5O_efl_copy(const void *_mesg, void *_dest); static size_t H5O_efl_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_efl_reset(void *_mesg); -static void * H5O_efl_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_efl_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_efl_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -86,12 +86,12 @@ static void * H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - H5O_efl_t * mesg = NULL; + H5O_efl_t *mesg = NULL; int version; const char *s = NULL; - H5HL_t * heap; + H5HL_t *heap; size_t u; /* Local index variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -251,9 +251,9 @@ static void * H5O_efl_copy(const void *_mesg, void *_dest) { const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; - H5O_efl_t * dest = (H5O_efl_t *)_dest; + H5O_efl_t *dest = (H5O_efl_t *)_dest; size_t u; /* Local index variable */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -450,9 +450,9 @@ H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_ds { H5O_efl_t *efl_src = (H5O_efl_t *)mesg_src; H5O_efl_t *efl_dst = NULL; - H5HL_t * heap = NULL; /* Pointer to local heap for EFL file names */ + H5HL_t *heap = NULL; /* Pointer to local heap for EFL file names */ size_t idx, size, name_offset, heap_size; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Ofill.c b/src/H5Ofill.c index e699a70..5482daf 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -30,15 +30,15 @@ #include "H5Pprivate.h" /* Property lists */ #include "H5Sprivate.h" /* Dataspaces */ -static void * H5O_fill_old_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_fill_old_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_fill_old_encode(H5F_t *f, uint8_t *p, const void *_mesg); static size_t H5O_fill_old_size(const H5F_t *f, const void *_mesg); -static void * H5O_fill_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_fill_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_fill_new_encode(H5F_t *f, uint8_t *p, const void *_mesg); static size_t H5O_fill_new_size(const H5F_t *f, const void *_mesg); -static void * H5O_fill_copy(const void *_mesg, void *_dest); +static void *H5O_fill_copy(const void *_mesg, void *_dest); static herr_t H5O_fill_reset(void *_mesg); static herr_t H5O_fill_free(void *_mesg); static herr_t H5O_fill_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, @@ -186,9 +186,9 @@ H5O_fill_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_fill_t * fill = NULL; + H5O_fill_t *fill = NULL; const uint8_t *p_end = p + p_size - 1; /* End of the p buffer */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -307,9 +307,9 @@ H5O_fill_old_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_fill_t * fill = NULL; /* Decoded fill value message */ + H5O_fill_t *fill = NULL; /* Decoded fill value message */ const uint8_t *p_end = p + p_size - 1; /* End of the p buffer */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -502,8 +502,8 @@ static void * H5O_fill_copy(const void *_src, void *_dst) { const H5O_fill_t *src = (const H5O_fill_t *)_src; - H5O_fill_t * dst = (H5O_fill_t *)_dst; - void * ret_value; + H5O_fill_t *dst = (H5O_fill_t *)_dst; + void *ret_value; FUNC_ENTER_NOAPI_NOINIT @@ -916,7 +916,7 @@ herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed, hid_t dxpl_id) { H5T_path_t *tpath; /* Type conversion info */ - void * buf = NULL, *bkg = NULL; /* Conversion buffers */ + void *buf = NULL, *bkg = NULL; /* Conversion buffers */ hid_t src_id = -1, dst_id = -1; /* Datatype identifiers */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c index 4ae2d31..ad7bf26 100644 --- a/src/H5Oginfo.c +++ b/src/H5Oginfo.c @@ -33,7 +33,7 @@ static void *H5O_ginfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_ginfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_ginfo_copy(const void *_mesg, void *_dest); +static void *H5O_ginfo_copy(const void *_mesg, void *_dest); static size_t H5O_ginfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_ginfo_free(void *_mesg); static herr_t H5O_ginfo_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, @@ -94,9 +94,9 @@ H5O_ginfo_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - H5O_ginfo_t * ginfo = NULL; /* Pointer to group information message */ + H5O_ginfo_t *ginfo = NULL; /* Pointer to group information message */ unsigned char flags; /* Flags for encoding group info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -216,8 +216,8 @@ static void * H5O_ginfo_copy(const void *_mesg, void *_dest) { const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg; - H5O_ginfo_t * dest = (H5O_ginfo_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_ginfo_t *dest = (H5O_ginfo_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 1931bf2..3421415 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -32,15 +32,15 @@ /* Local macros */ /* PRIVATE PROTOTYPES */ -static void * H5O_layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_layout_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_layout_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_layout_copy(const void *_mesg, void *_dest); +static void *H5O_layout_copy(const void *_mesg, void *_dest); static size_t H5O_layout_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_layout_reset(void *_mesg); static herr_t H5O_layout_free(void *_mesg); static herr_t H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg); -static void * H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_layout_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -92,10 +92,10 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED * unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_layout_t * mesg = NULL; + H5O_layout_t *mesg = NULL; unsigned u; const uint8_t *p_end = p + p_size - 1; /* End of the p buffer */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -376,8 +376,8 @@ static void * H5O_layout_copy(const void *_mesg, void *_dest) { const H5O_layout_t *mesg = (const H5O_layout_t *)_mesg; - H5O_layout_t * dest = (H5O_layout_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_layout_t *dest = (H5O_layout_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -587,11 +587,11 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t H unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id) { H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */ - H5O_layout_t * layout_src = (H5O_layout_t *)mesg_src; - H5O_layout_t * layout_dst = NULL; + H5O_layout_t *layout_src = (H5O_layout_t *)mesg_src; + H5O_layout_t *layout_dst = NULL; hbool_t copied = FALSE; /* Whether the data was copied */ - H5D_shared_t * shared_fo = (H5D_shared_t *)cpy_info->shared_fo; - void * ret_value; /* Return value */ + H5D_shared_t *shared_fo = (H5D_shared_t *)cpy_info->shared_fo; + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c index 23fe50b..f0d9e74 100644 --- a/src/H5Olinfo.c +++ b/src/H5Olinfo.c @@ -37,11 +37,11 @@ static void *H5O_linfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_linfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_linfo_copy(const void *_mesg, void *_dest); +static void *H5O_linfo_copy(const void *_mesg, void *_dest); static size_t H5O_linfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_linfo_free(void *_mesg); static herr_t H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg); -static void * H5O_linfo_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_linfo_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_linfo_post_copy_file(const H5O_loc_t *parent_src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, unsigned *mesg_flags, @@ -84,10 +84,10 @@ const H5O_msg_class_t H5O_MSG_LINFO[1] = {{ /* Data exchange structure to use when copying links from src to dst */ typedef struct { const H5O_loc_t *src_oloc; /* Source object location */ - H5O_loc_t * dst_oloc; /* Destination object location */ - H5O_linfo_t * dst_linfo; /* Destination object's link info message */ + H5O_loc_t *dst_oloc; /* Destination object location */ + H5O_linfo_t *dst_linfo; /* Destination object's link info message */ hid_t dxpl_id; /* DXPL for operation */ - H5O_copy_t * cpy_info; /* Information for copy operation */ + H5O_copy_t *cpy_info; /* Information for copy operation */ } H5O_linfo_postcopy_ud_t; /* Declare a free list to manage the H5O_linfo_t struct */ @@ -111,9 +111,9 @@ H5O_linfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *o unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - H5O_linfo_t * linfo = NULL; /* Link info */ + H5O_linfo_t *linfo = NULL; /* Link info */ unsigned char index_flags; /* Flags for encoding link index info */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -238,8 +238,8 @@ static void * H5O_linfo_copy(const void *_mesg, void *_dest) { const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg; - H5O_linfo_t * dest = (H5O_linfo_t *)_dest; - void * ret_value; /* Return value */ + H5O_linfo_t *dest = (H5O_linfo_t *)_dest; + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -370,10 +370,10 @@ H5O_linfo_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t *fil hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id) { - H5O_linfo_t * linfo_src = (H5O_linfo_t *)native_src; - H5O_linfo_t * linfo_dst = NULL; + H5O_linfo_t *linfo_src = (H5O_linfo_t *)native_src; + H5O_linfo_t *linfo_dst = NULL; H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *)_udata; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -483,7 +483,7 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_lo unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info) { const H5O_linfo_t *linfo_src = (const H5O_linfo_t *)mesg_src; - H5O_linfo_t * linfo_dst = (H5O_linfo_t *)mesg_dst; + H5O_linfo_t *linfo_dst = (H5O_linfo_t *)mesg_dst; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Olink.c b/src/H5Olink.c index 7e2b9e1..a99589c 100644 --- a/src/H5Olink.c +++ b/src/H5Olink.c @@ -36,16 +36,16 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_link_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_link_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_link_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_link_copy(const void *_mesg, void *_dest); +static void *H5O_link_copy(const void *_mesg, void *_dest); static size_t H5O_link_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_link_reset(void *_mesg); static herr_t H5O_link_free(void *_mesg); static herr_t H5O_link_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata); -static void * H5O_link_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_link_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); static herr_t H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id, @@ -117,11 +117,11 @@ H5O_link_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_link_t * lnk = NULL; /* Pointer to link message */ + H5O_link_t *lnk = NULL; /* Pointer to link message */ size_t len = 0; /* Length of a string in the message */ unsigned char link_flags; /* Flags for encoding link info */ const uint8_t *p_end = p + p_size; /* End of the p buffer */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -417,8 +417,8 @@ static void * H5O_link_copy(const void *_mesg, void *_dest) { const H5O_link_t *lnk = (const H5O_link_t *)_mesg; - H5O_link_t * dest = (H5O_link_t *)_dest; - void * ret_value; /* Return value */ + H5O_link_t *dest = (H5O_link_t *)_dest; + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -728,7 +728,7 @@ H5O_link_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t H5_AT hid_t H5_ATTR_UNUSED dxpl_id) { H5O_link_t *link_src = (H5O_link_t *)native_src; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -767,7 +767,7 @@ H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info) { const H5O_link_t *link_src = (const H5O_link_t *)mesg_src; - H5O_link_t * link_dst = (H5O_link_t *)mesg_dst; + H5O_link_t *link_dst = (H5O_link_t *)mesg_dst; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Omessage.c b/src/H5Omessage.c index 2482985..c2770e2 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -50,12 +50,12 @@ /* User data for iteration while removing a message */ typedef struct { - H5F_t * f; /* Pointer to file for insertion */ + H5F_t *f; /* Pointer to file for insertion */ hid_t dxpl_id; /* DXPL during iteration */ int sequence; /* Sequence # to search for */ unsigned nfailed; /* # of failed message removals */ H5O_operator_t op; /* Callback routine for removal operations */ - void * op_data; /* Callback data for removal operations */ + void *op_data; /* Callback data for removal operations */ hbool_t adj_link; /* Whether to adjust links when removing messages */ } H5O_iter_rm_t; @@ -240,7 +240,7 @@ herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to use */ + H5O_t *oh = NULL; /* Object header to use */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ herr_t ret_value = SUCCEED; /* Return value */ @@ -440,7 +440,7 @@ void * H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg, hid_t dxpl_id) { H5O_t *oh = NULL; /* Object header to use */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -492,7 +492,7 @@ H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, void *mesg { const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ unsigned idx; /* Message's index in object header */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -619,7 +619,7 @@ void * H5O_msg_free(unsigned type_id, void *mesg) { const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -712,7 +712,7 @@ void * H5O_msg_copy(unsigned type_id, const void *mesg, void *dst) { const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -748,7 +748,7 @@ done: int H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to operate on */ + H5O_t *oh = NULL; /* Object header to operate on */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ unsigned msg_count; /* Message count */ int ret_value = FAIL; /* Return value */ @@ -921,7 +921,7 @@ done: herr_t H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj_link, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ herr_t ret_value; /* Return value */ @@ -971,7 +971,7 @@ herr_t H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence, H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ herr_t ret_value; /* Return value */ @@ -1156,7 +1156,7 @@ herr_t H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id, const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Pointer to actual object header */ + H5O_t *oh = NULL; /* Pointer to actual object header */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ herr_t ret_value; /* Return value */ @@ -1342,7 +1342,7 @@ size_t H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id, const void *mesg, size_t extra_raw) { const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - H5P_genplist_t * ocpl; /* Object Creation Property list */ + H5P_genplist_t *ocpl; /* Object Creation Property list */ uint8_t oh_flags; /* Object header status flags */ size_t ret_value; /* Return value */ @@ -1741,7 +1741,7 @@ H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, size_t { const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ unsigned ioflags = 0; /* Flags for decode routine */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1889,7 +1889,7 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t idx, const H5O_msg_clas unsigned mesg_flags, unsigned update_flags) { H5O_chunk_proxy_t *chk_proxy = NULL; /* Chunk that message is in */ - H5O_mesg_t * idx_msg = &oh->mesg[idx]; /* Pointer to message to modify */ + H5O_mesg_t *idx_msg = &oh->mesg[idx]; /* Pointer to message to modify */ hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2184,9 +2184,9 @@ done: int H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to use */ + H5O_t *oh = NULL; /* Object header to use */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - H5O_mesg_t * idx_msg; /* Pointer to message to modify */ + H5O_mesg_t *idx_msg; /* Pointer to message to modify */ unsigned idx; /* Index of message to modify */ int ret_value; /* Return value */ @@ -2237,9 +2237,9 @@ done: herr_t H5O_msg_lock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to use */ + H5O_t *oh = NULL; /* Object header to use */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - H5O_mesg_t * idx_msg; /* Pointer to message to modify */ + H5O_mesg_t *idx_msg; /* Pointer to message to modify */ unsigned idx; /* Index of message to modify */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2293,9 +2293,9 @@ done: herr_t H5O_msg_unlock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header to use */ + H5O_t *oh = NULL; /* Object header to use */ const H5O_msg_class_t *type; /* Actual H5O class type for the ID */ - H5O_mesg_t * idx_msg; /* Pointer to message to modify */ + H5O_mesg_t *idx_msg; /* Pointer to message to modify */ unsigned idx; /* Index of message to modify */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 523f9dc..c1b0d87 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -25,7 +25,7 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Opkg.h" /* Object headers */ -static void * H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_mtime_new_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static size_t H5O_mtime_new_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -33,7 +33,7 @@ static size_t H5O_mtime_new_size(const H5F_t *f, hbool_t disable_shared, const v static void *H5O_mtime_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_mtime_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_mtime_copy(const void *_mesg, void *_dest); +static void *H5O_mtime_copy(const void *_mesg, void *_dest); static size_t H5O_mtime_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_mtime_reset(void *_mesg); static herr_t H5O_mtime_free(void *_mesg); @@ -121,9 +121,9 @@ H5O_mtime_new_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_ unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - time_t * mesg; + time_t *mesg; uint32_t tmp_time; /* Temporary copy of the time */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -176,10 +176,10 @@ H5O_mtime_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - time_t * mesg, the_time; + time_t *mesg, the_time; struct tm tm; int i; /* Local index variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -272,7 +272,7 @@ H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg) { const time_t *mesg = (const time_t *)_mesg; - struct tm * tm; + struct tm *tm; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -308,8 +308,8 @@ static void * H5O_mtime_copy(const void *_mesg, void *_dest) { const time_t *mesg = (const time_t *)_mesg; - time_t * dest = (time_t *)_dest; - void * ret_value = NULL; /* Return value */ + time_t *dest = (time_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -452,7 +452,7 @@ H5O_mtime_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const voi int indent, int fwidth) { const time_t *mesg = (const time_t *)_mesg; - struct tm * tm; + struct tm *tm; char buf[128]; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5Oname.c b/src/H5Oname.c index 68a225a..661bfc3 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -30,10 +30,10 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_name_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_name_copy(const void *_mesg, void *_dest); +static void *H5O_name_copy(const void *_mesg, void *_dest); static size_t H5O_name_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_name_reset(void *_mesg); static herr_t H5O_name_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, @@ -84,7 +84,7 @@ H5O_name_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_name_t *mesg; - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -158,8 +158,8 @@ static void * H5O_name_copy(const void *_mesg, void *_dest) { const H5O_name_t *mesg = (const H5O_name_t *)_mesg; - H5O_name_t * dest = (H5O_name_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_name_t *dest = (H5O_name_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Opkg.h b/src/H5Opkg.h index 06cecdd..39451e7 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -233,8 +233,8 @@ struct H5O_mesg_t { uint8_t flags; /* message flags */ H5O_msg_crt_idx_t crt_idx; /* message creation index */ unsigned chunkno; /* chunk number for this mesg */ - void * native; /* native format message */ - uint8_t * raw; /* pointer to raw data */ + void *native; /* native format message */ + uint8_t *raw; /* pointer to raw data */ size_t raw_size; /* size with alignment */ }; @@ -321,7 +321,7 @@ typedef struct H5O_addr_map_t { hbool_t is_locked; /* Indicate that the destination object is locked currently */ hsize_t inc_ref_count; /* Number of deferred increments to reference count */ const H5O_obj_class_t *obj_class; /* Object class */ - void * udata; /* Object class copy file udata */ + void *udata; /* Object class copy file udata */ } H5O_addr_map_t; /* Stack of continuation messages to interpret */ @@ -333,7 +333,7 @@ typedef struct H5O_cont_msgs_t { /* Common callback information for loading object header prefix from disk */ typedef struct H5O_common_cache_ud_t { - H5F_t * f; /* Pointer to file for object header/chunk */ + H5F_t *f; /* Pointer to file for object header/chunk */ hid_t dxpl_id; /* DXPL for operation */ unsigned file_intent; /* Read/write intent for file */ unsigned merged_null_msgs; /* Number of null messages merged together */ @@ -354,14 +354,14 @@ typedef struct H5O_chunk_proxy_t { H5AC_info_t cache_info; /* Information for metadata cache functions, _must_ be */ /* first field in structure */ - H5O_t * oh; /* Object header for this chunk */ + H5O_t *oh; /* Object header for this chunk */ unsigned chunkno; /* Chunk number for this chunk */ } H5O_chunk_proxy_t; /* Callback information for loading object header chunk from disk */ typedef struct H5O_chk_cache_ud_t { hbool_t decoding; /* Whether the object header is being decoded */ - H5O_t * oh; /* Object header for this chunk */ + H5O_t *oh; /* Object header for this chunk */ unsigned chunkno; /* Index of chunk being brought in (for re-loads) */ size_t size; /* Size of chunk in the file */ H5O_common_cache_ud_t common; /* Common object header cache callback info */ @@ -523,19 +523,19 @@ H5_DLL herr_t H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5 unsigned mesg_flags, unsigned update_flags, void *mesg); H5_DLL herr_t H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, unsigned mesg_flags, unsigned update_flags, void *mesg); -H5_DLL void * H5O_msg_free_real(const H5O_msg_class_t *type, void *mesg); +H5_DLL void *H5O_msg_free_real(const H5O_msg_class_t *type, void *mesg); H5_DLL herr_t H5O_msg_free_mesg(H5O_mesg_t *mesg); H5_DLL unsigned H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type); H5_DLL herr_t H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, int sequence, H5O_operator_t op, void *op_data, hbool_t adj_link, hid_t dxpl_id); -H5_DLL void * H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src, void *mesg_src, H5F_t *file_dst, +H5_DLL void *H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); H5_DLL herr_t H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, const H5O_mesg_operator_t *op, void *op_data, hid_t dxpl_id); /* Object header chunk routines */ -H5_DLL herr_t H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx); +H5_DLL herr_t H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx); H5_DLL H5O_chunk_proxy_t *H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx); H5_DLL herr_t H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, hbool_t chk_dirtied); H5_DLL herr_t H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx); diff --git a/src/H5Opline.c b/src/H5Opline.c index fae2d9e..449eaaf 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -108,12 +108,12 @@ H5O_pline_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5 unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_pline_t * pline = NULL; /* Pipeline message */ + H5O_pline_t *pline = NULL; /* Pipeline message */ H5Z_filter_info_t *filter; /* Filter to decode */ size_t name_length; /* Length of filter name */ size_t i; /* Local index variable */ - const uint8_t * p_end = p + p_size - 1; /* End of the p buffer */ - void * ret_value = NULL; /* Return value */ + const uint8_t *p_end = p + p_size - 1; /* End of the p buffer */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -249,7 +249,7 @@ done: static herr_t H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg) { - const H5O_pline_t * pline = (const H5O_pline_t *)mesg; /* Pipeline message to encode */ + const H5O_pline_t *pline = (const H5O_pline_t *)mesg; /* Pipeline message to encode */ const H5Z_filter_info_t *filter; /* Filter to encode */ size_t i, j; /* Local index variables */ @@ -351,9 +351,9 @@ static void * H5O_pline_copy(const void *_src, void *_dst /*out*/) { const H5O_pline_t *src = (const H5O_pline_t *)_src; /* Source pipeline message */ - H5O_pline_t * dst = (H5O_pline_t *)_dst; /* Destination pipeline message */ + H5O_pline_t *dst = (H5O_pline_t *)_dst; /* Destination pipeline message */ size_t i; /* Local index variable */ - H5O_pline_t * ret_value = NULL; /* Return value */ + H5O_pline_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -586,7 +586,7 @@ static herr_t H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata) { - const H5O_pline_t * pline_src = (const H5O_pline_t *)mesg_src; /* Source datatype */ + const H5O_pline_t *pline_src = (const H5O_pline_t *)mesg_src; /* Source datatype */ H5O_copy_file_ud_common_t *udata = (H5O_copy_file_ud_common_t *)_udata; /* Object copying user data */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 27a0a4a..477a929 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -144,7 +144,7 @@ typedef union { /* The object location information for an object */ typedef struct H5O_loc_t { - H5F_t * file; /* File that object header is located within */ + H5F_t *file; /* File that object header is located within */ haddr_t addr; /* File address of object header */ hbool_t holding_file; /* True if this object header has incremented * its file's count of open objects. */ @@ -152,14 +152,14 @@ typedef struct H5O_loc_t { /* Typedef for linked list of datatype merge suggestions */ typedef struct H5O_copy_dtype_merge_list_t { - char * path; /* Path to datatype in destination file */ + char *path; /* Path to datatype in destination file */ struct H5O_copy_dtype_merge_list_t *next; /* Next object in list */ } H5O_copy_dtype_merge_list_t; /* Structure for callback property before searching the global list of committed datatypes at destination */ typedef struct H5O_mcdt_cb_info_t { H5O_mcdt_search_cb_t func; - void * user_data; + void *user_data; } H5O_mcdt_cb_info_t; /* Settings/flags for copying an object */ @@ -174,12 +174,12 @@ typedef struct H5O_copy_t { H5O_copy_dtype_merge_list_t *dst_dt_suggestion_list; /* Suggestions for merging committed datatypes */ int curr_depth; /* Current depth in hierarchy copied */ int max_depth; /* Maximum depth in hierarchy to copy */ - H5SL_t * map_list; /* Skip list to hold address mappings */ - H5SL_t * dst_dt_list; /* Skip list to hold committed datatypes in dest file */ + H5SL_t *map_list; /* Skip list to hold address mappings */ + H5SL_t *dst_dt_list; /* Skip list to hold committed datatypes in dest file */ hbool_t dst_dt_list_complete; /* Whether the destination datatype list is complete (i.e. not only populated with "suggestions" from H5Padd_merge_committed_dtype_path) */ - H5O_t * oh_dst; /* The destination object header */ - void * shared_fo; /* The shared pointer for the object */ + H5O_t *oh_dst; /* The destination object header */ + void *shared_fo; /* The shared pointer for the object */ H5O_mcdt_search_cb_t mcdt_cb; /* The callback to invoke before searching the global list of committed datatypes at destination */ void *mcdt_ud; /* User data passed to callback */ @@ -254,7 +254,7 @@ typedef struct H5O_mesg_loc_t { */ typedef struct H5O_shared_t { unsigned type; /* Type describing how message is shared */ - H5F_t * file; /* File that message is located within */ + H5F_t *file; /* File that message is located within */ unsigned msg_type_id; /* Message's type ID */ union { H5O_mesg_loc_t loc; /* Object location info */ @@ -312,9 +312,9 @@ typedef struct H5O_fill_t { H5O_shared_t sh_loc; /* Shared message info (must be first) */ unsigned version; /* Encoding version number */ - H5T_t * type; /*type. Null implies same as dataset */ + H5T_t *type; /*type. Null implies same as dataset */ ssize_t size; /*number of bytes in the fill value */ - void * buf; /*the fill value */ + void *buf; /*the fill value */ H5D_alloc_time_t alloc_time; /* time to allocate space */ H5D_fill_time_t fill_time; /* time to write fill value */ hbool_t fill_defined; /* whether fill value is defined */ @@ -333,7 +333,7 @@ typedef struct H5O_link_soft_t { } H5O_link_soft_t; typedef struct H5O_link_ud_t { - void * udata; /* Opaque data supplied by the user */ + void *udata; /* Opaque data supplied by the user */ size_t size; /* Size of udata */ } H5O_link_ud_t; @@ -342,7 +342,7 @@ typedef struct H5O_link_t { hbool_t corder_valid; /* Creation order for link is valid (not stored) */ int64_t corder; /* Creation order for link (stored if it's valid) */ H5T_cset_t cset; /* Character set of link name */ - char * name; /* Link name */ + char *name; /* Link name */ union { H5O_link_hard_t hard; /* Information for hard links */ H5O_link_soft_t soft; /* Information for soft links */ @@ -359,7 +359,7 @@ typedef struct H5O_link_t { typedef struct H5O_efl_entry_t { size_t name_offset; /*offset of name within heap */ - char * name; /*malloc'd name */ + char *name; /*malloc'd name */ off_t offset; /*offset of data within file */ hsize_t size; /*size allocated within file */ } H5O_efl_entry_t; @@ -416,7 +416,7 @@ typedef struct H5O_storage_chunk_t { typedef struct H5O_storage_compact_t { hbool_t dirty; /* Dirty flag for compact dataset */ size_t size; /* Size of buffer in bytes */ - void * buf; /* Buffer for compact dataset */ + void *buf; /* Buffer for compact dataset */ } H5O_storage_compact_t; typedef struct H5O_storage_t { @@ -635,8 +635,8 @@ typedef struct { /* Typedef for abstract object creation */ typedef struct { H5O_type_t obj_type; /* Type of object to create */ - void * crt_info; /* Information for object creation callback */ - void * new_obj; /* Pointer to new object created */ + void *crt_info; /* Information for object creation callback */ + void *new_obj; /* Pointer to new object created */ } H5O_obj_create_t; /* Forward declarations for prototype arguments */ @@ -679,11 +679,11 @@ H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mes unsigned update_flags, void *mesg, hid_t dxpl_id); H5_DLL herr_t H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg); -H5_DLL void * H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg, hid_t dxpl_id); -H5_DLL void * H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, void *mesg); +H5_DLL void *H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg, hid_t dxpl_id); +H5_DLL void *H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id, void *mesg); H5_DLL herr_t H5O_msg_reset(unsigned type_id, void *native); -H5_DLL void * H5O_msg_free(unsigned type_id, void *mesg); -H5_DLL void * H5O_msg_copy(unsigned type_id, const void *mesg, void *dst); +H5_DLL void *H5O_msg_free(unsigned type_id, void *mesg); +H5_DLL void *H5O_msg_copy(unsigned type_id, const void *mesg, void *dst); H5_DLL int H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id); H5_DLL htri_t H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id); H5_DLL htri_t H5O_msg_exists_oh(const H5O_t *oh, unsigned type_id); @@ -706,7 +706,7 @@ H5_DLL herr_t H5O_msg_reset_share(unsigned type_id, void *mesg); H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg, H5O_msg_crt_idx_t *crt_idx); H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared, unsigned char *buf, const void *obj); -H5_DLL void * H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, size_t buf_size, +H5_DLL void *H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, size_t buf_size, const unsigned char *buf); H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, void *mesg); H5_DLL int H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id); diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c index 7f11a20..95de747 100644 --- a/src/H5Orefcount.c +++ b/src/H5Orefcount.c @@ -30,10 +30,10 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_refcount_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_refcount_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_refcount_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_refcount_copy(const void *_mesg, void *_dest); +static void *H5O_refcount_copy(const void *_mesg, void *_dest); static size_t H5O_refcount_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_refcount_free(void *_mesg); static herr_t H5O_refcount_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, @@ -90,7 +90,7 @@ H5O_refcount_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_refcount_t *refcount = NULL; /* Reference count */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -171,8 +171,8 @@ static void * H5O_refcount_copy(const void *_mesg, void *_dest) { const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg; - H5O_refcount_t * dest = (H5O_refcount_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_refcount_t *dest = (H5O_refcount_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index f39fcea..216369a 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -24,10 +24,10 @@ #include "H5Spkg.h" /* Dataspaces */ /* PRIVATE PROTOTYPES */ -static void * H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg); -static void * H5O_sdspace_copy(const void *_mesg, void *_dest); +static void *H5O_sdspace_copy(const void *_mesg, void *_dest); static size_t H5O_sdspace_size(const H5F_t *f, const void *_mesg); static herr_t H5O_sdspace_reset(void *_mesg); static herr_t H5O_sdspace_free(void *_mesg); @@ -114,7 +114,7 @@ H5O_sdspace_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED H5S_extent_t *sdim = NULL; /* New extent dimensionality structure */ unsigned flags, version; unsigned i; /* Local counting variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -296,8 +296,8 @@ static void * H5O_sdspace_copy(const void *_mesg, void *_dest) { const H5S_extent_t *mesg = (const H5S_extent_t *)_mesg; - H5S_extent_t * dest = (H5S_extent_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5S_extent_t *dest = (H5S_extent_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 6fc1799..7f8bab4 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -101,7 +101,7 @@ H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, cons H5HF_t *fheap = NULL; H5WB_t *wb = NULL; /* Wrapped buffer for attribute data */ uint8_t mesg_buf[H5O_MESG_BUF_SIZE]; /* Buffer for deserializing messages */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -171,7 +171,7 @@ H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, cons else /* The shared message is in another object header */ if (NULL == (ret_value = H5O_msg_read(&oloc, type->id, NULL, dxpl_id))) - HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message") + HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read message") } /* end else */ /* Mark the message as shared */ @@ -262,7 +262,7 @@ H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class else /* The shared message is in another object header */ if (H5O_link(&oloc, adjust, dxpl_id) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count") + HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust shared object link count") } /* end if */ else { HDassert(shared->type == H5O_SHARE_TYPE_SOHM || shared->type == H5O_SHARE_TYPE_HERE); @@ -301,7 +301,7 @@ H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags, co { H5O_shared_t sh_mesg; /* Shared message info */ unsigned version; /* Shared message version */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -660,7 +660,7 @@ H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type, const H5O_ else /* Share the message */ if (H5SM_try_share(f, dxpl_id, NULL, H5SM_WAS_DEFERRED, mesg_type->id, shared_dst, mesg_flags) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't share message") + HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "can't share message") done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Oshmesg.c b/src/H5Oshmesg.c index a2987ca..7d42eb9 100644 --- a/src/H5Oshmesg.c +++ b/src/H5Oshmesg.c @@ -25,10 +25,10 @@ #include "H5Opkg.h" /* Object headers */ #include "H5MMprivate.h" /* Memory management */ -static void * H5O_shmesg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, +static void *H5O_shmesg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_shmesg_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_shmesg_copy(const void *_mesg, void *_dest); +static void *H5O_shmesg_copy(const void *_mesg, void *_dest); static size_t H5O_shmesg_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_shmesg_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -77,7 +77,7 @@ H5O_shmesg_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED * size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_shmesg_table_t *mesg; /* Native message */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -151,8 +151,8 @@ static void * H5O_shmesg_copy(const void *_mesg, void *_dest) { const H5O_shmesg_table_t *mesg = (const H5O_shmesg_table_t *)_mesg; - H5O_shmesg_table_t * dest = (H5O_shmesg_table_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_shmesg_table_t *dest = (H5O_shmesg_table_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Ostab.c b/src/H5Ostab.c index 64e92bb..d169207 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -33,14 +33,14 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O_stab_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O_stab_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_stab_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O_stab_copy(const void *_mesg, void *_dest); +static void *H5O_stab_copy(const void *_mesg, void *_dest); static size_t H5O_stab_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O_stab_free(void *_mesg); static herr_t H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg); -static void * H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, +static void *H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, H5O_copy_t *cpy_info, void *_udata, hid_t dxpl_id); static herr_t H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, unsigned *mesg_flags, hid_t dxpl_id, @@ -96,7 +96,7 @@ H5O_stab_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *op size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_stab_t *stab = NULL; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -171,8 +171,8 @@ static void * H5O_stab_copy(const void *_mesg, void *_dest) { const H5O_stab_t *stab = (const H5O_stab_t *)_mesg; - H5O_stab_t * dest = (H5O_stab_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_stab_t *dest = (H5O_stab_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -294,11 +294,11 @@ H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t H unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata, hid_t dxpl_id) { - H5O_stab_t * stab_src = (H5O_stab_t *)native_src; - H5O_stab_t * stab_dst = NULL; + H5O_stab_t *stab_src = (H5O_stab_t *)native_src; + H5O_stab_t *stab_dst = NULL; H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *)_udata; size_t size_hint; /* Local heap initial size */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -351,7 +351,7 @@ H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc unsigned H5_ATTR_UNUSED *mesg_flags, hid_t dxpl_id, H5O_copy_t *cpy_info) { const H5O_stab_t *stab_src = (const H5O_stab_t *)mesg_src; - H5O_stab_t * stab_dst = (H5O_stab_t *)mesg_dst; + H5O_stab_t *stab_dst = (H5O_stab_t *)mesg_dst; H5G_bt_it_cpy_t udata; /* B-tree user data */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Otest.c b/src/H5Otest.c index acd33f0..8636523 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -85,9 +85,9 @@ htri_t H5O_is_attr_dense_test(hid_t oid) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ H5O_ainfo_t ainfo; /* Attribute information for object */ - H5O_loc_t * loc; /* Pointer to object's location */ + H5O_loc_t *loc; /* Pointer to object's location */ htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -146,11 +146,11 @@ done: htri_t H5O_is_attr_empty_test(hid_t oid) { - H5O_t * oh = NULL; /* Object header */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5O_t *oh = NULL; /* Object header */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ H5O_ainfo_t ainfo; /* Attribute information for object */ htri_t ainfo_exists = FALSE; /* Whether the attribute info exists in the file */ - H5O_loc_t * loc; /* Pointer to object's location */ + H5O_loc_t *loc; /* Pointer to object's location */ hsize_t nattrs; /* Number of attributes */ htri_t ret_value = FAIL; /* Return value */ @@ -234,10 +234,10 @@ done: herr_t H5O_num_attrs_test(hid_t oid, hsize_t *nattrs) { - H5O_t * oh = NULL; /* Object header */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ + H5O_t *oh = NULL; /* Object header */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ H5O_ainfo_t ainfo; /* Attribute information for object */ - H5O_loc_t * loc; /* Pointer to object's location */ + H5O_loc_t *loc; /* Pointer to object's location */ hsize_t obj_nattrs; /* Number of attributes */ herr_t ret_value = SUCCEED; /* Return value */ @@ -319,11 +319,11 @@ done: herr_t H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) { - H5O_t * oh = NULL; /* Object header */ - H5B2_t * bt2_name = NULL; /* v2 B-tree handle for name index */ - H5B2_t * bt2_corder = NULL; /* v2 B-tree handle for creation order index */ + H5O_t *oh = NULL; /* Object header */ + H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ + H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ H5O_ainfo_t ainfo; /* Attribute information for object */ - H5O_loc_t * loc; /* Pointer to object's location */ + H5O_loc_t *loc; /* Pointer to object's location */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -408,8 +408,8 @@ done: herr_t H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val) { - H5O_t * oh = NULL; /* Object header */ - H5O_loc_t * loc; /* Pointer to object's location */ + H5O_t *oh = NULL; /* Object header */ + H5O_loc_t *loc; /* Pointer to object's location */ H5O_mesg_t *idx_msg; /* Pointer to message */ unsigned idx; /* Index of message */ herr_t ret_value = SUCCEED; /* Return value */ @@ -471,7 +471,7 @@ done: herr_t H5O_expunge_chunks_test(const H5O_loc_t *loc, hid_t dxpl_id) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ haddr_t chk_addr[16]; /* Array of chunk addresses */ size_t nchunks; /* Number of chunks in object header */ size_t u; /* Local index variable */ @@ -45,7 +45,7 @@ typedef struct { H5P_iterate_t iter_func; /* Iterator callback */ hid_t id; /* Property list or class ID */ - void * iter_data; /* Iterator callback pointer */ + void *iter_data; /* Iterator callback pointer */ } H5P_iter_ud_t; /********************/ @@ -972,7 +972,7 @@ done: htri_t H5Pequal(hid_t id1, hid_t id2) { - void * obj1, *obj2; /* Property objects to compare */ + void *obj1, *obj2; /* Property objects to compare */ htri_t ret_value = FALSE; /* return value */ FUNC_ENTER_API(FAIL) @@ -1149,7 +1149,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data) { H5P_iter_ud_t udata; /* User data for internal iterator callback */ int fake_idx = 0; /* Index when user doesn't provide one */ - void * obj; /* Property object to copy */ + void *obj; /* Property object to copy */ int ret_value; /* return value */ FUNC_ENTER_API(FAIL) @@ -1476,7 +1476,7 @@ char * H5Pget_class_name(hid_t pclass_id) { H5P_genclass_t *pclass; /* Property class to query */ - char * ret_value; /* return value */ + char *ret_value; /* return value */ FUNC_ENTER_API(NULL) H5TRACE1("*s", "i", pclass_id); @@ -162,7 +162,7 @@ static size_t H5PL_table_used_g = 0; static H5PL_table_t *H5PL_table_g = NULL; /* Table of location paths for plugin libraries */ -static char * H5PL_path_table_g[H5PL_MAX_PATH_NUM]; +static char *H5PL_path_table_g[H5PL_MAX_PATH_NUM]; static size_t H5PL_num_paths_g = 0; static hbool_t H5PL_path_found_g = FALSE; @@ -222,7 +222,7 @@ H5PL__init_interface(void) herr_t H5PLset_loading_state(unsigned int plugin_type) { - char * preload_path; + char *preload_path; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -406,7 +406,7 @@ herr_t H5PLappend(const char *plugin_path) { herr_t ret_value = SUCCEED; /* Return value */ - char * dl_path = NULL; + char *dl_path = NULL; FUNC_ENTER_API(FAIL) H5TRACE1("e", "*s", plugin_path); @@ -440,7 +440,7 @@ herr_t H5PLprepend(const char *plugin_path) { herr_t ret_value = SUCCEED; /* Return value */ - char * dl_path = NULL; + char *dl_path = NULL; unsigned int plindex; FUNC_ENTER_API(FAIL) @@ -477,7 +477,7 @@ herr_t H5PLreplace(const char *plugin_path, unsigned int index) { herr_t ret_value = SUCCEED; /* Return value */ - char * dl_path = NULL; + char *dl_path = NULL; FUNC_ENTER_API(FAIL) H5TRACE2("e", "*sIu", plugin_path, index); @@ -513,7 +513,7 @@ herr_t H5PLinsert(const char *plugin_path, unsigned int index) { herr_t ret_value = SUCCEED; /* Return value */ - char * dl_path = NULL; + char *dl_path = NULL; unsigned int plindex; FUNC_ENTER_API(FAIL) @@ -603,7 +603,7 @@ H5PLget(unsigned int index, char *pathname /*out*/, size_t size) { ssize_t ret_value = 0; /* Return value */ size_t len = 0; /* Length of pathname */ - char * dl_path = NULL; + char *dl_path = NULL; FUNC_ENTER_API(FAIL) H5TRACE3("Zs", "Iuxz", index, pathname, size); @@ -665,9 +665,9 @@ done: static herr_t H5PL__init_path_table(void) { - char * dl_path = NULL; - char * origin_dl_path; - char * dir; + char *dl_path = NULL; + char *origin_dl_path; + char *dir; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -727,8 +727,8 @@ done: static htri_t H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info) { - char * pathname = NULL; - DIR * dirp = NULL; + char *pathname = NULL; + DIR *dirp = NULL; struct dirent *dp; htri_t ret_value = FALSE; @@ -791,7 +791,7 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info) { WIN32_FIND_DATAA fdFile; HANDLE hFind; - char * pathname = NULL; + char *pathname = NULL; char service[2048]; htri_t ret_value = FALSE; @@ -966,7 +966,7 @@ H5PL__search_table(H5PL_type_t plugin_type, int type_id, const void **info) for (i = 0; i < H5PL_table_used_g; i++) { if ((plugin_type == (H5PL_table_g[i]).pl_type) && (type_id == (H5PL_table_g[i]).pl_id)) { H5PL_get_plugin_info_t get_plugin_info; - const H5Z_class2_t * plugin_info; + const H5Z_class2_t *plugin_info; if (NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC( (H5PL_table_g[i]).handle, "H5PLget_plugin_info"))) diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index 4b5987b..846a539 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -472,7 +472,7 @@ ssize_t H5Pget_efile_prefix(hid_t plist_id, char *prefix, size_t size) { H5P_genplist_t *plist; /* Property list pointer */ - char * my_prefix; /* Library's copy of the prefix */ + char *my_prefix; /* Library's copy of the prefix */ size_t len; /* Length of prefix string */ ssize_t ret_value; /* Return value */ diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index fc56f2b..cdd2379 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -795,7 +795,7 @@ H5P__init_def_layout(void) herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout_type) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5O_layout_t *layout; /* Pointer to default layout information for type specified */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1462,7 +1462,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value) H5O_fill_reset_dyn(&fill); if (value) { - H5T_t * type; /* Datatype for fill value */ + H5T_t *type; /* Datatype for fill value */ H5T_path_t *tpath; /* Conversion information */ /* Retrieve pointer to datatype */ @@ -1535,8 +1535,8 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value /*out*/ { H5O_fill_t fill; /* Fill value to retrieve */ H5T_path_t *tpath; /*type conversion info */ - void * buf = NULL; /*conversion buffer */ - void * bkg = NULL; /*conversion buffer */ + void *buf = NULL; /*conversion buffer */ + void *bkg = NULL; /*conversion buffer */ hid_t src_id = -1; /*source datatype id */ hid_t dst_id = -1; /*destination datatype id */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1627,7 +1627,7 @@ herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ - H5T_t * type; /* Datatype */ + H5T_t *type; /* Datatype */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 0f4398d..6c2effd 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -217,16 +217,16 @@ static herr_t H5P__dxfr_reg_prop(H5P_genclass_t *pclass) { size_t def_max_temp_buf = H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */ - void * def_tconv_buf = H5D_XFER_TCONV_BUF_DEF; /* Default value for type conversion buffer */ - void * def_bkgr_buf = H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ + void *def_tconv_buf = H5D_XFER_TCONV_BUF_DEF; /* Default value for type conversion buffer */ + void *def_bkgr_buf = H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ H5T_bkg_t def_bkgr_buf_type = H5D_XFER_BKGR_BUF_TYPE_DEF; double def_btree_split_ratio[3] = H5D_XFER_BTREE_SPLIT_RATIO_DEF; /* Default value for B-tree node split ratios */ H5MM_allocate_t def_vlen_alloc = H5D_XFER_VLEN_ALLOC_DEF; /* Default value for vlen allocation function */ - void * def_vlen_alloc_info = + void *def_vlen_alloc_info = H5D_XFER_VLEN_ALLOC_INFO_DEF; /* Default value for vlen allocation information */ H5MM_free_t def_vlen_free = H5D_XFER_VLEN_FREE_DEF; /* Default value for vlen free function */ - void * def_vlen_free_info = H5D_XFER_VLEN_FREE_INFO_DEF; /* Default value for vlen free information */ + void *def_vlen_free_info = H5D_XFER_VLEN_FREE_INFO_DEF; /* Default value for vlen free information */ size_t def_hyp_vec_size = H5D_XFER_HYPER_VECTOR_SIZE_DEF; /* Default value for vector size */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t def_io_xfer_mode = H5D_XFER_IO_XFER_MODE_DEF; /* Default value for I/O transfer mode */ @@ -243,7 +243,7 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass) H5Z_EDC_t enable_edc = H5D_XFER_EDC_DEF; /* Default value for EDC property */ H5Z_cb_t filter_cb = H5D_XFER_FILTER_CB_DEF; /* Default value for filter callback */ H5T_conv_cb_t conv_cb = H5D_XFER_CONV_CB_DEF; /* Default value for datatype conversion callback */ - void * def_xfer_xform = H5D_XFER_XFORM_DEF; /* Default value for data transform */ + void *def_xfer_xform = H5D_XFER_XFORM_DEF; /* Default value for data transform */ hbool_t direct_chunk_flag = H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF; /* Default value for the flag of direct chunk write */ uint32_t direct_chunk_filters = @@ -602,7 +602,7 @@ done: herr_t H5Pset_data_transform(hid_t plist_id, const char *expression) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5Z_data_xform_t *data_xform_prop = NULL; /* New data xform property */ herr_t ret_value = SUCCEED; /* return value */ @@ -666,10 +666,10 @@ done: ssize_t H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5Z_data_xform_t *data_xform_prop = NULL; /* New data xform property */ size_t len; - const char * pexp; + const char *pexp; ssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 805e487..22d4c1a 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -209,7 +209,7 @@ H5P_facc_reg_prop(H5P_genclass_t *pclass) hsize_t sdata_block_size = H5F_ACS_SDATA_BLOCK_SIZE_DEF; /* Default small data allocation block size */ unsigned gc_ref = H5F_ACS_GARBG_COLCT_REF_DEF; /* Default garbage collection for references setting */ hid_t driver_id = H5F_ACS_FILE_DRV_ID_DEF; /* Default VFL driver ID */ - void * driver_info = H5F_ACS_FILE_DRV_INFO_DEF; /* Default VFL driver info */ + void *driver_info = H5F_ACS_FILE_DRV_INFO_DEF; /* Default VFL driver info */ H5F_close_degree_t close_degree = H5F_CLOSE_DEGREE_DEF; /* Default file close degree */ hsize_t family_offset = H5F_ACS_FAMILY_OFFSET_DEF; /* Default offset for family VFD */ hsize_t family_newsize = H5F_ACS_FAMILY_NEWSIZE_DEF; /* Default size of new files for family VFD */ @@ -436,7 +436,7 @@ H5P_facc_copy(hid_t dst_fapl_id, hid_t src_fapl_id, void H5_ATTR_UNUSED *copy_da if (driver_id > 0) { H5P_genplist_t *dst_plist; /* Destination property list */ - void * driver_info; + void *driver_info; /* Get driver info from source property list */ if (H5P_get(src_plist, H5F_ACS_FILE_DRV_INFO_NAME, &driver_info) < 0) @@ -615,7 +615,7 @@ herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_driver_info) { hid_t driver_id; /* VFL driver ID */ - void * driver_info; /* VFL driver info */ + void *driver_info; /* VFL driver info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -828,7 +828,7 @@ void * H5Pget_driver_info(hid_t plist_id) { H5P_genplist_t *plist; /* Property list pointer */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_API(NULL) H5TRACE1("*x", "i", plist_id); @@ -1825,7 +1825,7 @@ done: herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len) { - H5P_genplist_t * fapl; /* Property list pointer */ + H5P_genplist_t *fapl; /* Property list pointer */ H5FD_file_image_info_t image_info; /* File image info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1922,7 +1922,7 @@ done: herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr) { - H5P_genplist_t * fapl; /* Property list pointer */ + H5P_genplist_t *fapl; /* Property list pointer */ H5FD_file_image_info_t image_info; /* File image info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1997,7 +1997,7 @@ done: herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr) { - H5P_genplist_t * fapl; /* Property list pointer */ + H5P_genplist_t *fapl; /* Property list pointer */ H5FD_file_image_info_t info; /* File image info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2073,7 +2073,7 @@ done: herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr) { - H5P_genplist_t * fapl; /* Property list pointer */ + H5P_genplist_t *fapl; /* Property list pointer */ H5FD_file_image_info_t info; /* File image info */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Pint.c b/src/H5Pint.c index 6086b48..b7d3156 100644 --- a/src/H5Pint.c +++ b/src/H5Pint.c @@ -46,25 +46,25 @@ /* Typedef for checking for duplicate class names in parent class */ typedef struct { const H5P_genclass_t *parent; /* Pointer to parent class */ - const char * name; /* Pointer to name to check */ - H5P_genclass_t * new_class; /* Pointer to class during path traversal */ + const char *name; /* Pointer to name to check */ + H5P_genclass_t *new_class; /* Pointer to class during path traversal */ } H5P_check_class_t; /* Typedef for property list iterator callback */ typedef struct { H5P_iterate_int_t cb_func; /* Iterator callback */ - void * udata; /* Iterator callback pointer */ + void *udata; /* Iterator callback pointer */ const H5P_genplist_t *plist; /* Property list pointer */ - H5SL_t * seen; /* Skip list to hold names of properties already seen */ - int * curr_idx_ptr; /* Pointer to current iteration index */ + H5SL_t *seen; /* Skip list to hold names of properties already seen */ + int *curr_idx_ptr; /* Pointer to current iteration index */ int prev_idx; /* Previous iteration index */ } H5P_iter_plist_ud_t; /* Typedef for property list class iterator callback */ typedef struct { H5P_iterate_int_t cb_func; /* Iterator callback */ - void * udata; /* Iterator callback pointer */ - int * curr_idx_ptr; /* Pointer to current iteration index */ + void *udata; /* Iterator callback pointer */ + int *curr_idx_ptr; /* Pointer to current iteration index */ int prev_idx; /* Previous iteration index */ } H5P_iter_pclass_ud_t; @@ -325,7 +325,7 @@ static const H5I_class_t H5I_GENPROPLST_CLS[1] = {{ static herr_t H5P_do_prop_cb1(H5SL_t *slist, H5P_genprop_t *prop, H5P_prp_cb1_t cb) { - void * tmp_value = NULL; /* Temporary value buffer */ + void *tmp_value = NULL; /* Temporary value buffer */ H5P_genprop_t *pcopy = NULL; /* Copy of property to insert into skip list */ herr_t ret_value = SUCCEED; /* Return value */ @@ -602,7 +602,7 @@ H5P_genclass_t * H5P_copy_pclass(H5P_genclass_t *pclass) { H5P_genclass_t *new_pclass = NULL; /* Property list class copied */ - H5P_genprop_t * pcopy; /* Copy of property to insert into class */ + H5P_genprop_t *pcopy; /* Copy of property to insert into class */ H5P_genclass_t *ret_value = NULL; /* return value */ FUNC_ENTER_NOAPI_NOINIT @@ -678,11 +678,11 @@ H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref) { H5P_genclass_t *tclass; /* Temporary class pointer */ H5P_genplist_t *new_plist = NULL; /* New property list generated from copy */ - H5P_genprop_t * tmp; /* Temporary pointer to properties */ - H5P_genprop_t * new_prop; /* New property created for copy */ + H5P_genprop_t *tmp; /* Temporary pointer to properties */ + H5P_genprop_t *new_prop; /* New property created for copy */ hid_t new_plist_id; /* Property list ID of new list created */ - H5SL_node_t * curr_node; /* Current node in skip list */ - H5SL_t * seen = NULL; /* Skip list containing properties already seen */ + H5SL_node_t *curr_node; /* Current node in skip list */ + H5SL_t *seen = NULL; /* Skip list containing properties already seen */ size_t nseen; /* Number of items 'seen' */ hbool_t has_parent_class; /* Flag to indicate that this property list's class has a parent */ hid_t ret_value = H5I_INVALID_HID; /* return value */ @@ -1430,7 +1430,7 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod) static int H5P_open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key) { - H5P_genclass_t * obj = (H5P_genclass_t *)_obj; /* Pointer to the class for this ID */ + H5P_genclass_t *obj = (H5P_genclass_t *)_obj; /* Pointer to the class for this ID */ H5P_check_class_t *key = (H5P_check_class_t *)_key; /* Pointer to key information for comparison */ int ret_value = 0; /* Return value */ @@ -1585,8 +1585,8 @@ H5P_create(H5P_genclass_t *pclass) { H5P_genclass_t *tclass; /* Temporary class pointer */ H5P_genplist_t *plist = NULL; /* New property list created */ - H5P_genprop_t * tmp; /* Temporary pointer to parent class properties */ - H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */ + H5P_genprop_t *tmp; /* Temporary pointer to parent class properties */ + H5SL_t *seen = NULL; /* Skip list to hold names of properties already seen */ H5P_genplist_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -2440,7 +2440,7 @@ herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value) { H5P_genclass_t *tclass; /* Temporary class pointer */ - H5P_genprop_t * prop; /* Temporary property pointer */ + H5P_genprop_t *prop; /* Temporary property pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -3401,8 +3401,8 @@ property list. static int H5P__iterate_plist_cb(void *_item, void *_key, void *_udata) { - H5P_genprop_t * item = (H5P_genprop_t *)_item; /* Pointer to the property */ - char * key = (char *)_key; /* Pointer to the property's name */ + H5P_genprop_t *item = (H5P_genprop_t *)_item; /* Pointer to the property */ + char *key = (char *)_key; /* Pointer to the property's name */ H5P_iter_plist_ud_t *udata = (H5P_iter_plist_ud_t *)_udata; /* Pointer to user data */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -3454,8 +3454,8 @@ deleted, and then chains to the property list callback. static int H5P__iterate_plist_pclass_cb(void *_item, void *_key, void *_udata) { - H5P_genprop_t * item = (H5P_genprop_t *)_item; /* Pointer to the property */ - char * key = (char *)_key; /* Pointer to the property's name */ + H5P_genprop_t *item = (H5P_genprop_t *)_item; /* Pointer to the property */ + char *key = (char *)_key; /* Pointer to the property's name */ H5P_iter_plist_ud_t *udata = (H5P_iter_plist_ud_t *)_udata; /* Pointer to user data */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -3532,9 +3532,9 @@ int H5P_iterate_plist(const H5P_genplist_t *plist, hbool_t iter_all_prop, int *idx, H5P_iterate_int_t cb_func, void *udata) { - H5P_genclass_t * tclass; /* Temporary class pointer */ + H5P_genclass_t *tclass; /* Temporary class pointer */ H5P_iter_plist_ud_t udata_int; /* User data for skip list iterator */ - H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */ + H5SL_t *seen = NULL; /* Skip list to hold names of properties already seen */ int curr_idx = 0; /* Current iteration index */ int ret_value = 0; /* Return value */ @@ -3613,8 +3613,8 @@ property list class. static int H5P__iterate_pclass_cb(void *_item, void *_key, void *_udata) { - H5P_genprop_t * item = (H5P_genprop_t *)_item; /* Pointer to the property */ - char * key = (char *)_key; /* Pointer to the property's name */ + H5P_genprop_t *item = (H5P_genprop_t *)_item; /* Pointer to the property */ + char *key = (char *)_key; /* Pointer to the property's name */ H5P_iter_pclass_ud_t *udata = (H5P_iter_pclass_ud_t *)_udata; /* Pointer to user data */ int ret_value = 0; /* Return value */ @@ -3930,7 +3930,7 @@ herr_t H5P_get(const H5P_genplist_t *plist, const char *name, void *value) { H5P_genclass_t *tclass; /* Temporary class pointer */ - H5P_genprop_t * prop; /* Temporary property pointer */ + H5P_genprop_t *prop; /* Temporary property pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -4079,8 +4079,8 @@ herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name) { H5P_genclass_t *tclass; /* Temporary class pointer */ - H5P_genprop_t * prop; /* Temporary property pointer */ - char * del_name; /* Pointer to deleted name */ + H5P_genprop_t *prop; /* Temporary property pointer */ + char *del_name; /* Pointer to deleted name */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -4218,8 +4218,8 @@ H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name) { H5P_genplist_t *dst_plist; /* Pointer to destination property list */ H5P_genplist_t *src_plist; /* Pointer to source property list */ - H5P_genprop_t * prop; /* Temporary property pointer */ - H5P_genprop_t * new_prop = NULL; /* Pointer to new property */ + H5P_genprop_t *prop; /* Temporary property pointer */ + H5P_genprop_t *new_prop = NULL; /* Pointer to new property */ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI_NOINIT @@ -4327,7 +4327,7 @@ H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name) H5P_genclass_t *src_pclass; /* Source property class, containing property to copy */ H5P_genclass_t *dst_pclass; /* Destination property class */ H5P_genclass_t *orig_dst_pclass; /* Original destination property class */ - H5P_genprop_t * prop; /* Temporary property pointer */ + H5P_genprop_t *prop; /* Temporary property pointer */ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI_NOINIT @@ -4461,12 +4461,12 @@ H5P_close(void *_plist) { H5P_genclass_t *tclass; /* Temporary class pointer */ H5P_genplist_t *plist = (H5P_genplist_t *)_plist; - H5SL_t * seen = NULL; /* Skip list to hold names of properties already seen */ + H5SL_t *seen = NULL; /* Skip list to hold names of properties already seen */ size_t nseen; /* Number of items 'seen' */ hbool_t has_parent_class; /* Flag to indicate that this property list's class has a parent */ size_t ndel; /* Number of items deleted */ - H5SL_node_t * curr_node; /* Current node in skip list */ - H5P_genprop_t * tmp; /* Temporary pointer to properties */ + H5SL_node_t *curr_node; /* Current node in skip list */ + H5P_genprop_t *tmp; /* Temporary pointer to properties */ unsigned make_cb = 0; /* Operator data for property free callback */ herr_t ret_value = SUCCEED; /* return value */ @@ -4725,12 +4725,12 @@ done: H5P_genclass_t * H5P_open_class_path(const char *path) { - 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 */ - H5P_genclass_t * curr_class; /* Pointer to class during path 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 */ + H5P_genclass_t *curr_class; /* Pointer to class during path traversal */ H5P_check_class_t check_info; /* Structure to hold the information for checking duplicate names */ - H5P_genclass_t * ret_value = NULL; /* Return value */ + H5P_genclass_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Plapl.c b/src/H5Plapl.c index e487bc6..2c9dc29 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -145,7 +145,7 @@ static herr_t H5P_lacc_reg_prop(H5P_genclass_t *pclass) { size_t nlinks = H5L_ACS_NLINKS_DEF; /* Default number of soft links to traverse */ - char * elink_prefix = H5L_ACS_ELINK_PREFIX_DEF; /* Default external link prefix string */ + char *elink_prefix = H5L_ACS_ELINK_PREFIX_DEF; /* Default external link prefix string */ hid_t def_fapl_id = H5L_ACS_ELINK_FAPL_DEF; /* Default fapl for external link access */ unsigned elink_flags = H5L_ACS_ELINK_FLAGS_DEF; /* Default file access flags for external link traversal */ @@ -283,8 +283,8 @@ done: static int H5P_lacc_elink_fapl_cmp(const void *value1, const void *value2, size_t H5_ATTR_UNUSED size) { - const hid_t * fapl1 = (const hid_t *)value1; - const hid_t * fapl2 = (const hid_t *)value2; + const hid_t *fapl1 = (const hid_t *)value1; + const hid_t *fapl2 = (const hid_t *)value2; H5P_genplist_t *obj1, *obj2; /* Property lists to compare */ int ret_value = 0; @@ -564,7 +564,7 @@ herr_t H5Pset_elink_prefix(hid_t plist_id, const char *prefix) { H5P_genplist_t *plist; /* Property list pointer */ - char * my_prefix; /* Copy of prefix string */ + char *my_prefix; /* Copy of prefix string */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -613,7 +613,7 @@ ssize_t H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size) { H5P_genplist_t *plist; /* Property list pointer */ - char * my_prefix; /* Library's copy of the prefix */ + char *my_prefix; /* Library's copy of the prefix */ size_t len; /* Length of prefix string */ ssize_t ret_value; /* Return value */ diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index e261e6f..2acf9c9 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -862,7 +862,7 @@ H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/, unsigned *filter_config /*out*/) { - H5P_genplist_t * plist; /* Property list */ + H5P_genplist_t *plist; /* Property list */ H5O_pline_t pline; /* Filter pipeline */ const H5Z_filter_info_t *filter; /* Pointer to filter information */ H5Z_filter_t ret_value; /* return value */ @@ -994,7 +994,7 @@ H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out* size_t *cd_nelmts /*in_out*/, unsigned cd_values[] /*out*/, size_t namelen, char name[] /*out*/, unsigned *filter_config) { - H5P_genplist_t * plist; /* Property list */ + H5P_genplist_t *plist; /* Property list */ H5O_pline_t pline; /* Filter pipeline */ const H5Z_filter_info_t *filter; /* Pointer to filter information */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1454,7 +1454,7 @@ H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t { H5O_pline_t pline; /* Filter pipeline */ const H5Z_filter_info_t *filter; /* Pointer to filter information */ - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5Z_filter_t ret_value; /* return value */ FUNC_ENTER_API(H5Z_FILTER_ERROR) diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c index 7ded6dd..3c6f68f 100644 --- a/src/H5Pocpypl.c +++ b/src/H5Pocpypl.c @@ -211,8 +211,8 @@ static herr_t H5P__ocpy_merge_comm_dt_list_copy(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_UNUSED size, void *value) { const H5O_copy_dtype_merge_list_t *src_dt_list; /* Source merge named datatype lists */ - H5O_copy_dtype_merge_list_t * dst_dt_list = NULL; /* Destination merge named datatype lists */ - H5O_copy_dtype_merge_list_t * dst_dt_list_tail = NULL, + H5O_copy_dtype_merge_list_t *dst_dt_list = NULL; /* Destination merge named datatype lists */ + H5O_copy_dtype_merge_list_t *dst_dt_list_tail = NULL, *tmp_dt_list = NULL; /* temporary merge named datatype lists */ herr_t ret_value = SUCCEED; @@ -444,7 +444,7 @@ done: herr_t H5Padd_merge_committed_dtype_path(hid_t plist_id, const char *path) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5O_copy_dtype_merge_list_t *old_list; /* Merge committed dtype list currently present */ H5O_copy_dtype_merge_list_t *new_obj = NULL; /* New object to add to list */ herr_t ret_value = SUCCEED; /* Return value */ @@ -504,7 +504,7 @@ done: herr_t H5Pfree_merge_committed_dtype_paths(hid_t plist_id) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5O_copy_dtype_merge_list_t *dt_list; /* Merge committed dtype list currently present */ herr_t ret_value = SUCCEED; /* Return value */ @@ -551,7 +551,7 @@ done: herr_t H5Pset_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t func, void *op_data) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5O_mcdt_cb_info_t cb_info; /* Callback info struct */ herr_t ret_value = SUCCEED; /* Return value */ @@ -599,7 +599,7 @@ done: herr_t H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func, void **op_data) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5O_mcdt_cb_info_t cb_info; /* Callback info struct */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h index ee8124b..a9fabbb 100644 --- a/src/H5Ppkg.h +++ b/src/H5Ppkg.h @@ -62,9 +62,9 @@ typedef enum { /* Define structure to hold property information */ typedef struct H5P_genprop_t { /* Values for this property */ - char * name; /* Name of property */ + char *name; /* Name of property */ size_t size; /* Size of property value */ - void * value; /* Pointer to property value */ + void *value; /* Pointer to property value */ H5P_prop_within_t type; /* Type of object the property is within */ hbool_t shared_name; /* Whether the name is shared or not */ @@ -81,25 +81,25 @@ typedef struct H5P_genprop_t { /* Define structure to hold class information */ struct H5P_genclass_t { struct H5P_genclass_t *parent; /* Pointer to parent class */ - char * name; /* Name of property list class */ + char *name; /* Name of property list class */ H5P_plist_type_t type; /* Type of property */ size_t nprops; /* Number of properties in class */ unsigned - plists; /* Number of property lists that have been created since the last modification to the class */ + plists; /* Number of property lists that have been created since the last modification to the class */ unsigned classes; /* Number of classes that have been derived since the last modification to the class */ unsigned ref_count; /* Number of outstanding ID's open on this class object */ hbool_t deleted; /* Whether this class has been deleted and is waiting for dependent classes & proplists to close */ unsigned revision; /* Revision number of a particular class (global) */ - H5SL_t * props; /* Skip list containing properties */ + H5SL_t *props; /* Skip list containing properties */ /* Callback function pointers & info */ H5P_cls_create_func_t create_func; /* Function to call when a property list is created */ - void * create_data; /* Pointer to user data to pass along to create callback */ + void *create_data; /* Pointer to user data to pass along to create callback */ H5P_cls_copy_func_t copy_func; /* Function to call when a property list is copied */ - void * copy_data; /* Pointer to user data to pass along to copy callback */ + void *copy_data; /* Pointer to user data to pass along to copy callback */ H5P_cls_close_func_t close_func; /* Function to call when a property list is closed */ - void * close_data; /* Pointer to user data to pass along to close callback */ + void *close_data; /* Pointer to user data to pass along to close callback */ }; /* Define structure to hold property list information */ @@ -108,8 +108,8 @@ struct H5P_genplist_t { hid_t plist_id; /* Copy of the property list ID (for use in close callback) */ size_t nprops; /* Number of properties in class */ hbool_t class_init; /* Whether the class initialization callback finished successfully */ - H5SL_t * del; /* Skip list containing names of deleted properties */ - H5SL_t * props; /* Skip list containing properties */ + H5SL_t *del; /* Skip list containing names of deleted properties */ + H5SL_t *props; /* Skip list containing properties */ }; /* Function pointer for library classes with properties to register */ @@ -121,22 +121,22 @@ typedef herr_t (*H5P_reg_prop_func_t)(H5P_genclass_t *pclass); * class variables and methods used to initialize the class. */ typedef struct H5P_libclass_t { - const char * name; /* Class name */ + const char *name; /* Class name */ H5P_plist_type_t type; /* Class type */ - H5P_genclass_t ** par_pclass; /* Pointer to global parent class property list class */ - H5P_genclass_t ** pclass; /* Pointer to global property list class */ + H5P_genclass_t **par_pclass; /* Pointer to global parent class property list class */ + H5P_genclass_t **pclass; /* Pointer to global property list class */ hid_t *const class_id; /* Pointer to global property list class ID */ hid_t *const def_plist_id; /* Pointer to global default property list ID */ H5P_reg_prop_func_t reg_prop_func; /* Register class's properties */ /* Class callback function pointers & info */ H5P_cls_create_func_t create_func; /* Function to call when a property list is created */ - void * create_data; /* Pointer to user data to pass along to create callback */ + void *create_data; /* Pointer to user data to pass along to create callback */ H5P_cls_copy_func_t copy_func; /* Function to call when a property list is copied */ - void * copy_data; /* Pointer to user data to pass along to copy callback */ + void *copy_data; /* Pointer to user data to pass along to copy callback */ H5P_cls_close_func_t close_func; /* Function to call when a property list is closed */ - void * close_data; /* Pointer to user data to pass along to close callback */ + void *close_data; /* Pointer to user data to pass along to close callback */ } H5P_libclass_t; /* Property list/class iterator callback function pointer */ @@ -154,8 +154,8 @@ struct H5Z_filter_info_t; /******************************/ /* Private functions, not part of the publicly documented API */ -H5_DLL herr_t H5P__term_pub_interface(void); -H5_DLL herr_t H5P__term_deprec_interface(void); +H5_DLL herr_t H5P__term_pub_interface(void); +H5_DLL herr_t H5P__term_deprec_interface(void); H5_DLL H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class, const char *name, H5P_plist_type_t type, H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data, @@ -186,11 +186,11 @@ H5_DLL int H5P_iterate_pclass(const H5P_genclass_t *pclass, int *idx, H5P_ite H5_DLL herr_t H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name); H5_DLL herr_t H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name); H5_DLL herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name); -H5_DLL char * H5P_get_class_path(H5P_genclass_t *pclass); +H5_DLL char *H5P_get_class_path(H5P_genclass_t *pclass); H5_DLL H5P_genclass_t *H5P_open_class_path(const char *path); H5_DLL H5P_genclass_t *H5P_get_class_parent(const H5P_genclass_t *pclass); H5_DLL herr_t H5P_close_class(void *_pclass); -H5_DLL H5P_genprop_t *H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name); +H5_DLL H5P_genprop_t *H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name); /* Private OCPL routines */ H5_DLL herr_t H5P_get_filter(const struct H5Z_filter_info_t *filter, unsigned int *flags, size_t *cd_nelmts, @@ -198,7 +198,7 @@ H5_DLL herr_t H5P_get_filter(const struct H5Z_filter_info_t *filter, unsigned in /* Testing functions */ #ifdef H5P_TESTING -H5_DLL char * H5P_get_class_path_test(hid_t pclass_id); +H5_DLL char *H5P_get_class_path_test(hid_t pclass_id); H5_DLL hid_t H5P_open_class_path_test(const char *path); H5_DLL herr_t H5P_reset_external_file_test(hid_t dcpl_id); #endif /* H5P_TESTING */ diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index b03115f..a2c2153 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -116,10 +116,10 @@ H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, v H5_DLL herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name); H5_DLL htri_t H5P_exist_plist(const H5P_genplist_t *plist, const char *name); H5_DLL htri_t H5P_class_isa(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2); -H5_DLL char * H5P_get_class_name(H5P_genclass_t *pclass); +H5_DLL char *H5P_get_class_name(H5P_genclass_t *pclass); H5_DLL herr_t H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recurse); H5_DLL hid_t H5P_get_driver(H5P_genplist_t *plist); -H5_DLL void * H5P_get_driver_info(H5P_genplist_t *plist); +H5_DLL void *H5P_get_driver_info(H5P_genplist_t *plist); H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_driver_info); H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func, void *free_info); @@ -133,17 +133,17 @@ H5_DLL herr_t H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsig H5_DLL htri_t H5P_filter_in_pline(H5P_genplist_t *plist, H5Z_filter_t id); /* Query internal fields of the property list struct */ -H5_DLL hid_t H5P_get_plist_id(const H5P_genplist_t *plist); +H5_DLL hid_t H5P_get_plist_id(const H5P_genplist_t *plist); H5_DLL H5P_genclass_t *H5P_get_class(const H5P_genplist_t *plist); /* *SPECIAL* Don't make more of these! -QAK */ -H5_DLL htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id); +H5_DLL htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id); H5_DLL H5P_genplist_t *H5P_object_verify(hid_t plist_id, hid_t pclass_id); /* Private functions to "peek" at properties of a certain type */ H5_DLL unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name); H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name); -H5_DLL void * H5P_peek_voidp(H5P_genplist_t *plist, const char *name); +H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name); H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name); /* Private DCPL routines */ diff --git a/src/H5Ptest.c b/src/H5Ptest.c index 1c96098..38380d6 100644 --- a/src/H5Ptest.c +++ b/src/H5Ptest.c @@ -57,7 +57,7 @@ char * H5P_get_class_path_test(hid_t pclass_id) { H5P_genclass_t *pclass; /* Property class to query */ - char * ret_value = NULL; /* Return value */ + char *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -50,7 +50,7 @@ static herr_t H5R_create(void *ref, H5G_loc_t *loc, const char *name, H5R_type_ hid_t dxpl_id); static hid_t H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref, hbool_t app_ref); -static H5S_t * H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref); +static H5S_t *H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref); static ssize_t H5R_get_name(H5F_t *file, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_type, const void *_ref, char *name, size_t size); @@ -343,7 +343,7 @@ herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id) { H5G_loc_t loc; /* File location */ - H5S_t * space = NULL; /* Pointer to dataspace containing region */ + H5S_t *space = NULL; /* Pointer to dataspace containing region */ herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) @@ -428,7 +428,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_re case H5R_DATASET_REGION: { H5HG_t hobjid; /* Heap object ID */ - uint8_t * buf; /* Buffer to store serialized selection in */ + uint8_t *buf; /* Buffer to store serialized selection in */ const uint8_t *p; /* Pointer to OID to store */ /* Get the heap ID for the dataset region */ @@ -551,7 +551,7 @@ hid_t H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref) { H5G_loc_t loc; /* Group location */ - H5F_t * file = NULL; /* File object */ + H5F_t *file = NULL; /* File object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(FAIL) @@ -603,9 +603,9 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref) H5O_loc_t oloc; /* Object location */ const uint8_t *p; /* Pointer to OID to store */ H5HG_t hobjid; /* Heap object ID */ - uint8_t * buf = NULL; /* Buffer to store serialized selection in */ - H5S_t * ds = NULL; /* Temporary pointer to dataspace */ - H5S_t * ret_value = NULL; + uint8_t *buf = NULL; /* Buffer to store serialized selection in */ + H5S_t *ds = NULL; /* Temporary pointer to dataspace */ + H5S_t *ret_value = NULL; FUNC_ENTER_NOAPI_NOINIT @@ -679,7 +679,7 @@ hid_t H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref) { H5G_loc_t loc; /* Object's group location */ - H5S_t * space = NULL; /* Dataspace object */ + H5S_t *space = NULL; /* Dataspace object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -752,7 +752,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_r case H5R_DATASET_REGION: { H5HG_t hobjid; /* Heap object ID */ const uint8_t *p; /* Pointer to reference to decode */ - uint8_t * buf; /* Buffer to store serialized selection in */ + uint8_t *buf; /* Buffer to store serialized selection in */ /* Get the heap ID for the dataset region */ p = (const uint8_t *)_ref; @@ -891,7 +891,7 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty case H5R_DATASET_REGION: { H5HG_t hobjid; /* Heap object ID */ - uint8_t * buf; /* Buffer to store serialized selection in */ + uint8_t *buf; /* Buffer to store serialized selection in */ const uint8_t *p; /* Pointer to OID to store */ /* Get the heap ID for the dataset region */ @@ -964,7 +964,7 @@ ssize_t H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name, size_t size) { H5G_loc_t loc; /* Group location */ - H5F_t * file; /* File object */ + H5F_t *file; /* File object */ ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5RCprivate.h b/src/H5RCprivate.h index e1b7306..c2f45d9 100644 --- a/src/H5RCprivate.h +++ b/src/H5RCprivate.h @@ -38,7 +38,7 @@ typedef herr_t (*H5RC_free_func_t)(void *o); /* Typedef for reference counted objects */ typedef struct H5RC_t { - void * o; /* Object to be reference counted */ + void *o; /* Object to be reference counted */ size_t n; /* Reference count of number of pointers sharing object */ H5RC_free_func_t free_func; /* Function to free object */ } H5RC_t; @@ -24,7 +24,7 @@ /* Private typedefs & structs */ struct H5RS_str_t { - char * s; /* String to be reference counted */ + char *s; /* String to be reference counted */ unsigned wrapped; /* Indicates that the string to be ref-counted is not copied */ unsigned n; /* Reference count of number of pointers sharing string */ }; @@ -326,7 +326,7 @@ H5RS_dup(H5RS_str_t *ret_value) H5RS_str_t * H5RS_dup_str(const char *s) { - char * new_str; /* Duplicate of string */ + char *new_str; /* Duplicate of string */ size_t path_len; /* Length of the path */ H5RS_str_t *ret_value; diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h index 6532db1..ce83d21 100644 --- a/src/H5RSprivate.h +++ b/src/H5RSprivate.h @@ -52,7 +52,7 @@ H5_DLL H5RS_str_t *H5RS_dup(H5RS_str_t *s); H5_DLL H5RS_str_t *H5RS_dup_str(const char *s); H5_DLL int H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2); H5_DLL ssize_t H5RS_len(const H5RS_str_t *rs); -H5_DLL char * H5RS_get_str(const H5RS_str_t *rs); +H5_DLL char *H5RS_get_str(const H5RS_str_t *rs); H5_DLL unsigned H5RS_get_count(const H5RS_str_t *rs); #endif /* H5RSprivate_H */ @@ -622,7 +622,7 @@ done: hssize_t H5Sget_simple_extent_npoints(hid_t space_id) { - H5S_t * ds; + H5S_t *ds; hssize_t ret_value; FUNC_ENTER_API(FAIL) @@ -1370,7 +1370,7 @@ done: static herr_t H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc) { - H5F_t * f = NULL; /* Fake file structure*/ + H5F_t *f = NULL; /* Fake file structure*/ size_t extent_size; /* Size of serialized dataspace extent */ hssize_t sselect_size; /* Signed size of serialized dataspace selection */ size_t select_size; /* Size of serialized dataspace selection */ @@ -1482,12 +1482,12 @@ done: static H5S_t * H5S_decode(const unsigned char *buf) { - H5F_t * f = NULL; /* Fake file structure*/ - H5S_t * ds; /* Decoded dataspace */ + H5F_t *f = NULL; /* Fake file structure*/ + H5S_t *ds; /* Decoded dataspace */ H5S_extent_t *extent; /* Entent of decoded dataspace */ size_t extent_size; /* size of the extent message*/ uint8_t sizeof_size; /* 'Size of sizes' for file */ - H5S_t * ret_value = NULL; /* Return value */ + H5S_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1595,7 +1595,7 @@ done: H5S_class_t H5Sget_simple_extent_type(hid_t sid) { - H5S_t * space; + H5S_t *space; H5S_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5S_NO_CLASS) @@ -538,14 +538,14 @@ /* Skip list node data structure */ struct H5SL_node_t { - const void * key; /* Pointer to node's key */ - void * item; /* Pointer to node's item */ + const void *key; /* Pointer to node's key */ + void *item; /* Pointer to node's item */ size_t level; /* The level of this node */ size_t log_nalloc; /* log2(Number of slots allocated in forward) */ uint32_t hashval; /* Hash value for key (only for strings, currently) */ hbool_t removed; /* Whether the node is "removed" (actual removal deferred) */ struct H5SL_node_t **forward; /* Array of forward pointers from this node */ - struct H5SL_node_t * backward; /* Backward pointer from this node */ + struct H5SL_node_t *backward; /* Backward pointer from this node */ }; /* Main skip list data structure */ @@ -924,9 +924,9 @@ done: H5SL_t * H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp) { - H5SL_t * new_slist = NULL; /* Pointer to new skip list object created */ + H5SL_t *new_slist = NULL; /* Pointer to new skip list object created */ H5SL_node_t *header; /* Pointer to skip list header node */ - H5SL_t * ret_value = NULL; /* Return value */ + H5SL_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1128,7 +1128,7 @@ H5SL_remove(H5SL_t *slist, const void *key) { H5SL_node_t *x; /* Current node to examine */ uint32_t hashval = 0; /* Hash value for key */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1211,7 +1211,7 @@ done: void * H5SL_remove_first(H5SL_t *slist) { - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ H5SL_node_t *head = slist->header; /* Skip list header */ H5SL_node_t *tmp = slist->header->forward[0]; /* Temporary node pointer */ H5SL_node_t *next; /* Next node to search for */ @@ -1318,7 +1318,7 @@ H5SL_search(H5SL_t *slist, const void *key) { H5SL_node_t *x; /* Current node to examine */ uint32_t hashval = 0; /* Hash value for key */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1410,7 +1410,7 @@ H5SL_less(H5SL_t *slist, const void *key) { H5SL_node_t *x; /* Current node to examine */ uint32_t hashval = 0; /* Hash value for key */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1518,7 +1518,7 @@ H5SL_greater(H5SL_t *slist, const void *key) { H5SL_node_t *x; /* Current node to examine */ uint32_t hashval = 0; /* Hash value for key */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h index c9e1147..e57485c 100644 --- a/src/H5SLprivate.h +++ b/src/H5SLprivate.h @@ -66,15 +66,15 @@ typedef htri_t (*H5SL_try_free_op_t)(void *item, void *key, void *operator_data /********************/ /* Private routines */ /********************/ -H5_DLL H5SL_t *H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp); -H5_DLL size_t H5SL_count(H5SL_t *slist); -H5_DLL herr_t H5SL_insert(H5SL_t *slist, void *item, const void *key); +H5_DLL H5SL_t *H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp); +H5_DLL size_t H5SL_count(H5SL_t *slist); +H5_DLL herr_t H5SL_insert(H5SL_t *slist, void *item, const void *key); H5_DLL H5SL_node_t *H5SL_add(H5SL_t *slist, void *item, const void *key); -H5_DLL void * H5SL_remove(H5SL_t *slist, const void *key); -H5_DLL void * H5SL_remove_first(H5SL_t *slist); -H5_DLL void * H5SL_search(H5SL_t *slist, const void *key); -H5_DLL void * H5SL_less(H5SL_t *slist, const void *key); -H5_DLL void * H5SL_greater(H5SL_t *slist, const void *key); +H5_DLL void *H5SL_remove(H5SL_t *slist, const void *key); +H5_DLL void *H5SL_remove_first(H5SL_t *slist); +H5_DLL void *H5SL_search(H5SL_t *slist, const void *key); +H5_DLL void *H5SL_less(H5SL_t *slist, const void *key); +H5_DLL void *H5SL_greater(H5SL_t *slist, const void *key); H5_DLL H5SL_node_t *H5SL_find(H5SL_t *slist, const void *key); H5_DLL H5SL_node_t *H5SL_below(H5SL_t *slist, const void *key); H5_DLL H5SL_node_t *H5SL_above(H5SL_t *slist, const void *key); @@ -82,7 +82,7 @@ H5_DLL H5SL_node_t *H5SL_first(H5SL_t *slist); H5_DLL H5SL_node_t *H5SL_next(H5SL_node_t *slist_node); H5_DLL H5SL_node_t *H5SL_prev(H5SL_node_t *slist_node); H5_DLL H5SL_node_t *H5SL_last(H5SL_t *slist); -H5_DLL void * H5SL_item(H5SL_node_t *slist_node); +H5_DLL void *H5SL_item(H5SL_node_t *slist_node); H5_DLL herr_t H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data); H5_DLL herr_t H5SL_release(H5SL_t *slist); H5_DLL herr_t H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data); @@ -40,10 +40,10 @@ /* Udata struct for calls to H5SM_read_iter_op */ typedef struct H5SM_read_udata_t { - H5F_t * file; /* File in which sharing is happening (in) */ + H5F_t *file; /* File in which sharing is happening (in) */ H5O_msg_crt_idx_t idx; /* Creation index of this message (in) */ size_t buf_size; /* Size of the encoded message (out) */ - void * encoding_buf; /* The encoded message (out) */ + void *encoding_buf; /* The encoded message (out) */ } H5SM_read_udata_t; /********************/ @@ -63,7 +63,7 @@ static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_ind static herr_t H5SM_decr_ref(void *record, void *op_data, hbool_t *changed); static herr_t H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header, const H5O_shared_t *mesg, unsigned *cache_flags, - size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg); + size_t */*out*/ mesg_size, void **/*out*/ encoded_mesg); static herr_t H5SM_type_to_flag(unsigned type_id, unsigned *type_flag); static herr_t H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence, unsigned *oh_modified, void *_udata); @@ -384,7 +384,7 @@ done: herr_t H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_addr) { - H5SM_master_table_t * table = NULL; /* Shared object master table */ + H5SM_master_table_t *table = NULL; /* Shared object master table */ H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ ssize_t index_num; /* Which index */ herr_t ret_value = SUCCEED; /* Return value */ @@ -434,8 +434,8 @@ static herr_t H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id) { H5HF_create_t fheap_cparam; /* Fractal heap creation parameters */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT @@ -684,14 +684,14 @@ static herr_t H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header, H5SM_list_t **_list, H5HF_t *fheap, H5O_t *open_oh, hid_t dxpl_id) { - H5SM_list_t * list; /* Pointer to the existing message list */ + H5SM_list_t *list; /* Pointer to the existing message list */ H5SM_mesg_key_t key; /* Key for inserting records in v2 B-tree */ H5B2_create_t bt2_cparam; /* v2 B-tree creation parameters */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ haddr_t tree_addr; /* New v2 B-tree's address */ size_t num_messages; /* Number of messages being tracked */ size_t x; - void * encoding_buf = NULL; + void *encoding_buf = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -792,7 +792,7 @@ done: static herr_t H5SM_convert_btree_to_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id) { - H5SM_list_t * list = NULL; + H5SM_list_t *list = NULL; H5SM_list_cache_ud_t cache_udata; /* User-data for metadata cache callback */ haddr_t btree_addr; herr_t ret_value = SUCCEED; @@ -1019,7 +1019,7 @@ htri_t H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags, unsigned type_id, void *mesg, unsigned *mesg_flags) { - H5SM_master_table_t * table = NULL; + H5SM_master_table_t *table = NULL; H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ unsigned cache_flags = H5AC__NO_FLAGS_SET; ssize_t index_num; @@ -1131,7 +1131,7 @@ done: static herr_t H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed) { - H5SM_sohm_t * message = (H5SM_sohm_t *)record; + H5SM_sohm_t *message = (H5SM_sohm_t *)record; H5SM_incr_ref_opdata *op_data = (H5SM_incr_ref_opdata *)_op_data; herr_t ret_value = SUCCEED; @@ -1208,15 +1208,15 @@ static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_header_t *header, hbool_t defer, unsigned type_id, void *mesg, unsigned *cache_flags_ptr) { - H5SM_list_t * list = NULL; /* List index */ + H5SM_list_t *list = NULL; /* List index */ H5SM_mesg_key_t key; /* Key used to search the index */ H5SM_list_cache_ud_t cache_udata; /* User-data for metadata cache callback */ H5O_shared_t shared; /* Shared H5O message */ hbool_t found = FALSE; /* Was the message in the index? */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ size_t buf_size; /* Size of the encoded message */ - void * encoding_buf = NULL; /* Buffer for encoded message */ + void *encoding_buf = NULL; /* Buffer for encoded message */ size_t empty_pos = UFAIL; /* Empty entry in list */ herr_t ret_value = SUCCEED; @@ -1501,13 +1501,13 @@ done: herr_t H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg) { - H5SM_master_table_t * table = NULL; + H5SM_master_table_t *table = NULL; unsigned cache_flags = H5AC__NO_FLAGS_SET; H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ ssize_t index_num; size_t mesg_size = 0; - void * mesg_buf = NULL; - void * native_mesg = NULL; + void *mesg_buf = NULL; + void *native_mesg = NULL; unsigned type_id; /* Message type ID to operate on */ herr_t ret_value = SUCCEED; @@ -1735,14 +1735,14 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5SM_index_heade const H5O_shared_t *mesg, unsigned *cache_flags, size_t * /*out*/ mesg_size, void ** /*out*/ encoded_mesg) { - H5SM_list_t * list = NULL; + H5SM_list_t *list = NULL; H5SM_mesg_key_t key; H5SM_sohm_t message; /* Deleted message returned from index */ - H5SM_sohm_t * message_ptr; /* Pointer to deleted message returned from index */ - H5HF_t * fheap = NULL; /* Fractal heap that contains the message */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5SM_sohm_t *message_ptr; /* Pointer to deleted message returned from index */ + H5HF_t *fheap = NULL; /* Fractal heap that contains the message */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ size_t buf_size; /* Size of the encoded message (out) */ - void * encoding_buf = NULL; /* The encoded message (out) */ + void *encoding_buf = NULL; /* The encoded message (out) */ unsigned type_id; /* Message type to operate on */ herr_t ret_value = SUCCEED; @@ -1931,7 +1931,7 @@ done: herr_t H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id) { - H5F_t * f = ext_loc->file; /* File pointer (convenience variable) */ + H5F_t *f = ext_loc->file; /* File pointer (convenience variable) */ H5O_shmesg_table_t sohm_table; /* SOHM message from superblock extension */ H5SM_master_table_t *table = NULL; /* SOHM master table */ unsigned tmp_sohm_nindexes; /* Number of shared messages indexes in the table */ @@ -2079,7 +2079,7 @@ static herr_t H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data) { const H5SM_sohm_t *record = (const H5SM_sohm_t *)_record; /* v2 B-tree record for message */ - H5SM_sohm_t * op_data = (H5SM_sohm_t *)_op_data; /* "op data" from v2 B-tree find */ + H5SM_sohm_t *op_data = (H5SM_sohm_t *)_op_data; /* "op data" from v2 B-tree find */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -2110,17 +2110,17 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data) herr_t H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id, const H5O_shared_t *sh_mesg, hsize_t *ref_count) { - H5HF_t * fheap = NULL; /* Fractal heap that contains shared messages */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ - H5SM_master_table_t * table = NULL; /* SOHM master table */ + H5HF_t *fheap = NULL; /* Fractal heap that contains shared messages */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ + H5SM_master_table_t *table = NULL; /* SOHM master table */ H5SM_table_cache_ud_t tbl_cache_udata; /* User-data for callback */ - H5SM_list_t * list = NULL; /* SOHM index list for message type (if in list form) */ - H5SM_index_header_t * header = NULL; /* Index header for message type */ + H5SM_list_t *list = NULL; /* SOHM index list for message type (if in list form) */ + H5SM_index_header_t *header = NULL; /* Index header for message type */ H5SM_mesg_key_t key; /* Key for looking up message */ H5SM_sohm_t message; /* Shared message returned from callback */ ssize_t index_num; /* Table index for message type */ size_t buf_size; /* Size of the encoded message */ - void * encoding_buf = NULL; /* Buffer for encoded message */ + void *encoding_buf = NULL; /* Buffer for encoded message */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -2338,7 +2338,7 @@ H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap, H5O_t *open_oh, { H5SM_read_udata_t udata; /* User data for callbacks */ H5O_loc_t oloc; /* Object location for message in object header */ - H5O_t * oh = NULL; /* Object header for message in object header */ + H5O_t *oh = NULL; /* Object header for message in object header */ herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT @@ -2492,7 +2492,7 @@ herr_t H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, FILE *stream, int indent, int fwidth, unsigned table_vers, unsigned num_indexes) { - H5SM_master_table_t * table = NULL; /* SOHM master table */ + H5SM_master_table_t *table = NULL; /* SOHM master table */ H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ unsigned x; /* Counter variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2582,7 +2582,7 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, FILE *stream, int in unsigned table_vers, size_t num_messages) { - H5SM_list_t * list = NULL; /* SOHM index list for message type (if in list form) */ + H5SM_list_t *list = NULL; /* SOHM index list for message type (if in list form) */ H5SM_index_header_t header; /* A "false" header used to read the list */ H5SM_list_cache_ud_t cache_udata; /* User-data for metadata cache callback */ unsigned x; /* Counter variable */ @@ -2669,10 +2669,10 @@ done: herr_t H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *finfo) { - H5SM_master_table_t * table = NULL; /* SOHM master table */ + H5SM_master_table_t *table = NULL; /* SOHM master table */ H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ - H5HF_t * fheap = NULL; /* Fractal heap handle */ - H5B2_t * bt2 = NULL; /* v2 B-tree handle for index */ + H5HF_t *fheap = NULL; /* Fractal heap handle */ + H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c index f797855..f2bf4cb 100644 --- a/src/H5SMbtree2.c +++ b/src/H5SMbtree2.c @@ -39,12 +39,12 @@ /********************/ /* v2 B-tree callbacks */ -static void * H5SM_bt2_crt_context(void *udata); +static void *H5SM_bt2_crt_context(void *udata); static herr_t H5SM_bt2_dst_context(void *ctx); static herr_t H5SM_bt2_store(void *native, const void *udata); static herr_t H5SM_bt2_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth, const void *record, const void *_udata); -static void * H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); +static void *H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t dxpl_id, haddr_t addr); /*****************************/ /* Library Private Variables */ @@ -89,9 +89,9 @@ H5FL_DEFINE_STATIC(H5SM_bt2_ctx_t); static void * H5SM_bt2_crt_context(void *_f) { - H5F_t * f = (H5F_t *)_f; /* User data for building callback context */ + H5F_t *f = (H5F_t *)_f; /* User data for building callback context */ H5SM_bt2_ctx_t *ctx; /* Callback context structure */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -221,7 +221,7 @@ static void * H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr) { H5SM_bt2_ctx_t *ctx; /* Callback context structure */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 6cc9b26..c407529 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -118,10 +118,10 @@ static H5SM_master_table_t * H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata) { H5SM_master_table_t *table = NULL; - H5WB_t * wb = NULL; /* Wrapped buffer for table data */ + H5WB_t *wb = NULL; /* Wrapped buffer for table data */ uint8_t tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */ - uint8_t * buf; /* Reading buffer */ - const uint8_t * p; /* Pointer into input buffer */ + uint8_t *buf; /* Reading buffer */ + const uint8_t *p; /* Pointer into input buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t x; /* Counter variable for index headers */ @@ -452,17 +452,17 @@ H5SM_table_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_master_table_t *table, static H5SM_list_t * H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { - H5SM_list_t * list; /* The SOHM list being read in */ + H5SM_list_t *list; /* The SOHM list being read in */ H5SM_list_cache_ud_t *udata = (H5SM_list_cache_ud_t *)_udata; /* User data for callback */ H5SM_bt2_ctx_t ctx; /* Message encoding context */ - H5WB_t * wb = NULL; /* Wrapped buffer for list index data */ + H5WB_t *wb = NULL; /* Wrapped buffer for list index data */ uint8_t lst_buf[H5SM_LST_BUF_SIZE]; /* Buffer for list index */ - uint8_t * buf; /* Reading buffer */ - uint8_t * p; /* Pointer into input buffer */ + uint8_t *buf; /* Reading buffer */ + uint8_t *p; /* Pointer into input buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t x; /* Counter variable for messages in list */ - H5SM_list_t * ret_value; /* Return value */ + H5SM_list_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -570,8 +570,8 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis if (list->cache_info.is_dirty) { H5SM_bt2_ctx_t ctx; /* Message encoding context */ - uint8_t * buf; /* Temporary buffer */ - uint8_t * p; /* Pointer into raw data buffer */ + uint8_t *buf; /* Temporary buffer */ + uint8_t *p; /* Pointer into raw data buffer */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t mesgs_written; /* Number of messages written to list */ size_t x; /* Local index variable */ diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c index 1660db0..12a2e79 100644 --- a/src/H5SMmessage.c +++ b/src/H5SMmessage.c @@ -177,7 +177,7 @@ herr_t H5SM_message_compare(const void *rec1, const void *rec2, int *result) { const H5SM_mesg_key_t *key = (const H5SM_mesg_key_t *)rec1; - const H5SM_sohm_t * mesg = (const H5SM_sohm_t *)rec2; + const H5SM_sohm_t *mesg = (const H5SM_sohm_t *)rec2; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT @@ -278,7 +278,7 @@ done: herr_t H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx) { - H5SM_bt2_ctx_t * ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5SM_sohm_t *message = (const H5SM_sohm_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -322,7 +322,7 @@ herr_t H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx) { H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */ - H5SM_sohm_t * message = (H5SM_sohm_t *)_nrecord; + H5SM_sohm_t *message = (H5SM_sohm_t *)_nrecord; FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h index 31176dd..a25ea00 100644 --- a/src/H5SMpkg.h +++ b/src/H5SMpkg.h @@ -180,7 +180,7 @@ typedef struct { H5AC_info_t cache_info; H5SM_index_header_t *header; /* Pointer to the corresponding index header */ - H5SM_sohm_t * messages; /* Actual list, stored as an array */ + H5SM_sohm_t *messages; /* Actual list, stored as an array */ } H5SM_list_t; /* Typedef for shared object header message master table */ @@ -195,10 +195,10 @@ struct H5SM_master_table_t { /* Typedef for searching an index (list or B-tree) */ typedef struct { - H5F_t * file; /* File in which sharing is happening */ + H5F_t *file; /* File in which sharing is happening */ hid_t dxpl_id; /* DXPL for sharing messages in heap */ - H5HF_t * fheap; /* The heap for this message type, open. */ - void * encoding; /* The message encoded, or NULL */ + H5HF_t *fheap; /* The heap for this message type, open. */ + void *encoding; /* The message encoded, or NULL */ size_t encoding_size; /* Size of the encoding, or 0 */ H5SM_sohm_t message; /* The message to find/insert. * If the message doesn't yet have a @@ -236,7 +236,7 @@ typedef struct H5SM_table_cache_ud_t { /* Callback info for loading a shared message list index into the cache */ typedef struct H5SM_list_cache_ud_t { - H5F_t * f; /* File that shared message index stored as a table is in */ + H5F_t *f; /* File that shared message index stored as a table is in */ H5SM_index_header_t *header; /* Index header for this list */ } H5SM_list_cache_ud_t; diff --git a/src/H5SMtest.c b/src/H5SMtest.c index 63c1bae..601f741 100644 --- a/src/H5SMtest.c +++ b/src/H5SMtest.c @@ -78,7 +78,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, size_t *mesg /* Check for shared messages being enabled */ if (H5F_addr_defined(H5F_SOHM_ADDR(f))) { - H5SM_index_header_t * header; /* Index header for message type */ + H5SM_index_header_t *header; /* Index header for message type */ H5SM_table_cache_ud_t cache_udata; /* User-data for callback */ ssize_t index_num; /* Table index for message type */ @@ -358,7 +358,7 @@ void * H5ST_locate(H5ST_tree_t *tree, const char *s) { H5ST_ptr_t node; /* Pointer to node located */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -680,7 +680,7 @@ void * H5ST_remove(H5ST_tree_t *tree, const char *s) { H5ST_ptr_t node; /* Pointer to node to remove */ - void * ret_value; /* Return value */ + void *ret_value; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5STprivate.h b/src/H5STprivate.h index 02cd926..213d89b 100644 --- a/src/H5STprivate.h +++ b/src/H5STprivate.h @@ -51,10 +51,10 @@ H5_DLL herr_t H5ST_close(H5ST_tree_t *p); H5_DLL herr_t H5ST_insert(H5ST_tree_t *root, const char *s, void *obj); H5_DLL htri_t H5ST_search(H5ST_tree_t *root, const char *s); H5_DLL H5ST_ptr_t H5ST_find(H5ST_tree_t *root, const char *s); -H5_DLL void * H5ST_locate(H5ST_tree_t *root, const char *s); +H5_DLL void *H5ST_locate(H5ST_tree_t *root, const char *s); H5_DLL H5ST_ptr_t H5ST_findfirst(H5ST_tree_t *p); H5_DLL H5ST_ptr_t H5ST_findnext(H5ST_ptr_t p); -H5_DLL void * H5ST_remove(H5ST_tree_t *root, const char *s); +H5_DLL void *H5ST_remove(H5ST_tree_t *root, const char *s); H5_DLL herr_t H5ST_delete(H5ST_tree_t *root, H5ST_ptr_t p); H5_DLL herr_t H5ST_dump(H5ST_ptr_t p); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index e5e71d3..c7708d3 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -604,7 +604,7 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter) /* Check for a single "regular" hyperslab */ if (iter->u.hyp.diminfo_valid) { const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */ - const hsize_t * toff; /* Temporary offset in selection */ + const hsize_t *toff; /* Temporary offset in selection */ /* Check if the offset of the iterator is at the last location in all dimensions */ tdiminfo = iter->u.hyp.diminfo; @@ -745,9 +745,9 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem) } /* end if */ /* Must be an irregular hyperslab selection */ else { - H5S_hyper_span_t * curr_span = NULL; /* Current hyperslab span node */ + H5S_hyper_span_t *curr_span = NULL; /* Current hyperslab span node */ H5S_hyper_span_t **ispan; /* Iterator's hyperslab span nodes */ - hsize_t * abs_arr; /* Absolute hyperslab span position */ + hsize_t *abs_arr; /* Absolute hyperslab span position */ int curr_dim; /* Temporary rank holder */ /* Set the rank of the fastest changing dimension */ @@ -946,9 +946,9 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter) } /* end if */ /* Must be an irregular hyperslab selection */ else { - H5S_hyper_span_t * curr_span = NULL; /* Current hyperslab span node */ + H5S_hyper_span_t *curr_span = NULL; /* Current hyperslab span node */ H5S_hyper_span_t **ispan; /* Iterator's hyperslab span nodes */ - hsize_t * abs_arr; /* Absolute hyperslab span position */ + hsize_t *abs_arr; /* Absolute hyperslab span position */ int curr_dim; /* Temporary rank holder */ /* Set the rank of the fastest changing dimension */ @@ -1277,9 +1277,9 @@ H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value) static H5S_hyper_span_info_t * H5S_hyper_copy_span_helper(H5S_hyper_span_info_t *spans) { - H5S_hyper_span_t * span; /* Hyperslab span */ - H5S_hyper_span_t * new_span; /* Temporary hyperslab span */ - H5S_hyper_span_t * prev_span; /* Previous hyperslab span */ + H5S_hyper_span_t *span; /* Hyperslab span */ + H5S_hyper_span_t *new_span; /* Temporary hyperslab span */ + H5S_hyper_span_t *prev_span; /* Previous hyperslab span */ H5S_hyper_span_info_t *new_down; /* New down span tree */ H5S_hyper_span_info_t *ret_value; @@ -1605,7 +1605,7 @@ done: static herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src, hbool_t share_selection) { - H5S_hyper_sel_t * dst_hslab; /* Pointer to destination hyperslab info */ + H5S_hyper_sel_t *dst_hslab; /* Pointer to destination hyperslab info */ const H5S_hyper_sel_t *src_hslab; /* Pointer to source hyperslab info */ herr_t ret_value = SUCCEED; /* return value */ @@ -1887,7 +1887,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space) hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid) { - H5S_t * space; /* Dataspace to modify selection of */ + H5S_t *space; /* Dataspace to modify selection of */ hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) @@ -2065,7 +2065,7 @@ H5S_hyper_serialize(const H5S_t *space, uint8_t *buf) hsize_t bounds_start[H5S_MAX_RANK]; /* Selection bounds */ hsize_t bounds_end[H5S_MAX_RANK]; /* Selection bounds */ hsize_t temp_off; /* Offset in a given dimension */ - uint8_t * lenp; /* pointer to length location for later storage */ + uint8_t *lenp; /* pointer to length location for later storage */ uint32_t len = 0; /* number of bytes used */ hsize_t block_count; /* block counter for regular hyperslabs */ unsigned fast_dim; /* Rank of the fastest changing dimension for the dataspace */ @@ -2794,7 +2794,7 @@ static herr_t H5S_hyper_offset(const H5S_t *space, hsize_t *offset) { const hssize_t *sel_offset; /* Pointer to the selection's offset */ - const hsize_t * dim_size; /* Pointer to a dataspace's extent */ + const hsize_t *dim_size; /* Pointer to a dataspace's extent */ hsize_t accum; /* Accumulator for dimension sizes */ unsigned rank; /* Dataspace rank */ int i; /* index variable */ @@ -2965,7 +2965,7 @@ H5S_hyper_is_contiguous(const H5S_t *space) } /* end if */ else { H5S_hyper_span_info_t *spans; /* Hyperslab span info node */ - H5S_hyper_span_t * span; /* Hyperslab span node */ + H5S_hyper_span_t *span; /* Hyperslab span node */ /* * For a hyperslab to be contiguous, it must have only one block and @@ -3089,7 +3089,7 @@ static htri_t H5S_hyper_is_single(const H5S_t *space) { H5S_hyper_span_info_t *spans; /* Hyperslab span info node */ - H5S_hyper_span_t * span; /* Hyperslab span node */ + H5S_hyper_span_t *span; /* Hyperslab span node */ unsigned u; /* index variable */ htri_t ret_value = TRUE; /* return value */ @@ -3282,9 +3282,9 @@ H5S_hyper_recover_span(unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hype static H5S_hyper_span_t * H5S_hyper_coord_to_span(unsigned rank, hsize_t *coords) { - H5S_hyper_span_t * new_span; /* Pointer to new span tree for coordinate */ + H5S_hyper_span_t *new_span; /* Pointer to new span tree for coordinate */ H5S_hyper_span_info_t *down = NULL; /* Pointer to new span tree for next level down */ - H5S_hyper_span_t * ret_value = NULL; /* Return value */ + H5S_hyper_span_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -3349,9 +3349,9 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran { H5S_hyper_span_info_t *tspan_info; /* Temporary pointer to span info */ H5S_hyper_span_info_t *prev_span_info; /* Pointer to span info for level above current position */ - H5S_hyper_span_t * tmp_span; /* Temporary pointer to a span */ - H5S_hyper_span_t * tmp2_span; /* Another temporary pointer to a span */ - H5S_hyper_span_t * new_span; /* New span created for element */ + H5S_hyper_span_t *tmp_span; /* Temporary pointer to a span */ + H5S_hyper_span_t *tmp2_span; /* Another temporary pointer to a span */ + H5S_hyper_span_t *new_span; /* New span created for element */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -4200,7 +4200,7 @@ H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space) curr_dim = 0; while (curr_dim < (new_space->extent.rank - base_space->extent.rank)) { H5S_hyper_span_info_t *new_span_info; /* Pointer to list of spans */ - H5S_hyper_span_t * new_span; /* Temporary hyperslab span */ + H5S_hyper_span_t *new_span; /* Temporary hyperslab span */ /* Allocate a new span_info node */ if (NULL == (new_span_info = H5FL_MALLOC(H5S_hyper_span_info_t))) { @@ -4777,7 +4777,7 @@ H5S_hyper_clip_spans(H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_sp H5S_hyper_span_info_t *down_a_and_b; /* Temporary pointer to a_and_b span tree of down spans for overlapping nodes */ H5S_hyper_span_info_t - * down_b_not_a; /* Temporary pointer to b_and_a span tree of down spans for overlapping nodes */ + *down_b_not_a; /* Temporary pointer to b_and_a span tree of down spans for overlapping nodes */ unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */ herr_t ret_value = SUCCEED; /* Return value */ @@ -5305,10 +5305,10 @@ H5S_hyper_merge_spans_helper(H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info { H5S_hyper_span_info_t *merged_spans = NULL; /* Pointer to the merged span tree */ H5S_hyper_span_info_t *tmp_spans; /* Pointer to temporary new span tree */ - H5S_hyper_span_t * tmp_span; /* Pointer to temporary new span */ - H5S_hyper_span_t * span_a; /* Pointer to current span 'a' working on */ - H5S_hyper_span_t * span_b; /* Pointer to current span 'b' working on */ - H5S_hyper_span_t * prev_span_merge; /* Pointer to previous merged span */ + H5S_hyper_span_t *tmp_span; /* Pointer to temporary new span */ + H5S_hyper_span_t *span_a; /* Pointer to current span 'a' working on */ + H5S_hyper_span_t *span_b; /* Pointer to current span 'b' working on */ + H5S_hyper_span_t *prev_span_merge; /* Pointer to previous merged span */ unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */ H5S_hyper_span_info_t *ret_value; @@ -5754,8 +5754,8 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride, const hsize_t *block) { H5S_hyper_span_info_t *down = NULL; /* Pointer to spans in next dimension down */ - H5S_hyper_span_t * last_span; /* Current position in hyperslab span list */ - H5S_hyper_span_t * head = NULL; /* Head of new hyperslab span list */ + H5S_hyper_span_t *last_span; /* Current position in hyperslab span list */ + H5S_hyper_span_t *head = NULL; /* Head of new hyperslab span list */ hsize_t stride_iter; /* Iterator over the stride values */ int i; /* Counters */ unsigned u; /* Counters */ @@ -6654,7 +6654,7 @@ herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], const hsize_t stride[], const hsize_t count[], const hsize_t block[]) { - H5S_t * space; /* Dataspace to modify selection of */ + H5S_t *space; /* Dataspace to modify selection of */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -7362,9 +7362,9 @@ done: static H5S_t * H5S_combine_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2) { - H5S_t * new_space = NULL; /* New dataspace generated */ + H5S_t *new_space = NULL; /* New dataspace generated */ hbool_t span2_owned = FALSE; /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */ - H5S_t * ret_value; /* return value */ + H5S_t *ret_value; /* return value */ FUNC_ENTER_NOAPI_NOINIT @@ -7626,14 +7626,14 @@ static herr_t H5S_hyper_get_seq_list_gen(const H5S_t *space, H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len) { - H5S_hyper_span_t * curr_span; /* Current hyperslab span node */ + H5S_hyper_span_t *curr_span; /* Current hyperslab span node */ H5S_hyper_span_t **ispan; /* Iterator's hyperslab span nodes */ hsize_t slab[H5O_LAYOUT_NDIMS]; /* Cumulative size of each dimension in bytes */ hsize_t acc; /* Accumulator for computing cumulative sizes */ hsize_t loc_off; /* Element offset in the dataspace */ hsize_t last_span_end = 0; /* The offset of the end of the last span */ - hsize_t * abs_arr; /* Absolute hyperslab span position */ - const hssize_t * off_arr; /* Offset within the dataspace extent */ + hsize_t *abs_arr; /* Absolute hyperslab span position */ + const hssize_t *off_arr; /* Offset within the dataspace extent */ size_t span_size = 0; /* Number of bytes in current span to actually process */ size_t io_left; /* Number of elements left to process */ size_t io_bytes_left; /* Number of bytes left to process */ @@ -8048,9 +8048,9 @@ static herr_t H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len) { - hsize_t * mem_size; /* Size of the source buffer */ + hsize_t *mem_size; /* Size of the source buffer */ hsize_t slab[H5O_LAYOUT_NDIMS]; /* Hyperslab size */ - const hssize_t * sel_off; /* Selection offset in dataspace */ + const hssize_t *sel_off; /* Selection offset in dataspace */ hsize_t offset[H5O_LAYOUT_NDIMS]; /* Coordinate offset in dataspace */ hsize_t tmp_count[H5O_LAYOUT_NDIMS]; /* Temporary block count */ hsize_t tmp_block[H5O_LAYOUT_NDIMS]; /* Temporary block offset */ @@ -8494,8 +8494,8 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter, size_t m size_t *nseq, size_t *nelem, hsize_t *off, size_t *len) { const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */ - const hssize_t * sel_off; /* Selection offset in dataspace */ - hsize_t * mem_size; /* Size of the source buffer */ + const hssize_t *sel_off; /* Selection offset in dataspace */ + hsize_t *mem_size; /* Size of the source buffer */ hsize_t base_offset[H5O_LAYOUT_NDIMS]; /* Base coordinate offset in dataspace */ hsize_t offset[H5O_LAYOUT_NDIMS]; /* Coordinate offset in dataspace */ hsize_t slab[H5O_LAYOUT_NDIMS]; /* Hyperslab size */ @@ -8795,8 +8795,8 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned H5_ATTR_UNUSED flags, H5S_se /* Check for the special case of just one H5Sselect_hyperslab call made */ if (space->select.sel_info.hslab->diminfo_valid) { const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */ - const hssize_t * sel_off; /* Selection offset in dataspace */ - hsize_t * mem_size; /* Size of the source buffer */ + const hssize_t *sel_off; /* Selection offset in dataspace */ + hsize_t *mem_size; /* Size of the source buffer */ unsigned ndims; /* Number of dimensions of dataset */ unsigned fast_dim; /* Rank of the fastest changing dimension for the dataspace */ hbool_t single_block; /* Whether the selection is a single block */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 16909c2..2fa6ac0 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -147,7 +147,7 @@ H5S_mpio_create_point_datatype(size_t elmt_size, hsize_t num_points, MPI_Aint *d MPI_Datatype elmt_type; /* MPI datatype for individual element */ hbool_t elmt_type_created = FALSE; /* Whether the element MPI datatype was created */ int mpi_code; /* MPI error code */ - int * blocks = NULL; /* Array of block sizes for MPI hindexed create call */ + int *blocks = NULL; /* Array of block sizes for MPI hindexed create call */ hsize_t u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -208,7 +208,7 @@ static herr_t H5S_mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, int *count, hbool_t *is_derived_type, hbool_t do_permute, hsize_t **permute, hbool_t *is_permuted) { - MPI_Aint * disp = NULL; /* Datatype displacement for each point*/ + MPI_Aint *disp = NULL; /* Datatype displacement for each point*/ H5S_pnt_node_t *curr = NULL; /* Current point being operated on in from the selection */ hssize_t snum_points; /* Signed number of elements in selection */ hsize_t num_points; /* Sumber of points in the selection */ @@ -341,7 +341,7 @@ static herr_t H5S_mpio_permute_type(const H5S_t *space, size_t elmt_size, hsize_t **permute, MPI_Datatype *new_type, int *count, hbool_t *is_derived_type) { - MPI_Aint * disp = NULL; /* Datatype displacement for each point*/ + MPI_Aint *disp = NULL; /* Datatype displacement for each point*/ H5S_sel_iter_t sel_iter; /* Selection iteration info */ hbool_t sel_iter_init = FALSE; /* Selection iteration info has been initialized */ hsize_t off[H5D_IO_VECTOR_SIZE]; /* Array to store sequence offsets */ @@ -813,11 +813,11 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span, const MPI_Datat { size_t alloc_count = 0; /* Number of span tree nodes allocated at this level */ size_t outercount = 0; /* Number of span tree nodes at this level */ - MPI_Datatype * inner_type = NULL; + MPI_Datatype *inner_type = NULL; hbool_t inner_types_freed = FALSE; /* Whether the inner_type MPI datatypes have been freed */ hbool_t span_type_valid = FALSE; /* Whether the span_type MPI datatypes is valid */ - int * blocklen = NULL; - MPI_Aint * disp = NULL; + int *blocklen = NULL; + MPI_Aint *disp = NULL; H5S_hyper_span_t *tspan; /* Temporary pointer to span tree node */ int mpi_code; /* MPI return status code */ herr_t ret_value = SUCCEED; /* Return value */ @@ -842,7 +842,7 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span, const MPI_Datat /* Check if we need to increase the size of the buffers */ if (outercount >= alloc_count) { MPI_Aint *tmp_disp; /* Temporary pointer to new displacement buffer */ - int * tmp_blocklen; /* Temporary pointer to new block length buffer */ + int *tmp_blocklen; /* Temporary pointer to new block length buffer */ /* Double the allocation count */ alloc_count *= 2; @@ -884,8 +884,8 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span, const MPI_Datat /* Check if we need to increase the size of the buffers */ if (outercount >= alloc_count) { - MPI_Aint * tmp_disp; /* Temporary pointer to new displacement buffer */ - int * tmp_blocklen; /* Temporary pointer to new block length buffer */ + MPI_Aint *tmp_disp; /* Temporary pointer to new displacement buffer */ + int *tmp_blocklen; /* Temporary pointer to new block length buffer */ MPI_Datatype *tmp_inner_type; /* Temporary pointer to inner MPI datatype buffer */ /* Double the allocation count */ diff --git a/src/H5Spkg.h b/src/H5Spkg.h index f1a7ba5..cf74cb2 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -88,7 +88,7 @@ struct H5S_extent_t { /* Node in point selection list (typedef'd in H5Sprivate.h) */ struct H5S_pnt_node_t { - hsize_t * pnt; /* Pointer to a selected point */ + hsize_t *pnt; /* Pointer to a selected point */ struct H5S_pnt_node_t *next; /* pointer to next point in list */ }; @@ -109,7 +109,7 @@ struct H5S_hyper_span_t { hsize_t nelem; /* Number of elements in span (only needed during I/O) */ hsize_t pstride; /* Pseudo-stride from start of previous span (only used during I/O) */ struct H5S_hyper_span_info_t *down; /* Pointer to list of spans in next dimension down */ - struct H5S_hyper_span_t * next; /* Pointer to next span in list */ + struct H5S_hyper_span_t *next; /* Pointer to next span in list */ }; /* Information about a list of hyperslab spans */ @@ -181,11 +181,11 @@ typedef struct { /* Methods */ H5S_sel_copy_func_t copy; /* Method to make a copy of a selection */ H5S_sel_get_seq_list_func_t - get_seq_list; /* Method to retrieve a list of offset/length sequences for selection */ - H5S_sel_release_func_t release; /* Method to release current selection */ + get_seq_list; /* Method to retrieve a list of offset/length sequences for selection */ + H5S_sel_release_func_t release; /* Method to release current selection */ H5S_sel_is_valid_func_t is_valid; /* Method to determine if current selection is valid for dataspace */ H5S_sel_serial_size_func_t - serial_size; /* Method to determine number of bytes required to store current selection */ + serial_size; /* Method to determine number of bytes required to store current selection */ H5S_sel_serialize_func_t serialize; /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */ H5S_sel_deserialize_func_t deserialize; /* Method to store create selection from "serialized" form (a byte @@ -193,7 +193,7 @@ typedef struct { H5S_sel_bounds_func_t bounds; /* Method to determine to smallest n-D bounding box containing the current selection */ H5S_sel_offset_func_t - offset; /* Method to determine linear offset of initial element in selection within dataspace */ + offset; /* Method to determine linear offset of initial element in selection within dataspace */ H5S_sel_is_contiguous_func_t is_contiguous; /* Method to determine if current selection is contiguous */ H5S_sel_is_single_func_t is_single; /* Method to determine if current selection is a single block */ H5S_sel_is_regular_func_t is_regular; /* Method to determine if current selection is "regular" */ @@ -213,7 +213,7 @@ typedef struct { hsize_t num_elem; /* Number of elements in selection */ union { - H5S_pnt_list_t * pnt_lst; /* Info about list of selected points (order is important) */ + H5S_pnt_list_t *pnt_lst; /* Info about list of selected points (order is important) */ H5S_hyper_sel_t *hslab; /* Info about hyperslab selection */ } sel_info; } H5S_select_t; @@ -256,7 +256,7 @@ typedef struct H5S_sel_iter_class_t { H5S_sel_iter_next_func_t iter_next; /* Method to move selection iterator to the next element in the selection */ H5S_sel_iter_next_block_func_t - iter_next_block; /* Method to move selection iterator to the next block in the selection */ + iter_next_block; /* Method to move selection iterator to the next block in the selection */ H5S_sel_iter_release_func_t iter_release; /* Method to release iterator for current selection */ } H5S_sel_iter_class_t; diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 3cc0a84..efc93c1 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -710,7 +710,7 @@ done: hssize_t H5Sget_select_elem_npoints(hid_t spaceid) { - H5S_t * space; /* Dataspace to modify selection of */ + H5S_t *space; /* Dataspace to modify selection of */ hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) @@ -797,7 +797,7 @@ static herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf) { H5S_pnt_node_t *curr; /* Point information nodes */ - uint8_t * lenp; /* pointer to length location for later storage */ + uint8_t *lenp; /* pointer to length location for later storage */ uint32_t len = 0; /* number of bytes used */ unsigned u; /* local counting variable */ hsize_t bounds_start[H5S_MAX_RANK]; /* Selection bounding box */ @@ -882,10 +882,10 @@ H5S_point_deserialize(H5S_t *space, const uint8_t *buf) H5S_seloper_t op = H5S_SELECT_SET; /* Selection operation */ uint32_t rank; /* Rank of points */ size_t num_elem = 0; /* Number of elements in selection */ - hsize_t * coord = NULL, *tcoord; /* Pointer to array of elements */ + hsize_t *coord = NULL, *tcoord; /* Pointer to array of elements */ unsigned i, j; /* local counting variables */ uint32_t version; /* Decoded version */ - uint8_t * p; /* Temporary pointer to buf */ + uint8_t *p; /* Temporary pointer to buf */ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1146,9 +1146,9 @@ done: static herr_t H5S_point_offset(const H5S_t *space, hsize_t *offset) { - const hsize_t * pnt; /* Pointer to a selected point's coordinates */ + const hsize_t *pnt; /* Pointer to a selected point's coordinates */ const hssize_t *sel_offset; /* Pointer to the selection's offset */ - const hsize_t * dim_size; /* Pointer to a dataspace's extent */ + const hsize_t *dim_size; /* Pointer to a dataspace's extent */ hsize_t accum; /* Accumulator for dimension sizes */ int i; /* index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1410,8 +1410,8 @@ static herr_t H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offset) { const H5S_pnt_node_t *base_node; /* Point node in base space */ - H5S_pnt_node_t * new_node; /* Point node in new space */ - H5S_pnt_node_t * prev_node; /* Previous point node in new space */ + H5S_pnt_node_t *new_node; /* Point node in new space */ + H5S_pnt_node_t *prev_node; /* Previous point node in new space */ unsigned rank_diff; /* Difference in ranks between spaces */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 8629ecb..1372438 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -83,7 +83,7 @@ typedef struct { /* Irregular hyperslab selection fields */ H5S_hyper_span_info_t *spans; /* Pointer to copy of the span tree */ - H5S_hyper_span_t * span[H5S_MAX_RANK]; /* Array of pointers to span nodes */ + H5S_hyper_span_t *span[H5S_MAX_RANK]; /* Array of pointers to span nodes */ } H5S_hyper_iter_t; /* "All" selection iteration container */ @@ -198,7 +198,7 @@ typedef struct H5S_sel_iter_op_t { #define H5S_SELECT_DESERIALIZE(S, BUF) (H5S_select_deserialize(S, BUF)) /* Operations on dataspaces */ -H5_DLL H5S_t * H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max); +H5_DLL H5S_t *H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max); H5_DLL herr_t H5S_close(H5S_t *ds); H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds); H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 7882db2..39882b1 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -277,7 +277,7 @@ H5S_select_serialize(const H5S_t *space, uint8_t *buf) hssize_t H5Sget_select_npoints(hid_t spaceid) { - H5S_t * space; /* Dataspace to modify selection of */ + H5S_t *space; /* Dataspace to modify selection of */ hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) @@ -1321,7 +1321,7 @@ done: H5S_sel_type H5Sget_select_type(hid_t space_id) { - H5S_t * space; /* dataspace to modify */ + H5S_t *space; /* dataspace to modify */ H5S_sel_type ret_value; /* Return value */ FUNC_ENTER_API(H5S_SEL_ERROR) @@ -1732,7 +1732,7 @@ herr_t H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr, unsigned new_space_rank, const void *buf, void const **adj_buf_ptr, hsize_t element_size) { - H5S_t * new_space = NULL; /* New dataspace constructed */ + H5S_t *new_space = NULL; /* New dataspace constructed */ hsize_t base_space_dims[H5S_MAX_RANK]; /* Current dimensions of base dataspace */ hsize_t base_space_maxdims[H5S_MAX_RANK]; /* Maximum dimensions of base dataspace */ int sbase_space_rank; /* Signed # of dimensions of base dataspace */ @@ -553,7 +553,7 @@ static struct { H5T_path_t **path; /*sorted array of path pointers */ int nsoft; /*number of soft conversions defined */ size_t asoft; /*number of soft conversions allocated */ - H5T_soft_t * soft; /*unsorted array of soft conversions */ + H5T_soft_t *soft; /*unsorted array of soft conversions */ } H5T_g; /* Declare the free list for H5T_path_t's */ @@ -609,9 +609,9 @@ done: static herr_t H5T_init_inf(void) { - H5T_t * dst_p; /* Datatype type operate on */ + H5T_t *dst_p; /* Datatype type operate on */ H5T_atomic_t *dst; /* Datatype's atomic info */ - uint8_t * d; /* Pointer to value to set */ + uint8_t *d; /* Pointer to value to set */ size_t half_size; /* Half the type size */ size_t u; /* Local index value */ herr_t ret_value = SUCCEED; /* Return value */ @@ -772,24 +772,24 @@ H5T_init_interface(void) #if H5_SIZEOF_LONG_DOUBLE != 0 H5T_t *native_ldouble = NULL; /* Datatype structure for native long double */ #endif - H5T_t * std_u8le = NULL; /* Datatype structure for unsigned 8-bit little-endian integer */ - H5T_t * std_u8be = NULL; /* Datatype structure for unsigned 8-bit big-endian integer */ - H5T_t * std_u16le = NULL; /* Datatype structure for unsigned 16-bit little-endian integer */ - H5T_t * std_u16be = NULL; /* Datatype structure for unsigned 16-bit big-endian integer */ - H5T_t * std_u32le = NULL; /* Datatype structure for unsigned 32-bit little-endian integer */ - H5T_t * std_u32be = NULL; /* Datatype structure for unsigned 32-bit big-endian integer */ - H5T_t * std_u64le = NULL; /* Datatype structure for unsigned 64-bit little-endian integer */ - H5T_t * std_u64be = NULL; /* Datatype structure for unsigned 64-bit big-endian integer */ - H5T_t * dt = NULL; - H5T_t * fixedpt = NULL; /* Datatype structure for native int */ - H5T_t * floatpt = NULL; /* Datatype structure for native float */ - H5T_t * string = NULL; /* Datatype structure for C string */ - H5T_t * bitfield = NULL; /* Datatype structure for bitfield */ - H5T_t * compound = NULL; /* Datatype structure for compound objects */ - H5T_t * enum_type = NULL; /* Datatype structure for enum objects */ - H5T_t * vlen = NULL; /* Datatype structure for vlen objects */ - H5T_t * array = NULL; /* Datatype structure for array objects */ - H5T_t * objref = NULL; /* Datatype structure for object reference objects */ + H5T_t *std_u8le = NULL; /* Datatype structure for unsigned 8-bit little-endian integer */ + H5T_t *std_u8be = NULL; /* Datatype structure for unsigned 8-bit big-endian integer */ + H5T_t *std_u16le = NULL; /* Datatype structure for unsigned 16-bit little-endian integer */ + H5T_t *std_u16be = NULL; /* Datatype structure for unsigned 16-bit big-endian integer */ + H5T_t *std_u32le = NULL; /* Datatype structure for unsigned 32-bit little-endian integer */ + H5T_t *std_u32be = NULL; /* Datatype structure for unsigned 32-bit big-endian integer */ + H5T_t *std_u64le = NULL; /* Datatype structure for unsigned 64-bit little-endian integer */ + H5T_t *std_u64be = NULL; /* Datatype structure for unsigned 64-bit big-endian integer */ + H5T_t *dt = NULL; + H5T_t *fixedpt = NULL; /* Datatype structure for native int */ + H5T_t *floatpt = NULL; /* Datatype structure for native float */ + H5T_t *string = NULL; /* Datatype structure for C string */ + H5T_t *bitfield = NULL; /* Datatype structure for bitfield */ + H5T_t *compound = NULL; /* Datatype structure for compound objects */ + H5T_t *enum_type = NULL; /* Datatype structure for enum objects */ + H5T_t *vlen = NULL; /* Datatype structure for vlen objects */ + H5T_t *array = NULL; /* Datatype structure for array objects */ + H5T_t *objref = NULL; /* Datatype structure for object reference objects */ hsize_t dim[1] = {1}; /* Dimension info for array datatype */ herr_t status; unsigned copied_dtype = @@ -1992,7 +1992,7 @@ done: H5T_class_t H5Tget_class(hid_t type_id) { - H5T_t * dt; /* Pointer to datatype */ + H5T_t *dt; /* Pointer to datatype */ H5T_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NO_CLASS) @@ -2741,7 +2741,7 @@ done: H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata) { - H5T_t * src, *dst; + H5T_t *src, *dst; H5T_path_t *path; H5T_conv_t ret_value; /* Return value */ @@ -2835,7 +2835,7 @@ herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background, hid_t dxpl_id) { H5T_path_t *tpath; /* type conversion info */ - H5T_t * src, *dst; /* unatomized types */ + H5T_t *src, *dst; /* unatomized types */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -3212,11 +3212,11 @@ done: H5T_t * H5T_copy(H5T_t *old_dt, H5T_copy_t method) { - H5T_t * new_dt = NULL, *tmp = NULL; + H5T_t *new_dt = NULL, *tmp = NULL; H5T_shared_t *reopened_fo = NULL; unsigned i; - char * s; - H5T_t * ret_value = NULL; /* Return value */ + char *s; + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3728,7 +3728,7 @@ H5T_close(H5T_t *dt) /* Free object location (i.e. "unhold" the file if appropriate) */ if (H5O_loc_free(&(dt->oloc)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "problem attempting to free location") + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "problem attempting to free location") } /* end if */ /* Free the group hier. path since we're not calling H5T__free() */ @@ -3854,7 +3854,7 @@ H5T_set_size(H5T_t *dt, size_t size) case H5T_STRING: /* Convert string to variable-length datatype */ if (size == H5T_VARIABLE) { - H5T_t * base = NULL; /* base data type */ + H5T_t *base = NULL; /* base data type */ H5T_cset_t tmp_cset; /* Temp. cset info */ H5T_str_t tmp_strpad; /* Temp. strpad info */ diff --git a/src/H5Tarray.c b/src/H5Tarray.c index 32c0dee..920e40b 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -108,8 +108,8 @@ H5T_init_array_interface(void) hid_t H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */]) { - H5T_t * base; /* base datatype */ - H5T_t * dt = NULL; /* new array datatype */ + H5T_t *base; /* base datatype */ + H5T_t *dt = NULL; /* new array datatype */ unsigned u; /* local index variable */ hid_t ret_value; /* return value */ @@ -164,7 +164,7 @@ H5T_t * H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */]) { unsigned u; /* Local index variable */ - H5T_t * ret_value = NULL; /* New array data type */ + H5T_t *ret_value = NULL; /* New array data type */ FUNC_ENTER_PACKAGE @@ -358,8 +358,8 @@ hid_t H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */], const int H5_ATTR_UNUSED perm[/* ndims */]) { - H5T_t * base; /* base datatype */ - H5T_t * dt = NULL; /* new array datatype */ + H5T_t *base; /* base datatype */ + H5T_t *dt = NULL; /* new array datatype */ unsigned u; /* local index variable */ hid_t ret_value; /* return value */ diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 3c9dfab..1a80a0b 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -108,7 +108,7 @@ herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id) { H5G_loc_t loc; /* Location to create datatype */ - H5T_t * type; /* Datatype for ID */ + H5T_t *type; /* Datatype for ID */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -253,7 +253,7 @@ herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) { H5G_loc_t loc; /* Group location for location */ - H5T_t * type = NULL; /* Datatype created */ + H5T_t *type = NULL; /* Datatype created */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -529,7 +529,7 @@ done: hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id) { - H5T_t * type = NULL; /* Datatype opened in file */ + H5T_t *type = NULL; /* Datatype opened in file */ H5G_loc_t loc; /* Group location of object to open */ H5G_name_t path; /* Datatype group hier. path */ H5O_loc_t oloc; /* Datatype object location */ @@ -616,7 +616,7 @@ done: hid_t H5Tget_create_plist(hid_t dtype_id) { - H5T_t * type; /* Datatype object for ID */ + H5T_t *type; /* Datatype object for ID */ H5P_genplist_t *tcpl_plist; /* Existing datatype creation propertty list */ hid_t new_tcpl_id = FAIL; /* New datatype creation property list */ herr_t status; /* Generic status value */ @@ -682,8 +682,8 @@ H5T_t * H5T_open(const H5G_loc_t *loc, hid_t dxpl_id) { H5T_shared_t *shared_fo = NULL; - H5T_t * dt = NULL; - H5T_t * ret_value = NULL; /* Return value */ + H5T_t *dt = NULL; + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 0e35b16..94735b3 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -174,7 +174,7 @@ H5T_get_member_offset(const H5T_t *dt, unsigned membno) H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno) { - H5T_t * dt; /* Datatype to query */ + H5T_t *dt; /* Datatype to query */ H5T_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NO_CLASS) diff --git a/src/H5Tconv.c b/src/H5Tconv.c index af5790e..e19c1d3 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -663,11 +663,11 @@ { \ size_t elmtno; /*element number */ \ H5T_CONV_DECL_PREC(PREC) /*declare precision variables, or not */ \ - uint8_t * src_buf; /*'raw' source buffer */ \ - uint8_t * dst_buf; /*'raw' destination buffer */ \ - ST * src, *s; /*source buffer */ \ - DT * dst, *d; /*destination buffer */ \ - H5T_t * st, *dt; /*datatype descriptors */ \ + uint8_t *src_buf; /*'raw' source buffer */ \ + uint8_t *dst_buf; /*'raw' destination buffer */ \ + ST *src, *s; /*source buffer */ \ + DT *dst, *d; /*destination buffer */ \ + H5T_t *st, *dt; /*datatype descriptors */ \ ST src_aligned; /*source aligned type */ \ DT dst_aligned; /*destination aligned type */ \ hbool_t s_mv, d_mv; /*move data to align it? */ \ @@ -992,10 +992,10 @@ done: /* Conversion data for H5T__conv_struct() */ typedef struct H5T_conv_struct_t { - int * src2dst; /*mapping from src to dst member num */ - hid_t * src_memb_id; /*source member type ID's */ - hid_t * dst_memb_id; /*destination member type ID's */ - H5T_path_t ** memb_path; /*conversion path for each member */ + int *src2dst; /*mapping from src to dst member num */ + hid_t *src_memb_id; /*source member type ID's */ + hid_t *dst_memb_id; /*destination member type ID's */ + H5T_path_t **memb_path; /*conversion path for each member */ H5T_subset_info_t subset_info; /*info related to compound subsets */ unsigned src_nmembs; /*needed by free function */ } H5T_conv_struct_t; @@ -1004,7 +1004,7 @@ typedef struct H5T_conv_struct_t { typedef struct H5T_enum_struct_t { int base; /*lowest `in' value */ unsigned length; /*num elements in arrays */ - int * src2dst; /*map from src to dst index */ + int *src2dst; /*map from src to dst index */ } H5T_enum_struct_t; /* Conversion data for the hardware conversion functions */ @@ -1129,8 +1129,8 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmt hid_t H5_ATTR_UNUSED dxpl_id) { uint8_t *buf = (uint8_t *)_buf; - H5T_t * src = NULL; - H5T_t * dst = NULL; + H5T_t *src = NULL; + H5T_t *dst = NULL; size_t i; herr_t ret_value = SUCCEED; /* Return value */ @@ -1539,8 +1539,8 @@ H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, s hid_t H5_ATTR_UNUSED dxpl_id) { uint8_t *buf = (uint8_t *)_buf; - H5T_t * src = NULL; - H5T_t * dst = NULL; + H5T_t *src = NULL; + H5T_t *dst = NULL; size_t i; size_t j, md; herr_t ret_value = SUCCEED; /* Return value */ @@ -1634,17 +1634,17 @@ herr_t H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background, hid_t dxpl_id) { - uint8_t * buf = (uint8_t *)_buf; - H5T_t * src = NULL, *dst = NULL; /*source and dest datatypes */ + uint8_t *buf = (uint8_t *)_buf; + H5T_t *src = NULL, *dst = NULL; /*source and dest datatypes */ ssize_t direction; /*direction of traversal */ size_t elmtno; /*element number */ size_t olap; /*num overlapping elements */ size_t half_size; /*1/2 of total size for swapping*/ - uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/ + uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs*/ uint8_t dbuf[256]; /*temp destination buffer */ size_t msb_pad_offset; /*offset for dest MSB padding */ size_t i; - uint8_t * src_rev = NULL; /*order-reversed source buffer */ + uint8_t *src_rev = NULL; /*order-reversed source buffer */ H5P_genplist_t *plist; /*property list pointer */ H5T_conv_cb_t cb_struct = {NULL, NULL}; /*conversion callback structure */ H5T_conv_ret_t except_ret; /*return of callback function */ @@ -1886,8 +1886,8 @@ done: static H5T_conv_struct_t * H5T_conv_struct_free(H5T_conv_struct_t *priv) { - int * src2dst = priv->src2dst; - hid_t * src_memb_id = priv->src_memb_id, *dst_memb_id = priv->dst_memb_id; + int *src2dst = priv->src2dst; + hid_t *src_memb_id = priv->src_memb_id, *dst_memb_id = priv->dst_memb_id; unsigned i; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1960,7 +1960,7 @@ static herr_t H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id) { H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv); - int * src2dst = NULL; + int *src2dst = NULL; unsigned src_nmembs, dst_nmembs; unsigned i, j; herr_t ret_value = SUCCEED; /* Return value */ @@ -2180,14 +2180,14 @@ herr_t H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id) { - uint8_t * buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ - uint8_t * bkg = (uint8_t *)_bkg; /*background pointer arithmetic */ - uint8_t * xbuf = buf, *xbkg = bkg; /*temp pointers into buf and bkg*/ - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ - int * src2dst = NULL; /*maps src member to dst member */ - H5T_cmemb_t * src_memb = NULL; /*source struct member descript.*/ - H5T_cmemb_t * dst_memb = NULL; /*destination struct memb desc. */ + uint8_t *buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ + uint8_t *bkg = (uint8_t *)_bkg; /*background pointer arithmetic */ + uint8_t *xbuf = buf, *xbkg = bkg; /*temp pointers into buf and bkg*/ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ + int *src2dst = NULL; /*maps src member to dst member */ + H5T_cmemb_t *src_memb = NULL; /*source struct member descript.*/ + H5T_cmemb_t *dst_memb = NULL; /*destination struct memb desc. */ size_t offset; /*byte offset wrt struct */ ssize_t src_delta; /*source stride */ ssize_t bkg_delta; /*background stride */ @@ -2407,15 +2407,15 @@ herr_t H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id) { - uint8_t * buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ - uint8_t * bkg = (uint8_t *)_bkg; /*background pointer arithmetic */ - uint8_t * xbuf = NULL; /*temporary pointer into `buf' */ - uint8_t * xbkg = NULL; /*temporary pointer into `bkg' */ - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ - int * src2dst = NULL; /*maps src member to dst member */ - H5T_cmemb_t * src_memb = NULL; /*source struct member descript.*/ - H5T_cmemb_t * dst_memb = NULL; /*destination struct memb desc. */ + uint8_t *buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ + uint8_t *bkg = (uint8_t *)_bkg; /*background pointer arithmetic */ + uint8_t *xbuf = NULL; /*temporary pointer into `buf' */ + uint8_t *xbkg = NULL; /*temporary pointer into `bkg' */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ + int *src2dst = NULL; /*maps src member to dst member */ + H5T_cmemb_t *src_memb = NULL; /*source struct member descript.*/ + H5T_cmemb_t *dst_memb = NULL; /*destination struct memb desc. */ size_t offset; /*byte offset wrt struct */ size_t elmtno; /*element counter */ size_t copy_size; /*size of element for copying */ @@ -2654,7 +2654,7 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) H5T_enum_struct_t *priv = NULL; /*private conversion data */ int n; /*src value cast as native int */ int domain[2] = {0, 0}; /*min and max source values */ - int * map = NULL; /*map from src value to dst idx */ + int *map = NULL; /*map from src value to dst idx */ unsigned length; /*nelmts in map array */ unsigned i, j; /*counters */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2793,13 +2793,13 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id) { - uint8_t * buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ - H5T_t * src = NULL, *dst = NULL; /*src and dst datatypes */ - uint8_t * s = NULL, *d = NULL; /*src and dst BUF pointers */ + uint8_t *buf = (uint8_t *)_buf; /*cast for pointer arithmetic */ + H5T_t *src = NULL, *dst = NULL; /*src and dst datatypes */ + uint8_t *s = NULL, *d = NULL; /*src and dst BUF pointers */ ssize_t src_delta, dst_delta; /*conversion strides */ int n; /*src value cast as native int */ H5T_enum_struct_t *priv = (H5T_enum_struct_t *)(cdata->priv); - H5P_genplist_t * plist; /*property list pointer */ + H5P_genplist_t *plist; /*property list pointer */ H5T_conv_cb_t cb_struct; /*conversion callback structure */ H5T_conv_ret_t except_ret; /*return of callback function */ size_t i; /*counters */ @@ -2994,8 +2994,8 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne size_t H5_ATTR_UNUSED buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id) { - H5T_t * src, *dst; /*src and dst datatypes */ - H5T_t * src_parent; /*parent type for src */ + H5T_t *src, *dst; /*src and dst datatypes */ + H5T_t *src_parent; /*parent type for src */ hid_t src_parent_id = -1; /*ID for parent of the source */ H5T_path_t *tpath; /* Conversion information */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3087,25 +3087,25 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si { H5T_vlen_alloc_info_t _vl_alloc_info; /* VL allocation info buffer */ H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */ - H5T_path_t * tpath = NULL; /* Type conversion path */ + H5T_path_t *tpath = NULL; /* Type conversion path */ hbool_t noop_conv = FALSE; /* Flag to indicate a noop conversion */ hbool_t write_to_file = FALSE; /* Flag to indicate writing to file */ htri_t parent_is_vlen; /* Flag to indicate parent is vlen datatyp */ hid_t tsrc_id = -1, tdst_id = -1; /*temporary type atoms */ - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ H5HG_t bg_hobjid, parent_hobjid; - uint8_t * s = NULL; /*source buffer */ - uint8_t * d = NULL; /*destination buffer */ - uint8_t * b = NULL; /*background buffer */ + uint8_t *s = NULL; /*source buffer */ + uint8_t *d = NULL; /*destination buffer */ + uint8_t *b = NULL; /*background buffer */ ssize_t s_stride, d_stride; /*src and dst strides */ ssize_t b_stride; /*bkg stride */ size_t safe; /*how many elements are safe to process in each pass */ size_t bg_seq_len = 0; size_t src_base_size, dst_base_size; /*source & destination base size*/ - void * conv_buf = NULL; /*temporary conversion buffer */ + void *conv_buf = NULL; /*temporary conversion buffer */ size_t conv_buf_size = 0; /*size of conversion buffer in bytes */ - void * tmp_buf = NULL; /*temporary background buffer */ + void *tmp_buf = NULL; /*temporary background buffer */ size_t tmp_buf_size = 0; /*size of temporary bkg buffer */ hbool_t nested = FALSE; /*flag of nested VL case */ size_t elmtno; /*element number counter */ @@ -3445,14 +3445,14 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, s { H5T_path_t *tpath; /* Type conversion path */ hid_t tsrc_id = -1, tdst_id = -1; /*temporary type atoms */ - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ - uint8_t * sp, *dp; /*source and dest traversal ptrs */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ + uint8_t *sp, *dp; /*source and dest traversal ptrs */ ssize_t src_delta, dst_delta; /*source & destination stride */ int direction; /*direction of traversal */ size_t elmtno; /*element number counter */ unsigned u; /* local index variable */ - void * bkg_buf = NULL; /*temporary background buffer */ + void *bkg_buf = NULL; /*temporary background buffer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3598,15 +3598,15 @@ herr_t H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id) { - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ ssize_t src_delta, dst_delta; /*source & destination stride */ int direction; /*direction of traversal */ size_t elmtno; /*element number */ size_t half_size; /*half the type size */ size_t olap; /*num overlapping elements */ - uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/ - uint8_t * src_rev = NULL; /*order-reversed source buffer */ + uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs*/ + uint8_t *src_rev = NULL; /*order-reversed source buffer */ uint8_t dbuf[64]; /*temp destination buffer */ size_t first; ssize_t sfirst; /*a signed version of `first' */ @@ -4042,8 +4042,8 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id) { /* Traversal-related variables */ - H5T_t * src_p; /*source datatype */ - H5T_t * dst_p; /*destination datatype */ + H5T_t *src_p; /*source datatype */ + H5T_t *dst_p; /*destination datatype */ H5T_atomic_t src; /*atomic source info */ H5T_atomic_t dst; /*atomic destination info */ ssize_t src_delta, dst_delta; /*source & destination stride */ @@ -4053,8 +4053,8 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t tsize; /*type size for swapping bytes */ size_t olap; /*num overlapping elements */ ssize_t bitno = 0; /*bit number */ - uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/ - uint8_t * src_rev = NULL; /*order-reversed source buffer */ + uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs*/ + uint8_t *src_rev = NULL; /*order-reversed source buffer */ uint8_t dbuf[64]; /*temp destination buffer */ uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/ @@ -4632,8 +4632,8 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dxpl_id) { - H5T_t * src = NULL; /*source datatype */ - H5T_t * dst = NULL; /*destination datatype */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ ssize_t src_delta, dst_delta; /*source & destination stride */ int direction; /*direction of traversal */ size_t elmtno; /*element number */ @@ -8326,8 +8326,8 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id) { /* Traversal-related variables */ - H5T_t * src_p; /*source datatype */ - H5T_t * dst_p; /*destination datatype */ + H5T_t *src_p; /*source datatype */ + H5T_t *dst_p; /*destination datatype */ H5T_atomic_t src; /*atomic source info */ H5T_atomic_t dst; /*atomic destination info */ int direction; /*forward or backward traversal */ @@ -8335,15 +8335,15 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t half_size; /*half the type size */ size_t tsize; /*type size for swapping bytes */ size_t olap; /*num overlapping elements */ - uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/ - uint8_t * src_rev = NULL; /*order-reversed source buffer */ + uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs*/ + uint8_t *src_rev = NULL; /*order-reversed source buffer */ uint8_t dbuf[64]; /*temp destination buffer */ uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/ /* Conversion-related variables */ hssize_t expo; /*source exponent */ hssize_t sign; /*source sign bit value */ - uint8_t * int_buf = NULL; /*buffer for temporary value */ + uint8_t *int_buf = NULL; /*buffer for temporary value */ size_t buf_size; /*buffer size for temporary value */ size_t i; /*miscellaneous counters */ size_t first; /*first bit(MSB) in an integer */ @@ -8954,8 +8954,8 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t H5_ATTR_UNUSED bkg_stride, void *buf, void H5_ATTR_UNUSED *bkg, hid_t dxpl_id) { /* Traversal-related variables */ - H5T_t * src_p; /*source datatype */ - H5T_t * dst_p; /*destination datatype */ + H5T_t *src_p; /*source datatype */ + H5T_t *dst_p; /*destination datatype */ H5T_atomic_t src; /*atomic source info */ H5T_atomic_t dst; /*atomic destination info */ int direction; /*forward or backward traversal */ @@ -8963,8 +8963,8 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t half_size; /*half the type size */ size_t tsize; /*type size for swapping bytes */ size_t olap; /*num overlapping elements */ - uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/ - uint8_t * src_rev = NULL; /*order-reversed source buffer */ + uint8_t *s, *sp, *d, *dp; /*source and dest traversal ptrs*/ + uint8_t *src_rev = NULL; /*order-reversed source buffer */ uint8_t dbuf[64]; /*temp destination buffer */ uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/ @@ -8974,7 +8974,7 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz size_t sign; /*source sign bit value */ hbool_t is_max_neg; /*source is maximal negative value*/ hbool_t do_round; /*whether there is roundup */ - uint8_t * int_buf = NULL; /*buffer for temporary value */ + uint8_t *int_buf = NULL; /*buffer for temporary value */ size_t buf_size; /*buffer size for temporary value */ size_t i; /*miscellaneous counters */ size_t first; /*first bit(MSB) in an integer */ diff --git a/src/H5Tcset.c b/src/H5Tcset.c index 9284266..be95706 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -66,7 +66,7 @@ H5T_init_cset_interface(void) H5T_cset_t H5Tget_cset(hid_t type_id) { - H5T_t * dt; + H5T_t *dt; H5T_cset_t ret_value; FUNC_ENTER_API(H5T_CSET_ERROR) diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index cd98cad..4313dc7 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -137,7 +137,7 @@ herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) { H5G_loc_t loc; /* Location to create datatype */ - H5T_t * type; /* Datatype for ID */ + H5T_t *type; /* Datatype for ID */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -179,7 +179,7 @@ done: hid_t H5Topen1(hid_t loc_id, const char *name) { - H5T_t * type = NULL; + H5T_t *type = NULL; H5G_loc_t loc; H5G_name_t path; /* Datatype group hier. path */ H5O_loc_t oloc; /* Datatype object location */ diff --git a/src/H5Tenum.c b/src/H5Tenum.c index d9efdc0..d51d4bf 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -28,7 +28,7 @@ #include "H5Tpkg.h" /*data-type functions */ /* Static local functions */ -static char * H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size); +static char *H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size); static herr_t H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/); /*-------------------------------------------------------------------------- @@ -198,7 +198,7 @@ herr_t H5T__enum_insert(const H5T_t *dt, const char *name, const void *value) { unsigned i; - char ** names = NULL; + char **names = NULL; uint8_t *values = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -380,11 +380,11 @@ done: static char * H5T_enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t size) { - H5T_t * copied_dt = NULL; /* Do sorting in copied datatype */ + H5T_t *copied_dt = NULL; /* Do sorting in copied datatype */ unsigned lt, md = 0, rt; /* Indices for binary search */ int cmp = (-1); /* Comparison result */ hbool_t alloc_name = FALSE; /* Whether name has been allocated */ - char * ret_value = NULL; /* Return value */ + char *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -513,7 +513,7 @@ H5T_enum_valueof(const H5T_t *dt, const char *name, void *value /*out*/) { unsigned lt, md = 0, rt; /*indices for binary search */ int cmp = (-1); /*comparison result */ - H5T_t * copied_dt = NULL; /*do sorting in copied datatype */ + H5T_t *copied_dt = NULL; /*do sorting in copied datatype */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Tfields.c b/src/H5Tfields.c index f0e687e..d5602c7 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -145,7 +145,7 @@ char * H5Tget_member_name(hid_t type_id, unsigned membno) { H5T_t *dt = NULL; - char * ret_value; + char *ret_value; FUNC_ENTER_API(NULL) H5TRACE2("*s", "iIu", type_id, membno); @@ -239,7 +239,7 @@ done: int H5Tget_member_index(hid_t type_id, const char *name) { - H5T_t * dt = NULL; + H5T_t *dt = NULL; int ret_value = FAIL; unsigned i; diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c index b508327..258e16e 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -64,7 +64,7 @@ H5T_init_fixed_interface(void) H5T_sign_t H5Tget_sign(hid_t type_id) { - H5T_t * dt = NULL; + H5T_t *dt = NULL; H5T_sign_t ret_value; FUNC_ENTER_API(H5T_SGN_ERROR) diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c index 2f2cba0..4672157 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -257,7 +257,7 @@ done: H5T_norm_t H5Tget_norm(hid_t type_id) { - H5T_t * dt; /* Datatype */ + H5T_t *dt; /* Datatype */ H5T_norm_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NORM_ERROR) @@ -339,7 +339,7 @@ done: H5T_pad_t H5Tget_inpad(hid_t type_id) { - H5T_t * dt; /* Datatype */ + H5T_t *dt; /* Datatype */ H5T_pad_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_PAD_ERROR) diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 778986f..e197c8c 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -145,26 +145,26 @@ 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 *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 */ + 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 = 0; /* Number of members in compound & enum types */ unsigned u; /* Local index variable */ - H5T_t * ret_value = NULL; /* Return value */ + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5Toh.c b/src/H5Toh.c index 17ab3fa..3c2b1da 100644 --- a/src/H5Toh.c +++ b/src/H5Toh.c @@ -41,7 +41,7 @@ static htri_t H5O_dtype_isa(H5O_t *loc); static hid_t H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref); -static void * H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); +static void *H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id); static H5O_loc_t *H5O_dtype_get_oloc(hid_t obj_id); /*********************/ @@ -159,7 +159,7 @@ static void * H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) { H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -201,7 +201,7 @@ done: static H5O_loc_t * H5O_dtype_get_oloc(hid_t obj_id) { - H5T_t * type = NULL; /* Datatype opened */ + H5T_t *type = NULL; /* Datatype opened */ H5O_loc_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5Topaque.c b/src/H5Topaque.c index dafd56a..c84c796 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -108,7 +108,7 @@ char * H5Tget_tag(hid_t type_id) { H5T_t *dt = NULL; - char * ret_value; + char *ret_value; FUNC_ENTER_API(NULL) H5TRACE1("*s", "i", type_id); diff --git a/src/H5Torder.c b/src/H5Torder.c index 0b5e749..feb594f 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -104,7 +104,7 @@ H5T_init_order_interface(void) H5T_order_t H5Tget_order(hid_t type_id) { - H5T_t * dt; /* Datatype to query */ + H5T_t *dt; /* Datatype to query */ H5T_order_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_ORDER_ERROR) diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 564de61..3b4eec2 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -150,8 +150,8 @@ struct H5T_stats_t { /* The datatype conversion database */ struct H5T_path_t { char name[H5T_NAMELEN]; /*name for debugging only */ - H5T_t * src; /*source datatype */ - H5T_t * dst; /*destination datatype */ + H5T_t *src; /*source datatype */ + H5T_t *dst; /*destination datatype */ H5T_conv_t func; /*data conversion function */ hbool_t is_hard; /*is it a hard function? */ hbool_t is_noop; /*is it the noop conversion? */ @@ -203,7 +203,7 @@ typedef enum H5T_sort_t { /* A compound datatype member */ typedef struct H5T_cmemb_t { - char * name; /*name of this member */ + char *name; /*name of this member */ size_t offset; /*offset from beginning of struct */ size_t size; /*size of this member */ struct H5T_t *type; /*type of this member */ @@ -224,8 +224,8 @@ typedef struct H5T_enum_t { unsigned nalloc; /*num entries allocated */ unsigned nmembs; /*number of members defined in enum */ H5T_sort_t sorted; /*how are members sorted? */ - uint8_t * value; /*array of values */ - char ** name; /*array of symbol names */ + uint8_t *value; /*array of values */ + char **name; /*array of symbol names */ } H5T_enum_t; /* VL function pointers */ @@ -252,7 +252,7 @@ typedef struct H5T_vlen_t { H5T_cset_t cset; /* For VL string: character set */ H5T_str_t pad; /* For VL string: space or null padding of * extra bytes */ - H5F_t * f; /* File ID (if VL data is on disk) */ + H5F_t *f; /* File ID (if VL data is on disk) */ H5T_vlen_getptrfunc_t getptr; /* Function to get VL sequence pointer */ H5T_vlen_getlenfunc_t getlen; /* Function to get VL sequence size (in element units, not bytes) */ H5T_vlen_isnullfunc_t isnull; /* Function to check if VL value is NIL */ @@ -289,7 +289,7 @@ typedef struct H5T_shared_t { size_t size; /*total size of an instance of this type */ unsigned version; /* Version of object header message to encode this object with */ hbool_t - force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */ + force_conv; /* Set if this type always needs to be converted and H5T__conv_noop cannot be called */ struct H5T_t *parent; /*parent type for derived datatypes */ union { H5T_atomic_t atomic; /* an atomic datatype */ @@ -966,9 +966,9 @@ H5_DLL int H5T__get_array_ndims(const H5T_t *dt); H5_DLL int H5T__get_array_dims(const H5T_t *dt, hsize_t dims[]); /* Compound functions */ -H5_DLL herr_t H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member); -H5_DLL size_t H5T__get_member_size(const H5T_t *dt, unsigned membno); -H5_DLL void H5T__update_packed(const H5T_t *dt); +H5_DLL herr_t H5T__insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member); +H5_DLL size_t H5T__get_member_size(const H5T_t *dt, unsigned membno); +H5_DLL void H5T__update_packed(const H5T_t *dt); H5_DLL H5T_subset_info_t *H5T__conv_struct_subset(const H5T_cdata_t *cdata); /* Enumerated type functions */ @@ -977,7 +977,7 @@ H5_DLL herr_t H5T__enum_insert(const H5T_t *dt, const char *name, const void *va H5_DLL herr_t H5T__get_member_value(const H5T_t *dt, unsigned membno, void *value); /* Field functions (for both compound & enumerated types) */ -H5_DLL char * H5T__get_member_name(H5T_t const *dt, unsigned membno); +H5_DLL char *H5T__get_member_name(H5T_t const *dt, unsigned membno); H5_DLL herr_t H5T__sort_value(const H5T_t *dt, int *map); H5_DLL herr_t H5T__sort_name(const H5T_t *dt, int *map); diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 7ec8aff..c66824c 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -63,15 +63,15 @@ typedef enum { /* VL allocation information */ typedef struct { H5MM_allocate_t alloc_func; /* Allocation function */ - void * alloc_info; /* Allocation information */ + void *alloc_info; /* Allocation information */ H5MM_free_t free_func; /* Free function */ - void * free_info; /* Free information */ + void *free_info; /* Free information */ } H5T_vlen_alloc_info_t; /* Structure for conversion callback property */ typedef struct H5T_conv_cb_t { H5T_conv_except_func_t func; - void * user_data; + void *user_data; } H5T_conv_cb_t; /* Values for the optimization of compound data reading and writing. They indicate @@ -98,29 +98,29 @@ struct H5O_t; H5_DLLVAR H5T_order_t H5T_native_order_g; /* Private functions */ -H5_DLL herr_t H5TN_init_interface(void); -H5_DLL herr_t H5T_init(void); -H5_DLL H5T_t *H5T_copy(H5T_t *old_dt, H5T_copy_t method); -H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); -H5_DLL herr_t H5T_close(H5T_t *dt); -H5_DLL H5T_t * H5T_get_super(const H5T_t *dt); -H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal); -H5_DLL htri_t H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api); -H5_DLL size_t H5T_get_size(const H5T_t *dt); -H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset); -H5_DLL herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc); -H5_DLL H5T_t * H5T_decode(size_t buf_size, const unsigned char *buf); -H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE *stream); -H5_DLL struct H5O_loc_t *H5T_oloc(H5T_t *dt); -H5_DLL H5G_name_t *H5T_nameof(H5T_t *dt); -H5_DLL htri_t H5T_is_immutable(const H5T_t *dt); -H5_DLL htri_t H5T_is_named(const H5T_t *dt); -H5_DLL herr_t H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f); -H5_DLL htri_t H5T_is_relocatable(const H5T_t *dt); -H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func, - hid_t dxpl_id, hbool_t is_api); -H5_DLL hbool_t H5T_path_noop(const H5T_path_t *p); -H5_DLL H5T_bkg_t H5T_path_bkg(const H5T_path_t *p); +H5_DLL herr_t H5TN_init_interface(void); +H5_DLL herr_t H5T_init(void); +H5_DLL H5T_t *H5T_copy(H5T_t *old_dt, H5T_copy_t method); +H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); +H5_DLL herr_t H5T_close(H5T_t *dt); +H5_DLL H5T_t *H5T_get_super(const H5T_t *dt); +H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal); +H5_DLL htri_t H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api); +H5_DLL size_t H5T_get_size(const H5T_t *dt); +H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset); +H5_DLL herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc); +H5_DLL H5T_t *H5T_decode(size_t buf_size, const unsigned char *buf); +H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE *stream); +H5_DLL struct H5O_loc_t *H5T_oloc(H5T_t *dt); +H5_DLL H5G_name_t *H5T_nameof(H5T_t *dt); +H5_DLL htri_t H5T_is_immutable(const H5T_t *dt); +H5_DLL htri_t H5T_is_named(const H5T_t *dt); +H5_DLL herr_t H5T_convert_committed_datatype(H5T_t *dt, H5F_t *f); +H5_DLL htri_t H5T_is_relocatable(const H5T_t *dt); +H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func, + hid_t dxpl_id, hbool_t is_api); +H5_DLL hbool_t H5T_path_noop(const H5T_path_t *p); +H5_DLL H5T_bkg_t H5T_path_bkg(const H5T_path_t *p); H5_DLL H5T_subset_info_t *H5T_path_compound_subset(const H5T_path_t *p); H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); @@ -146,7 +146,7 @@ H5_DLL int H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id); H5_DLL herr_t H5T_update_shared(H5T_t *type); /* Field functions (for both compound & enumerated types) */ -H5_DLL int H5T_get_nmembers(const H5T_t *dt); +H5_DLL int H5T_get_nmembers(const H5T_t *dt); H5_DLL H5T_t *H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method); H5_DLL size_t H5T_get_member_offset(const H5T_t *dt, unsigned membno); diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 96ca8b5..780b7c7 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -281,7 +281,7 @@ typedef struct H5T_cdata_t { H5T_cmd_t command; /**< what should the conversion function do? */ H5T_bkg_t need_bkg; /**< is the background buffer needed? */ hbool_t recalc; /**< recalculate private data */ - void * priv; /**< private data */ + void *priv; /**< private data */ } H5T_cdata_t; //! <!-- [H5T_cdata_t_snip] --> @@ -340,7 +340,7 @@ typedef enum H5T_conv_ret_t { */ typedef struct { size_t len; /**< Length of VL data (in base type units) */ - void * p; /**< Pointer to VL data */ + void *p; /**< Pointer to VL data */ } hvl_t; /* Variable Length String information */ diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index ed12d04..961a33a 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -67,7 +67,7 @@ H5T_init_strpad_interface(void) H5T_str_t H5Tget_strpad(hid_t type_id) { - H5T_t * dt = NULL; + H5T_t *dt = NULL; H5T_str_t ret_value; FUNC_ENTER_API(H5T_STR_ERROR) diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index bc3b68e..1ec2dc1 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -33,21 +33,21 @@ /* Local functions */ static herr_t H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, void *free_info); static ssize_t H5T_vlen_seq_mem_getlen(const void *_vl); -static void * H5T_vlen_seq_mem_getptr(void *_vl); +static void *H5T_vlen_seq_mem_getptr(void *_vl); static htri_t H5T_vlen_seq_mem_isnull(const H5F_t *f, void *_vl); static herr_t H5T_vlen_seq_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len); static herr_t H5T_vlen_seq_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size); static herr_t H5T_vlen_seq_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg); static ssize_t H5T_vlen_str_mem_getlen(const void *_vl); -static void * H5T_vlen_str_mem_getptr(void *_vl); +static void *H5T_vlen_str_mem_getptr(void *_vl); static htri_t H5T_vlen_str_mem_isnull(const H5F_t *f, void *_vl); static herr_t H5T_vlen_str_mem_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len); static herr_t H5T_vlen_str_mem_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *_buf, void *_bg, size_t seq_len, size_t base_size); static herr_t H5T_vlen_str_mem_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg); static ssize_t H5T_vlen_disk_getlen(const void *_vl); -static void * H5T_vlen_disk_getptr(void *_vl); +static void *H5T_vlen_disk_getptr(void *_vl); static htri_t H5T_vlen_disk_isnull(const H5F_t *f, void *_vl); static herr_t H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *_buf, size_t len); static herr_t H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, @@ -685,7 +685,7 @@ H5T_vlen_str_mem_write(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void H5_ATTR_UNUSED *_bg, size_t seq_len, size_t base_size) { - char * t; /* Pointer to temporary buffer allocated */ + char *t; /* Pointer to temporary buffer allocated */ size_t len; /* Maximum length of the string to copy */ herr_t ret_value = SUCCEED; /* Return value */ @@ -23,7 +23,7 @@ /* Local typedefs */ typedef struct H5VM_memcpy_ud_t { - unsigned char * dst; /* Pointer to destination buffer */ + unsigned char *dst; /* Pointer to destination buffer */ const unsigned char *src; /* Pointer to source buffer */ } H5VM_memcpy_ud_t; @@ -503,7 +503,7 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *src_size, const hsize_t *src_offset, const void *_src) { const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmtc */ - uint8_t * dst = (uint8_t *)_dst; /*cast for ptr arithmtc */ + uint8_t *dst = (uint8_t *)_dst; /*cast for ptr arithmtc */ hsize_t size[H5VM_HYPER_NDIMS]; /*a modifiable _size */ hsize_t src_stride[H5VM_HYPER_NDIMS]; /*source stride info */ hsize_t dst_stride[H5VM_HYPER_NDIMS]; /*dest stride info */ @@ -715,7 +715,7 @@ herr_t H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize_t *dst_stride, void *_dst, const hsize_t *src_stride, const void *_src) { - uint8_t * dst = (uint8_t *)_dst; /*cast for ptr arithmetic*/ + uint8_t *dst = (uint8_t *)_dst; /*cast for ptr arithmetic*/ const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmetic*/ hsize_t idx[H5VM_HYPER_NDIMS]; /*1-origin indices */ hsize_t nelmts; /*num elements to copy */ @@ -781,7 +781,7 @@ herr_t H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride, const void *_src) { - uint8_t * dst = (uint8_t *)_dst; /*cast for ptr arithmetic*/ + uint8_t *dst = (uint8_t *)_dst; /*cast for ptr arithmetic*/ const uint8_t *src = (const uint8_t *)_src; /*cast for ptr arithmetic*/ hsize_t idx[H5VM_HYPER_NDIMS]; /*1-origin indices */ hsize_t nelmts; /*num elements to copy */ @@ -850,7 +850,7 @@ H5VM_stride_copy2(hsize_t nelmts, hsize_t elmt_size, /* source */ unsigned src_n, const hsize_t *src_size, const hsize_t *src_stride, const void *_src) { - uint8_t * dst = (uint8_t *)_dst; + uint8_t *dst = (uint8_t *)_dst; const uint8_t *src = (const uint8_t *)_src; hsize_t dst_idx[H5VM_HYPER_NDIMS]; hsize_t src_idx[H5VM_HYPER_NDIMS]; @@ -1241,7 +1241,7 @@ H5VM_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[], hsize { hsize_t *max_dst_off_ptr, *max_src_off_ptr; /* Pointers to max. source and destination offset locations */ hsize_t *dst_off_ptr, *src_off_ptr; /* Pointers to source and destination offset arrays */ - size_t * dst_len_ptr, *src_len_ptr; /* Pointers to source and destination length arrays */ + size_t *dst_len_ptr, *src_len_ptr; /* Pointers to source and destination length arrays */ hsize_t tmp_dst_off, tmp_src_off; /* Temporary source and destination offset values */ size_t tmp_dst_len, tmp_src_len; /* Temporary source and destination length values */ size_t acc_len; /* Accumulated length of sequences */ @@ -1443,11 +1443,11 @@ H5VM_memcpyvv(void *_dst, size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_ hsize_t dst_off_arr[], const void *_src, size_t src_max_nseq, size_t *src_curr_seq, size_t src_len_arr[], hsize_t src_off_arr[]) { - unsigned char * dst; /* Destination buffer pointer */ + unsigned char *dst; /* Destination buffer pointer */ const unsigned char *src; /* Source buffer pointer */ hsize_t *max_dst_off_ptr, *max_src_off_ptr; /* Pointers to max. source and destination offset locations */ hsize_t *dst_off_ptr, *src_off_ptr; /* Pointers to source and destination offset arrays */ - size_t * dst_len_ptr, *src_len_ptr; /* Pointers to source and destination length arrays */ + size_t *dst_len_ptr, *src_len_ptr; /* Pointers to source and destination length arrays */ size_t tmp_dst_len; /* Temporary dest. length value */ size_t tmp_src_len; /* Temporary source length value */ size_t acc_len; /* Accumulated length of sequences */ @@ -50,9 +50,9 @@ /* Typedef for buffer wrapper */ struct H5WB_t { - void * wrapped_buf; /* Pointer to wrapped buffer */ + void *wrapped_buf; /* Pointer to wrapped buffer */ size_t wrapped_size; /* Size of wrapped buffer */ - void * actual_buf; /* Pointer to actual buffer */ + void *actual_buf; /* Pointer to actual buffer */ size_t actual_size; /* Size of actual buffer used */ size_t alloc_size; /* Size of actual buffer allocated */ }; diff --git a/src/H5WBprivate.h b/src/H5WBprivate.h index 1092365..c1f74ee 100644 --- a/src/H5WBprivate.h +++ b/src/H5WBprivate.h @@ -51,8 +51,8 @@ typedef struct H5WB_t H5WB_t; /* General routines for wrapped buffer operations */ H5_DLL H5WB_t *H5WB_wrap(void *buf, size_t buf_size); -H5_DLL void * H5WB_actual(H5WB_t *wb, size_t need); -H5_DLL void * H5WB_actual_clear(H5WB_t *wb, size_t need); +H5_DLL void *H5WB_actual(H5WB_t *wb, size_t need); +H5_DLL void *H5WB_actual_clear(H5WB_t *wb, size_t need); H5_DLL herr_t H5WB_unwrap(H5WB_t *wb); #endif /* H5WBprivate_H */ @@ -763,7 +763,7 @@ H5Z_prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type /* Check if the chunks have filters */ if (dcpl_pline.nused > 0) { hsize_t chunk_dims[H5O_LAYOUT_NDIMS]; /* Size of chunk dimensions */ - H5S_t * space; /* Dataspace describing chunk */ + H5S_t *space; /* Dataspace describing chunk */ size_t u; /* Local index variable */ /* Create a dataspace for a chunk & set the extent */ diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 2dbe720..fac0c7d 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -68,7 +68,7 @@ static size_t H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf) { - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ int status; /* Status from zlib operation */ size_t ret_value = 0; /* Return value */ @@ -157,7 +157,7 @@ H5Z_filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], * must allocate a separate buffer for the result. */ const Bytef *z_src = (const Bytef *)(*buf); - Bytef * z_dst; /*destination buffer */ + Bytef *z_dst; /*destination buffer */ uLongf z_dst_nbytes = (uLongf)H5Z_DEFLATE_SIZE_ADJUST(nbytes); uLong z_src_nbytes = (uLong)nbytes; int aggression; /* Compression aggression setting */ diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c index c4d1d3c..46c7feb 100644 --- a/src/H5Zfletcher32.c +++ b/src/H5Zfletcher32.c @@ -59,7 +59,7 @@ static size_t H5Z_filter_fletcher32(unsigned flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned H5_ATTR_UNUSED cd_values[], size_t nbytes, size_t *buf_size, void **buf) { - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ unsigned char *src = (unsigned char *)(*buf); uint32_t fletcher; /* Checksum value */ uint32_t reversed_fletcher; /* Possible wrong checksum value */ diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 294bbee..eaf1e73 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -220,7 +220,7 @@ H5Z_calc_parms_atomic(void) static herr_t H5Z_calc_parms_array(const H5T_t *type) { - H5T_t * dtype_base = NULL; /* Array datatype's base datatype */ + H5T_t *dtype_base = NULL; /* Array datatype's base datatype */ H5T_class_t dtype_base_class; /* Array datatype's base datatype's class */ herr_t ret_value = SUCCEED; /* Return value */ @@ -289,7 +289,7 @@ static herr_t H5Z_calc_parms_compound(const H5T_t *type) { int nmembers; /* Compound datatype's number of members */ - H5T_t * dtype_member = NULL; /* Compound datatype's member datatype */ + H5T_t *dtype_member = NULL; /* Compound datatype's member datatype */ H5T_class_t dtype_member_class; /* Compound datatype's member datatype's class */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -496,7 +496,7 @@ done: static herr_t H5Z_set_parms_array(const H5T_t *type, unsigned cd_values[]) { - H5T_t * dtype_base = NULL; /* Array datatype's base datatype */ + H5T_t *dtype_base = NULL; /* Array datatype's base datatype */ H5T_class_t dtype_base_class; /* Array datatype's base datatype's class */ size_t dtype_size; /* Array datatype's size (in bytes) */ htri_t is_vlstring; /* flag indicating if datatype is variable-length string */ @@ -581,7 +581,7 @@ static herr_t H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[]) { int nmembers; /* Compound datatype's number of members */ - H5T_t * dtype_member = NULL; /* Compound datatype's member datatype */ + H5T_t *dtype_member = NULL; /* Compound datatype's member datatype */ H5T_class_t dtype_member_class; /* Compound datatype's member datatype's class */ size_t dtype_member_offset; /* Compound datatype's current member datatype's offset (in bytes) */ size_t dtype_next_member_offset; /* Compound datatype's next member datatype's offset (in bytes) */ @@ -703,11 +703,11 @@ static herr_t H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id) { H5P_genplist_t *dcpl_plist; /* Property list pointer */ - const H5T_t * type; /* Datatype */ - const H5S_t * ds; /* Dataspace */ + const H5T_t *type; /* Datatype */ + const H5S_t *ds; /* Dataspace */ unsigned flags; /* Filter flags */ size_t cd_nelmts = H5Z_NBIT_USER_NPARMS; /* Number of filter parameters */ - unsigned * cd_values = NULL; /* Filter parameters */ + unsigned *cd_values = NULL; /* Filter parameters */ hssize_t npoints; /* Number of points in the dataspace */ H5T_class_t dtype_class; /* Datatype's class */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index ecca1c0..2d60f8f 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -53,10 +53,10 @@ typedef struct H5Z_filter_info_t { H5Z_filter_t id; /*filter identification number */ unsigned flags; /*defn and invocation flags */ char _name[H5Z_COMMON_NAME_LEN]; /*internal filter name */ - char * name; /*optional filter name */ + char *name; /*optional filter name */ size_t cd_nelmts; /*number of elements in cd_values[] */ unsigned _cd_values[H5Z_COMMON_CD_VALUES]; /*internal client data values */ - unsigned * cd_values; /*client data values */ + unsigned *cd_values; /*client data values */ } H5Z_filter_info_t; /*****************************/ @@ -78,11 +78,11 @@ H5_DLL herr_t H5Z_modify(const struct H5O_pline_t *pline, H5Z_filter_t filter, u H5_DLL herr_t H5Z_pipeline(const struct H5O_pline_t *pline, unsigned flags, unsigned *filter_mask /*in,out*/, H5Z_EDC_t edc_read, H5Z_cb_t cb_struct, size_t *nbytes /*in,out*/, size_t *buf_size /*in,out*/, void **buf /*in,out*/); -H5_DLL H5Z_class2_t *H5Z_find(H5Z_filter_t id); -H5_DLL herr_t H5Z_can_apply(hid_t dcpl_id, hid_t type_id); -H5_DLL herr_t H5Z_set_local(hid_t dcpl_id, hid_t type_id); -H5_DLL herr_t H5Z_can_apply_direct(const struct H5O_pline_t *pline); -H5_DLL herr_t H5Z_set_local_direct(const struct H5O_pline_t *pline); +H5_DLL H5Z_class2_t *H5Z_find(H5Z_filter_t id); +H5_DLL herr_t H5Z_can_apply(hid_t dcpl_id, hid_t type_id); +H5_DLL herr_t H5Z_set_local(hid_t dcpl_id, hid_t type_id); +H5_DLL herr_t H5Z_can_apply_direct(const struct H5O_pline_t *pline); +H5_DLL herr_t H5Z_set_local_direct(const struct H5O_pline_t *pline); H5_DLL H5Z_filter_info_t *H5Z_filter_info(const struct H5O_pline_t *pline, H5Z_filter_t filter); H5_DLL htri_t H5Z_filter_in_pline(const struct H5O_pline_t *pline, H5Z_filter_t filter); H5_DLL htri_t H5Z_all_filters_avail(const struct H5O_pline_t *pline); @@ -100,6 +100,6 @@ H5_DLL herr_t H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop); H5_DLL herr_t H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size, const H5T_t *buf_type); H5_DLL hbool_t H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop); -H5_DLL const char * H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop); +H5_DLL const char *H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop); #endif diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index bb92595..948b949 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -336,7 +336,7 @@ typedef H5Z_cb_return_t (*H5Z_filter_func_t)(H5Z_filter_t filter, void *buf, siz */ typedef struct H5Z_cb_t { H5Z_filter_func_t func; - void * op_data; + void *op_data; } H5Z_cb_t; #ifdef __cplusplus @@ -460,7 +460,7 @@ typedef struct H5Z_class2_t { H5Z_filter_t id; /**< Filter ID number */ unsigned encoder_present; /**< Does this filter have an encoder? */ unsigned decoder_present; /**< Does this filter have a decoder? */ - const char * name; /**< Comment for debugging */ + const char *name; /**< Comment for debugging */ H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */ H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */ H5Z_func_t filter; /**< The actual filter function */ @@ -763,7 +763,7 @@ H5_DLL herr_t H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_confi //! <!-- [H5Z_class1_t_snip] --> typedef struct H5Z_class1_t { H5Z_filter_t id; /**< Filter ID number */ - const char * name; /**< Comment for debugging */ + const char *name; /**< Comment for debugging */ H5Z_can_apply_func_t can_apply; /**< The "can apply" callback for a filter */ H5Z_set_local_func_t set_local; /**< The "set local" callback for a filter */ H5Z_func_t filter; /**< The actual filter function */ diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c index 7d6ef4e..eebb55c 100644 --- a/src/H5Zscaleoffset.c +++ b/src/H5Zscaleoffset.c @@ -131,7 +131,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ { \ unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values */ \ uint32_t _cd_value; /* Current cd_value */ \ - char * _fv_p; /* Pointer to current byte in fill_val */ \ + char *_fv_p; /* Pointer to current byte in fill_val */ \ size_t _copy_size = 4; /* # of bytes to copy this iteration */ \ size_t _size_rem = sizeof(type); /* # of bytes left to copy to cd_values */ \ \ @@ -260,7 +260,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ { \ unsigned _i = H5Z_SCALEOFFSET_PARM_FILVAL; /* index into cd_values */ \ uint32_t _cd_value; /* Current cd_value */ \ - char * _fv_p; /* Pointer to current byte in fill_val */ \ + char *_fv_p; /* Pointer to current byte in fill_val */ \ size_t _copy_size = 4; /* # of bytes to copy this iteration */ \ size_t _size_rem = sizeof(type); /* # of bytes left to copy to filval */ \ \ @@ -453,7 +453,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Precompress for unsigned integer type */ #define H5Z_scaleoffset_precompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval) \ { \ - type * buf = (type *)data, min = 0, max = 0, span, filval = 0; \ + type *buf = (type *)data, min = 0, max = 0, span, filval = 0; \ unsigned i; \ \ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \ @@ -490,7 +490,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Precompress for signed integer type */ #define H5Z_scaleoffset_precompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval) \ { \ - type * buf = (type *)data, min = 0, max = 0, filval = 0; \ + type *buf = (type *)data, min = 0, max = 0, filval = 0; \ unsigned type span; \ unsigned i; \ \ @@ -506,8 +506,9 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ H5Z_scaleoffset_min_1( \ i, d_nelmts, buf, filval, \ min) if (*minbits != sizeof(type) * 8) /* change values if minbits != full precision */ \ - for (i = 0; i < d_nelmts; i++) buf[i] = (type)( \ - (buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) : (buf[i] - min)); \ + for (i = 0; i < d_nelmts; i++) buf[i] = \ + (type)((buf[i] == filval) ? (type)(((unsigned type)1 << *minbits) - 1) \ + : (buf[i] - min)); \ } \ else { /* fill value undefined */ \ if (*minbits == \ @@ -598,7 +599,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Precompress for floating-point type using variable-minimum-bits method */ #define H5Z_scaleoffset_precompress_3(type, data, d_nelmts, filavail, cd_values, minbits, minval, D_val) \ { \ - type * buf = (type *)data, min = 0, max = 0, filval = 0; \ + type *buf = (type *)data, min = 0, max = 0, filval = 0; \ unsigned long long span; \ unsigned i; \ \ @@ -630,7 +631,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Postdecompress for unsigned integer type */ #define H5Z_scaleoffset_postdecompress_1(type, data, d_nelmts, filavail, cd_values, minbits, minval) \ { \ - type * buf = (type *)data, filval = 0; \ + type *buf = (type *)data, filval = 0; \ unsigned i; \ \ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \ @@ -645,7 +646,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Postdecompress for signed integer type */ #define H5Z_scaleoffset_postdecompress_2(type, data, d_nelmts, filavail, cd_values, minbits, minval) \ { \ - type * buf = (type *)data, filval = 0; \ + type *buf = (type *)data, filval = 0; \ unsigned i; \ \ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \ @@ -718,7 +719,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ /* Postdecompress for floating-point type using variable-minimum-bits method */ #define H5Z_scaleoffset_postdecompress_3(type, data, d_nelmts, filavail, cd_values, minbits, minval, D_val) \ { \ - type * buf = (type *)data, filval = 0, min = 0; \ + type *buf = (type *)data, filval = 0, min = 0; \ unsigned i; \ \ H5Z_scaleoffset_get_min(type, minval, min) \ @@ -926,9 +927,9 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist, H5T_t *type, enum static herr_t H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id) { - H5P_genplist_t * dcpl_plist; /* Property list pointer */ - H5T_t * type; /* Datatype */ - const H5S_t * ds; /* Dataspace */ + H5P_genplist_t *dcpl_plist; /* Property list pointer */ + H5T_t *type; /* Datatype */ + const H5S_t *ds; /* Dataspace */ unsigned flags; /* Filter flags */ size_t cd_nelmts = H5Z_SCALEOFFSET_USER_NPARMS; /* Number of filter parameters */ unsigned cd_values[H5Z_SCALEOFFSET_TOTAL_NPARMS]; /* Filter parameters */ @@ -1119,7 +1120,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value unsigned long long minval = 0; /* minimum value of input buffer */ enum H5Z_scaleoffset_t type; /* memory type corresponding to dataset datatype */ int need_convert = FALSE; /* flag indicating conversion of byte order */ - unsigned char * outbuf = NULL; /* pointer to new output buffer */ + unsigned char *outbuf = NULL; /* pointer to new output buffer */ unsigned buf_offset = 21; /* buffer offset because of parameters stored in file */ unsigned i; /* index */ parms_atomic p; /* parameters needed for compress/decompress functions */ @@ -1226,7 +1227,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value */ minval_size = sizeof(unsigned long long) <= ((unsigned char *)*buf)[4] ? sizeof(unsigned long long) : ((unsigned char *)*buf)[4]; - minval = 0; + minval = 0; for (i = 0; i < minval_size; i++) { minval_mask = ((unsigned char *)*buf)[5 + i]; minval_mask <<= i * 8; @@ -1471,7 +1472,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse H5Z_scaleoffset_precompress_1(unsigned long long, data, d_nelmts, filavail, cd_values, minbits, minval) else if (type == t_schar) { - signed char * buf = (signed char *)data, min = 0, max = 0, filval = 0; + signed char *buf = (signed char *)data, min = 0, max = 0, filval = 0; unsigned char span; unsigned i; diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index 926e7ed..e6f8204 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -59,7 +59,7 @@ static herr_t H5Z_set_local_shuffle(hid_t dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id) { H5P_genplist_t *dcpl_plist; /* Property list pointer */ - const H5T_t * type; /* Datatype */ + const H5T_t *type; /* Datatype */ unsigned flags; /* Filter flags */ size_t cd_nelmts = H5Z_SHUFFLE_USER_NPARMS; /* Number of filter parameters */ unsigned cd_values[H5Z_SHUFFLE_TOTAL_NPARMS]; /* Filter parameters */ @@ -115,7 +115,7 @@ static size_t H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf) { - void * dest = NULL; /* Buffer to deposit [un]shuffled bytes into */ + void *dest = NULL; /* Buffer to deposit [un]shuffled bytes into */ unsigned char *_src = NULL; /* Alias for source buffer */ unsigned char *_dest = NULL; /* Alias for destination buffer */ unsigned bytesoftype; /* Number of bytes per element */ diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 2b4bf01..eed87e8 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -121,8 +121,8 @@ static herr_t H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id) { H5P_genplist_t *dcpl_plist; /* Property list pointer */ - const H5T_t * type; /* Datatype */ - const H5S_t * ds; /* Dataspace */ + const H5T_t *type; /* Datatype */ + const H5S_t *ds; /* Dataspace */ unsigned flags; /* Filter flags */ size_t cd_nelmts = H5Z_SZIP_USER_NPARMS; /* Number of filter parameters */ unsigned cd_values[H5Z_SZIP_TOTAL_NPARMS]; /* Filter parameters */ diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index 9f8707b..71fc944 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -37,12 +37,12 @@ typedef enum { typedef struct { unsigned int num_ptrs; - void ** ptr_dat_val; + void **ptr_dat_val; } H5Z_datval_ptrs; /* Used to represent values in transform expression */ typedef union { - void * dat_val; + void *dat_val; long int_val; double float_val; } H5Z_num_val; @@ -55,8 +55,8 @@ typedef struct H5Z_node { } H5Z_node; struct H5Z_data_xform_t { - char * xform_exp; - H5Z_node * parse_root; + char *xform_exp; + H5Z_node *parse_root; H5Z_datval_ptrs *dat_val_pointers; }; @@ -71,21 +71,21 @@ typedef struct { /* Current token values */ H5Z_token_type tok_type; /* The type of the current token */ - const char * tok_begin; /* The beginning of the current token */ - const char * tok_end; /* The end of the current token */ + const char *tok_begin; /* The beginning of the current token */ + const char *tok_end; /* The end of the current token */ /* Previous token values */ H5Z_token_type tok_last_type; /* The type of the last token */ - const char * tok_last_begin; /* The beginning of the last token */ - const char * tok_last_end; /* The end of the last token */ + const char *tok_last_begin; /* The beginning of the last token */ + const char *tok_last_end; /* The end of the last token */ } H5Z_token; /* Local function prototypes */ static H5Z_token *H5Z_get_token(H5Z_token *current); -static H5Z_node * H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); -static H5Z_node * H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); -static H5Z_node * H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); -static H5Z_node * H5Z_new_node(H5Z_token_type type); +static H5Z_node *H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); +static H5Z_node *H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); +static H5Z_node *H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs *dat_val_pointers); +static H5Z_node *H5Z_new_node(H5Z_token_type type); static void H5Z_do_op(H5Z_node *tree); static hbool_t H5Z_op_is_numbs(H5Z_node *_tree); static hbool_t H5Z_op_is_numbs2(H5Z_node *_tree); @@ -93,8 +93,8 @@ static hid_t H5Z_xform_find_type(const H5T_t *type); static herr_t H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_type, H5Z_result *res); static void H5Z_xform_destroy_parse_tree(H5Z_node *tree); -static void * H5Z_xform_parse(const char *expression, H5Z_datval_ptrs *dat_val_pointers); -static void * H5Z_xform_copy_tree(H5Z_node *tree, H5Z_datval_ptrs *dat_val_pointers, +static void *H5Z_xform_parse(const char *expression, H5Z_datval_ptrs *dat_val_pointers); +static void *H5Z_xform_copy_tree(H5Z_node *tree, H5Z_datval_ptrs *dat_val_pointers, H5Z_datval_ptrs *new_dat_val_pointers); static void H5Z_xform_reduce_tree(H5Z_node *tree); #ifdef H5Z_XFORM_DEBUG @@ -112,7 +112,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); size_t u; \ \ if (((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type != H5Z_XFORM_SYMBOL)) { \ - TYPE * p; \ + TYPE *p; \ double tree_val; \ \ tree_val = \ @@ -125,7 +125,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); } \ } \ else if (((RESR).type == H5Z_XFORM_SYMBOL) && ((RESL).type != H5Z_XFORM_SYMBOL)) { \ - TYPE * p; \ + TYPE *p; \ double tree_val; \ \ /* The case that the left operand is nothing, like -x or +x */ \ @@ -544,7 +544,7 @@ static void * H5Z_xform_parse(const char *expression, H5Z_datval_ptrs *dat_val_pointers) { H5Z_token tok; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -930,7 +930,7 @@ done: herr_t H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void *array, size_t array_size, const H5T_t *buf_type) { - H5Z_node * tree; + H5Z_node *tree; hid_t array_type; H5Z_result res; size_t i; diff --git a/src/H5detect.c b/src/H5detect.c index 6df9658..4d86804 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -95,7 +95,7 @@ H5_GCC_DIAG_OFF("cast-align") * was detected. */ typedef struct detected_t { - const char * varname; + const char *varname; unsigned int size; /* total byte size */ unsigned int precision; /* meaningful bits */ unsigned int offset; /* bit offset to meaningful bits */ @@ -112,7 +112,7 @@ typedef struct detected_t { /* This structure holds structure alignment for pointers, hvl_t, hobj_ref_t, * hdset_reg_ref_t */ typedef struct malign_t { - const char * name; + const char *name; unsigned int comp_align; /* alignment for structure */ } malign_t; @@ -282,7 +282,7 @@ precision(detected_t *d) unsigned char _pad_mask[sizeof(TYPE)]; \ unsigned char _byte_mask; \ int _i, _j, _last = (-1); \ - const char * _mesg; \ + const char *_mesg; \ \ HDmemset(&INFO, 0, sizeof(INFO)); \ INFO.varname = #VAR; \ @@ -1134,7 +1134,7 @@ print_header(void) { time_t now = HDtime(NULL); - struct tm * tm = HDlocaltime(&now); + struct tm *tm = HDlocaltime(&now); char real_name[30]; char host_name[256]; int i; @@ -1190,7 +1190,7 @@ bit.\n"; #ifdef H5_HAVE_GETPWUID { size_t n; - char * comma; + char *comma; if ((pwd = HDgetpwuid(HDgetuid()))) { if ((comma = HDstrchr(pwd->pw_gecos, ','))) { n = MIN(sizeof(real_name) - 1, (unsigned)(comma - pwd->pw_gecos)); diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c index 06f7ae3..c65f7f3 100644 --- a/src/H5make_libsettings.c +++ b/src/H5make_libsettings.c @@ -136,7 +136,7 @@ static void print_header(void) { time_t now = HDtime(NULL); - struct tm * tm = HDlocaltime(&now); + struct tm *tm = HDlocaltime(&now); char real_name[30]; char host_name[256]; int i; @@ -158,7 +158,7 @@ information about the library build configuration\n"; #ifdef H5_HAVE_GETPWUID { size_t n; - char * comma; + char *comma; if ((pwd = HDgetpwuid(HDgetuid()))) { if ((comma = HDstrchr(pwd->pw_gecos, ','))) { diff --git a/src/H5private.h b/src/H5private.h index d388fbd..a30c80d 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1482,7 +1482,7 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base); * define these in terms of macros. */ #if !defined strdup && !defined H5_HAVE_STRDUP -extern char * strdup(const char *s); +extern char *strdup(const char *s); #endif #ifndef HDstrdup @@ -1667,17 +1667,17 @@ typedef enum { } H5_pkg_t; typedef struct H5_debug_open_stream_t { - FILE * stream; /* Open output stream */ + FILE *stream; /* Open output stream */ struct H5_debug_open_stream_t *next; /* Next open output stream */ } H5_debug_open_stream_t; typedef struct H5_debug_t { - FILE * trace; /*API trace output stream */ + FILE *trace; /*API trace output stream */ hbool_t ttop; /*Show only top-level calls? */ hbool_t ttimes; /*Show trace event times? */ struct { const char *name; /*package name */ - FILE * stream; /*output stream or NULL */ + FILE *stream; /*output stream or NULL */ } pkg[H5_NPKGS]; H5_debug_open_stream_t *open_stream; /* Stack of open output streams */ } H5_debug_t; diff --git a/src/H5system.c b/src/H5system.c index 70e41f3..4c58c0d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -109,7 +109,7 @@ HDfprintf(FILE *stream, const char *fmt, ...) int prefix; char modifier[8]; int conv; - char * rest, format_templ[128]; + char *rest, format_templ[128]; int len; const char *s; va_list ap; @@ -1027,9 +1027,9 @@ done: herr_t H5_build_extpath(const char *name, char **extpath /*out*/) { - char * full_path = NULL; /* Pointer to the full path, as built or passed in */ - char * cwdpath = NULL; /* Pointer to the current working directory path */ - char * new_name = NULL; /* Pointer to the name of the file */ + char *full_path = NULL; /* Pointer to the full path, as built or passed in */ + char *cwdpath = NULL; /* Pointer to the current working directory path */ + char *new_name = NULL; /* Pointer to the name of the file */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1050,7 +1050,7 @@ H5_build_extpath(const char *name, char **extpath /*out*/) HGOTO_ERROR(H5E_INTERNAL, H5E_NOSPACE, FAIL, "memory allocation failed") } /* end if */ else { /* relative pathname */ - char * retcwd; + char *retcwd; size_t name_len; int drive; @@ -1277,7 +1277,7 @@ herr_t H5_expand_windows_env_vars(char **env_var) { long n_chars = 0; - char * temp_buf = NULL; + char *temp_buf = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT diff --git a/src/H5trace.c b/src/H5trace.c index 3b34cff..efd1678 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -110,12 +110,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...) { va_list ap; char buf[64], *rest; - const char * argname; + const char *argname; int argno = 0, ptr, asize_idx; hssize_t asize[16]; hssize_t i; - void * vp = NULL; - FILE * out = H5_debug_g.trace; + void *vp = NULL; + FILE *out = H5_debug_g.trace; H5_timer_t event_time; static H5_timer_t first_time = {0.0F, 0.0F, 0.0F}; static int current_depth = 0; @@ -1656,7 +1656,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end if */ else { hid_t pclass_id = HDva_arg(ap, hid_t); - char * class_name = NULL; + char *class_name = NULL; H5P_genclass_t *pclass; /* Get the class name and print it */ diff --git a/src/H5win32defs.h b/src/H5win32defs.h index 308ba6d..96a6199 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -160,13 +160,13 @@ struct timespec { #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz); -H5_DLL int Wsetenv(const char *name, const char *value, int overwrite); -H5_DLL char * Wgetlogin(void); -H5_DLL int c99_snprintf(char *str, size_t size, const char *format, ...); -H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap); -H5_DLL int Wnanosleep(const struct timespec *req, struct timespec *rem); -H5_DLL herr_t H5_expand_windows_env_vars(char **env_var); +H5_DLL int Wgettimeofday(struct timeval *tv, struct timezone *tz); +H5_DLL int Wsetenv(const char *name, const char *value, int overwrite); +H5_DLL char *Wgetlogin(void); +H5_DLL int c99_snprintf(char *str, size_t size, const char *format, ...); +H5_DLL int c99_vsnprintf(char *str, size_t size, const char *format, va_list ap); +H5_DLL int Wnanosleep(const struct timespec *req, struct timespec *rem); +H5_DLL herr_t H5_expand_windows_env_vars(char **env_var); H5_DLL const wchar_t *H5_get_utf16_str(const char *s); H5_DLL int Wopen_utf8(const char *path, int oflag, ...); H5_DLL int Wremove_utf8(const char *path); diff --git a/test/accum.c b/test/accum.c index d8674eb..6614dcd 100644 --- a/test/accum.c +++ b/test/accum.c @@ -1917,8 +1917,8 @@ test_random_write(const H5F_io_info_t *fio_info) { uint8_t *wbuf, *rbuf; /* Buffers for reading & writing */ unsigned seed = 0; /* Random # seed */ - size_t * off; /* Offset of buffer segments to write */ - size_t * len; /* Size of buffer segments to write */ + size_t *off; /* Offset of buffer segments to write */ + size_t *len; /* Size of buffer segments to write */ size_t cur_off; /* Current offset */ size_t nsegments; /* Number of segments to write */ size_t swap; /* Position to swap with */ @@ -347,9 +347,9 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) hsize_t hs_start[1]; hsize_t hs_size[1]; hid_t file = -1, space1 = -1, space2 = -1, mem_space = -1, d1 = -1, d2 = -1; - int * buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); int i, j; - FILE * out = HDfopen(DNAME, "w"); + FILE *out = HDfopen(DNAME, "w"); hid_t dcpl; switch (testsize) { @@ -493,12 +493,12 @@ error: static int reader(char *filename, hid_t fapl) { - FILE * script = NULL; + FILE *script = NULL; hid_t file = -1, mspace = -1, fspace = -1, d2 = -1; char ln[128], *s; hsize_t hs_offset[1]; hsize_t hs_size[1] = {WRT_SIZE}; - int * buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); int i, j, zero, wrong, nerrors = 0; /* Open script file */ diff --git a/test/btree2.c b/test/btree2.c index dfc81ea..c71be22 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -285,7 +285,7 @@ static int iter_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * idx = (hsize_t *)_op_data; + hsize_t *idx = (hsize_t *)_op_data; if (*record != *idx) return (H5_ITER_ERROR); @@ -312,7 +312,7 @@ static int find_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; if (*record != *search) return (FALSE); @@ -339,7 +339,7 @@ static int find_dec_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; if (*record != (INSERT_MANY - (*search + 1))) return (-1); @@ -365,7 +365,7 @@ static int neighbor_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * search = (hsize_t *)_op_data; + hsize_t *search = (hsize_t *)_op_data; *search = *record; @@ -416,7 +416,7 @@ static int remove_cb(const void *_record, void *_op_data) { const hsize_t *record = (const hsize_t *)_record; - hsize_t * rrecord = (hsize_t *)_op_data; + hsize_t *rrecord = (hsize_t *)_op_data; *rrecord = *record; @@ -440,7 +440,7 @@ static unsigned test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ @@ -660,9 +660,9 @@ static unsigned test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t idx; /* Index within B-tree, for iterator */ @@ -834,9 +834,9 @@ static unsigned test_insert_level1_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -988,9 +988,9 @@ static unsigned test_insert_level1_side_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1148,9 +1148,9 @@ static unsigned test_insert_level1_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1289,9 +1289,9 @@ static unsigned test_insert_level1_middle_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1405,9 +1405,9 @@ static unsigned test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1584,9 +1584,9 @@ static unsigned test_insert_level2_leaf_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -1799,9 +1799,9 @@ static unsigned test_insert_level2_leaf_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2034,9 +2034,9 @@ test_insert_level2_2internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2206,9 +2206,9 @@ static unsigned test_insert_level2_2internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2386,9 +2386,9 @@ test_insert_level2_3internal_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2564,9 +2564,9 @@ static unsigned test_insert_level2_3internal_split(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -2744,14 +2744,14 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t idx; /* Index within B-tree, for iterator */ time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ unsigned swap_idx; /* Location to swap with when shuffling */ hsize_t temp_rec; /* Temporary record */ @@ -2972,7 +2972,7 @@ static unsigned test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ @@ -3286,9 +3286,9 @@ static unsigned test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -3511,9 +3511,9 @@ static unsigned test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -3708,9 +3708,9 @@ static unsigned test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -3887,9 +3887,9 @@ static unsigned test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4013,9 +4013,9 @@ static unsigned test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4241,9 +4241,9 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4390,9 +4390,9 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4539,9 +4539,9 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4685,9 +4685,9 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4830,9 +4830,9 @@ static unsigned test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -4969,9 +4969,9 @@ static unsigned test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5256,9 +5256,9 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t * const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5408,9 +5408,9 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t * const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5560,9 +5560,9 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5713,9 +5713,9 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5866,9 +5866,9 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -5993,9 +5993,9 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6119,9 +6119,9 @@ static unsigned test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6246,9 +6246,9 @@ static unsigned test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ @@ -6373,9 +6373,9 @@ gen_l4_btree2(const char *filename, hid_t fapl, const H5B2_create_t *cparam, had const hsize_t *records) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ hsize_t record; /* Record to insert into tree */ unsigned u; /* Local index variable */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -6448,18 +6448,18 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ int fd = -1; /* File descriptor */ h5_stat_t sb; /* Stat buffer for file */ - void * file_data = NULL; /* Copy of file data */ + void *file_data = NULL; /* Copy of file data */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t rrecord; /* Record to remove from tree */ haddr_t root_addr; /* Address of root of B-tree created */ time_t curr_time; /* Current time, for seeding random number generator */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ unsigned rem_idx; /* Location to remove */ hsize_t nrec; /* Number of records in B-tree */ @@ -6875,13 +6875,13 @@ static unsigned test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t search; /* Search value */ - hsize_t * records; /* Record #'s for random insertion */ + hsize_t *records; /* Record #'s for random insertion */ unsigned u; /* Local index variable */ H5B2_node_info_test_t ninfo; /* B-tree node info */ herr_t ret; /* Generic error return value */ @@ -7102,11 +7102,11 @@ test_delete(hid_t fapl, const H5B2_create_t *cparam) { hid_t file = -1; /* File ID */ char filename[1024]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -7358,9 +7358,9 @@ static unsigned test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ hsize_t record; /* Record to insert into tree */ hsize_t modify; /* Modified value */ @@ -7599,7 +7599,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ hbool_t reopen; /* Whether to reopen B-tree during tests */ int ExpressMode; - const char * envval = NULL; + const char *envval = NULL; envval = HDgetenv("HDF5_DRIVER"); if (envval == NULL) diff --git a/test/cache.c b/test/cache.c index 52bcf3f..2c16060 100644 --- a/test/cache.c +++ b/test/cache.c @@ -242,7 +242,7 @@ smoke_check_1(void) hbool_t display_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("smoke check #1 -- all clean, ins, dest, ren, 4/2 MB cache"); @@ -418,7 +418,7 @@ smoke_check_2(void) hbool_t display_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("smoke check #2 -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache"); @@ -593,7 +593,7 @@ smoke_check_3(void) hbool_t display_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("smoke check #3 -- all clean, ins, dest, ren, 2/1 KB cache"); @@ -769,7 +769,7 @@ smoke_check_4(void) hbool_t display_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("smoke check #4 -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache"); @@ -938,15 +938,15 @@ smoke_check_4(void) static unsigned smoke_check_5(void) { - const char * fcn_name = "smoke_check_5"; + const char *fcn_name = "smoke_check_5"; herr_t result; hbool_t show_progress = FALSE; int dirty_unprotects = FALSE; hbool_t display_stats = FALSE; int32_t max_index = 1024; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1162,15 +1162,15 @@ smoke_check_5(void) static unsigned smoke_check_6(void) { - const char * fcn_name = "smoke_check_6"; + const char *fcn_name = "smoke_check_6"; herr_t result; hbool_t show_progress = FALSE; int dirty_unprotects = FALSE; hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1383,15 +1383,15 @@ smoke_check_6(void) static unsigned smoke_check_7(void) { - const char * fcn_name = "smoke_check_7"; + const char *fcn_name = "smoke_check_7"; herr_t result; hbool_t show_progress = FALSE; int dirty_unprotects = FALSE; hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1605,15 +1605,15 @@ smoke_check_7(void) static unsigned smoke_check_8(void) { - const char * fcn_name = "smoke_check_8"; + const char *fcn_name = "smoke_check_8"; herr_t result; hbool_t show_progress = FALSE; int dirty_unprotects = FALSE; hbool_t display_stats = FALSE; int mile_stone = 1; int32_t max_index = 1024; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, #if 1 @@ -1837,8 +1837,8 @@ smoke_check_9(void) hbool_t display_detailed_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; TESTING("smoke check #9 -- all clean, ins, dest, ren, 4/2 MB, corked"); @@ -2127,8 +2127,8 @@ smoke_check_10(void) hbool_t display_detailed_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; TESTING("smoke check #10 -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked"); @@ -2409,7 +2409,7 @@ write_permitted_check(void) hbool_t display_stats = FALSE; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ @@ -2581,7 +2581,7 @@ write_permitted_check(void) static unsigned check_insert_entry(void) { - const char * fcn_name = "check_insert_entry"; + const char *fcn_name = "check_insert_entry"; int entry_type = PICO_ENTRY_TYPE; int i; herr_t result; @@ -2590,10 +2590,10 @@ check_insert_entry(void) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + test_entry_t *base_addr; + test_entry_t *entry_ptr; struct H5C_cache_entry_t *search_ptr; TESTING("H5C_insert_entry() functionality"); @@ -2854,7 +2854,7 @@ check_flush_cache(void) { const char *fcn_name = "check_flush_cache"; hbool_t show_progress = FALSE; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("H5C_flush_cache() functionality"); @@ -4375,7 +4375,7 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int struct flush_cache_test_spec spec[]) { /* const char * fcn_name = "check_flush_cache__multi_entry_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; herr_t result; int i; @@ -4560,7 +4560,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i struct pe_flush_cache_test_spec spec[]) { /* const char * fcn_name = "check_flush_cache__pe_multi_entry_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; herr_t result; int i; @@ -8048,8 +8048,8 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu size_t expected_index_size, int check_size, struct fo_flush_entry_check check[]) { - const char * fcn_name = "check_flush_cache__flush_op_test"; - H5C_t * cache_ptr = file_ptr->shared->cache; + const char *fcn_name = "check_flush_cache__flush_op_test"; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; hbool_t show_progress = FALSE; hbool_t verbose = FALSE; @@ -8503,14 +8503,14 @@ static void check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) { /* const char * fcn_name = "check_flush_cache__flush_op_eviction_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; int num_variable_entries = 8; int num_monster_entries = 31; int num_large_entries = 0; herr_t result; - test_entry_t * entry_ptr; - test_entry_t * base_addr; + test_entry_t *entry_ptr; + test_entry_t *base_addr; struct expected_entry_status expected[8 + 31 + 14] = { /* the expected array is used to maintain a table of the expected status of every * entry used in this test. Note that since the function that processes this @@ -9570,7 +9570,7 @@ check_flush_cache__single_entry(H5F_t *file_ptr) { const char *fcn_name = "check_flush_cache__single_entry"; hbool_t show_progress = FALSE; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; if (cache_ptr == NULL) { @@ -11804,7 +11804,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty hbool_t expected_flushed, hbool_t expected_destroyed) { /* const char * fcn_name = "check_flush_cache__single_entry_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; herr_t result; test_entry_t *base_addr; @@ -11955,7 +11955,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e hbool_t expected_destroyed) { /* const char *fcn_name = "check_flush_cache__pinned_single_entry_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; hbool_t expected_loaded = TRUE; herr_t result; @@ -12116,7 +12116,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e static unsigned check_get_entry_status(void) { - const char * fcn_name = "check_get_entry_status"; + const char *fcn_name = "check_get_entry_status"; static char msg[128]; herr_t result; hbool_t in_cache; @@ -12124,7 +12124,7 @@ check_get_entry_status(void) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr = NULL; test_entry_t *entry_ptr = NULL; @@ -12336,7 +12336,7 @@ check_get_entry_status(void) static unsigned check_expunge_entry(void) { - const char * fcn_name = "check_expunge_entry"; + const char *fcn_name = "check_expunge_entry"; static char msg[128]; herr_t result; hbool_t in_cache; @@ -12344,7 +12344,7 @@ check_expunge_entry(void) hbool_t is_protected; hbool_t is_pinned; size_t entry_size; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -12623,7 +12623,7 @@ static unsigned check_multiple_read_protect(void) { const char *fcn_name = "check_multiple_read_protect()"; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; #if H5C_COLLECT_CACHE_STATS H5C_t *cache_ptr = NULL; #endif /* H5C_COLLECT_CACHE_STATS */ @@ -13011,9 +13011,9 @@ check_multiple_read_protect(void) static unsigned check_move_entry(void) { - const char * fcn_name = "check_move_entry"; + const char *fcn_name = "check_move_entry"; int i; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; struct move_entry_test_spec test_specs[4] = {{/* int entry_type = */ PICO_ENTRY_TYPE, /* int entry_index = */ 10, /* hbool_t is_dirty = */ FALSE, @@ -13117,11 +13117,11 @@ static void check_move_entry__run_test(H5F_t *file_ptr, int test_num, struct move_entry_test_spec *spec_ptr) { /* const char * fcn_name = "check_move_entry__run_test"; */ - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned int flags = H5C__NO_FLAGS_SET; - test_entry_t * base_addr; - test_entry_t * entry_ptr = NULL; + test_entry_t *base_addr; + test_entry_t *entry_ptr = NULL; H5C_cache_entry_t *test_ptr = NULL; assert(cache_ptr); @@ -13235,10 +13235,10 @@ check_move_entry__run_test(H5F_t *file_ptr, int test_num, struct move_entry_test static unsigned check_pin_protected_entry(void) { - const char * fcn_name = "check_pin_protected_entry"; + const char *fcn_name = "check_pin_protected_entry"; static char msg[128]; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -13334,7 +13334,7 @@ check_pin_protected_entry(void) static unsigned check_resize_entry(void) { - const char * fcn_name = "check_resize_entry"; + const char *fcn_name = "check_resize_entry"; static char msg[128]; herr_t result; hbool_t in_cache; @@ -13343,8 +13343,8 @@ check_resize_entry(void) hbool_t is_pinned; size_t entry_size; size_t reported_entry_size; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -14204,7 +14204,7 @@ check_resize_entry(void) static unsigned check_evictions_enabled(void) { - const char * fcn_name = "check_evictions_enabled"; + const char *fcn_name = "check_evictions_enabled"; static char msg[128]; herr_t result; hbool_t show_progress = FALSE; @@ -14212,8 +14212,8 @@ check_evictions_enabled(void) hbool_t in_cache; int i; int mile_stone = 1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *base_addr = NULL; test_entry_t *entry_ptr; @@ -14839,7 +14839,7 @@ static unsigned check_flush_protected_err(void) { const char *fcn_name = "check_flush_protected_err"; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("flush cache with protected entry error"); @@ -14918,7 +14918,7 @@ static unsigned check_destroy_pinned_err(void) { const char *fcn_name = "check_destroy_pinned_err()"; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("destroy cache with permanently pinned entry error"); @@ -15006,7 +15006,7 @@ static unsigned check_destroy_protected_err(void) { const char *fcn_name = "check_destroy_protected_err"; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; TESTING("destroy cache with protected entry error"); @@ -15092,9 +15092,9 @@ check_destroy_protected_err(void) static unsigned check_duplicate_insert_err(void) { - const char * fcn_name = "check_duplicate_insert_err"; + const char *fcn_name = "check_duplicate_insert_err"; herr_t result = -1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -15172,10 +15172,10 @@ check_duplicate_insert_err(void) static unsigned check_move_err(void) { - const char * fcn_name = "check_move_err()"; + const char *fcn_name = "check_move_err()"; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; test_entry_t *entry_0_0_ptr; test_entry_t *entry_0_1_ptr; test_entry_t *entry_1_0_ptr; @@ -15269,9 +15269,9 @@ check_move_err(void) static unsigned check_double_pin_err(void) { - const char * fcn_name = "check_double_pin_err()"; + const char *fcn_name = "check_double_pin_err()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("pin a pinned entry error"); @@ -15357,9 +15357,9 @@ check_double_pin_err(void) static unsigned check_double_unpin_err(void) { - const char * fcn_name = "check_double_unpin_err()"; + const char *fcn_name = "check_double_unpin_err()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("unpin an unpinned entry error"); @@ -15454,9 +15454,9 @@ check_double_unpin_err(void) static unsigned check_pin_entry_errs(void) { - const char * fcn_name = "check_pin_entry_errs()"; + const char *fcn_name = "check_pin_entry_errs()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("pin entry related errors"); @@ -15560,9 +15560,9 @@ check_pin_entry_errs(void) static unsigned check_double_protect_err(void) { - const char * fcn_name = "check_double_protect_err()"; - H5F_t * file_ptr = NULL; - test_entry_t * entry_ptr; + const char *fcn_name = "check_double_protect_err()"; + H5F_t *file_ptr = NULL; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; TESTING("protect a protected entry error"); @@ -15641,9 +15641,9 @@ check_double_protect_err(void) static unsigned check_double_unprotect_err(void) { - const char * fcn_name = "check_double_unprotect_err()"; + const char *fcn_name = "check_double_unprotect_err()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("unprotect an unprotected entry error"); @@ -15721,9 +15721,9 @@ check_double_unprotect_err(void) static unsigned check_mark_entry_dirty_errs(void) { - const char * fcn_name = "check_mark_entry_dirty_errs()"; + const char *fcn_name = "check_mark_entry_dirty_errs()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("mark entry dirty related errors"); @@ -15802,9 +15802,9 @@ check_mark_entry_dirty_errs(void) static unsigned check_expunge_entry_errs(void) { - const char * fcn_name = "check_expunge_entry_errs()"; + const char *fcn_name = "check_expunge_entry_errs()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("expunge entry related errors"); @@ -15916,9 +15916,9 @@ check_expunge_entry_errs(void) static unsigned check_resize_entry_errs(void) { - const char * fcn_name = "check_resize_entry_errs()"; + const char *fcn_name = "check_resize_entry_errs()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("resize entry related errors"); @@ -16015,9 +16015,9 @@ check_resize_entry_errs(void) static unsigned check_unprotect_ro_dirty_err(void) { - const char * fcn_name = "check_unprotect_ro_dirty_err()"; + const char *fcn_name = "check_unprotect_ro_dirty_err()"; herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; TESTING("unprotect a read only entry dirty error"); @@ -16140,10 +16140,10 @@ check_unprotect_ro_dirty_err(void) static unsigned check_protect_ro_rw_err(void) { - const char * fcn_name = "check_protect_ro_rw_err()"; - H5F_t * file_ptr = NULL; + const char *fcn_name = "check_protect_ro_rw_err()"; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; - void * thing_ptr = NULL; + void *thing_ptr = NULL; TESTING("protect a read only entry rw error"); @@ -16229,8 +16229,8 @@ check_check_evictions_enabled_err(void) const char *fcn_name = "check_evictions_enabled_err()"; herr_t result; hbool_t evictions_enabled; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; TESTING("get/set evictions enabled errors"); @@ -16381,13 +16381,13 @@ test_rpt_fcn(H5_ATTR_UNUSED H5C_t *cache_ptr, H5_ATTR_UNUSED int32_t version, H5 static unsigned check_auto_cache_resize(void) { - const char * fcn_name = "check_auto_cache_resize()"; + const char *fcn_name = "check_auto_cache_resize()"; hbool_t show_progress = FALSE; herr_t result; int32_t i; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -20363,13 +20363,13 @@ check_auto_cache_resize(void) static unsigned check_auto_cache_resize_disable(void) { - const char * fcn_name = "check_auto_cache_resize_disable()"; + const char *fcn_name = "check_auto_cache_resize_disable()"; hbool_t show_progress = FALSE; herr_t result; int32_t i; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -22959,14 +22959,14 @@ check_auto_cache_resize_disable(void) static unsigned check_auto_cache_resize_epoch_markers(void) { - const char * fcn_name = "check_auto_cache_resize_epoch_markers()"; + const char *fcn_name = "check_auto_cache_resize_epoch_markers()"; hbool_t show_progress = FALSE; herr_t result; int32_t i; int32_t j; int32_t checkpoint = 0; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -23649,10 +23649,10 @@ check_auto_cache_resize_epoch_markers(void) static unsigned check_auto_cache_resize_input_errs(void) { - const char * fcn_name = "check_auto_cache_resize_input_errs()"; + const char *fcn_name = "check_auto_cache_resize_input_errs()"; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_auto_size_ctl_t ref_auto_size_ctl = { /* int32_t version = */ H5C__CURR_AUTO_SIZE_CTL_VER, /* H5C_auto_resize_report_fcn rpt_fcn = */ test_rpt_fcn, @@ -25879,11 +25879,11 @@ check_auto_cache_resize_input_errs(void) static unsigned check_auto_cache_resize_aux_fcns(void) { - const char * fcn_name = "check_auto_cache_resize_aux_fcns()"; + const char *fcn_name = "check_auto_cache_resize_aux_fcns()"; herr_t result; int32_t i; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; double hit_rate; size_t max_size; size_t min_clean_size; @@ -26383,8 +26383,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion) const char *fcn_name = "check_metadata_blizzard_absence"; int entry_type = HUGE_ENTRY_TYPE; size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */ - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; hbool_t show_progress = FALSE; int32_t checkpoint = 0; int32_t entry_idx = 0; @@ -27261,9 +27261,9 @@ setup_cache(size_t max_cache_size, size_t min_clean_size) hbool_t verbose = TRUE; int mile_stone = 1; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - H5F_t * ret_val = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + H5F_t *ret_val = NULL; haddr_t actual_base_addr; hid_t fapl_id = H5P_DEFAULT; diff --git a/test/cache_api.c b/test/cache_api.c index a9b2a83..e42cf38 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -63,14 +63,14 @@ static void check_file_mdc_api_errs(void); static void check_fapl_mdc_api_calls(void) { - const char * fcn_name = "check_fapl_mdc_api_calls()"; + const char *fcn_name = "check_fapl_mdc_api_calls()"; char filename[512]; herr_t result; hid_t fapl_id = -1; hid_t test_fapl_id = -1; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t default_config = H5AC__DEFAULT_CACHE_CONFIG; H5AC_cache_config_t mod_config = { /* int version = */ H5AC__CURR_CACHE_CONFIG_VERSION, @@ -501,7 +501,7 @@ check_fapl_mdc_api_calls(void) static void check_file_mdc_api_calls(void) { - const char * fcn_name = "check_file_mdc_api_calls()"; + const char *fcn_name = "check_file_mdc_api_calls()"; char filename[512]; hid_t file_id = -1; size_t max_size; @@ -837,7 +837,7 @@ check_file_mdc_api_calls(void) static void mdc_api_call_smoke_check(int express_test) { - const char * fcn_name = "mdc_api_call_smoke_check()"; + const char *fcn_name = "mdc_api_call_smoke_check()"; char filename[512]; hbool_t valid_chunk; hbool_t dump_hit_rate = FALSE; @@ -2856,7 +2856,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] = { static void check_fapl_mdc_api_errs(void) { - const char * fcn_name = "check_fapl_mdc_api_errs()"; + const char *fcn_name = "check_fapl_mdc_api_errs()"; static char msg[128]; int i; herr_t result; @@ -3034,7 +3034,7 @@ check_fapl_mdc_api_errs(void) static void check_file_mdc_api_errs(void) { - const char * fcn_name = "check_file_mdc_api_errs()"; + const char *fcn_name = "check_file_mdc_api_errs()"; char filename[512]; static char msg[128]; hbool_t show_progress = FALSE; diff --git a/test/cache_common.c b/test/cache_common.c index 2f64ba8..9e82028 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -162,7 +162,7 @@ static herr_t clear(H5F_t *f, void *thing, hbool_t dest); static herr_t destroy(H5F_t *f, void *thing); static herr_t flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, void *thing, unsigned H5_ATTR_UNUSED *flags_ptr); -static void * load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static void *load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); static herr_t size(H5F_t *f, void *thing, size_t *size_ptr); static void execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_op *op_ptr, unsigned *flags_ptr); @@ -1246,8 +1246,8 @@ hbool_t entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) { hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ - test_entry_t * base_addr; - test_entry_t * entry_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; H5C_cache_entry_t *test_ptr = NULL; HDassert(cache_ptr); @@ -1924,7 +1924,7 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ void insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t result; hbool_t insert_pinned; test_entry_t *base_addr; @@ -2165,9 +2165,9 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) void protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) { - H5C_t * cache_ptr; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5C_t *cache_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (pass) { @@ -2253,9 +2253,9 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) void protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) { - H5C_t * cache_ptr; - test_entry_t * base_addr; - test_entry_t * entry_ptr; + H5C_t *cache_ptr; + test_entry_t *base_addr; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (pass) { @@ -2484,7 +2484,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t lag, hbool_t verbose, hbool_t re hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { const char *fcn_name = "row_major_scan_forward"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = 0; int32_t idx; @@ -2741,7 +2741,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { const char *fcn_name = "hl_row_major_scan_forward"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = 0; int32_t idx; int32_t i; @@ -2838,7 +2838,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t lag, hbool_t verbose, hbool_t r hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { const char *fcn_name = "row_major_scan_backward"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; @@ -3089,7 +3089,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { const char *fcn_name = "hl_row_major_scan_backward"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; int32_t i; @@ -3185,7 +3185,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t lag, hbool_t verbose, hbool_t re int dirty_unprotects) { const char *fcn_name = "col_major_scan_forward()"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = 0; int32_t idx; @@ -3275,7 +3275,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h int dirty_unprotects) { const char *fcn_name = "hl_col_major_scan_forward()"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = 0; int32_t idx; int32_t lag = 200; @@ -3381,7 +3381,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t lag, hbool_t verbose, hbool_t r int dirty_unprotects) { const char *fcn_name = "col_major_scan_backward()"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int mile_stone = 1; int32_t type; int32_t idx; @@ -3483,7 +3483,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, int dirty_unprotects) { const char *fcn_name = "hl_col_major_scan_backward()"; - H5C_t * cache_ptr; + H5C_t *cache_ptr; int32_t type = 0; int32_t idx; int32_t lag = 50; @@ -3606,8 +3606,8 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d int64_t cache_accesses = 0; double expected_hit_rate; double hit_rate; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; /* get a pointer to the files internal data structure */ if (pass) { @@ -3734,8 +3734,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c size_t cur_size; int32_t expected_cur_num_entries; int cur_num_entries; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; /* get a pointer to the files internal data structure */ if (pass) { @@ -3896,8 +3896,8 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t { /* const char * fcn_name = "validate_mdc_config()"; */ static char msg[256]; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t scratch; H5C_auto_size_ctl_t int_config; diff --git a/test/cache_common.h b/test/cache_common.h index 0f8cf42..09cfc3e 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -429,7 +429,7 @@ H5TEST_DLLVAR const int32_t max_indices[NUMBER_OF_ENTRY_TYPES]; H5TEST_DLLVAR const size_t entry_sizes[NUMBER_OF_ENTRY_TYPES]; H5TEST_DLLVAR const haddr_t base_addrs[NUMBER_OF_ENTRY_TYPES]; H5TEST_DLLVAR const haddr_t alt_base_addrs[NUMBER_OF_ENTRY_TYPES]; -H5TEST_DLLVAR const char * entry_type_names[NUMBER_OF_ENTRY_TYPES]; +H5TEST_DLLVAR const char *entry_type_names[NUMBER_OF_ENTRY_TYPES]; /* call back function declarations: */ diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index b9583a7..d074de3 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -1709,7 +1709,7 @@ static unsigned test_pack_ooo(void) { hid_t cmpd, sub_cmpd; /* Datatype IDs */ - H5T_t * dt; /* Datatype pointer */ + H5T_t *dt; /* Datatype pointer */ unsigned order[PACK_NMEMBS]; /* Order of insertion */ unsigned free_order[PACK_NMEMBS]; /* Index of remaining free slots in order */ unsigned num_free; /* Number of free slots in order */ diff --git a/test/dsets.c b/test/dsets.c index 21057ef..36260a2 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -392,7 +392,7 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) hid_t file = -1, dataset = -1, space = -1, xfer = -1; int i, j, n; hsize_t dims[2]; - void * tconv_buf = NULL; + void *tconv_buf = NULL; int f = -1; haddr_t offset; int rdata[DSET_DIM1][DSET_DIM2]; @@ -772,8 +772,8 @@ test_max_compact(hid_t fapl) hid_t plist = -1; hsize_t dims[1]; size_t compact_size; - int * wbuf = NULL; - int * rbuf = NULL; + int *wbuf = NULL; + int *rbuf = NULL; char filename[FILENAME_BUF_SIZE]; int n; size_t u; @@ -1083,7 +1083,7 @@ test_conv_buffer(hid_t fid) herr_t status = -1; int j, k, l; - CmpField * cf = NULL; + CmpField *cf = NULL; CmpFieldR *cfrR = NULL; hid_t dataset = H5I_INVALID_HID; /* dataset ID */ @@ -1251,7 +1251,7 @@ error: static herr_t test_tconv(hid_t file) { - char * out = NULL, *in = NULL; + char *out = NULL, *in = NULL; hsize_t dims[1]; hid_t space = -1, dataset = -1; int i; @@ -1454,7 +1454,7 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_value /* "Compressing" */ else { unsigned add_on = cd_values[3]; /* Get "add on" value */ - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Add the "add on" value to all the data values */ @@ -1514,7 +1514,7 @@ static size_t filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - void * data = NULL; + void *data = NULL; unsigned char *dst = (unsigned char *)(*buf); unsigned int offset; unsigned int length; @@ -1615,7 +1615,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, const hsize_t size[2] = {DSET_DIM1, DSET_DIM2}; /* Dataspace dimensions */ const hsize_t hs_offset[2] = {FILTER_HS_OFFSET1, FILTER_HS_OFFSET2}; /* Hyperslab offset */ const hsize_t hs_size[2] = {FILTER_HS_SIZE1, FILTER_HS_SIZE2}; /* Hyperslab size */ - void * tconv_buf = NULL; /* Temporary conversion buffer */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ size_t i, j, n; /* Local index variables */ herr_t status; /* Error status */ @@ -2559,7 +2559,7 @@ test_missing_filter(hid_t file) size_t i, j; /* Local index variables */ herr_t ret; /* Generic return value */ char testfile[512] = ""; /* Buffer to hold name of existing test file */ - char * srcdir = + char *srcdir = HDgetenv("srcdir"); /* The source directory, if we are using the --srcdir configure option */ TESTING("dataset access with missing filter"); @@ -3977,7 +3977,7 @@ test_nbit_compound_3(hid_t file) typedef struct { /* Struct with some no-op type fields */ int i; /* integer field, NOT a no-op type */ char str[30]; /* fixed-length string, no-op type */ - char * vl_str; /* varible-length string, no-op type */ + char *vl_str; /* varible-length string, no-op type */ hvl_t v; /* VL datatype field, no-op type */ hobj_ref_t r; /* Object reference field, no-op type */ unsigned char o[5]; /* Opaque field, no-op type */ @@ -6758,7 +6758,7 @@ auxread_fdata(hid_t fid, const char *name) hid_t ftype_id = -1; /* file data type ID */ hid_t mtype_id = -1; /* memory data type ID */ size_t msize; /* memory size of memory type */ - void * buf = NULL; /* data buffer */ + void *buf = NULL; /* data buffer */ hsize_t nelmts; /* number of elements in dataset */ int rank; /* rank of dataset */ hsize_t dims[H5S_MAX_RANK]; /* dimensions of dataset */ @@ -8904,7 +8904,7 @@ error: *------------------------------------------------------------------------- */ typedef struct scatter_info_t { - int * src_buf; /* Source data buffer */ + int *src_buf; /* Source data buffer */ size_t block; /* Maximum number of elements to return to H5Dscatter() */ size_t size; /* Remaining number of elements to return */ } scatter_info_t; @@ -9216,7 +9216,7 @@ error: *------------------------------------------------------------------------- */ typedef struct gather_info_t { - int * expect_dst_buf; /* Expected destination data buffer */ + int *expect_dst_buf; /* Expected destination data buffer */ size_t max_nelmts; /* Maximum number of elements passed to callback */ hbool_t last_call; /* Whether this should be the last time the callback is called */ } gather_info_t; diff --git a/test/dt_arith.c b/test/dt_arith.c index a82486d..26466d7 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -911,7 +911,7 @@ test_derived_flt(void) size_t spos, epos, esize, mpos, msize, size; size_t src_size, dst_size; unsigned char *buf = NULL, *saved_buf = NULL; - int * aligned = NULL; + int *aligned = NULL; int endian; /*endianess */ size_t nelmts = NTESTELEM; unsigned int fails_this_test = 0; @@ -1683,21 +1683,21 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) size_t fails_this_test; /*fails for this test */ char str[256]; /*hello string */ dtype_t src_type, dst_type; /*data types */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ int endian; /*machine endianess */ size_t src_size, dst_size; /*type sizes */ - unsigned char * buf = NULL; /*buffer for conversion */ - unsigned char * saved = NULL; /*original values */ + unsigned char *buf = NULL; /*buffer for conversion */ + unsigned char *saved = NULL; /*original values */ size_t j, k; /*counters */ - unsigned char * hw = NULL; /*hardware conv result */ + unsigned char *hw = NULL; /*hardware conv result */ unsigned char src_bits[32]; /*src value in LE order */ unsigned char dst_bits[32]; /*dest value in LE order*/ size_t src_nbits; /*source length in bits */ size_t dst_nbits; /*dst length in bits */ H5T_sign_t src_sign; /*source sign type */ H5T_sign_t dst_sign; /*dst sign type */ - void * aligned = NULL; /*aligned temp buffer */ + void *aligned = NULL; /*aligned temp buffer */ signed char hw_char; unsigned char hw_uchar; short hw_short; @@ -2907,13 +2907,13 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) const size_t max_fails = 8; /*max number of failures*/ size_t fails_all_tests = 0; /*number of failures */ size_t fails_this_test; /*fails for this test */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ size_t src_size, dst_size; /*type sizes */ unsigned char *buf = NULL; /*buffer for conversion */ unsigned char *saved = NULL; /*original values */ char str[256]; /*hello string */ - void * aligned = NULL; /*aligned buffer */ + void *aligned = NULL; /*aligned buffer */ float hw_f; /*hardware-converted */ double hw_d; /*hardware-converted */ #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE @@ -3510,7 +3510,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hid_t dxpl_id; /*dataset transfer property list*/ int fill_value = 9; /*fill value for conversion exception*/ H5T_conv_except_func_t op; /*returned callback function for conversion exception*/ - void * user_data; /*returned pointer to user data passed in to the callback*/ + void *user_data; /*returned pointer to user data passed in to the callback*/ hbool_t except_set = FALSE; /*whether user's exception handling is set*/ size_t nelmts = 0; /*num values per test */ const size_t max_fails = 40; /*max number of failures*/ @@ -3519,20 +3519,20 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) char str[256]; /*hello string */ dtype_t src_type; /*data types */ dtype_t dst_type; /*data types */ - const char * src_type_name = NULL; /*source type name */ - const char * dst_type_name = NULL; /*destination type name */ + const char *src_type_name = NULL; /*source type name */ + const char *dst_type_name = NULL; /*destination type name */ int sendian; /*source endianess */ int dendian; /*destination endianess */ size_t src_size, dst_size; /*type sizes */ - unsigned char * buf = NULL; /*buffer for conversion */ - unsigned char * saved = NULL; /*original values */ + unsigned char *buf = NULL; /*buffer for conversion */ + unsigned char *saved = NULL; /*original values */ size_t j, k; /*counters */ - unsigned char * hw = NULL; /*hardware conv result */ + unsigned char *hw = NULL; /*hardware conv result */ unsigned char src_bits[32]; /*src value in LE order */ unsigned char dst_bits[32]; /*dest value in LE order*/ size_t src_nbits; /*source length in bits */ size_t dst_nbits; /*dst length in bits */ - void * aligned = NULL; /*aligned temp buffer */ + void *aligned = NULL; /*aligned temp buffer */ float hw_float = 0; double hw_double = 0; long double hw_ldouble = 0; diff --git a/test/dtransform.c b/test/dtransform.c index cf1e02f..b505c55 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -791,7 +791,7 @@ test_getset(const hid_t dxpl_id_c_to_f) float windchillFfloatread[ROWS][COLS]; const char *simple = "(4/2) * ( (2 + 4)/(5 - 2.5))"; /* this equals 4.8 */ const char *c_to_f = "(9/5.0)*x + 32"; - char * ptrgetTest = NULL; + char *ptrgetTest = NULL; TESTING("H5Pget_data_transform") @@ -853,7 +853,7 @@ test_set(void) hid_t dxpl_id = -1; H5E_auto2_t func; const char *str = "(9/5.0)*x + 32"; - char * ptrgetTest = NULL; + char *ptrgetTest = NULL; TESTING("H5Pget_data_transform (get before set)") diff --git a/test/dtypes.c b/test/dtypes.c index e324369..d99ef2c 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -587,7 +587,7 @@ test_compound_1(void) H5T_str_t strpad; H5T_order_t order; H5T_sign_t sign; - char * tag = NULL; + char *tag = NULL; int offset; herr_t ret; int retval = 1; @@ -1160,8 +1160,8 @@ test_compound_5(void) src_type_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; dst_type_t *dst; - void * buf = HDcalloc((size_t)2, sizeof(dst_type_t)); - void * bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); + void *buf = HDcalloc((size_t)2, sizeof(dst_type_t)); + void *bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); int retval = 1; TESTING("optimized struct converter"); @@ -2040,7 +2040,7 @@ test_compound_10(void) hid_t dset_id; hsize_t arr_dim[1] = {ARRAY_DIM}; /* Array dimensions */ hsize_t dim1[1]; - void * t1, *t2; + void *t1, *t2; char filename[1024]; size_t len; int i; @@ -2242,7 +2242,7 @@ test_compound_11(void) typedef struct { double d1; int i1; - char * s1; + char *s1; int i2; double d2; double d3; @@ -2251,7 +2251,7 @@ test_compound_11(void) typedef struct { double d1; int i1; - char * s1; + char *s1; } little_t; hid_t var_string_tid; /* Datatype IDs for type conversion */ @@ -2260,9 +2260,9 @@ test_compound_11(void) hid_t opaq_src_tid, opaq_dst_tid; /* Datatype IDs for type conversion */ hid_t space_id; /* Dataspace for buffer elements */ hsize_t dim[1]; /* Dimensions for dataspace */ - void * buf = NULL; /* Conversion buffer */ - void * buf_orig = NULL; /* Copy of original conversion buffer */ - void * bkg = NULL; /* Background buffer */ + void *buf = NULL; /* Conversion buffer */ + void *buf_orig = NULL; /* Copy of original conversion buffer */ + void *bkg = NULL; /* Background buffer */ size_t u; /* Local index variable */ int retval = 1; @@ -4940,7 +4940,7 @@ error: static int test_conv_str_2(void) { - char * buf = NULL, s[80]; + char *buf = NULL, s[80]; hid_t c_type = -1; hid_t f_type = -1; const size_t nelmts = NTESTELEM; @@ -5012,7 +5012,7 @@ error: static int test_conv_str_3(void) { - char * buf = NULL; + char *buf = NULL; hid_t type = -1; hid_t super = -1; const size_t nelmts = NTESTELEM; @@ -5021,7 +5021,7 @@ test_conv_str_3(void) size_t size; H5T_pad_t inpad; H5T_sign_t sign; - char * tag = NULL; + char *tag = NULL; herr_t ret; TESTING("some type functions for string"); @@ -5231,7 +5231,7 @@ static int test_conv_enum_2(void) { hid_t srctype = -1, dsttype = -1, oddsize = -1; - int * data = NULL, i, nerrors = 0; + int *data = NULL, i, nerrors = 0; const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; TESTING("non-native enumeration type conversion"); @@ -5412,7 +5412,7 @@ test_bitfield_funcs(void) { hid_t type = -1, ntype = -1, super = -1; size_t size; - char * tag = 0; + char *tag = 0; H5T_pad_t inpad; H5T_cset_t cset; H5T_str_t strpad; @@ -5706,7 +5706,7 @@ error: static int opaque_long(void) { - char * long_tag = NULL; + char *long_tag = NULL; hid_t dt = -1; herr_t ret; @@ -6705,7 +6705,7 @@ test_int_float_except(void) (float)4.5f}; int buf_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 4}; float buf_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX + 1.0f, (float)INT_MAX - 127.0f, 4}; - int * intp; /* Pointer to buffer, as integers */ + int *intp; /* Pointer to buffer, as integers */ int buf2[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 72, 0}; float buf2_float[CONVERT_SIZE] = {(float)INT_MIN, (float)INT_MAX, (float)INT_MAX - 127.0f, (float)0.0f}; int buf2_int[CONVERT_SIZE] = {INT_MIN, INT_MAX, INT_MAX - 127, 0}; @@ -7271,8 +7271,8 @@ test_named_indirect_reopen(hid_t fapl) static hsize_t dims[1] = {3}; size_t dt_size; int enum_value; - const char * tag = "opaque_tag"; - char * tag_ret = NULL; + const char *tag = "opaque_tag"; + char *tag_ret = NULL; char filename[1024]; TESTING("indirectly reopening committed datatypes"); @@ -8285,9 +8285,9 @@ test_utf_ascii_conv(void) hid_t ascii_tid = -1; hid_t sid = -1; const char *utf8_w = "foo!"; - char * ascii_r = NULL; + char *ascii_r = NULL; const char *ascii_w = "bar!"; - char * utf8_r = NULL; + char *utf8_r = NULL; char filename[1024]; char ascii2[4], utf8_2[4]; herr_t status; diff --git a/test/dynlib1.c b/test/dynlib1.c index bc72a4b..ca7213a 100644 --- a/test/dynlib1.c +++ b/test/dynlib1.c @@ -68,7 +68,7 @@ static size_t H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int add_on = 0; diff --git a/test/dynlib2.c b/test/dynlib2.c index da37e1d..683f693 100644 --- a/test/dynlib2.c +++ b/test/dynlib2.c @@ -69,7 +69,7 @@ static size_t H5Z_filter_dynlib2(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/test/dynlib3.c b/test/dynlib3.c index 6102d21..71da204 100644 --- a/test/dynlib3.c +++ b/test/dynlib3.c @@ -83,7 +83,7 @@ H5Z_filter_dynlib3(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_ ret_value = *buf_size = nbytes - SUFFIX_LEN; } /* end if */ else { /*write*/ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ unsigned char *dst; /* Temporary pointer to destination buffer */ dst = (unsigned char *)(outbuf = malloc(nbytes + SUFFIX_LEN)); diff --git a/test/dynlib4.c b/test/dynlib4.c index 2db97da..812ecdb 100644 --- a/test/dynlib4.c +++ b/test/dynlib4.c @@ -65,7 +65,7 @@ static size_t H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int add_on = 0; unsigned ver_info[3]; diff --git a/test/err_compat.c b/test/err_compat.c index fa1ecbd..d3be2fd 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -117,9 +117,9 @@ error: herr_t custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; - char * maj = NULL; - char * min = NULL; + FILE *stream = (FILE *)client_data; + char *maj = NULL; + char *min = NULL; const int indent = 4; if (NULL == (min = H5Eget_minor(err_desc->min_num))) @@ -168,9 +168,9 @@ error: herr_t custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; - char * maj = NULL; - char * min = NULL; + FILE *stream = (FILE *)client_data; + char *maj = NULL; + char *min = NULL; const int indent = 4; if (NULL == (min = H5Eget_minor(err_desc->min_num))) @@ -223,7 +223,7 @@ test_error1(void) hsize_t dims[2]; H5E_auto1_t old_func1; H5E_auto2_t old_func2; - void * old_data; + void *old_data; herr_t ret; TESTING("error API H5Eset/get_auto"); diff --git a/test/error_test.c b/test/error_test.c index 11e4a9b..3be2415 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -96,7 +96,7 @@ test_error(hid_t file) hsize_t dims[2]; const char *FUNC_test_error = "test_error"; H5E_auto2_t old_func; - void * old_data = NULL; + void *old_data = NULL; HDfprintf(stderr, "\nTesting error API based on data I/O\n"); @@ -183,8 +183,8 @@ init_error(void) { ssize_t cls_size = (ssize_t)HDstrlen(ERR_CLS_NAME) + 1; ssize_t msg_size = (ssize_t)HDstrlen(ERR_MIN_SUBROUTINE_MSG) + 1; - char * cls_name = NULL; - char * msg = NULL; + char *cls_name = NULL; + char *msg = NULL; H5E_type_t msg_type; if (NULL == (cls_name = (char *)HDmalloc(HDstrlen(ERR_CLS_NAME) + 1))) @@ -326,8 +326,8 @@ static herr_t test_long_desc(void) { const char *format = "Testing very long description string, %s"; - char * long_desc = NULL; - char * full_desc = NULL; + char *long_desc = NULL; + char *full_desc = NULL; size_t u; const char *test_FUNC = "test_long_desc"; @@ -421,7 +421,7 @@ error: static herr_t custom_print_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) { - FILE * stream = (FILE *)client_data; + FILE *stream = (FILE *)client_data; char maj[MSG_SIZE]; char min[MSG_SIZE]; char cls[MSG_SIZE]; diff --git a/test/fheap.c b/test/fheap.c index 54ccca6..f197f4a 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -145,8 +145,8 @@ typedef struct fheap_heap_ids_t { size_t num_ids; /* # of heap IDs in array */ size_t alloc_ids; /* # of heap IDs allocated in array */ unsigned char *ids; /* Array of object heap IDs */ - size_t * lens; /* Array of object lengths */ - size_t * offs; /* Array of object offsets (in global shared write buffer) */ + size_t *lens; /* Array of object lengths */ + size_t *offs; /* Array of object offsets (in global shared write buffer) */ } fheap_heap_ids_t; /* Local variables */ @@ -154,8 +154,8 @@ unsigned char *shared_wobj_g; /* Pointer to shared write buffer for unsigned char *shared_robj_g; /* Pointer to shared read buffer for objects */ size_t shared_obj_size_g; /* Size of shared objects */ unsigned char *shared_ids_g = NULL; /* Array of shared object heap IDs */ -size_t * shared_lens_g = NULL; /* Array of shared object lengths */ -size_t * shared_offs_g = NULL; /* Array of shared object offsets */ +size_t *shared_lens_g = NULL; /* Array of shared object lengths */ +size_t *shared_offs_g = NULL; /* Array of shared object offsets */ size_t shared_alloc_ids_g = 0; /* # of shared heap IDs allocated in array */ /* Local routines */ @@ -421,8 +421,8 @@ add_obj(H5HF_t *fh, hid_t dxpl, size_t obj_off, size_t obj_size, fheap_heap_stat /* Check for needing to increase size of heap ID array */ if (keep_ids->num_ids + 1 > keep_ids->alloc_ids) { unsigned char *tmp_ids; - size_t * tmp_lens; - size_t * tmp_offs; + size_t *tmp_lens; + size_t *tmp_offs; keep_ids->alloc_ids = MAX(1024, (keep_ids->alloc_ids * 2)); if (NULL == @@ -1032,8 +1032,8 @@ fill_heap(H5HF_t *fh, hid_t dxpl, unsigned block_row, size_t obj_size, fheap_hea { unsigned char *wobj; /* Buffer for object to insert */ unsigned char *curr_id_ptr; /* Pointer into shared ID array */ - size_t * curr_len_ptr; /* Pointer into shared length array */ - size_t * curr_off_ptr; /* Pointer into shared offset array */ + size_t *curr_len_ptr; /* Pointer into shared length array */ + size_t *curr_off_ptr; /* Pointer into shared offset array */ size_t num_ids = 0; /* # of heap IDs in array */ size_t data_size; /* Size of data portion of heap block */ size_t last_obj_len; /* Size of last object inserted into heap */ @@ -1810,9 +1810,9 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Heap address in file */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -1925,9 +1925,9 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -2024,11 +2024,11 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UN hid_t file = -1; /* File ID */ hid_t file2 = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5F_t * f2 = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5F_t *f2 = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ - H5HF_t * fh2 = NULL; /* 2nd fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh2 = NULL; /* 2nd fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -2159,10 +2159,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_U { hid_t file = -1; /* File ID */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_create_t test_cparam; /* Creation parameters for heap */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ - H5HF_t * fh2 = NULL; /* 2nd fractal heap wrapper */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ + H5HF_t *fh2 = NULL; /* 2nd fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -2299,8 +2299,8 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam) hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ unsigned deflate_level; /* Deflation level */ size_t id_len; /* Size of fractal heap IDs */ @@ -2634,8 +2634,8 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam) hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ H5HF_create_t test_cparam; /* Temporary local heap creation parameters */ @@ -2749,7 +2749,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam) hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ hsize_t empty_heap_size; /* Total size of empty heap on disk */ @@ -2885,7 +2885,7 @@ test_reopen_hdr(hid_t fapl, H5HF_create_t *cparam) hid_t file2 = -2; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ hsize_t heap_size; /* Total size of heap on disk */ @@ -3011,8 +3011,8 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ size_t id_len; /* Size of fractal heap IDs */ @@ -3123,8 +3123,8 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -3221,8 +3221,8 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -3314,8 +3314,8 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3410,8 +3410,8 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3513,8 +3513,8 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3617,8 +3617,8 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3725,8 +3725,8 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3818,8 +3818,8 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -3918,8 +3918,8 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4016,8 +4016,8 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4123,8 +4123,8 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4218,8 +4218,8 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4311,8 +4311,8 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4410,8 +4410,8 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4517,8 +4517,8 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4617,8 +4617,8 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4725,8 +4725,8 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4830,8 +4830,8 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -4929,8 +4929,8 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5035,8 +5035,8 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5135,8 +5135,8 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5242,8 +5242,8 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5350,8 +5350,8 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5455,8 +5455,8 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5561,8 +5561,8 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5673,8 +5673,8 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5791,8 +5791,8 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -5900,8 +5900,8 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6013,8 +6013,8 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -6140,8 +6140,8 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ unsigned long seed = 0; /* Random # seed */ @@ -6297,8 +6297,8 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ unsigned char obj[SMALL_OBJ_SIZE1]; /* Buffer for object to insert */ @@ -6454,8 +6454,8 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ @@ -6641,11 +6641,11 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -6803,12 +6803,12 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7040,13 +7040,13 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */ unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */ unsigned char heap_id3[HEAP_ID_LEN]; /* Heap ID for third object */ - unsigned char * obj; /* Buffer for object to insert */ + unsigned char *obj; /* Buffer for object to insert */ size_t obj_len; /* Length of object to insert */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7335,8 +7335,8 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ unsigned char heap_id[100][MAX_HEAP_ID_LEN]; /* Heap ID for object inserted */ struct a_type_t1 { @@ -7449,8 +7449,8 @@ test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7523,8 +7523,8 @@ test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7612,8 +7612,8 @@ test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7683,8 +7683,8 @@ test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_par hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7756,8 +7756,8 @@ test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7833,8 +7833,8 @@ test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7904,8 +7904,8 @@ test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -7979,8 +7979,8 @@ test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8064,8 +8064,8 @@ test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8144,8 +8144,8 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8244,8 +8244,8 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8355,8 +8355,8 @@ test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8453,8 +8453,8 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8600,8 +8600,8 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8767,8 +8767,8 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -8896,8 +8896,8 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned num_direct_rows; /* Number of rows (of direct blocks) in root indirect block */ @@ -9025,8 +9025,8 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -9151,13 +9151,13 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ - unsigned row; /* Current row in indirect block */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + unsigned row; /* Current row in indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -9284,12 +9284,12 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -9434,13 +9434,13 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5 hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ - unsigned row; /* Current row in indirect block */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + unsigned row; /* Current row in indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -9607,12 +9607,12 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -9764,12 +9764,12 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ unsigned max_dblock_rows; /* Max. # of rows (of direct blocks) in the root indirect block */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -9949,8 +9949,8 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -10081,8 +10081,8 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -10218,18 +10218,18 @@ error: */ static int test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(hid_t fapl, - H5HF_create_t * cparam, + H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10375,18 +10375,18 @@ error: */ static int test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(hid_t fapl, - H5HF_create_t * cparam, + H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10548,12 +10548,12 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -10716,18 +10716,18 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ unsigned u; /* Local index variables */ /* Test description */ - const char * base_desc = + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect " "blocks, fill all direct blocks in next 3rd level indirect block, fill all 1st row of 2nd level " "indirect blocks, except last one, and insert object too large for 2nd level indirect block, then " @@ -10888,12 +10888,12 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5 hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11055,12 +11055,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11242,12 +11242,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11466,12 +11466,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11670,12 +11670,12 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_ hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -11906,8 +11906,8 @@ test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ @@ -12038,8 +12038,8 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned root_direct_rows; /* Number of rows in root indirect block */ @@ -12210,12 +12210,12 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned - num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ + num_first_indirect_rows; /* Number of rows (of direct blocks) in each of the first indirect blocks */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ @@ -12326,8 +12326,8 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ unsigned root_direct_rows; /* Number of rows in root indirect block */ @@ -12444,14 +12444,14 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -12598,15 +12598,15 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -12832,16 +12832,16 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13141,18 +13141,18 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ - unsigned char * heap_id4 = NULL; /* Heap ID for fourth object */ - unsigned char * heap_id5 = NULL; /* Heap ID for fifth object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id4 = NULL; /* Heap ID for fourth object */ + unsigned char *heap_id5 = NULL; /* Heap ID for fifth object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13568,15 +13568,15 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13784,14 +13784,14 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for object */ + unsigned char *heap_id = NULL; /* Heap ID for object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -13938,15 +13938,15 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -14173,20 +14173,20 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ size_t id_len; /* Size of fractal heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ h5_stat_size_t file_size; /* Size of file currently */ - unsigned char * heap_id = NULL; /* Heap ID for first object */ - unsigned char * heap_id2 = NULL; /* Heap ID for second object */ - unsigned char * heap_id3 = NULL; /* Heap ID for third object */ - unsigned char * heap_id4 = NULL; /* Heap ID for fourth object */ - unsigned char * heap_id5 = NULL; /* Heap ID for fifth object */ - unsigned char * heap_id6 = NULL; /* Heap ID for sixth object */ - unsigned char * heap_id7 = NULL; /* Heap ID for seventh object */ + unsigned char *heap_id = NULL; /* Heap ID for first object */ + unsigned char *heap_id2 = NULL; /* Heap ID for second object */ + unsigned char *heap_id3 = NULL; /* Heap ID for third object */ + unsigned char *heap_id4 = NULL; /* Heap ID for fourth object */ + unsigned char *heap_id5 = NULL; /* Heap ID for fifth object */ + unsigned char *heap_id6 = NULL; /* Heap ID for sixth object */ + unsigned char *heap_id7 = NULL; /* Heap ID for seventh object */ size_t obj_size; /* Size of object */ size_t robj_size; /* Size of object read */ unsigned char obj_type; /* Type of storage for object */ @@ -14785,8 +14785,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ @@ -14960,8 +14960,8 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ @@ -15279,8 +15279,8 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ @@ -15489,8 +15489,8 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ @@ -15725,15 +15725,15 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ H5HF_create_t tmp_cparam; /* Local heap creation parameters */ size_t id_len; /* Size of fractal heap IDs */ unsigned char tiny_heap_id[HEAP_ID_LEN]; /* Heap ID for 'tiny' object */ unsigned char huge_heap_id[HEAP_ID_LEN]; /* Heap ID for 'huge' object */ hbool_t id_changed = FALSE; /* Whether the heap ID changed */ - unsigned char * rewrite_obj = NULL; /* Pointer to re-write buffer for objects */ + unsigned char *rewrite_obj = NULL; /* Pointer to re-write buffer for objects */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ @@ -16002,8 +16002,8 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) hid_t file = -1; /* File ID */ hid_t dxpl = H5P_DATASET_XFER_DEFAULT; /* DXPL to use */ char filename[FHEAP_FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5HF_t * fh = NULL; /* Fractal heap wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_ids_t keep_ids; /* Structure to retain heap IDs */ diff --git a/test/file_image.c b/test/file_image.c index 6c1747b..259fe4c 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -83,10 +83,10 @@ test_properties(void) { hid_t fapl_1 = -1; hid_t fapl_2 = -1; - char * buffer = 0; + char *buffer = 0; int count = 10; - void * temp = 0; - char * temp2 = 0; + void *temp = 0; + char *temp2 = 0; int i; size_t size; size_t temp_size; @@ -336,9 +336,9 @@ test_callbacks(void) H5FD_file_image_callbacks_t callbacks; hid_t fapl_1; hid_t fapl_2; - udata_t * udata; - char * file_image; - char * temp_file_image; + udata_t *udata; + char *file_image; + char *temp_file_image; int count = 10; int i; size_t size; @@ -548,11 +548,11 @@ test_core(void) hid_t file; hid_t dset; hid_t space; - udata_t * udata; - unsigned char * file_image; + udata_t *udata; + unsigned char *file_image; char filename[1024]; char copied_filename[1024]; - const char * tmp = NULL; + const char *tmp = NULL; size_t size; hsize_t dims[2]; int fd; @@ -704,9 +704,9 @@ static int test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl) { char file_name[1024] = "\0"; - void * insertion_ptr = NULL; - void * image_ptr = NULL; - void * file_image_ptr = NULL; + void *insertion_ptr = NULL; + void *image_ptr = NULL; + void *file_image_ptr = NULL; hbool_t is_family_file = FALSE; hbool_t identical; int data[100]; @@ -958,7 +958,7 @@ test_get_file_image_error_rejection(void) { const char *memb_name[H5FD_MEM_NTYPES]; char file_name[1024] = "\0"; - void * image_ptr = NULL; + void *image_ptr = NULL; int data[100]; int i; hid_t fapl_id = -1; diff --git a/test/fillval.c b/test/fillval.c index 8e1f7a0..0ff0657 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -298,8 +298,8 @@ test_getset_vl(hid_t fapl) hid_t fileid = (-1), spaceid = (-1), dtypeid = (-1), datasetid = (-1), plistid = (-1); char fill_value[] = "aaaa"; char orig_fill_value[] = "aaaa"; - char * f1 = fill_value; - char * f2; + char *f1 = fill_value; + char *f2; char filename[1024]; TESTING("property lists, with variable-length datatype"); @@ -886,7 +886,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f int i, j, *buf = NULL, odd; unsigned u; comp_datatype rd_c, fill_c, should_be_c; - comp_datatype * buf_c = NULL; + comp_datatype *buf_c = NULL; H5D_space_status_t allocation; if (datatype == H5T_INTEGER) { @@ -1409,7 +1409,7 @@ error: static int test_extend_init_integer(void *_buf, size_t nelmts, const void *_val) { - int * buf = (int *)_buf; /* Buffer to initialize */ + int *buf = (int *)_buf; /* Buffer to initialize */ const int *val = (const int *)_val; /* Value to use */ while (nelmts) { @@ -1492,7 +1492,7 @@ test_extend_release_integer(void H5_ATTR_UNUSED *_elmt) static int test_extend_init_cmpd_vl(void *_buf, size_t nelmts, const void *_val) { - comp_vl_datatype * buf = (comp_vl_datatype *)_buf; /* Buffer to initialize */ + comp_vl_datatype *buf = (comp_vl_datatype *)_buf; /* Buffer to initialize */ const comp_vl_datatype *val = (const comp_vl_datatype *)_val; /* Value to use */ while (nelmts) { @@ -1604,12 +1604,12 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, hsize_t *ch_si int (*verify_rtn)(unsigned, const hsize_t *, const void *, const void *); int (*release_rtn)(void *); size_t val_size; /* Size of element */ - void * val_rd, *odd_val; - const void * init_val, *should_be, *even_val; + void *val_rd, *odd_val; + const void *init_val, *should_be, *even_val; int val_rd_i, init_val_i = 9999; comp_vl_datatype init_val_c = {87, "baz", "mumble", 129}; comp_vl_datatype val_rd_c; - void * buf = NULL; + void *buf = NULL; unsigned odd; /* Whether an odd or even coord. was read */ unsigned i, j; /* Local index variables */ @@ -2212,7 +2212,7 @@ test_compatible(void) hsize_t dims[2], one[2] = {1, 1}; hsize_t hs_offset[2] = {3, 4}; H5D_fill_value_t status; - const char * testfile = H5_get_srcdir_filename(FILE_COMPATIBLE); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(FILE_COMPATIBLE); /* Corrected test file name */ TESTING("contiguous dataset compatibility with v. 1.4"); diff --git a/test/filter_fail.c b/test/filter_fail.c index bcad18d..2e32abe 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -60,7 +60,7 @@ static size_t filter_fail(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * dst = (int *)(*buf); + int *dst = (int *)(*buf); size_t ret_value = 0; if (flags & H5Z_FLAG_REVERSE) { /* do nothing during read */ diff --git a/test/freespace.c b/test/freespace.c index 1d74d8a..71c4ab2 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -282,7 +282,7 @@ TEST_sect_free(H5FS_section_info_t *sect) static herr_t TEST_sect_can_shrink(const H5FS_section_info_t *_sect, void *_udata) { - unsigned * can_shrink = (unsigned *)_udata; + unsigned *can_shrink = (unsigned *)_udata; const TEST_free_section_t *sect = (const TEST_free_section_t *)_sect; haddr_t end, eoa; @@ -307,7 +307,7 @@ static herr_t TEST_sect_shrinking(H5FS_section_info_t **_sect, void *_udata) { TEST_free_section_t **sect = (TEST_free_section_t **)_sect; - unsigned * can_shrink = (unsigned *)_udata; + unsigned *can_shrink = (unsigned *)_udata; /* address of the section is faked, so, doesn't need to do anything */ /* just free the section node */ @@ -329,7 +329,7 @@ static herr_t TEST_sects_cb(H5FS_section_info_t *_sect, void *_udata) { TEST_free_section_t *sect = (TEST_free_section_t *)_sect; - TEST_iter_ud_t * udata = (TEST_iter_ud_t *)_udata; + TEST_iter_ud_t *udata = (TEST_iter_ud_t *)_udata; herr_t ret_value = SUCCEED; /* Return value */ HDassert(sect); @@ -441,8 +441,8 @@ test_fs_create(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr; /* address of free space */ h5_stat_size_t file_size, empty_size; /* File size */ frspace_state_t state; /* State of free space*/ @@ -579,8 +579,8 @@ test_fs_sect_add(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -915,8 +915,8 @@ test_fs_sect_find(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1307,8 +1307,8 @@ test_fs_sect_merge(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1796,8 +1796,8 @@ test_fs_sect_shrink(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2146,8 +2146,8 @@ test_fs_sect_change_class(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2442,8 +2442,8 @@ test_fs_sect_extend(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2803,8 +2803,8 @@ test_fs_sect_iterate(hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FS_t * frsp = NULL; /* pointer to free space structure */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FS_t *frsp = NULL; /* pointer to free space structure */ haddr_t fs_addr = HADDR_UNDEF; /* address of free space */ size_t nclasses; H5FS_create_t cparam; /* creation parameters */ diff --git a/test/gen_deflate.c b/test/gen_deflate.c index d11ed09..734c2b8 100644 --- a/test/gen_deflate.c +++ b/test/gen_deflate.c @@ -51,7 +51,7 @@ main(void) hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; hsize_t chunk_dims[SPACE_RANK] = {CHUNK_DIM1, CHUNK_DIM2}; size_t i, j; /* Local index variables */ - int * data = NULL; /* Dataset data */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ /* (Try for something easily compressible) */ diff --git a/test/gen_file_image.c b/test/gen_file_image.c index b5e07da..b39e449 100644 --- a/test/gen_file_image.c +++ b/test/gen_file_image.c @@ -43,7 +43,7 @@ main(void) hid_t fid = -1, sid = -1, did = -1; hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; size_t i, j; /* Local index variables */ - int * data = NULL; /* Dataset data */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ if (NULL == (data = (int *)HDmalloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) diff --git a/test/gheap.c b/test/gheap.c index f259789..ef8a0ae 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -67,7 +67,7 @@ static int test_1(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; uint8_t in[GHEAP_TEST_NOBJS]; @@ -176,7 +176,7 @@ static int test_2(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; uint8_t in[GHEAP_TEST_NOBJS]; @@ -276,7 +276,7 @@ static int test_3(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; size_t u; @@ -367,7 +367,7 @@ static int test_4(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; H5HG_t *obj = NULL; uint8_t out[GHEAP_TEST_NOBJS]; size_t u; @@ -464,9 +464,9 @@ static int test_ooo_indices(hid_t fapl) { hid_t file = H5I_INVALID_HID; - H5F_t * f = NULL; + H5F_t *f = NULL; unsigned i, j; - H5HG_t * obj = NULL; + H5HG_t *obj = NULL; herr_t status; int nerrors = 0; char filename[1024]; diff --git a/test/h5test.c b/test/h5test.c index 35cb572..7373f03 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -110,7 +110,7 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */ static H5E_auto2_t err_func = NULL; static herr_t h5_errors(hid_t estack, void *client_data); -static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, char *fullname, +static char *h5_fixname_real(const char *base_name, hid_t fapl, const char *suffix, char *fullname, size_t size, hbool_t nest_printf); /*------------------------------------------------------------------------- @@ -535,7 +535,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu { const char *prefix = NULL; const char *env = NULL; /* HDF5_DRIVER environment variable */ - char * ptr, last = '\0'; + char *ptr, last = '\0'; const char *suffix = _suffix; size_t i, j; hid_t driver = -1; @@ -863,7 +863,7 @@ h5_get_vfd_fapl(hid_t fapl) { const char *env = NULL; /* HDF5_DRIVER environment variable */ const char *tok = NULL; /* strtok pointer */ - char * lasts = NULL; /* Context pointer for strtok_r() call */ + char *lasts = NULL; /* Context pointer for strtok_r() call */ char buf[1024]; /* buffer for tokenizing HDF5_DRIVER */ /* Get the environment variable, if it exists */ @@ -921,7 +921,7 @@ h5_get_vfd_fapl(hid_t fapl) H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl[H5FD_MEM_NTYPES]; const char *memb_name[H5FD_MEM_NTYPES]; - char * sv[H5FD_MEM_NTYPES]; + char *sv[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; H5FD_mem_t mt; @@ -1120,7 +1120,7 @@ h5_set_info_object(void) do { size_t len; - char * key_val, *endp, *namep; + char *key_val, *endp, *namep; if (*valp == ';') valp++; @@ -1520,7 +1520,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name) { int fd_old = (-1), fd_new = (-1); /* File descriptors for copying data */ ssize_t nread; /* Number of bytes read in */ - void * buf = NULL; /* Buffer for copying data */ + void *buf = NULL; /* Buffer for copying data */ const char *filename = H5_get_srcdir_filename(origfilename); /* Get the test file name to copy */ /* Allocate copy buffer */ @@ -1725,7 +1725,7 @@ h5_send_message(const char *send, const char *arg1, const char *arg2) herr_t h5_wait_message(const char *waitfor) { - FILE * returnfile; + FILE *returnfile; time_t t0, t1; /* Start timer. If this function runs for too long (i.e., diff --git a/test/h5test.h b/test/h5test.h index 8efa7b8..3ccdbb3 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -255,9 +255,9 @@ extern "C" { /* Generally useful testing routines */ H5TEST_DLL void h5_clean_files(const char *base_name[], hid_t fapl); H5TEST_DLL int h5_cleanup(const char *base_name[], hid_t fapl); -H5TEST_DLL char * h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); -H5TEST_DLL char * h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size); -H5TEST_DLL char * h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname_no_suffix(const char *base_name, hid_t fapl, char *fullname, size_t size); +H5TEST_DLL char *h5_fixname_printf(const char *base_name, hid_t fapl, char *fullname, size_t size); H5TEST_DLL hid_t h5_fileaccess(void); H5TEST_DLL hid_t h5_fileaccess_flags(unsigned flags); H5TEST_DLL void h5_no_hwconv(void); @@ -269,8 +269,8 @@ H5TEST_DLL h5_stat_size_t h5_get_file_size(const char *filename, hid_t fapl); H5TEST_DLL int print_func(const char *format, ...); H5TEST_DLL int h5_make_local_copy(const char *origfilename, const char *local_copy_name); H5TEST_DLL herr_t h5_verify_cached_stabs(const char *base_name[], hid_t fapl); -H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void); -H5TEST_DLL char * h5_get_version_string(H5F_libver_t libver); +H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void); +H5TEST_DLL char *h5_get_version_string(H5F_libver_t libver); /* Functions that will replace components of a FAPL */ H5TEST_DLL herr_t h5_get_vfd_fapl(hid_t fapl_id); diff --git a/test/hdfs.c b/test/hdfs.c index a9e0dea..d8d0afc 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -419,7 +419,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_hdfs_fapl_t config; }; @@ -794,7 +794,7 @@ test_vfd_open(void) }; unsigned i = 0; unsigned failing_conditions_count = 10; - H5FD_t * fd = NULL; + H5FD_t *fd = NULL; hid_t fapl_hdfs = -1; hid_t fapl_unconfigured = -1; @@ -1030,7 +1030,7 @@ test_H5FDread_without_eoa_set_fails(void) { char buffer[HDFS_TEST_MAX_BUF_SIZE]; unsigned int i = 0; - H5FD_t * file_shakespeare = NULL; + H5FD_t *file_shakespeare = NULL; hid_t fapl_id = -1; TESTING("HDFS VFD read-eoa temporal coupling library limitation"); @@ -1194,7 +1194,7 @@ test_read(void) herr_t open_return = FAIL; char buffer[HDFS_TEST_MAX_BUF_SIZE]; unsigned int i = 0; - H5FD_t * file_raven = NULL; + H5FD_t *file_raven = NULL; hid_t fapl_id = -1; TESTING("HDFS VFD read/range-gets"); @@ -1326,7 +1326,7 @@ test_noops_and_autofails(void) ************************/ hid_t fapl_id = -1; - H5FD_t * file = NULL; + H5FD_t *file = NULL; const char data[36] = "The Force shall be with you, always"; TESTING("HDFS VFD always-fail and no-op routines"); diff --git a/test/hyperslab.c b/test/hyperslab.c index 4427e0b..18b15ae 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -299,8 +299,8 @@ static herr_t test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size_t ddx, size_t ddy, size_t ddz) { - uint8_t * src = NULL; /*source array */ - uint8_t * dst = NULL; /*destination array */ + uint8_t *src = NULL; /*source array */ + uint8_t *dst = NULL; /*destination array */ hsize_t hs_size[3]; /*hyperslab size */ hsize_t dst_size[3]; /*destination total size */ hsize_t src_size[3]; /*source total size */ @@ -764,8 +764,8 @@ error: static herr_t test_transpose(size_t nx, size_t ny) { - int * src = NULL; - int * dst = NULL; + int *src = NULL; + int *dst = NULL; hsize_t src_stride[2], dst_stride[2]; hsize_t size[2]; char s[256]; @@ -1012,7 +1012,7 @@ error: static herr_t test_array_fill(size_t lo, size_t hi) { - int * dst = NULL; /* Destination */ + int *dst = NULL; /* Destination */ int src[ARRAY_FILL_SIZE]; /* Source to duplicate */ size_t u, v, w; /* Local index variables */ char s[256]; diff --git a/test/lheap.c b/test/lheap.c index 38bc0d8..22b1f69 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -48,10 +48,10 @@ main(void) { hid_t fapl = H5P_DEFAULT; /* file access properties */ hid_t file = -1; /* hdf5 file */ - H5F_t * f = NULL; /* hdf5 file pointer */ + H5F_t *f = NULL; /* hdf5 file pointer */ char filename[1024]; /* file name */ haddr_t heap_addr; /* local heap address */ - H5HL_t * heap = NULL; /* local heap */ + H5HL_t *heap = NULL; /* local heap */ size_t obj[NOBJS]; /* offsets within the heap */ int i, j; /* miscellaneous counters */ char buf[1024]; /* the value to store */ diff --git a/test/links.c b/test/links.c index b28b1c2..676f5cb 100644 --- a/test/links.c +++ b/test/links.c @@ -152,7 +152,7 @@ typedef struct { int stop; /* # of iterations to stop after */ int64_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited link" flag array */ - hbool_t * visited; /* Pointer to array of "visited link" flags */ + hbool_t *visited; /* Pointer to array of "visited link" flags */ } link_iter_info_t; /* Link visit structs */ @@ -746,7 +746,7 @@ long_links(hid_t fapl, hbool_t new_format) hid_t fid = -1; /* File ID */ hid_t gid = -1; /* Group ID */ hid_t gid2 = -1; /* Datatype ID */ - char * objname = NULL; /* Name of object [Long] */ + char *objname = NULL; /* Name of object [Long] */ size_t u; /* Local index variable */ char filename[NAME_BUF_SIZE]; @@ -4659,8 +4659,8 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format) base_driver == H5FD_MPIO || base_driver == H5FD_CORE) ? H5P_DEFAULT : fapl; - op_data.fam_size = ELINK_CB_FAM_SIZE; - op_data.code = 0; + op_data.fam_size = ELINK_CB_FAM_SIZE; + op_data.code = 0; /* Create family fapl */ if ((fam_fapl = H5Pcopy(fapl)) < 0) @@ -14207,7 +14207,7 @@ link_iterate(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -14710,7 +14710,7 @@ link_iterate_old(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ link_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t skip; /* # of links to skip in group */ unsigned u; /* Local index variable */ herr_t ret; /* Generic return value */ @@ -14954,7 +14954,7 @@ open_by_idx(hid_t fapl) char filename[NAME_BUF_SIZE]; /* File name */ char objname[NAME_BUF_SIZE]; /* Object name */ char valname[2 * NAME_BUF_SIZE]; /* Link value */ - haddr_t * objno = NULL; /* Addresses of the objects created */ + haddr_t *objno = NULL; /* Addresses of the objects created */ unsigned u; /* Local index variable */ hid_t ret; /* Generic return value */ @@ -15451,7 +15451,7 @@ object_info(hid_t fapl) char objname[NAME_BUF_SIZE]; /* Object name */ char valname[2 * NAME_BUF_SIZE]; /* Link value */ char attrname[NAME_BUF_SIZE]; /* Attribute name */ - haddr_t * objno = NULL; /* Addresses of the objects created */ + haddr_t *objno = NULL; /* Addresses of the objects created */ herr_t ret; /* Generic return value */ unsigned u, v; /* Local index variables */ @@ -166,7 +166,7 @@ test_mf_eoa(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr1, addr2; @@ -314,7 +314,7 @@ test_mf_eoa_shrink(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size = 0, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr = 0; @@ -601,7 +601,7 @@ test_mf_eoa_extend(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type; haddr_t addr; @@ -819,7 +819,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl) /* Can't run this test with multi-file VFDs */ if (HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family")) { char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ haddr_t maxaddr; /* File's max. address */ haddr_t tmp_addr; /* Temporary space file address */ @@ -991,7 +991,7 @@ test_mf_fs_start(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; frspace_state_t state; @@ -1105,7 +1105,7 @@ test_mf_fs_alloc_free(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; H5MF_free_section_t *sect_node = NULL; @@ -1465,7 +1465,7 @@ test_mf_fs_extend(hid_t fapl) hid_t file = -1; /* File ID */ hid_t fapl_new = -1; /* copy of fapl */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; H5MF_free_section_t *sect_node1 = NULL, *sect_node2 = NULL; @@ -2021,7 +2021,7 @@ test_mf_fs_absorb(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type, stype; haddr_t addr, saddr; haddr_t ma_addr = HADDR_UNDEF; @@ -2228,7 +2228,7 @@ test_mf_aggr_alloc1(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr1, addr2; @@ -2363,7 +2363,7 @@ test_mf_aggr_alloc2(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -2518,7 +2518,7 @@ test_mf_aggr_alloc3(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, addr4, saddr1; @@ -2686,7 +2686,7 @@ test_mf_aggr_alloc4(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, saddr1, saddr2, saddr3; @@ -2835,7 +2835,7 @@ test_mf_aggr_alloc5(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* File size */ H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -2970,7 +2970,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -3142,7 +3142,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size, file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1, saddr2, saddr3; @@ -3313,7 +3313,7 @@ test_mf_aggr_extend(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size, file_size; H5FD_mem_t type, stype; haddr_t new_addr, addr, saddr; @@ -3617,7 +3617,7 @@ test_mf_aggr_absorb(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t empty_size, file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -3868,7 +3868,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) hid_t file = -1; /* File ID */ hid_t fapl1; char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size, new_file_size; H5FD_mem_t type; haddr_t addr1, addr2; @@ -4161,7 +4161,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ h5_stat_size_t file_size; - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; H5MF_free_section_t *sect_node = NULL; haddr_t addr; @@ -4544,7 +4544,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; /* File size */ H5FD_mem_t type; @@ -4809,7 +4809,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; /* File size */ H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -5156,7 +5156,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3; @@ -5468,7 +5468,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type; haddr_t addr1, addr2, addr3; @@ -5687,7 +5687,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, saddr1; @@ -5959,7 +5959,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ h5_stat_size_t file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2; @@ -6169,7 +6169,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) hid_t file = -1; /* File ID */ hid_t copied_fapl = -1; /* FAPL to use for this test */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type; haddr_t addr1, addr2; hsize_t block_size; @@ -6221,7 +6221,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) else { H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char * memb_name[H5FD_MEM_NTYPES]; + char *memb_name[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; hbool_t relax; H5FD_mem_t mt; @@ -6356,7 +6356,7 @@ test_dichotomy(const char *env_h5_drvr, hid_t fapl) { hid_t file = -1; /* File ID */ char filename[FILENAME_LEN]; /* Filename to use */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FD_mem_t type, stype; haddr_t addr1, addr3, saddr1, saddr2; hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ diff --git a/test/mtime.c b/test/mtime.c index a4c931b..5e41f23 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -57,7 +57,7 @@ main(void) hid_t fapl, file, space, dset; hsize_t size[1] = {2}; time_t now; - struct tm * tm; + struct tm *tm; H5O_info_t oi1, oi2; signed char buf1[32], buf2[32]; char filename[1024]; diff --git a/test/ntypes.c b/test/ntypes.c index 77a1416..43fe6eb 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -79,7 +79,7 @@ test_atomic_dtype(hid_t file) hid_t dtype = -1, native_type = -1; int i, j, n; hsize_t dims[2]; - void * tmp = NULL; + void *tmp = NULL; TESTING("atomic datatype"); @@ -325,9 +325,9 @@ test_compound_dtype2(hid_t file) nest_mem_id = -1; int i, j, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("nested compound datatype"); @@ -648,12 +648,12 @@ test_compound_dtype(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, mem_id = -1; int i, j, n; hsize_t dims[2]; - s1 * temp_point = NULL; - s1 * temp_check = NULL; - s1 * points = NULL; - s1 * check = NULL; - void * tmp = NULL; - void * bkg = NULL; + s1 *temp_point = NULL; + s1 *temp_check = NULL; + s1 *points = NULL; + s1 *check = NULL; + void *tmp = NULL; + void *bkg = NULL; TESTING("compound datatype"); @@ -863,9 +863,9 @@ test_compound_dtype3(hid_t file) hsize_t array_dims[1] = {5}; int i, j, k, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("compound datatype with array as field"); @@ -1102,9 +1102,9 @@ test_compound_opaque(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1, mem_id = -1; int i, j, k, n; hsize_t dims[2]; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL, *bkg = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL, *bkg = NULL; TESTING("compound datatype with opaque field"); @@ -1324,10 +1324,10 @@ test_enum_dtype(hid_t file) hid_t tid = -1, tid_m = -1, dtype = -1, native_type = -1; int i, j, n; hsize_t dims[2]; - void * tmp = NULL; + void *tmp = NULL; short colors[8]; unsigned char sub_colors[16]; - const char * mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; + const char *mname[] = {"RED", "GREEN", "BLUE", "YELLOW", "PINK", "PURPLE", "ORANGE", "WHITE"}; TESTING("enum datatype"); @@ -1473,9 +1473,9 @@ test_array_dtype(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid3 = -1, tid_m = -1; int i, j, k, n; hsize_t space_dims[2], array_dims[1] = {5}; - s1 * temp_point = NULL, *temp_check = NULL; - s1 * points = NULL, *check = NULL; - void * tmp = NULL; + s1 *temp_point = NULL, *temp_check = NULL; + s1 *points = NULL, *check = NULL; + void *tmp = NULL; TESTING("array of compound datatype"); @@ -1656,7 +1656,7 @@ test_array_dtype2(hid_t file) hid_t dtype = -1, native_type = -1, tid = -1, tid_m = -1; int i, j, k, n; hsize_t space_dims[2], array_dims[1] = {5}; - void * tmp = NULL; + void *tmp = NULL; TESTING("array of atomic datatype"); @@ -1789,12 +1789,12 @@ test_vl_dtype(hid_t file) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hsize_t dims1[] = {SPACE1_DIM1}; hid_t dataset = -1, space = -1; hid_t dtype = -1, native_type = -1, nat_super_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1; size_t i, j, k; - void ** tmp = NULL; + void **tmp = NULL; TESTING("variable length datatype"); @@ -1999,7 +1999,7 @@ test_vlstr_dtype(hid_t file) "conceived in liberty and dedicated to the proposition that all men are created equal.", "Now we are engaged in a great civil war,", "testing whether that nation or any nation so conceived and so dedicated can long endure."}; - char * rdata[SPACE1_DIM1]; /* Information read in */ + char *rdata[SPACE1_DIM1]; /* Information read in */ hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ hid_t dataset = -1; /* Dataset ID */ hid_t sid1 = -1; /* Dataspace ID */ @@ -2442,7 +2442,7 @@ test_refer_dtype2(hid_t file) rbuf; /* buffer read from disk */ uint8_t *dwbuf = NULL, /* Buffer for writing numeric data to disk */ *drbuf = NULL; /* Buffer for reading numeric data from disk */ - uint8_t * tu8 = NULL; /* Temporary pointer to uint8 data */ + uint8_t *tu8 = NULL; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Object type */ int i; /* counting variables */ @@ -2749,7 +2749,7 @@ test_bitfield_dtype(hid_t file) size_t ntype_size, i; unsigned char wbuf[BITFIELD_ENUMB * sizeof(int)]; unsigned char *p = NULL; - void * rbuf = NULL; + void *rbuf = NULL; unsigned int intw[BITFIELD_ENUMB], intr[BITFIELD_ENUMB]; hsize_t nelmts; diff --git a/test/objcopy.c b/test/objcopy.c index 2de533b..b9d1343 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -744,8 +744,8 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ H5A_info_t ainfo; /* Attribute info */ H5A_info_t ainfo2; /* Attribute info */ hssize_t nelmts; /* # of elements in dataspace */ - void * rbuf = NULL; /* Buffer for reading raw data */ - void * rbuf2 = NULL; /* Buffer for reading raw data */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ /* Check the character sets are equal */ if (H5Aget_info(aid, &ainfo) < 0) @@ -1304,8 +1304,8 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) int ext_count; /* Number of external files in plist */ int nfilters; /* Number of filters applied to dataset */ hssize_t nelmts; /* # of elements in dataspace */ - void * rbuf = NULL; /* Buffer for reading raw data */ - void * rbuf2 = NULL; /* Buffer for reading raw data */ + void *rbuf = NULL; /* Buffer for reading raw data */ + void *rbuf2 = NULL; /* Buffer for reading raw data */ H5D_space_status_t space_status; /* Dataset's raw dataspace status */ H5D_space_status_t space_status2; /* Dataset's raw dataspace status */ @@ -4521,7 +4521,7 @@ test_copy_dataset_multi_ohdr_chunks(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fa else /* open the group for copy */ if ((gid = H5Gopen2(fid_src, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) - FAIL_STACK_ERROR + FAIL_STACK_ERROR /* open the destination group */ if ((gid2 = H5Gopen2(fid_dst, NAME_GROUP_TOP, H5P_DEFAULT)) < 0) @@ -8623,7 +8623,7 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -8811,7 +8811,7 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -9002,7 +9002,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; @@ -9189,7 +9189,7 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap unsigned int i, j, k; /* Local index variables */ hsize_t dim1d[1]; /* Dataset dimensions */ hvl_t buf[DIM_SIZE_1]; /* Buffer for writing data */ - hvl_t * tvl; /* Temporary pointer to VL information */ + hvl_t *tvl; /* Temporary pointer to VL information */ hsize_t chunk_dim1d[1] = {CHUNK_SIZE_1}; /* Chunk dimensions */ char src_filename[NAME_BUF_SIZE]; char dst_filename[NAME_BUF_SIZE]; diff --git a/test/ohdr.c b/test/ohdr.c index e821593..b8f0c20 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -53,12 +53,12 @@ static herr_t test_cont(char *filename, hid_t fapl) { hid_t file = -1; - H5F_t * f = NULL; + H5F_t *f = NULL; H5O_hdr_info_t hdr_info; H5O_loc_t oh_locA, oh_locB; time_t time_new; - const char * short_name = "T"; - const char * long_name = "This is the message"; + const char *short_name = "T"; + const char *long_name = "This is the message"; size_t nchunks; TESTING("object header continuation block"); @@ -162,8 +162,8 @@ test_ohdr_cache(char *filename, hid_t fapl) hid_t my_fapl; /* FAPL ID */ hid_t my_dxpl; /* DXPL ID */ H5AC_cache_config_t mdc_config; /* Metadata cache configuration info */ - H5F_t * f = NULL; /* File handle */ - H5HL_t * lheap, *lheap2, *lheap3; /* Pointer to local heaps */ + H5F_t *f = NULL; /* File handle */ + H5HL_t *lheap, *lheap2, *lheap3; /* Pointer to local heaps */ haddr_t lheap_addr, lheap_addr2, lheap_addr3; /* Local heap addresses */ H5O_loc_t oh_loc; /* Object header location */ time_t time_new; /* Time value for modification time message */ @@ -601,7 +601,7 @@ main(void) { hid_t fapl = -1, file = -1; hid_t dset = -1; - H5F_t * f = NULL; + H5F_t *f = NULL; char filename[1024]; H5O_hdr_info_t hdr_info; /* Object info */ H5O_loc_t oh_loc, oh_loc2; /* Object header locations */ diff --git a/test/plugin.c b/test/plugin.c index e73e87a..858a904 100644 --- a/test/plugin.c +++ b/test/plugin.c @@ -83,7 +83,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl) const hsize_t size[2] = {DSET_DIM1, DSET_DIM2}; /* Dataspace dimensions */ const hsize_t hs_offset[2] = {FILTER_HS_OFFSET1, FILTER_HS_OFFSET2}; /* Hyperslab offset */ const hsize_t hs_size[2] = {FILTER_HS_SIZE1, FILTER_HS_SIZE2}; /* Hyperslab size */ - void * tconv_buf = NULL; /* Temporary conversion buffer */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ int points[DSET_DIM1][DSET_DIM2], check[DSET_DIM1][DSET_DIM2]; size_t i, j; /* Local index variables */ int n = 0; @@ -456,7 +456,7 @@ test_read_data(hid_t dataset, int *origin_data) herr_t ret_value = -1; int check[DSET_DIM1][DSET_DIM2]; const hsize_t size[2] = {DSET_DIM1, DSET_DIM2}; /* Dataspace dimensions */ - int * data_p = origin_data; + int *data_p = origin_data; size_t i, j; /* Local index variables */ /* Read the dataset back */ diff --git a/test/pool.c b/test/pool.c index eee16d8..d5dfdcf 100644 --- a/test/pool.c +++ b/test/pool.c @@ -166,7 +166,7 @@ test_allocate_first(void) H5MP_pool_t *mp; /* Memory pool */ H5MP_page_t *page; /* Memory pool page */ size_t free_size; /* Free size in pool */ - void * spc; /* Pointer to space allocated */ + void *spc; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -321,8 +321,8 @@ test_allocate_split(void) { H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ - void * spc1; /* Pointer to space allocated */ - void * spc2; /* Pointer to space allocated */ + void *spc1; /* Pointer to space allocated */ + void *spc2; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -431,7 +431,7 @@ test_allocate_many_small(void) { H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ - void * spc[MPOOL_NUM_SMALL_BLOCKS]; /* Pointers to space allocated */ + void *spc[MPOOL_NUM_SMALL_BLOCKS]; /* Pointers to space allocated */ int i; /* Local index variable */ /* @@ -515,9 +515,9 @@ test_allocate_new_page(void) H5MP_pool_t *mp; /* Memory pool */ size_t free_size; /* Free size in pool */ size_t u; /* Local index variable */ - void * spc[MPOOL_NUM_NORMAL_BLOCKS]; /* Pointer to space allocated */ - void * spc1; /* Pointer to space allocated */ - void * spc2; /* Pointer to space allocated */ + void *spc[MPOOL_NUM_NORMAL_BLOCKS]; /* Pointer to space allocated */ + void *spc1; /* Pointer to space allocated */ + void *spc2; /* Pointer to space allocated */ /* * Test memory pool allocation @@ -648,10 +648,10 @@ test_allocate_random(void) H5MP_pool_t *mp; /* Memory pool */ size_t u; /* Local index variable */ time_t curr_time; /* Current time, for seeding random number generator */ - size_t * blk_size = NULL; /* Pointer to block sizes */ - void ** spc = NULL; /* Pointer to space allocated */ + size_t *blk_size = NULL; /* Pointer to block sizes */ + void **spc = NULL; /* Pointer to space allocated */ size_t swap_idx; /* Location to swap with when shuffling */ - void * swap_ptr; /* Pointer to swap when shuffling */ + void *swap_ptr; /* Pointer to swap when shuffling */ /* * Test memory pool allocation diff --git a/test/ros3.c b/test/ros3.c index 5f1b73d..5f0bf90 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -430,7 +430,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_ros3_fapl_t config; }; @@ -818,7 +818,7 @@ test_vfd_open(void) 0, }, }; - H5FD_t * fd = NULL; + H5FD_t *fd = NULL; hbool_t curl_ready = FALSE; hid_t fapl_id = -1; hid_t fapl_file_access = -1; @@ -1074,7 +1074,7 @@ test_H5FDread_without_eoa_set_fails(void) { char buffer[256]; unsigned int i = 0; - H5FD_t * file_shakespeare = NULL; + H5FD_t *file_shakespeare = NULL; hid_t fapl_id = -1; TESTING("ROS3 VFD read-eoa temporal coupling library limitation "); @@ -1248,7 +1248,7 @@ test_read(void) herr_t open_return = FAIL; char buffer[S3_TEST_MAX_URL_SIZE]; unsigned int i = 0; - H5FD_t * file_raven = NULL; + H5FD_t *file_raven = NULL; hid_t fapl_id = -1; TESTING("ROS3 VFD read/range-gets"); @@ -1392,7 +1392,7 @@ test_noops_and_autofails(void) hbool_t curl_ready = FALSE; hid_t fapl_id = -1; - H5FD_t * file = NULL; + H5FD_t *file = NULL; const char data[36] = "The Force shall be with you, always"; TESTING("ROS3 VFD always-fail and no-op routines"); diff --git a/test/s3comms.c b/test/s3comms.c index 239e3ed..f90278b 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -447,10 +447,10 @@ test_aws_canonical_request(void) }; struct testcase { - const char * exp_request; - const char * exp_headers; - const char * verb; - const char * resource; + const char *exp_request; + const char *exp_headers; + const char *verb; + const char *resource; unsigned int listsize; struct header list[5]; }; @@ -500,10 +500,10 @@ test_aws_canonical_request(void) }; /* struct testcase cases[] */ struct testcase *C = NULL; char cr_dest[512]; /* canonical request */ - hrb_t * hrb = NULL; /* http request buffer object */ + hrb_t *hrb = NULL; /* http request buffer object */ unsigned int i = 0; /* looping/indexing */ unsigned int j = 0; /* looping/indexing */ - hrb_node_t * node = NULL; /* http headers list pointer */ + hrb_node_t *node = NULL; /* http headers list pointer */ unsigned int n_cases = 3; char sh_dest[64]; /* signed headers */ @@ -753,7 +753,7 @@ test_hrb_init_request(void) struct testcase *C = NULL; unsigned int i = 0; unsigned int ncases = 5; - hrb_t * req = NULL; + hrb_t *req = NULL; TESTING("hrb_init_request"); @@ -1123,7 +1123,7 @@ test_hrb_node_set(void) for (test_i = 0; test_i < testcases_count; test_i++) { const hrb_node_t *node = NULL; - const testcase * test = &(cases[test_i]); + const testcase *test = &(cases[test_i]); unsigned mock_i = 0; /********* @@ -1208,9 +1208,9 @@ test_HMAC_SHA256(void) herr_t ret; /* SUCCEED/FAIL expected from call */ const unsigned char key[SHA256_DIGEST_LENGTH]; size_t key_len; - const char * msg; + const char *msg; size_t msg_len; - const char * exp; /* not used if ret == FAIL */ + const char *exp; /* not used if ret == FAIL */ size_t dest_size; /* if 0, `dest` is not malloc'd */ }; @@ -1406,14 +1406,14 @@ test_parse_url(void) herr_t exp_ret; /* expected return; */ /* if FAIL, `expected` is unused */ const_purl_t expected; - const char * msg; + const char *msg; }; /************************ * test-local variables * ************************/ - parsed_url_t * purl = NULL; + parsed_url_t *purl = NULL; unsigned int i = 0; unsigned int ncases = 15; struct testcase cases[] = { @@ -1818,9 +1818,9 @@ test_s3r_open(void) char url_raven_badport[S3_TEST_MAX_URL_SIZE]; char url_shakespeare[S3_TEST_MAX_URL_SIZE]; unsigned char signing_key[SHA256_DIGEST_LENGTH]; - struct tm * now = NULL; + struct tm *now = NULL; char iso8601now[ISO8601_SIZE]; - s3r_t * handle = NULL; + s3r_t *handle = NULL; hbool_t curl_ready = FALSE; parsed_url_t *purl = NULL; @@ -2021,7 +2021,7 @@ test_s3r_read(void) char url_raven[S3_TEST_MAX_URL_SIZE]; char buffer[S3COMMS_TEST_BUFFER_SIZE]; - s3r_t * handle = NULL; + s3r_t *handle = NULL; hbool_t curl_ready = FALSE; unsigned int i = 0; @@ -2182,9 +2182,9 @@ test_signing_key(void) *************************/ struct testcase { - const char * region; - const char * secret_key; - const char * when; + const char *region; + const char *secret_key; + const char *when; unsigned char exp[SHA256_DIGEST_LENGTH]; }; @@ -2286,11 +2286,11 @@ test_tostringtosign(void) * test-local variables * ************************/ - const char canonreq[] = "GET\n/" - "test.txt\n\nhost:examplebucket.s3.amazonaws.com\nrange:bytes=0-9\nx-amz-content-" - "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-" - "date:20130524T000000Z\n\nhost;range;x-amz-content-sha256;x-amz-" - "date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; + const char canonreq[] = "GET\n/" + "test.txt\n\nhost:examplebucket.s3.amazonaws.com\nrange:bytes=0-9\nx-amz-content-" + "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\nx-amz-" + "date:20130524T000000Z\n\nhost;range;x-amz-content-sha256;x-amz-" + "date\ne3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; const char iso8601now[] = "20130524T000000Z"; const char region[] = "us-east-1"; char s2s[512]; @@ -2386,7 +2386,7 @@ test_trim(void) size_t dest_len = 0; int i = 0; int n_cases = 5; - char * str = NULL; + char *str = NULL; TESTING("s3comms trim"); @@ -2496,7 +2496,7 @@ test_uriencode(void) "", }}; - char * dest = NULL; + char *dest = NULL; size_t dest_written = 0; int i = 0; int ncases = 6; diff --git a/test/set_extent.c b/test/set_extent.c index e581741..afb87a5 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -153,7 +153,7 @@ main(void) /* Set the "use the earliest version of the format" bounds for * creating objects in the file */ if (H5Pset_libver_bounds(my_fapl, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST) < 0) - TEST_ERROR + TEST_ERROR /* Tests which use chunked datasets */ nerrors += do_ranks(my_fapl) < 0 ? 1 : 0; @@ -2127,7 +2127,7 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t do_spars hsize_t dims[4]; /* Dataset's dimensions */ hsize_t old_dims[4]; /* Old dataset dimensions */ hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ - hsize_t * valid_dims = old_dims; /* Dimensions of region still containing written data */ + hsize_t *valid_dims = old_dims; /* Dimensions of region still containing written data */ hsize_t cdims[4]; /* Chunk dimensions */ const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslabe operations on memory */ diff --git a/test/stab.c b/test/stab.c index 4b27483..5396a0c 100644 --- a/test/stab.c +++ b/test/stab.c @@ -198,7 +198,7 @@ test_long(hid_t fapl, hbool_t new_format) { hid_t fid = (-1); /* File ID */ hid_t g1 = (-1), g2 = (-1); - char * name1 = NULL, *name2 = NULL; + char *name1 = NULL, *name2 = NULL; char filename[NAME_BUF_SIZE]; size_t i; @@ -646,7 +646,7 @@ long_compact(hid_t fapl2) hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group ID */ hid_t gid2 = (-1); /* Group ID */ - char * objname = NULL; /* Object name */ + char *objname = NULL; /* Object name */ char filename[NAME_BUF_SIZE]; h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ diff --git a/test/tarray.c b/test/tarray.c index c885b90..697ad10 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -54,7 +54,7 @@ /* Struct used with test_array_bkg() test */ typedef struct { int nsubfields; - char * name[NMAX]; + char *name[NMAX]; size_t offset[NMAX]; hid_t datatype[NMAX]; @@ -577,7 +577,7 @@ test_array_compound_atomic(void) int ndims; /* Array rank for reading */ hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i, j; /* counting variables */ @@ -788,7 +788,7 @@ test_array_compound_array(void) int ndims; /* Array rank for reading */ hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ H5T_class_t mclass; /* Datatype class for field */ @@ -1041,7 +1041,7 @@ test_array_compound_array(void) void * test_array_alloc_custom(size_t size, void *info) { - void * ret_value = NULL; /* Pointer to return */ + void *ret_value = NULL; /* Pointer to return */ size_t *mem_used = (size_t *)info; /* Pointer to the memory used */ size_t extra; /* Extra space needed */ @@ -1077,7 +1077,7 @@ void test_array_free_custom(void *_mem, void *info) { unsigned char *mem = NULL; /* Pointer to mem to be freed */ - size_t * mem_used = (size_t *)info; /* Pointer to the memory used */ + size_t *mem_used = (size_t *)info; /* Pointer to the memory used */ size_t extra; /* Extra space needed */ /* @@ -1908,7 +1908,7 @@ test_compat(void) hsize_t rdims1[H5S_MAX_RANK]; /* Array dimensions for reading */ H5T_class_t mclass; /* Datatype class for VL */ int nmemb; /* Number of compound members */ - char * mname; /* Name of compound field */ + char *mname; /* Name of compound field */ size_t off; /* Offset of compound field */ hid_t mtid; /* Datatype ID for field */ int i; /* Index variables */ diff --git a/test/tattr.c b/test/tattr.c index 92e41c7..73fab20 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -147,7 +147,7 @@ typedef struct { int stop; /* # of iterations to stop after */ int64_t curr; /* Current creation order value */ size_t max_visit; /* Size of "visited attribute" flag array */ - hbool_t * visited; /* Pointer to array of "visited attribute" flags */ + hbool_t *visited; /* Pointer to array of "visited attribute" flags */ } attr_iter_info_t; static herr_t attr_op1(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data); @@ -174,7 +174,7 @@ test_attr_basic_write(hid_t fapl) hid_t attr, attr2; /* Attribute ID */ hsize_t attr_size; /* storage size for attribute */ ssize_t attr_name_size; /* size of attribute name */ - char * attr_name = NULL; /* name of attribute */ + char *attr_name = NULL; /* name of attribute */ hsize_t dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3}; hsize_t dims2[] = {ATTR1_DIM1}; hsize_t dims3[] = {ATTR2_DIM1, ATTR2_DIM2}; @@ -778,7 +778,7 @@ test_attr_compound_read(hid_t fapl) H5T_order_t order; /* Attribute datatype order */ size_t size; /* Attribute datatype size as stored in file */ int fields; /* # of Attribute datatype fields */ - char * fieldname; /* Name of a field */ + char *fieldname; /* Name of a field */ size_t offset; /* Attribute datatype field offset */ hid_t field; /* Attribute field datatype */ struct attr4_struct read_data4[ATTR4_DIM1][ATTR4_DIM2]; /* Buffer for reading 4th attribute */ @@ -1402,7 +1402,7 @@ test_attr_mult_read(hid_t fapl) static herr_t attr_op1(hid_t H5_ATTR_UNUSED loc_id, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *op_data) { - int * count = (int *)op_data; + int *count = (int *)op_data; herr_t ret = 0; switch (*count) { @@ -6807,10 +6807,10 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) H5_index_t idx_type; /* Type of index to operate on */ H5_iter_order_t order; /* Order within in the index */ attr_iter_info_t iter_info; /* Iterator info */ - hbool_t * visited = NULL; /* Array of flags for visiting links */ + hbool_t *visited = NULL; /* Array of flags for visiting links */ hsize_t idx; /* Start index for iteration */ unsigned use_index; /* Use index on creation order values */ - const char * dsetname; /* Name of dataset for attributes */ + const char *dsetname; /* Name of dataset for attributes */ char attrname[NAME_BUF_SIZE]; /* Name of attribute */ unsigned curr_dset; /* Current dataset to work on */ unsigned u; /* Local index variable */ @@ -8018,7 +8018,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) htri_t is_shared; /* Is attributes shared? */ hsize_t shared_refcount; /* Reference count of shared attribute */ unsigned attr_value; /* Attribute value */ - unsigned * big_value; /* Data for "big" attribute */ + unsigned *big_value; /* Data for "big" attribute */ size_t mesg_count; /* # of shared messages */ unsigned test_shared; /* Index over shared component type */ unsigned u; /* Local index variable */ diff --git a/test/testframe.c b/test/testframe.c index e7b0e1d..b0df8fa 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -645,7 +645,7 @@ SetTest(const char *testname, int action) void TestAlarmOn(void) { - char * env_val = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ + char *env_val = HDgetenv("HDF5_ALARM_SECONDS"); /* Alarm environment */ unsigned long alarm_sec = H5_ALARM_SEC; /* Number of seconds before alarm goes off */ /* Get the alarm value from the environment variable, if set */ diff --git a/test/tfile.c b/test/tfile.c index 02a4e17..c7e77b5 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -995,7 +995,7 @@ test_get_obj_ids(void) hid_t filespace; hsize_t file_dims[F2_RANK] = {F2_DIM0, F2_DIM1}; ssize_t oid_count, ret_count; - hid_t * oid_list = NULL; + hid_t *oid_list = NULL; herr_t ret; int i, m, n; ssize_t oid_list_size = NDSETS; @@ -2176,7 +2176,7 @@ CheckRead(hid_t did) { hid_t mtid = -1; hid_t sid = -1; - hvl_t * read = NULL; + hvl_t *read = NULL; herr_t ret; int ndims; hsize_t dims[1] = {1}; diff --git a/test/tgenprop.c b/test/tgenprop.c index 2996174..78df44c 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -71,7 +71,7 @@ test_genprop_basic_class(void) hid_t cid1; /* Generic Property class ID */ hid_t cid2; /* Generic Property class ID */ hid_t cid3; /* Generic Property class ID */ - char * name; /* Name of class */ + char *name; /* Name of class */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1796,7 +1796,7 @@ test_genprop_path(void) hid_t cid1; /* Generic Property class ID */ hid_t cid2; /* Generic Property class ID */ hid_t cid3; /* Generic Property class ID */ - char * path; /* Class path */ + char *path; /* Class path */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1869,7 +1869,7 @@ test_genprop_refcount(void) { hid_t cid1; /* Generic Property class ID */ hid_t lid1; /* Generic Property class ID */ - char * name; /* Name of class */ + char *name; /* Name of class */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ diff --git a/test/theap.c b/test/theap.c index 0baaff8..209a03a 100644 --- a/test/theap.c +++ b/test/theap.c @@ -149,7 +149,7 @@ test_heap_create(void) static void test_heap_insert_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -223,7 +223,7 @@ test_heap_insert_min(void) static void test_heap_insert_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -390,10 +390,10 @@ test_heap_insert_many(void) static void test_heap_remove_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ - void * ptr; /* Pointer for object on heap */ + void *ptr; /* Pointer for object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ herr_t ret; /* Generic return value */ @@ -464,10 +464,10 @@ test_heap_remove_min(void) static void test_heap_remove_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ - void * ptr; /* Pointer for object on heap */ + void *ptr; /* Pointer for object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ herr_t ret; /* Generic return value */ @@ -555,7 +555,7 @@ test_heap_remove(void) static void test_heap_remove_many_core(H5HP_type_t heap_type, test_obj *arr, size_t nelem) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int last_val; /* Last value from the heap */ int val; /* Value of object on heap */ @@ -705,7 +705,7 @@ test_heap_remove_many(void) static void test_heap_change_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -779,7 +779,7 @@ test_heap_change_min(void) static void test_heap_change_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -871,7 +871,7 @@ test_heap_change(void) static void test_heap_incdec_min(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -946,7 +946,7 @@ test_heap_incdec_min(void) static void test_heap_incdec_max(void) { - H5HP_t * heap; /* Heap created */ + H5HP_t *heap; /* Heap created */ ssize_t num; /* Number of elements in heap */ int val; /* Value of object on heap */ test_obj obj1, obj2, obj3; /* Test objects to insert */ @@ -26,8 +26,8 @@ basic_id_test(void) { H5I_type_t myType = H5I_BADID; hid_t arrayID = H5I_INVALID_HID; - void * testObj = NULL; - void * testPtr = NULL; + void *testObj = NULL; + void *testPtr = NULL; char nameString[10]; hid_t testID; ssize_t testSize = -1; @@ -244,10 +244,10 @@ test_search_func(void H5_ATTR_UNUSED *ptr1, void H5_ATTR_UNUSED *ptr2) static int id_predefined_test(void) { - void * testObj; + void *testObj; hid_t testID; hid_t typeID = H5I_INVALID_HID; - void * testPtr; + void *testPtr; herr_t testErr; testObj = HDmalloc(sizeof(int)); @@ -574,9 +574,9 @@ static int test_id_wrap(void) { H5I_type_t testType; /* ID class for testing */ - hid_t * id_array; /* Array of IDs allocated */ + hid_t *id_array; /* Array of IDs allocated */ hid_t test_id; /* Test ID */ - void * obj; /* Object pointer returned for ID */ + void *obj; /* Object pointer returned for ID */ unsigned u; /* Local index variable */ hsize_t nids; /* Number of IDs registered for type */ herr_t status; /* Status from routine */ diff --git a/test/titerate.c b/test/titerate.c index 6b41fec..7bb83bb 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -119,7 +119,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) int i; /* counting variable */ hsize_t idx; /* Index in the group */ char name[NAMELEN]; /* temporary name buffer */ - char * lnames[NDATASETS + 2]; /* Names of the links created */ + char *lnames[NDATASETS + 2]; /* Names of the links created */ char dataset_name[NAMELEN]; /* dataset name */ iter_info info; /* Custom iteration information */ H5G_info_t ginfo; /* Buffer for querying object's info */ @@ -401,7 +401,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) int i; /* counting variable */ hsize_t idx; /* Index in the attribute list */ char name[NAMELEN]; /* temporary name buffer */ - char * anames[NATTR]; /* Names of the attributes created */ + char *anames[NATTR]; /* Names of the attributes created */ iter_info info; /* Custom iteration information */ herr_t ret; /* Generic return value */ @@ -728,8 +728,8 @@ test_grp_memb_funcs(hid_t fapl) hid_t root_group, grp; /* Root group ID */ int i; /* counting variable */ char name[NAMELEN]; /* temporary name buffer */ - char * dnames[NDATASETS + 2]; /* Names of the datasets created */ - char * obj_names[NDATASETS + 2]; /* Names of the objects in group */ + char *dnames[NDATASETS + 2]; /* Names of the datasets created */ + char *obj_names[NDATASETS + 2]; /* Names of the objects in group */ char dataset_name[NAMELEN]; /* dataset name */ ssize_t name_len; /* Length of object's name */ H5G_info_t ginfo; /* Buffer for querying object's info */ diff --git a/test/tmisc.c b/test/tmisc.c index 6926e21..12a76c1 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -429,8 +429,8 @@ test_misc2_write_attribute(void) hid_t type; herr_t ret; misc2_struct data, data_check; - char * string_att1 = HDstrdup("string attribute in file one"); - char * string_att2 = HDstrdup("string attribute in file two"); + char *string_att1 = HDstrdup("string attribute in file one"); + char *string_att2 = HDstrdup("string attribute in file two"); type = misc2_create_type(); @@ -1237,8 +1237,8 @@ test_misc8(void) hsize_t dims[MISC8_RANK] = {MISC8_DIM0, MISC8_DIM1}; hsize_t chunk_dims[MISC8_RANK] = {MISC8_CHUNK_DIM0, MISC8_CHUNK_DIM1}; hsize_t storage_size; /* Number of bytes of raw data storage used */ - int * wdata; /* Data to write */ - int * tdata; /* Temporary pointer to data write */ + int *wdata; /* Data to write */ + int *tdata; /* Temporary pointer to data write */ #ifdef VERIFY_DATA int *rdata; /* Data to read */ int *tdata2; /* Temporary pointer to data to read */ @@ -2015,7 +2015,7 @@ test_misc12(void) "bien germina ya! Ceso la horrible noche, La libertad sublime", "derrama las auroras de su invencible luz.", "La humanidad entera, que entre cadenas gime, comprende", "las palabras del que murio en la cruz."}; - char * rdata[MISC12_SPACE1_DIM1 + MISC12_APPEND_SIZE]; /* Information read in */ + char *rdata[MISC12_SPACE1_DIM1 + MISC12_APPEND_SIZE]; /* Information read in */ hid_t fid1; hid_t dataset; hid_t sid1, space, memspace; @@ -2298,10 +2298,10 @@ misc13_create_hdf_file(const char *name, const unsigned *data) static void misc13_insert_user_block(const char *old_name, const char *new_name, const char *str, size_t size) { - FILE * new_fp = NULL; /* Pointers to new & old files */ - FILE * old_fp = NULL; - void * user_block = NULL; /* Pointer to user block to write to file */ - void * copy_buf = NULL; /* Pointer to buffer for copying data */ + FILE *new_fp = NULL; /* Pointers to new & old files */ + FILE *old_fp = NULL; + void *user_block = NULL; /* Pointer to user block to write to file */ + void *copy_buf = NULL; /* Pointer to buffer for copying data */ size_t written; /* Amount of data written to new file */ size_t read_in; /* Amount of data read in from old file */ int ret; /* Generic status value */ @@ -3740,7 +3740,7 @@ static void test_misc21(void) { hid_t fid, sid, dcpl, dsid; - char * buf; + char *buf; hsize_t dims[2] = {MISC21_SPACE_DIM0, MISC21_SPACE_DIM1}, chunk_size[2] = {MISC21_CHUNK_DIM0, MISC21_CHUNK_DIM1}; herr_t ret; /* Generic return value */ @@ -3806,7 +3806,7 @@ static void test_misc22(void) { hid_t fid, sid, dcpl, dsid, dcpl2; - char * buf; + char *buf; hsize_t dims[2] = {MISC22_SPACE_DIM0, MISC22_SPACE_DIM1}, chunk_size[2] = {MISC22_CHUNK_DIM0, MISC22_CHUNK_DIM1}; herr_t ret; /* Generic return value */ @@ -5515,8 +5515,8 @@ test_misc31(void) static void test_misc32(void) { - void * buffer; - void * resized; + void *buffer; + void *resized; size_t size; /* Output message about test being performed */ diff --git a/test/trefer.c b/test/trefer.c index 8810f3a..e98a20c 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -74,7 +74,7 @@ test_reference_params(void) hobj_ref_t *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ - unsigned * tu32; /* Temporary pointer to uint32 data */ + unsigned *tu32; /* Temporary pointer to uint32 data */ int i; /* counting variables */ const char *write_comment = "Foo!"; /* Comments for group */ hid_t ret_id; /* Generic hid_t return value */ @@ -245,7 +245,7 @@ test_reference_obj(void) *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ hobj_ref_t nvrbuf[3] = {0, 101, 1000000000}; /* buffer with non-valid refs */ - unsigned * tu32; /* Temporary pointer to uint32 data */ + unsigned *tu32; /* Temporary pointer to uint32 data */ int i, j; /* counting variables */ const char *write_comment = "Foo!"; /* Comments for group */ char read_comment[10]; @@ -491,15 +491,15 @@ test_reference_region(void) hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */ hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */ hsize_t coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */ - hsize_t * coords; /* Coordinate buffer */ + hsize_t *coords; /* Coordinate buffer */ hsize_t low[SPACE2_RANK]; /* Selection bounds */ hsize_t high[SPACE2_RANK]; /* Selection bounds */ hdset_reg_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ hdset_reg_ref_t nvrbuf[3] = {{0}, {101}, {255}}; /* buffer with non-valid refs */ - uint8_t * dwbuf, /* Buffer for writing numeric data to disk */ + uint8_t *dwbuf, /* Buffer for writing numeric data to disk */ *drbuf; /* Buffer for reading numeric data from disk */ - uint8_t * tu8; /* Temporary pointer to uint8 data */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Type of object */ int i, j; /* counting variables */ hssize_t hssize_ret; /* hssize_t return value */ @@ -862,14 +862,14 @@ test_reference_region_1D(void) hsize_t count[SPACE3_RANK]; /* Element count of hyperslab */ hsize_t block[SPACE3_RANK]; /* Block size of hyperslab */ hsize_t coord1[POINT1_NPOINTS][SPACE3_RANK]; /* Coordinates for point selection */ - hsize_t * coords; /* Coordinate buffer */ + hsize_t *coords; /* Coordinate buffer */ hsize_t low[SPACE3_RANK]; /* Selection bounds */ hsize_t high[SPACE3_RANK]; /* Selection bounds */ hdset_reg_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ uint8_t *dwbuf, /* Buffer for writing numeric data to disk */ *drbuf; /* Buffer for reading numeric data from disk */ - uint8_t * tu8; /* Temporary pointer to uint8 data */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Object type */ int i; /* counting variables */ herr_t ret; /* Generic return value */ @@ -1229,7 +1229,7 @@ static herr_t test_deref_iter_op(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *info, void *op_data) { - int * count = (int *)op_data; /* Pointer to name counter */ + int *count = (int *)op_data; /* Pointer to name counter */ herr_t ret_value; /* Simple check for correct names */ diff --git a/test/trefstr.c b/test/trefstr.c index 049384f..bfd3842 100644 --- a/test/trefstr.c +++ b/test/trefstr.c @@ -289,7 +289,7 @@ static void test_refstr_own(void) { H5RS_str_t *rs; /* Ref-counted string created */ - char * s; /* Pointer to string to transfer */ + char *s; /* Pointer to string to transfer */ const char *t; /* Temporary pointers to string */ int cmp; /* Comparison value */ herr_t ret; /* Generic return value */ diff --git a/test/tselect.c b/test/tselect.c index 464ff02..e42ef91 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -433,8 +433,8 @@ static herr_t test_select_point_iter1(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *_operator_data) { - uint8_t * elem = (uint8_t *)_elem; /* Pointer to the element to examine */ - uint8_t * tmp; /* temporary ptr to element in operator data */ + uint8_t *elem = (uint8_t *)_elem; /* Pointer to the element to examine */ + uint8_t *tmp; /* temporary ptr to element in operator data */ struct pnt_iter *pnt_info = (struct pnt_iter *)_operator_data; tmp = pnt_info->buf + (pnt_info->coord[pnt_info->offset][0] * SPACE2_DIM2) + @@ -1936,10 +1936,10 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co hsize_t stride[SS_DR_MAX_RANK]; /* Shared hyperslab stride */ hsize_t count[SS_DR_MAX_RANK]; /* Shared hyperslab count */ hsize_t block[SS_DR_MAX_RANK]; /* Shared hyperslab block size */ - hsize_t * start_ptr; /* Actual hyperslab start offset */ - hsize_t * stride_ptr; /* Actual hyperslab stride */ - hsize_t * count_ptr; /* Actual hyperslab count */ - hsize_t * block_ptr; /* Actual hyperslab block size */ + hsize_t *start_ptr; /* Actual hyperslab start offset */ + hsize_t *stride_ptr; /* Actual hyperslab stride */ + hsize_t *count_ptr; /* Actual hyperslab count */ + hsize_t *block_ptr; /* Actual hyperslab block size */ size_t small_cube_size; /* Number of elements in small cube */ size_t large_cube_size; /* Number of elements in large cube */ unsigned u, v, w, x; /* Local index variables */ @@ -2789,7 +2789,7 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank hbool_t in_checker; hbool_t start_in_checker[5]; uint16_t expected_value; - uint16_t * val_ptr; + uint16_t *val_ptr; unsigned i, j, k, l, m; /* to track position in n-cube */ unsigned v, w, x, y, z; /* to track position in checker */ const unsigned test_max_rank = 5; /* code changes needed if this is increased */ @@ -2914,9 +2914,9 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ size_t start_index; /* Offset within buffer to begin inspecting */ size_t stop_index; /* Offset within buffer to end inspecting */ uint16_t expected_value; - uint16_t * small_cube_buf_1; - uint16_t * large_cube_buf_1; - uint16_t * ptr_1; + uint16_t *small_cube_buf_1; + uint16_t *large_cube_buf_1; + uint16_t *ptr_1; size_t small_cube_size; /* Number of elements in small cube */ size_t large_cube_size; /* Number of elements in large cube */ hsize_t dims[SS_DR_MAX_RANK]; @@ -6114,7 +6114,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) hsize_t dims2[] = {SPACE6_DIM1}; hsize_t start[SPACE5_RANK]; /* Starting location of hyperslab */ hsize_t count[SPACE5_RANK]; /* Element count of hyperslab */ - int * wbuf, /* buffer to write to disk */ + int *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temporary buffer pointer */ int i, j, k, l, m; /* Counters */ @@ -6256,8 +6256,8 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) { hsize_t dimsf[3]; /* dataset dimensions */ hsize_t chunk_dimsf[3] = {CHUNK_X, CHUNK_Y, CHUNK_Z}; /* chunk sizes */ - short * data; /* data to write */ - short * tmpdata; /* data to write */ + short *data; /* data to write */ + short *tmpdata; /* data to write */ /* * Data and output buffer initialization. @@ -7215,7 +7215,7 @@ test_select_combine(void) typedef struct { unsigned short fill_value; /* The fill value to check */ size_t curr_coord; /* Current coordinate to examine */ - hsize_t * coords; /* Pointer to selection's coordinates */ + hsize_t *coords; /* Pointer to selection's coordinates */ } fill_iter_info; /**************************************************************** @@ -7227,7 +7227,7 @@ static herr_t test_select_hyper_iter3(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data) { - unsigned * tbuf = (unsigned *)_elem; /* temporary buffer pointer */ + unsigned *tbuf = (unsigned *)_elem; /* temporary buffer pointer */ fill_iter_info *iter_info = (fill_iter_info *)_operator_data; /* Get the pointer to the iterator information */ hsize_t *coord_ptr; /* Pointer to the coordinate information for a point*/ @@ -7267,7 +7267,7 @@ test_select_fill_all(void) unsigned fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ hsize_t points[SPACE7_DIM1 * SPACE7_DIM2][SPACE7_RANK]; /* Coordinates of selection */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v; /* Counters */ herr_t ret; /* Generic return value */ @@ -7343,7 +7343,7 @@ test_select_fill_point(hssize_t *offset) size_t num_points = 5; /* Number of points selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -7443,7 +7443,7 @@ test_select_fill_hyper_simple(hssize_t *offset) hsize_t points[16][SPACE7_RANK]; /* Coordinates selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v; /* Counters */ herr_t ret; /* Generic return value */ @@ -7554,7 +7554,7 @@ test_select_fill_hyper_regular(hssize_t *offset) size_t num_points = 16; /* Number of points selected */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -7674,7 +7674,7 @@ test_select_fill_hyper_irregular(hssize_t *offset) size_t num_iter_points = 28; /* Number of resulting points */ int fill_value; /* Fill value */ fill_iter_info iter_info; /* Iterator information structure */ - unsigned * wbuf, /* buffer to write to disk */ + unsigned *wbuf, /* buffer to write to disk */ *tbuf; /* temporary buffer pointer */ unsigned u, v, w; /* Counters */ herr_t ret; /* Generic return value */ @@ -12531,8 +12531,8 @@ test_select_hyper_chunk_offset(void) const hsize_t mem_dims[1] = {SPACE10_DIM1}; /* Dataspace dimensions for memory */ const hsize_t dims[1] = {0}; /* Dataspace initial dimensions */ const hsize_t maxdims[1] = {H5S_UNLIMITED}; /* Dataspace mam dims */ - int * wbuf; /* Buffer for writing data */ - int * rbuf; /* Buffer for reading data */ + int *wbuf; /* Buffer for writing data */ + int *rbuf; /* Buffer for reading data */ hid_t dcpl; /* Dataset creation property list ID */ hsize_t chunks[1] = {SPACE10_CHUNK_SIZE}; /* Chunk size */ hsize_t start[1] = {0}; /* The start of the hyperslab */ diff --git a/test/tskiplist.c b/test/tskiplist.c index 4bf9b11..5430cb8 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -148,7 +148,7 @@ test_skiplist_insert(void) int key, /* Key of item to insert */ item; /* Item to insert */ int search_key; /* Key of item to search for in skip list */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ size_t num; /* Number of elements in skip list */ herr_t ret; /* Generic return value */ @@ -211,7 +211,7 @@ test_skiplist_insert_many(void) H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -284,7 +284,7 @@ test_skiplist_remove(void) key2, /* Key of 2nd item to insert */ key3; /* Key of 3rd item to insert */ int search_key; /* Key of item to search for in skip list */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ size_t num; /* Number of elements in skip list */ herr_t ret; /* Generic return value */ @@ -364,7 +364,7 @@ test_skiplist_remove_many(void) H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -462,11 +462,11 @@ test_skiplist_remove_many(void) static void test_skiplist_firstnext(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -528,7 +528,7 @@ test_skiplist_firstnext(void) static void test_skiplist_string(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -646,13 +646,13 @@ test_skiplist_iterate(void) static void test_skiplist_hsize(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ hsize_t data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; hsize_t sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - hsize_t * found_item; /* Item found in skip list */ + hsize_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -701,13 +701,13 @@ test_skiplist_hsize(void) static void test_skiplist_unsigned(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -756,7 +756,7 @@ test_skiplist_unsigned(void) static void test_skiplist_obj(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -764,7 +764,7 @@ test_skiplist_obj(void) {8, 12}, {31, 12}, {20, 11}, {31, 11}, {8, 32}}; H5_obj_t sorted_data[10] = {{8, 12}, {8, 32}, {10, 11}, {10, 12}, {10, 32}, {20, 11}, {20, 12}, {31, 11}, {31, 12}, {50, 1}}; - H5_obj_t * found_item; /* Item found in skip list */ + H5_obj_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -837,7 +837,7 @@ test_skiplist_generic_cmp(const void *_key1, const void *_key2) static void test_skiplist_generic(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ @@ -845,7 +845,7 @@ test_skiplist_generic(void) {30, 100}, {31, 38}, {32, 34}, {80, 32}, {90, 0}}; generic_t sorted_data[10] = {{30, 100}, {15, 32}, {31, 38}, {32, 34}, {5, 2}, {20, 13}, {10, 1}, {50, 37}, {80, 32}, {90, 0}}; - generic_t * found_item; /* Item found in skip list */ + generic_t *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -895,11 +895,11 @@ test_skiplist_generic(void) static void test_skiplist_lastprev(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -961,12 +961,12 @@ test_skiplist_lastprev(void) static void test_skiplist_find(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ unsigned find_item; /* Item to find in skip list */ herr_t ret; /* Generic return value */ @@ -1017,12 +1017,12 @@ test_skiplist_find(void) static void test_skiplist_add(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; - unsigned * found_item; /* Item found in skip list */ + unsigned *found_item; /* Item found in skip list */ unsigned new_item; /* Item to add to skip list */ herr_t ret; /* Generic return value */ @@ -1083,7 +1083,7 @@ test_skiplist_destroy_free(void *item, void H5_ATTR_UNUSED *key, void *op_data) static void test_skiplist_destroy(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned free_count; /* Number of items freed */ herr_t ret; /* Generic return value */ @@ -1118,7 +1118,7 @@ test_skiplist_destroy(void) static void test_skiplist_free(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t num; /* Number of elements in skip list */ size_t u; /* Local index variable */ unsigned free_count; /* Number of items freed */ @@ -1176,7 +1176,7 @@ test_skiplist_free(void) /* Structure to hold the list of objects */ typedef struct { - H5SL_t * slist; /* Skiplist holding the objects */ + H5SL_t *slist; /* Skiplist holding the objects */ struct test_tfs_obj_t *list; /* Linear list of objects */ int nobjs; /* Number of objects in list */ int nobjs_rem; /* Number of objects in list that have not been freed */ @@ -1199,7 +1199,7 @@ typedef struct test_tfs_it_ud_t { static herr_t test_tfs_iter(void *_obj, void *key, void *_udata) { - test_tfs_obj_t * obj = (test_tfs_obj_t *)_obj; + test_tfs_obj_t *obj = (test_tfs_obj_t *)_obj; test_tfs_it_ud_t *udata = (test_tfs_it_ud_t *)_udata; /* Check consistency */ @@ -1222,11 +1222,11 @@ test_tfs_iter(void *_obj, void *key, void *_udata) static htri_t test_tfs_free(void *_obj, void *key, void *_obj_list) { - test_tfs_obj_t * obj = (test_tfs_obj_t *)_obj; + test_tfs_obj_t *obj = (test_tfs_obj_t *)_obj; test_tfs_list_t *obj_list = (test_tfs_list_t *)_obj_list; test_tfs_it_ud_t iter_ud; int nrems, rem_idx, i, j; - test_tfs_obj_t * obj_ret; + test_tfs_obj_t *obj_ret; herr_t ret; /* return value */ htri_t ret_value; @@ -1379,7 +1379,7 @@ test_skiplist_try_free_safe(void) static void test_skiplist_less(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; /* unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; */ @@ -1443,7 +1443,7 @@ test_skiplist_less(void) static void test_skiplist_greater(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; /* unsigned sorted_data[10]={ 5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; */ @@ -1507,7 +1507,7 @@ test_skiplist_greater(void) static void test_skiplist_below(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; @@ -1586,7 +1586,7 @@ test_skiplist_below(void) static void test_skiplist_above(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ H5SL_node_t *node; /* Skip list node */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; @@ -1665,7 +1665,7 @@ test_skiplist_above(void) static void test_skiplist_remove_first(void) { - H5SL_t * slist; /* Skip list created */ + H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ unsigned data[10] = {10, 20, 15, 5, 50, 30, 31, 32, 80, 90}; unsigned sorted_data[10] = {5, 10, 15, 20, 30, 31, 32, 50, 80, 90}; @@ -1712,7 +1712,7 @@ test_skiplist_remove_first_many(void) { H5SL_t *slist; /* Skip list created */ size_t u; /* Local index variable */ - int * found_item; /* Item found in skip list */ + int *found_item; /* Item found in skip list */ int prev_item = INT_MIN; /* Previously found item in skip list */ herr_t ret; /* Generic return value */ diff --git a/test/tsohm.c b/test/tsohm.c index 0170604..1892a8f 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -3804,7 +3804,7 @@ test_sohm_external_dtype(void) int a; int b; } s1_t; - s1_t * s_ptr, *orig; + s1_t *s_ptr, *orig; hid_t fcpl, file1, file2; hid_t dataset1, dataset2; hid_t s1_tid, dset1_tid, dset2_tid, space; diff --git a/test/ttsafe.c b/test/ttsafe.c index c26cad7..d24c4dc 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -78,7 +78,7 @@ tts_is_threadsafe(void) char * gen_name(int value) { - char * temp; + char *temp; unsigned length; int i; diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c index c2c34a0..57108a3 100644 --- a/test/ttsafe_acreate.c +++ b/test/ttsafe_acreate.c @@ -144,8 +144,8 @@ void * tts_acreate_thread(void *client_data) { hid_t attribute = H5I_INVALID_HID; - char * attribute_name; - int * attribute_data; /* data for attributes */ + char *attribute_name; + int *attribute_data; /* data for attributes */ herr_t status; ttsafe_name_data_t *attrib_data; @@ -155,7 +155,7 @@ tts_acreate_thread(void *client_data) /* Create attribute */ attribute_name = gen_name(attrib_data->current_index); attribute = H5Acreate2(attrib_data->dataset, attribute_name, attrib_data->datatype, - attrib_data->dataspace, H5P_DEFAULT, H5P_DEFAULT); + attrib_data->dataspace, H5P_DEFAULT, H5P_DEFAULT); CHECK(attribute, H5I_INVALID_HID, "H5Acreate2"); /* Write data to the attribute */ diff --git a/test/ttsafe_attr_vlen.c b/test/ttsafe_attr_vlen.c index ecd0aa6..2fe140c 100644 --- a/test/ttsafe_attr_vlen.c +++ b/test/ttsafe_attr_vlen.c @@ -60,7 +60,7 @@ tts_attr_vlen(void) hid_t atid = H5I_INVALID_HID; /* Datatype ID for attribute */ hid_t asid = H5I_INVALID_HID; /* Dataspace ID for attribute */ hid_t aid = H5I_INVALID_HID; /* The attribute ID */ - const char * string_attr = "2.0"; /* The attribute data */ + const char *string_attr = "2.0"; /* The attribute data */ int ret; /* Return value */ int i; /* Local index variable */ @@ -124,7 +124,7 @@ tts_attr_vlen_thread(void H5_ATTR_UNUSED *client_data) hid_t gid = H5I_INVALID_HID; /* Group ID */ hid_t aid = H5I_INVALID_HID; /* Attribute ID */ hid_t atid = H5I_INVALID_HID; /* Datatype ID for the attribute */ - char * string_attr_check; /* The attribute data being read */ + char *string_attr_check; /* The attribute data being read */ const char *string_attr = "2.0"; /* The expected attribute data */ herr_t ret; /* Return value */ diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index bfd63f4..7add96a 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -39,7 +39,7 @@ #define FILENAME "ttsafe_cancel.h5" #define DATASETNAME "commonname" -void * tts_cancel_thread(void *); +void *tts_cancel_thread(void *); void tts_cancel_barrier(void); herr_t tts_cancel_callback(void *, hid_t, unsigned, const hsize_t *, void *); void cancellation_cleanup(void *); diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index 63664f7..c917ee7 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -57,7 +57,7 @@ H5TS_mutex_simple_t error_mutex_g; /* Prototypes */ static herr_t error_callback(hid_t, void *); static herr_t walk_error_callback(unsigned, const H5E_error2_t *, void *); -static void * tts_error_thread(void *); +static void *tts_error_thread(void *); void tts_error(void) @@ -146,7 +146,7 @@ tts_error_thread(void H5_ATTR_UNUSED *arg) hid_t dataset = H5I_INVALID_HID; hsize_t dimsf[1]; /* dataset dimensions */ H5E_auto2_t old_error_cb; - void * old_error_client_data; + void *old_error_client_data; int value; herr_t status; diff --git a/test/ttst.c b/test/ttst.c index 53aab5e..87e9221 100644 --- a/test/ttst.c +++ b/test/ttst.c @@ -69,7 +69,7 @@ static void test_tst_init(void) { time_t curr_time; /* Current time, for seeding random number generator */ - char * tmp_word; /* Temporary pointer to word in word set */ + char *tmp_word; /* Temporary pointer to word in word set */ size_t u, v, w; /* Local index variables */ /* Compute the number of words in the test set */ @@ -176,7 +176,7 @@ test_tst_insert(void) { H5ST_tree_t *tree; /* TST created */ H5ST_ptr_t found; /* Pointer to TST node found */ - void * obj; /* Pointer to object located in TST */ + void *obj; /* Pointer to object located in TST */ size_t u; /* Local index counter */ htri_t check; /* Is string in TST? */ herr_t ret; /* Generic return value */ @@ -287,7 +287,7 @@ test_tst_remove(void) { H5ST_tree_t *tree; /* TST created */ H5ST_ptr_t found; /* Pointer to TST node found */ - void * obj; /* Pointer to object removed from TST */ + void *obj; /* Pointer to object removed from TST */ htri_t check; /* Is string in TST? */ size_t u; /* Local index counter */ herr_t ret; /* Generic return value */ diff --git a/test/tunicode.c b/test/tunicode.c index f497aa3..8f09d09 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -317,7 +317,7 @@ test_vl_string(hid_t fid, const char *string) hid_t type_id, space_id, dset_id; hsize_t dims = 1; hsize_t size; /* Number of bytes used */ - char * read_buf[1]; + char *read_buf[1]; herr_t ret; /* Create dataspace for datasets */ @@ -582,7 +582,7 @@ test_compound(hid_t fid, const char *string) hid_t s1_tid, s2_tid; hid_t space_id, dset_id; hsize_t dim = 1; - char * readbuf; + char *readbuf; herr_t ret; /* Initialize compound data */ @@ -698,7 +698,7 @@ void test_opaque(hid_t H5_ATTR_UNUSED fid, const char *string) { hid_t type_id; - char * read_buf; + char *read_buf; herr_t ret; /* Create an opaque type and give it a UTF-8 tag */ diff --git a/test/tvlstr.c b/test/tvlstr.c index 54204b1..70b440d 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -35,7 +35,7 @@ /* String for testing attributes */ static const char *string_att = "This is the string for the attribute"; -static char * string_att_write = NULL; +static char *string_att_write = NULL; void *test_vlstr_alloc_custom(size_t size, void *info); void test_vlstr_free_custom(void *mem, void *info); @@ -51,7 +51,7 @@ void test_vlstr_free_custom(void *mem, void *info); void * test_vlstr_alloc_custom(size_t size, void *info) { - void * ret_value = NULL; /* Pointer to return */ + void *ret_value = NULL; /* Pointer to return */ size_t *mem_used = (size_t *)info; /* Get the pointer to the memory used */ size_t extra; /* Extra space needed */ @@ -81,7 +81,7 @@ void test_vlstr_free_custom(void *_mem, void *info) { unsigned char *mem; - size_t * mem_used = (size_t *)info; /* Get the pointer to the memory used */ + size_t *mem_used = (size_t *)info; /* Get the pointer to the memory used */ size_t extra; /* Extra space needed */ /* @@ -113,8 +113,8 @@ test_vlstrings_basic(void) "Now we are engaged in a great civil war,", "testing whether that nation or any nation so conceived and so dedicated can long endure."}; - char * rdata[SPACE1_DIM1]; /* Information read in */ - char * wdata2; + char *rdata[SPACE1_DIM1]; /* Information read in */ + char *wdata2; hid_t dataspace, dataset2; hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ @@ -249,8 +249,8 @@ test_vlstrings_special(void) { const char *wdata[SPACE1_DIM1] = {"", "two", "three", "\0"}; const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL}; - char * rdata[SPACE1_DIM1]; /* Information read in */ - char * fill; /* Fill value */ + char *rdata[SPACE1_DIM1]; /* Information read in */ + char *fill; /* Fill value */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -482,7 +482,7 @@ static void test_compact_vlstring(void) { const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"}; - char * rdata[SPACE1_DIM1]; /* Information read in */ + char *rdata[SPACE1_DIM1]; /* Information read in */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -579,7 +579,7 @@ test_write_vl_string_attribute(void) hid_t file, root, dataspace, att; hid_t type; herr_t ret; - char * string_att_check = NULL; + char *string_att_check = NULL; /* Open the file */ file = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT); @@ -671,7 +671,7 @@ test_read_vl_string_attribute(void) hid_t file, root, att; hid_t type; herr_t ret; - char * string_att_check = NULL; + char *string_att_check = NULL; /* Open file */ file = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -762,7 +762,7 @@ read_scalar_dset(hid_t file, hid_t type, hid_t space, char *name, char *data) { hid_t dset; herr_t ret; - char * data_read; + char *data_read; dset = H5Dopen2(file, name, H5P_DEFAULT); CHECK(dset, FAIL, "H5Dopen2"); diff --git a/test/tvltypes.c b/test/tvltypes.c index b0926c4..ee99263 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -55,7 +55,7 @@ void test_vltypes_free_custom(void *mem, void *info); void * test_vltypes_alloc_custom(size_t size, void *mem_used) { - void * ret_value; /* Pointer to return */ + void *ret_value; /* Pointer to return */ const size_t extra = MAX(sizeof(void *), sizeof(size_t)); /* Extra space needed */ /* (This weird contortion is required on the * DEC Alpha to keep the alignment correct - QAK) @@ -1034,15 +1034,15 @@ test_vltypes_compound_vlen_vlen(void) float f; hvl_t v; } s1; - s1 * wdata; /* data to write */ - s1 * rdata; /* data to read */ + s1 *wdata; /* data to write */ + s1 *rdata; /* data to read */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ hid_t tid1, tid2, tid3; /* Datatype IDs */ hsize_t dims1[] = {SPACE3_DIM1}; unsigned i, j, k; /* counting variables */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ herr_t ret; /* Generic return value */ /* Output message about test being performed */ @@ -1230,7 +1230,7 @@ test_vltypes_compound_vlstr(void) hsize_t size[] = {SPACE1_DIM1}; hsize_t offset[] = {0}; unsigned i, j; /* counting variables */ - s2 * t1, *t2; /* Temporary pointer to VL information */ + s2 *t1, *t2; /* Temporary pointer to VL information */ int val; herr_t ret; /* Generic return value */ @@ -1918,7 +1918,7 @@ test_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2119,7 +2119,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2299,7 +2299,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ hvl_t rdata[SPACE1_DIM1]; /* Information read in */ - hvl_t * t1, *t2; /* Temporary pointer to VL information */ + hvl_t *t1, *t2; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -2487,17 +2487,17 @@ test_vltypes_fill_value(void) typedef struct dtype1_struct { unsigned int gui; unsigned int pgui; - char * str_id; - char * str_name; - char * str_desc; - char * str_orig; - char * str_stat; + char *str_id; + char *str_name; + char *str_desc; + char *str_orig; + char *str_stat; unsigned int ver; double val; double ma; double mi; - char * str_form; - char * str_unit; + char *str_form; + char *str_unit; } dtype1_struct; herr_t ret; @@ -2529,7 +2529,7 @@ test_vltypes_fill_value(void) const dtype1_struct fill1 = {1, 2, "foobar", "", NULL, "\0", "dead", 3, 4.0F, 100.0F, 1.0F, "liquid", "meter"}; const dtype1_struct wdata = {3, 4, "", NULL, "\0", "foo", "two", 6, 8.0F, 200.0F, 2.0F, "solid", "yard"}; - dtype1_struct * rbuf = NULL; /* Buffer for reading data */ + dtype1_struct *rbuf = NULL; /* Buffer for reading data */ size_t mem_used = 0; /* Memory used during allocation */ H5D_layout_t layout; /* Dataset storage layout */ char dset_name1[64], dset_name2[64]; /* Dataset names */ diff --git a/test/unlink.c b/test/unlink.c index 5beeac8..b080299 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -565,8 +565,8 @@ test_filespace(hid_t fapl) FILESPACE_CHUNK2}; /* Chunk dimensions */ hsize_t attr_dims[FILESPACE_ATTR_NDIMS] = {FILESPACE_ATTR_DIM0, FILESPACE_ATTR_DIM1}; /* Attribute dimensions */ - int * data = NULL; /* Pointer to dataset buffer */ - int * tmp_data; /* Temporary pointer to dataset buffer */ + int *data = NULL; /* Pointer to dataset buffer */ + int *tmp_data; /* Temporary pointer to dataset buffer */ h5_stat_size_t empty_size; /* Size of an empty file */ h5_stat_size_t file_size; /* Size of each file created */ herr_t status; /* Function status return value */ @@ -95,7 +95,7 @@ test_sec2(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; /* filename */ - void * os_file_handle = NULL; /* OS file handle */ + void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ TESTING("SEC2 file driver"); @@ -207,16 +207,16 @@ test_core(void) hid_t did = -1; /* dataset ID */ hid_t sid = -1; /* dataspace ID */ char filename[1024]; /* filename */ - void * os_file_handle = NULL; /* OS file handle */ + void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ size_t increment; /* core VFD increment */ hbool_t backing_store; /* use backing store? */ hbool_t use_write_tracking; /* write tracking flag */ size_t write_tracking_page_size; /* write tracking page size */ - int * data_w = NULL; /* data written to the dataset */ - int * data_r = NULL; /* data read from the dataset */ + int *data_w = NULL; /* data written to the dataset */ + int *data_r = NULL; /* data read from the dataset */ int val; /* data value */ - int * pw = NULL, *pr = NULL; /* pointers for iterating over + int *pw = NULL, *pr = NULL; /* pointers for iterating over data arrays (write & read) */ hsize_t dims[2]; /* dataspace dimensions */ int i, j; /* iterators */ @@ -563,13 +563,13 @@ test_direct(void) hid_t file = -1, fapl = -1, access_fapl = -1; hid_t dset1 = -1, dset2 = -1, space1 = -1, space2 = -1; char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size; hsize_t dims1[2], dims2[1]; size_t mbound; size_t fbsize; size_t cbsize; - int * points = NULL, *check = NULL, *p1 = NULL, *p2 = NULL; + int *points = NULL, *check = NULL, *p1 = NULL, *p2 = NULL; int wdata2[DSET2_DIM] = {11, 12, 13, 14}; int rdata2[DSET2_DIM]; int i, j, n; @@ -878,7 +878,7 @@ test_family(void) char filename[1024]; char dname[] = "dataset"; unsigned int i, j; - int * fhandle = NULL, *fhandle2 = NULL; + int *fhandle = NULL, *fhandle2 = NULL; int buf[FAMILY_NUMBER][FAMILY_SIZE]; hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE}; hsize_t file_size; @@ -1214,12 +1214,12 @@ test_multi(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle2 = NULL, *fhandle = NULL; + int *fhandle2 = NULL, *fhandle = NULL; hsize_t file_size; H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl[H5FD_MEM_NTYPES]; haddr_t memb_addr[H5FD_MEM_NTYPES]; - const char * memb_name[H5FD_MEM_NTYPES]; + const char *memb_name[H5FD_MEM_NTYPES]; char sv[H5FD_MEM_NTYPES][32]; hsize_t dims[2] = {MULTI_SIZE, MULTI_SIZE}; hsize_t adims[1] = {1}; @@ -1621,7 +1621,7 @@ test_log(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size = 0; unsigned int flags = H5FD_LOG_ALL; size_t buf_size = 4 * KB; @@ -1731,7 +1731,7 @@ test_stdio(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - FILE * fhandle = NULL; + FILE *fhandle = NULL; hsize_t file_size = 0; TESTING("STDIO file driver"); @@ -1838,7 +1838,7 @@ test_windows(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; - int * fhandle = NULL; + int *fhandle = NULL; hsize_t file_size = 0; #endif /*H5_HAVE_WINDOWS*/ @@ -1964,7 +1964,7 @@ test_ros3(void) hid_t driver_id = -1; /* ID for this VFD */ unsigned long driver_flags = 0; /* VFD feature flags */ char filename[1024]; /* filename */ - void * os_file_handle = NULL; /* OS file handle */ + void *os_file_handle = NULL; /* OS file handle */ hsize_t file_size; /* file size */ H5FD_ros3_fapl_t test_ros3_fa; H5FD_ros3_fapl_t ros3_fa_0 = { diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 8d47915..d23f70d 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -359,7 +359,7 @@ static hbool_t serve_rw_count_reset_request(struct mssg_t *mssg_ptr); static herr_t clear_datum(H5F_t *f, void *thing, hbool_t dest); static herr_t destroy_datum(H5F_t H5_ATTR_UNUSED *f, void *thing); static herr_t flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t addr, void *thing); -static void * load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, +static void *load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata); static herr_t size_datum(H5F_t H5_ATTR_UNUSED *f, void *thing, size_t *size_ptr); @@ -1065,7 +1065,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag) static hbool_t setup_derived_types(void) { - const char * fcn_name = "setup_derived_types()"; + const char *fcn_name = "setup_derived_types()"; hbool_t success = TRUE; int i; int result; @@ -1262,7 +1262,7 @@ reset_server_counters(void) static hbool_t server_main(void) { - const char * fcn_name = "server_main()"; + const char *fcn_name = "server_main()"; hbool_t done = FALSE; hbool_t success = TRUE; int done_count = 0; @@ -1404,7 +1404,7 @@ server_main(void) static hbool_t serve_read_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_read_request()"; + const char *fcn_name = "serve_read_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; int target_index; @@ -1523,7 +1523,7 @@ serve_read_request(struct mssg_t *mssg_ptr) static hbool_t serve_sync_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_sync_request()"; + const char *fcn_name = "serve_sync_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; struct mssg_t reply; @@ -1724,7 +1724,7 @@ serve_write_request(struct mssg_t *mssg_ptr) static hbool_t serve_total_writes_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_total_writes_request()"; + const char *fcn_name = "serve_total_writes_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; struct mssg_t reply; @@ -1795,7 +1795,7 @@ serve_total_writes_request(struct mssg_t *mssg_ptr) static hbool_t serve_total_reads_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_total_reads_request()"; + const char *fcn_name = "serve_total_reads_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; struct mssg_t reply; @@ -1866,7 +1866,7 @@ serve_total_reads_request(struct mssg_t *mssg_ptr) static hbool_t serve_entry_writes_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_entry_writes_request()"; + const char *fcn_name = "serve_entry_writes_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; int target_index; @@ -1956,7 +1956,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr) static hbool_t serve_entry_reads_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_entry_reads_request()"; + const char *fcn_name = "serve_entry_reads_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; int target_index; @@ -2045,7 +2045,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr) static hbool_t serve_rw_count_reset_request(struct mssg_t *mssg_ptr) { - const char * fcn_name = "serve_rw_count_reset_request()"; + const char *fcn_name = "serve_rw_count_reset_request()"; hbool_t report_mssg = FALSE; hbool_t success = TRUE; struct mssg_t reply; @@ -2225,13 +2225,13 @@ destroy_datum(H5F_t H5_ATTR_UNUSED *f, void *thing) static herr_t flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t H5_ATTR_UNUSED addr, void *thing) { - const char * fcn_name = "flush_datum()"; + const char *fcn_name = "flush_datum()"; hbool_t was_dirty = FALSE; herr_t ret_value = SUCCEED; int idx; - struct datum * entry_ptr; + struct datum *entry_ptr; struct mssg_t mssg; - H5C_t * cache_ptr; + H5C_t *cache_ptr; struct H5AC_aux_t *aux_ptr; HDassert(thing); @@ -2368,7 +2368,7 @@ flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t H5_ATT static void * load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata) { - const char * fcn_name = "load_datum()"; + const char *fcn_name = "load_datum()"; hbool_t success = TRUE; int idx; struct datum *entry_ptr = NULL; @@ -2574,7 +2574,7 @@ size_datum(H5F_t H5_ATTR_UNUSED *f, void *thing, size_t *size_ptr) static void expunge_entry(H5F_t *file_ptr, int32_t idx) { - const char * fcn_name = "expunge_entry()"; + const char *fcn_name = "expunge_entry()"; hbool_t in_cache; herr_t result; struct datum *entry_ptr; @@ -2651,7 +2651,7 @@ expunge_entry(H5F_t *file_ptr, int32_t idx) static void insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags) { - const char * fcn_name = "insert_entry()"; + const char *fcn_name = "insert_entry()"; hbool_t insert_pinned; herr_t result; struct datum *entry_ptr; @@ -3026,8 +3026,8 @@ lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx) static void lock_entry(H5F_t *file_ptr, int32_t idx) { - const char * fcn_name = "lock_entry()"; - struct datum * entry_ptr; + const char *fcn_name = "lock_entry()"; + struct datum *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (nerrors == 0) { @@ -3080,7 +3080,7 @@ lock_entry(H5F_t *file_ptr, int32_t idx) static void mark_entry_dirty(int32_t idx) { - const char * fcn_name = "mark_entry_dirty()"; + const char *fcn_name = "mark_entry_dirty()"; herr_t result; struct datum *entry_ptr; @@ -3195,7 +3195,7 @@ pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty) static void pin_protected_entry(int32_t idx, hbool_t global) { - const char * fcn_name = "pin_protected_entry()"; + const char *fcn_name = "pin_protected_entry()"; herr_t result; struct datum *entry_ptr; @@ -3261,7 +3261,7 @@ pin_protected_entry(int32_t idx, hbool_t global) static void move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx) { - const char * fcn_name = "move_entry()"; + const char *fcn_name = "move_entry()"; herr_t result; int tmp; size_t tmp_len; @@ -3378,7 +3378,7 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx) static hbool_t reset_server_counts(void) { - const char * fcn_name = "reset_server_counts()"; + const char *fcn_name = "reset_server_counts()"; hbool_t success = TRUE; /* will set to FALSE if appropriate. */ struct mssg_t mssg; @@ -3450,7 +3450,7 @@ reset_server_counts(void) static void resize_entry(int32_t idx, size_t new_size) { - const char * fcn_name = "resize_entry()"; + const char *fcn_name = "resize_entry()"; herr_t result; struct datum *entry_ptr; @@ -3519,14 +3519,14 @@ resize_entry(int32_t idx, size_t new_size) static hbool_t setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, int metadata_write_strategy) { - const char * fcn_name = "setup_cache_for_test()"; + const char *fcn_name = "setup_cache_for_test()"; hbool_t success = FALSE; /* will set to TRUE if appropriate. */ hbool_t enable_rpt_fcn = FALSE; hid_t fid = -1; H5AC_cache_config_t config; H5AC_cache_config_t test_config; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; HDassert(fid_ptr != NULL); HDassert(file_ptr_ptr != NULL); @@ -3723,7 +3723,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr static void verify_writes(int num_writes, haddr_t *written_entries_tbl) { - const char * fcn_name = "verify_writes()"; + const char *fcn_name = "verify_writes()"; const hbool_t report = FALSE; hbool_t proceed = TRUE; int i = 0; @@ -3832,7 +3832,7 @@ verify_writes(int num_writes, haddr_t *written_entries_tbl) static void setup_rand(void) { - const char * fcn_name = "setup_rand()"; + const char *fcn_name = "setup_rand()"; hbool_t use_predefined_seeds = FALSE; int num_predefined_seeds = 3; unsigned predefined_seeds[3] = {33402, 33505, 33422}; @@ -3948,7 +3948,7 @@ take_down_cache(hid_t fid) static hbool_t verify_entry_reads(haddr_t addr, int expected_entry_reads) { - const char * fcn_name = "verify_entry_reads()"; + const char *fcn_name = "verify_entry_reads()"; hbool_t success = TRUE; int reported_entry_reads; struct mssg_t mssg; @@ -4046,7 +4046,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) static hbool_t verify_entry_writes(haddr_t addr, int expected_entry_writes) { - const char * fcn_name = "verify_entry_writes()"; + const char *fcn_name = "verify_entry_writes()"; hbool_t success = TRUE; int reported_entry_writes; struct mssg_t mssg; @@ -4143,7 +4143,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) static hbool_t verify_total_reads(int expected_total_reads) { - const char * fcn_name = "verify_total_reads()"; + const char *fcn_name = "verify_total_reads()"; hbool_t success = TRUE; /* will set to FALSE if appropriate. */ long reported_total_reads; struct mssg_t mssg; @@ -4236,7 +4236,7 @@ verify_total_reads(int expected_total_reads) static hbool_t verify_total_writes(int expected_total_writes) { - const char * fcn_name = "verify_total_writes()"; + const char *fcn_name = "verify_total_writes()"; hbool_t success = TRUE; /* will set to FALSE if appropriate. */ long reported_total_writes; struct mssg_t mssg; @@ -4329,7 +4329,7 @@ verify_total_writes(int expected_total_writes) void unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags) { - const char * fcn_name = "unlock_entry()"; + const char *fcn_name = "unlock_entry()"; herr_t dirtied; herr_t result; struct datum *entry_ptr; @@ -4405,7 +4405,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags) static void unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t via_unprotect) { - const char * fcn_name = "unpin_entry()"; + const char *fcn_name = "unpin_entry()"; herr_t result; unsigned int flags = H5AC__UNPIN_ENTRY_FLAG; struct datum *entry_ptr; @@ -4488,7 +4488,7 @@ unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t static hbool_t server_smoke_check(void) { - const char * fcn_name = "server_smoke_check()"; + const char *fcn_name = "server_smoke_check()"; hbool_t success = TRUE; int max_nerrors; struct mssg_t mssg; @@ -4816,13 +4816,13 @@ server_smoke_check(void) static hbool_t smoke_check_1(int metadata_write_strategy) { - const char * fcn_name = "smoke_check_1()"; + const char *fcn_name = "smoke_check_1()"; hbool_t success = TRUE; int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -4981,13 +4981,13 @@ smoke_check_1(int metadata_write_strategy) static hbool_t smoke_check_2(int metadata_write_strategy) { - const char * fcn_name = "smoke_check_2()"; + const char *fcn_name = "smoke_check_2()"; hbool_t success = TRUE; int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5183,7 +5183,7 @@ smoke_check_2(int metadata_write_strategy) static hbool_t smoke_check_3(int metadata_write_strategy) { - const char * fcn_name = "smoke_check_3()"; + const char *fcn_name = "smoke_check_3()"; hbool_t success = TRUE; int cp = 0; int i; @@ -5193,8 +5193,8 @@ smoke_check_3(int metadata_write_strategy) int min_idx; int max_idx; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5545,7 +5545,7 @@ smoke_check_3(int metadata_write_strategy) static hbool_t smoke_check_4(int metadata_write_strategy) { - const char * fcn_name = "smoke_check_4()"; + const char *fcn_name = "smoke_check_4()"; hbool_t success = TRUE; int i; int max_nerrors; @@ -5554,8 +5554,8 @@ smoke_check_4(int metadata_write_strategy) int min_idx; int max_idx; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5825,14 +5825,14 @@ smoke_check_4(int metadata_write_strategy) static hbool_t smoke_check_5(int metadata_write_strategy) { - const char * fcn_name = "smoke_check_5()"; + const char *fcn_name = "smoke_check_5()"; hbool_t success = TRUE; int cp = 0; int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -6113,8 +6113,8 @@ trace_file_check(int metadata_write_strategy) const char *expected_output_0[] = { "### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 2097152 0.300000 33554432 " - "1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 " - "0.100000 262144 0 0\n", + "1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 " + "0.100000 262144 0 0\n", "H5AC_insert_entry 0x200 25 0x0 2 0\n", "H5AC_insert_entry 0x202 25 0x0 2 0\n", "H5AC_insert_entry 0x204 25 0x0 4 0\n", @@ -6174,9 +6174,9 @@ trace_file_check(int metadata_write_strategy) int expected_line_len; int actual_line_len; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - FILE * trace_file_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + FILE *trace_file_ptr = NULL; H5AC_cache_config_t config; struct mssg_t mssg; diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index fc117e3..a324b6b 100644 --- a/testpar/t_coll_chunk.c +++ b/testpar/t_coll_chunk.c @@ -591,8 +591,8 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap hid_t acc_plist, xfer_plist, crp_plist; hsize_t dims[RANK], chunk_dims[RANK]; - int * data_array1 = NULL; - int * data_origin1 = NULL; + int *data_array1 = NULL; + int *data_origin1 = NULL; hsize_t start[RANK], count[RANK], stride[RANK], block[RANK]; diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 199b2b8..36a2351 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -281,7 +281,7 @@ dataset_writeInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -418,8 +418,8 @@ dataset_readInd(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -545,7 +545,7 @@ dataset_writeAll(void) hid_t dataset5, dataset6, dataset7; /* Dataset ID */ hid_t datatype; /* Datatype ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -1061,8 +1061,8 @@ dataset_readAll(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2, dataset5, dataset6, dataset7; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -1420,7 +1420,7 @@ dataset_readAll(void) start[0] = dim0 / mpi_size * mpi_rank; start[1] = 0; ret = dataset_vrfy(start, count, stride, block, data_array1 + (dim0 / mpi_size * dim1 * mpi_rank), - data_origin1); + data_origin1); if (ret) nerrors++; @@ -1479,7 +1479,7 @@ extend_writeInd(void) const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -1857,9 +1857,9 @@ extend_readInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -2039,7 +2039,7 @@ extend_writeAll(void) const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2278,9 +2278,9 @@ extend_readAll(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ hsize_t start[RANK]; /* for hyperslab setting */ hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ @@ -2473,8 +2473,8 @@ compress_readAll(void) int rank = 1; /* Dataspace rank */ hsize_t dim = dim0; /* Dataspace dimensions */ unsigned u; /* Local index variable */ - DATATYPE * data_read = NULL; /* data buffer */ - DATATYPE * data_orig = NULL; /* expected data buffer */ + DATATYPE *data_read = NULL; /* data buffer */ + DATATYPE *data_orig = NULL; /* expected data buffer */ const char *filename; MPI_Comm comm = MPI_COMM_WORLD; MPI_Info info = MPI_INFO_NULL; @@ -2644,8 +2644,8 @@ none_selection_chunk(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_origin = NULL; /* data buffer */ - DATATYPE * data_array = NULL; /* data buffer */ + DATATYPE *data_origin = NULL; /* data buffer */ + DATATYPE *data_array = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2902,8 +2902,8 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_write = -1; H5D_mpio_actual_io_mode_t actual_io_mode_read = -1; H5D_mpio_actual_io_mode_t actual_io_mode_expected = -1; - const char * filename; - const char * test_name; + const char *filename; + const char *test_name; hbool_t direct_multi_chunk_io; hbool_t multi_chunk_io; hbool_t is_chunked; @@ -2911,7 +2911,7 @@ test_actual_io_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm = MPI_COMM_NULL; MPI_Info mpi_info = MPI_INFO_NULL; @@ -3431,7 +3431,7 @@ test_no_collective_cause_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm; MPI_Info mpi_info; @@ -3750,7 +3750,7 @@ test_no_collective_cause_mode_filter(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm = MPI_COMM_NULL; MPI_Info mpi_info = MPI_INFO_NULL; @@ -4006,8 +4006,8 @@ dataset_atomicity(void) hid_t sid; /* Dataspace ID */ hid_t dataset1; /* Dataset IDs */ hsize_t dims[RANK]; /* dataset dim sizes */ - int * write_buf = NULL; /* data buffer */ - int * read_buf = NULL; /* data buffer */ + int *write_buf = NULL; /* data buffer */ + int *read_buf = NULL; /* data buffer */ int buf_size; hid_t dataset2; hid_t file_dataspace; /* File dataspace ID */ diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c index a8251de..039576f 100644 --- a/testpar/t_file_image.c +++ b/testpar/t_file_image.c @@ -67,7 +67,7 @@ file_image_daisy_chain_test(void) int i; int space_ndims; MPI_Status rcvstat; - int * vector_ptr = NULL; + int *vector_ptr = NULL; hid_t fapl_id = -1; hid_t file_id; /* file IDs */ hid_t dset_id = -1; @@ -75,7 +75,7 @@ file_image_daisy_chain_test(void) hid_t space_id = -1; herr_t err; hsize_t dims[1]; - void * image_ptr = NULL; + void *image_ptr = NULL; ssize_t bytes_read; ssize_t image_len; hbool_t vector_ok = TRUE; diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c index ad25f1b..b179cce 100644 --- a/testpar/t_filter_read.c +++ b/testpar/t_filter_read.c @@ -60,8 +60,8 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size) size_t i, j; /* Local index variables */ char name[32] = "dataset"; herr_t hrc; /* Error status */ - int * points = NULL; /* Writing buffer for entire dataset */ - int * check = NULL; /* Reading buffer for selected hyperslab */ + int *points = NULL; /* Writing buffer for entire dataset */ + int *check = NULL; /* Reading buffer for selected hyperslab */ /* set up MPI parameters */ MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -205,7 +205,7 @@ test_filter_read(void) const hsize_t chunk_size[2] = {CHUNK_DIM1, CHUNK_DIM2}; /* Chunk dimensions */ hsize_t null_size; /* Size of dataset without filters */ herr_t hrc; - const char * filename; + const char *filename; hsize_t fletcher32_size; /* Size of dataset with Fletcher32 checksum */ #ifdef H5_HAVE_FILTER_DEFLATE diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 6e0e64e..ac6df1b 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -144,12 +144,12 @@ multiple_dset_write(void) hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM]; hsize_t count[DIM] = {1, 1}; - double * outme = NULL; + double *outme = NULL; double fill = 1.0; /* Fill value */ char dname[100]; herr_t ret; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ndatasets; pt = GetTestParameters(); @@ -229,8 +229,8 @@ compact_dataset(void) int i, j, mpi_size, mpi_rank, size, err_num = 0; hid_t iof, plist, dcpl, dxpl, dataset, filespace; hsize_t file_dims[DIM]; - double * outme; - double * inme; + double *outme; + double *inme; char dname[] = "dataset"; herr_t ret; const char *filename; @@ -601,8 +601,8 @@ dataset_fillvalue(void) hsize_t req_start[4] = {0, 0, 0, 0}; hsize_t req_count[4] = {1, 6, 7, 8}; hsize_t dset_size; /* Dataset size */ - int * rdata, *wdata; /* Buffers for data to read and write */ - int * twdata, *trdata; /* Temporary pointer into buffer */ + int *rdata, *wdata; /* Buffers for data to read and write */ + int *twdata, *trdata; /* Temporary pointer into buffer */ int acc, i, j, k, l; /* Local index variables */ herr_t ret; /* Generic return value */ const char *filename; @@ -795,13 +795,13 @@ collective_group_write(void) int i, j, m; char gname[64], dname[32]; hid_t fid, gid, did, plist, dcpl, memspace, filespace; - DATATYPE * outme = NULL; + DATATYPE *outme = NULL; hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; hsize_t chunk_size[2]; /* Chunk dimensions - computed shortly */ herr_t ret1, ret2; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -887,7 +887,7 @@ independent_group_read(void) int mpi_rank, m; hid_t plist, fid; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -1016,7 +1016,7 @@ multiple_group_write(void) hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; herr_t ret; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -1183,7 +1183,7 @@ multiple_group_read(void) hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -1522,10 +1522,10 @@ io_mode_confusion(void) * test bed related variables */ - const char * fcn_name = "io_mode_confusion"; + const char *fcn_name = "io_mode_confusion"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; pt = GetTestParameters(); filename = pt->name; @@ -1776,7 +1776,7 @@ rr_obj_hdr_flush_confusion(void) MPI_Comm comm; /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion"; + const char *fcn_name = "rr_obj_hdr_flush_confusion"; const hbool_t verbose = FALSE; /* Create two new private communicators from MPI_COMM_WORLD. @@ -1853,10 +1853,10 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm) int steps_done = 0; /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion_writer"; + const char *fcn_name = "rr_obj_hdr_flush_confusion_writer"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; /* * setup test bed related variables: @@ -2226,10 +2226,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm) int steps_done = -1; /* How far (steps) have been verified */ /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion_reader"; + const char *fcn_name = "rr_obj_hdr_flush_confusion_reader"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; /* * setup test bed related variables: @@ -2558,7 +2558,7 @@ chunk_align_bug_1(void) h5_stat_size_t file_size; hsize_t align; herr_t ret; - const char * filename; + const char *filename; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index a883f55..7e8ac3a 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -189,7 +189,7 @@ test_mpio_gb_file(char *filename) int writerrs; /* write errors */ int nerrs; int ntimes; /* how many times */ - char * buf = NULL; + char *buf = NULL; char expected; MPI_Offset size; MPI_Offset mpi_off; diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index 2a80f4a..4b0a912 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -117,7 +117,7 @@ main(int argc, char *argv[]) hid_t fid1 = H5I_INVALID_HID; hid_t fid2 = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; - MPI_File * mpifh_p = NULL; + MPI_File *mpifh_p = NULL; char name[1024]; const char *envval = NULL; int mpi_size; diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 54c3a7f..9aa09a4 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -85,10 +85,10 @@ struct hs_dr_pio_test_vars_t { hsize_t stride[PAR_SS_DR_MAX_RANK]; hsize_t count[PAR_SS_DR_MAX_RANK]; hsize_t block[PAR_SS_DR_MAX_RANK]; - hsize_t * start_ptr; - hsize_t * stride_ptr; - hsize_t * count_ptr; - hsize_t * block_ptr; + hsize_t *start_ptr; + hsize_t *stride_ptr; + hsize_t *count_ptr; + hsize_t *block_ptr; int skips; int max_skips; int64_t total_tests; @@ -126,8 +126,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker int mrc; int mpi_rank; /* needed by the VRFY macro */ uint32_t expected_value; - uint32_t * ptr_0; - uint32_t * ptr_1; + uint32_t *ptr_0; + uint32_t *ptr_1; hid_t acc_tpl; /* File access templates */ hid_t small_ds_dcpl_id = H5P_DEFAULT; hid_t large_ds_dcpl_id = H5P_DEFAULT; @@ -846,12 +846,13 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - mis_match = FALSE; - ptr_1 = tv_ptr->small_ds_slice_buf; - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + mis_match = FALSE; + ptr_1 = tv_ptr->small_ds_slice_buf; + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); for (n = 0; n < tv_ptr->small_ds_slice_size; n++) { @@ -1078,10 +1079,11 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) */ ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -1351,10 +1353,11 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) mis_match = FALSE; ptr_1 = tv_ptr->small_ds_buf_1; - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size; stop_index = start_index + tv_ptr->small_ds_slice_size - 1; @@ -1641,10 +1644,11 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -2551,7 +2555,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) { #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__d2m_l2s()"; - uint32_t * ptr_0; + uint32_t *ptr_0; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */ hbool_t data_ok = FALSE; int i, j, k, l; @@ -2729,10 +2733,11 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); data_ok = ckrbrd_hs_dr_pio_test__verify_data( tv_ptr->small_ds_slice_buf, tv_ptr->small_rank - 1, tv_ptr->edge_size, @@ -2950,10 +2955,11 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) data_ok = TRUE; ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG @@ -3280,10 +3286,11 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) mis_match = FALSE; - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size; stop_index = start_index + tv_ptr->small_ds_slice_size - 1; @@ -3578,10 +3585,11 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) */ expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -3975,7 +3983,7 @@ int facc_type = FACC_MPIO; /*Test file access type */ int dxfer_coll_type = DXFER_COLLECTIVE_IO; H5E_auto2_t old_func; /* previous error handler */ -void * old_client_data; /* previous error handler arg.*/ +void *old_client_data; /* previous error handler arg.*/ /* other option flags */ diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c index 5530584..c417d93 100644 --- a/testpar/t_span_tree.c +++ b/testpar/t_span_tree.c @@ -1461,12 +1461,12 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ size_t large_ds_size; size_t large_ds_slice_size; uint32_t expected_value; - uint32_t * small_ds_buf_0 = NULL; - uint32_t * small_ds_buf_1 = NULL; - uint32_t * large_ds_buf_0 = NULL; - uint32_t * large_ds_buf_1 = NULL; - uint32_t * ptr_0; - uint32_t * ptr_1; + uint32_t *small_ds_buf_0 = NULL; + uint32_t *small_ds_buf_1 = NULL; + uint32_t *large_ds_buf_0 = NULL; + uint32_t *large_ds_buf_1 = NULL; + uint32_t *ptr_0; + uint32_t *ptr_1; hsize_t small_chunk_dims[LDSCT_DS_RANK]; hsize_t large_chunk_dims[LDSCT_DS_RANK]; hsize_t small_dims[LDSCT_DS_RANK]; diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 653e112..2b840be 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -34,7 +34,7 @@ int facc_type = FACC_MPIO; /*Test file access type */ int dxfer_coll_type = DXFER_COLLECTIVE_IO; H5E_auto2_t old_func; /* previous error handler */ -void * old_client_data; /* previous error handler arg.*/ +void *old_client_data; /* previous error handler arg.*/ /* other option flags */ diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index 53234a5..790bdb1 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -229,7 +229,7 @@ extern int dim0, dim1; /*Dataset dimensions */ extern int chunkdim0, chunkdim1; /*Chunk dimensions */ extern int nerrors; /*errors count */ extern H5E_auto2_t old_func; /* previous error handler */ -extern void * old_client_data; /*previous error handler arg.*/ +extern void *old_client_data; /*previous error handler arg.*/ extern int facc_type; /*Test file access type */ extern int dxfer_coll_type; diff --git a/tools/h5copy/dynlib_copy.c b/tools/h5copy/dynlib_copy.c index b954a22..f474a55 100644 --- a/tools/h5copy/dynlib_copy.c +++ b/tools/h5copy/dynlib_copy.c @@ -62,7 +62,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - char * int_ptr = (char *)*buf; /* Pointer to the data values */ + char *int_ptr = (char *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c index 63d83b8..f4f4859 100644 --- a/tools/h5copy/h5copy.c +++ b/tools/h5copy/h5copy.c @@ -19,7 +19,7 @@ #define PROGRAMNAME "h5copy" /* command-line options: short and long-named parameters */ -static const char * s_opts = "d:f:hi:o:ps:vVE*"; +static const char *s_opts = "d:f:hi:o:ps:vVE*"; static struct long_options l_opts[] = {{"destination", require_arg, 'd'}, {"flag", require_arg, 'f'}, {"help", no_arg, 'h'}, @@ -31,11 +31,11 @@ static struct long_options l_opts[] = {{"destination", require_arg, 'd'}, {"version", no_arg, 'V'}, {"enable-error-stack", optional_arg, 'E'}, {NULL, 0, '\0'}}; -char * fname_src = NULL; -char * fname_dst = NULL; -char * oname_src = NULL; -char * oname_dst = NULL; -char * str_flag = NULL; +char *fname_src = NULL; +char *fname_dst = NULL; +char *oname_src = NULL; +char *oname_dst = NULL; +char *str_flag = NULL; /*------------------------------------------------------------------------- * Function: leave diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c index cce63c8..74069c1 100644 --- a/tools/h5copy/h5copygentest.c +++ b/tools/h5copy/h5copygentest.c @@ -280,7 +280,7 @@ gent_nested_vl(hid_t loc_id) hid_t sid, did, tid1, tid2; hsize_t dims[1] = {2}; hvl_t buf[2]; - hvl_t * tvl; + hvl_t *tvl; /* allocate and initialize VL dataset to write */ buf[0].len = 1; diff --git a/tools/h5diff/dynlib_diff.c b/tools/h5diff/dynlib_diff.c index 433522d..9d277e0 100644 --- a/tools/h5diff/dynlib_diff.c +++ b/tools/h5diff/dynlib_diff.c @@ -62,7 +62,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - char * int_ptr = (char *)*buf; /* Pointer to the data values */ + char *int_ptr = (char *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index 4add08d..9f7006b 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -25,7 +25,7 @@ static int check_d_input(const char *); * Command-line options: The user can specify short or long-named * parameters. */ -static const char * s_opts = "hVrv*qn:d:p:NcelxE:A:S*"; +static const char *s_opts = "hVrv*qn:d:p:NcelxE:A:S*"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"version", no_arg, 'V'}, {"report", no_arg, 'r'}, @@ -88,8 +88,8 @@ check_options(diff_opt_t *opts) static void parse_hsize_list(const char *h_list, subset_d *d) { - hsize_t * p_list; - const char * ptr; + hsize_t *p_list; + const char *ptr; unsigned int size_count = 0; unsigned int i = 0; unsigned int last_digit = 0; @@ -148,7 +148,7 @@ static struct subset_t * parse_subset_params(const char *dset) { struct subset_t *s = NULL; - char * brace; + char *brace; H5TOOLS_START_DEBUG(" - dset:%s", dset); if ((brace = HDstrrchr(dset, '[')) != NULL) { diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 3015883..8cf067a 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -3326,8 +3326,8 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new /* compound1 datatype */ typedef struct comp1_t { - char * str_vlen; /* vlen string */ - char * str_vlen_repeat; /* vlen string */ + char *str_vlen; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */ @@ -3338,9 +3338,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new /* compound2 datatype */ typedef struct comp2_t { - char * str_vlen; /* vlen string */ + char *str_vlen; /* vlen string */ char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen_repeat; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */ char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */ @@ -3363,9 +3363,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new /* compound4 datatype */ typedef struct comp4_t { char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen; /* vlen string */ + char *str_vlen; /* vlen string */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen_repeat; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */ const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */ char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */ @@ -3404,8 +3404,8 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */ char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen; /* vlen string */ - char * str_vlen_repeat; /* vlen string */ + char *str_vlen; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ } comp7_t; /* compound8 datatype */ @@ -3415,9 +3415,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */ const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */ char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen; /* vlen string */ + char *str_vlen; /* vlen string */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ - char * str_vlen_repeat; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ } comp8_t; /* compound9 datatype */ @@ -3431,9 +3431,9 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new hobj_ref_t objref1; /* reference */ char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */ hobj_ref_t objref2; /* reference */ - char * str_vlen; /* vlen string */ + char *str_vlen; /* vlen string */ int int_data2; - char * str_vlen_repeat; /* vlen string */ + char *str_vlen_repeat; /* vlen string */ hobj_ref_t objref3; /* reference */ int int_data3; } comp9_t; @@ -4629,15 +4629,15 @@ test_data_nocomparables(const char *fname, int make_diffs) int rank_attr; char data1_str[DIM_ARRY][STR_SIZE] = {"ab", "cd", "ef"}; herr_t status = SUCCEED; - void * dset_data_ptr1 = NULL; - void * dset_data_ptr2 = NULL; - void * dset_data_ptr3 = NULL; - void * attr_data_ptr1 = NULL; - void * attr_data_ptr2 = NULL; - void * attr_data_ptr3 = NULL; - void * attr_data_ptr4 = NULL; - void * attr2_dim_ptr = NULL; - void * attr3_dim_ptr = NULL; + void *dset_data_ptr1 = NULL; + void *dset_data_ptr2 = NULL; + void *dset_data_ptr3 = NULL; + void *attr_data_ptr1 = NULL; + void *attr_data_ptr2 = NULL; + void *attr_data_ptr3 = NULL; + void *attr_data_ptr4 = NULL; + void *attr2_dim_ptr = NULL; + void *attr3_dim_ptr = NULL; /* init */ tid_dset1 = H5Tcopy(H5T_NATIVE_INT); @@ -5109,7 +5109,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid, /* create 1D attributes with dimension [2], 2 elements */ hsize_t dims[1] = {2}; char buf1[2][STR_SIZE] = {"ab", "de"}; /* string */ - char * buf1a[2]; /* VL string */ + char *buf1a[2]; /* VL string */ char buf2[2] = {1, 2}; /* bitfield, opaque */ s_t buf3[2] = {{1, 2.0}, {3, 4.0}}; /* compound */ hobj_ref_t buf4[2]; /* reference */ @@ -5123,7 +5123,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid, /* create 2D attributes with dimension [3][2], 6 elements */ hsize_t dims2[2] = {3, 2}; char buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */ - char * buf12a[3][2]; /* VL string */ + char *buf12a[3][2]; /* VL string */ char buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}}; /* bitfield, opaque */ s_t buf32[6] = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */ hobj_ref_t buf42[3][2]; /* reference */ @@ -5139,7 +5139,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid, {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}}, {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}}, {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */ - char * buf13a[4][3][2]; /* VL string */ + char *buf13a[4][3][2]; /* VL string */ char buf23[4][3][2]; /* bitfield, opaque */ s_t buf33[4][3][2]; /* compound */ hobj_ref_t buf43[4][3][2]; /* reference */ @@ -6098,7 +6098,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid, /* create 1D attributes with dimension [2], 2 elements */ hsize_t dims[1] = {2}; char buf1[2][STR_SIZE] = {"ab", "de"}; /* string */ - char * buf1a[2]; /* VL string */ + char *buf1a[2]; /* VL string */ char buf2[2] = {1, 2}; /* bitfield, opaque */ s_t buf3[2] = {{1, 2.0}, {3, 4.0}}; /* compound */ hobj_ref_t buf4[2]; /* reference */ @@ -6112,7 +6112,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid, /* create 2D attributes with dimension [3][2], 6 elements */ hsize_t dims2[2] = {3, 2}; char buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */ - char * buf12a[3][2]; /* VL string */ + char *buf12a[3][2]; /* VL string */ char buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}}; /* bitfield, opaque */ s_t buf32[6] = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */ hobj_ref_t buf42[3][2]; /* reference */ @@ -6128,7 +6128,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid, {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}}, {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}}, {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */ - char * buf13a[4][3][2]; /* VL string */ + char *buf13a[4][3][2]; /* VL string */ char buf23[4][3][2]; /* bitfield, opaque */ s_t buf33[4][3][2]; /* compound */ hobj_ref_t buf43[4][3][2]; /* reference */ @@ -7090,7 +7090,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid, /* create 1D attributes with dimension [2], 2 elements */ hsize_t dims[1] = {2}; char buf1[2][STR_SIZE] = {"ab", "de"}; /* string */ - char * buf1a[2]; /* VL string */ + char *buf1a[2]; /* VL string */ char buf2[2] = {1, 2}; /* bitfield, opaque */ s_t buf3[2] = {{1, 2.0}, {3, 4.0}}; /* compound */ hobj_ref_t buf4[2]; /* reference */ @@ -7104,7 +7104,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid, /* create 2D attributes with dimension [3][2], 6 elements */ hsize_t dims2[2] = {3, 2}; char buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */ - char * buf12a[3][2]; /* VL string */ + char *buf12a[3][2]; /* VL string */ char buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}}; /* bitfield, opaque */ s_t buf32[6] = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */ hobj_ref_t buf42[3][2]; /* reference */ @@ -7119,7 +7119,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid, {{"mn", "pq"}, {"rs", "tu"}, {"vw", "xz"}}, {{"AB", "CD"}, {"EF", "GH"}, {"IJ", "KL"}}, {{"MN", "PQ"}, {"RS", "TU"}, {"VW", "XZ"}}}; /* string */ - char * buf13a[4][3][2]; /* VL string */ + char *buf13a[4][3][2]; /* VL string */ char buf23[4][3][2]; /* bitfield, opaque */ s_t buf33[4][3][2]; /* compound */ hobj_ref_t buf43[4][3][2]; /* reference */ @@ -7706,7 +7706,7 @@ gen_datareg(hid_t fid, int make_diffs /* flag to modify data buffers */) hid_t did1 = H5I_INVALID_HID; /* dataset ID */ hid_t sid1 = H5I_INVALID_HID; /* dataspace ID */ hsize_t dims1[2] = {10, 10}; /* dimensions */ - int * buf; /* dataset buffer */ + int *buf; /* dataset buffer */ /* reference dataset */ hid_t did2 = H5I_INVALID_HID; /* dataset ID */ hid_t sid2 = H5I_INVALID_HID; /* dataspace ID */ @@ -7826,7 +7826,7 @@ test_hyperslab(const char *fname, int make_diffs /* flag to modify data buffers size_t size; size_t nelmts = (size_t)GBLL / (1024 * 1024); /* elements in each hyperslab */ char fillvalue = -1; - char * buf = NULL; + char *buf = NULL; int i, j, s; char c; diff --git a/tools/h5dump/binread.c b/tools/h5dump/binread.c index 341a085..4e46c57 100644 --- a/tools/h5dump/binread.c +++ b/tools/h5dump/binread.c @@ -61,11 +61,11 @@ usage(void) int main(int argc, char *argv[]) { - FILE * stream; + FILE *stream; size_t numread; TYPE buf[NELMTS]; size_t i, nelmts = NELMTS; - char * fname = NULL; + char *fname = NULL; if (argc != 2) { usage(); diff --git a/tools/h5dump/dynlib_dump.c b/tools/h5dump/dynlib_dump.c index 433522d..9d277e0 100644 --- a/tools/h5dump/dynlib_dump.c +++ b/tools/h5dump/dynlib_dump.c @@ -62,7 +62,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - char * int_ptr = (char *)*buf; /* Pointer to the data values */ + char *int_ptr = (char *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 97a79cb..4b4dd84 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -19,7 +19,7 @@ #define PROGRAMNAME "h5dump" static const char *driver_name_g = NULL; /* The driver to open the file with. */ -const char * outfname_g = NULL; +const char *outfname_g = NULL; static hbool_t doxml_g = FALSE; static hbool_t useschema_g = TRUE; static const char *xml_dtd_uri_g = NULL; @@ -66,7 +66,7 @@ static void init_prefix(char **prfx, size_t prfx_len); /* a structure for handling the order command-line parameters come in */ struct handler_t { void (*func)(hid_t, const char *, void *, int, const char *); - char * obj; + char *obj; struct subset_t *subset_info; }; @@ -77,7 +77,7 @@ struct handler_t { */ /* The following initialization makes use of C language concatenating */ /* "xxx" "yyy" into "xxxyyy". */ -static const char * s_opts = "a:b*c:d:ef:g:hik:l:m:n*o*pq:rs:t:uvw:xyz:A*BCD:E*F:G:HM:N:O*RS:VX:"; +static const char *s_opts = "a:b*c:d:ef:g:hik:l:m:n*o*pq:rs:t:uvw:xyz:A*BCD:E*F:G:HM:N:O*RS:VX:"; static struct long_options l_opts[] = {{"attribute", require_arg, 'a'}, {"attribut", require_arg, 'a'}, {"attribu", require_arg, 'a'}, @@ -614,8 +614,8 @@ set_sort_order(const char *form) static void parse_hsize_list(const char *h_list, subset_d *d) { - hsize_t * p_list; - const char * ptr; + hsize_t *p_list; + const char *ptr; unsigned int size_count = 0; unsigned int i = 0; unsigned int last_digit = 0; @@ -668,7 +668,7 @@ static struct subset_t * parse_subset_params(const char *dset) { struct subset_t *s = NULL; - char * brace; + char *brace; if (!dump_opts.disable_compact_subset && ((brace = HDstrrchr(dset, '[')) != NULL)) { *brace++ = '\0'; @@ -723,7 +723,7 @@ parse_mask_list(const char *h_list) int slength_value; unsigned length_value; unsigned long long temp_mask; - const char * ptr = NULL; + const char *ptr = NULL; /* sanity check */ if (h_list) { @@ -1340,7 +1340,7 @@ main(int argc, char *argv[]) struct handler_t *hand = NULL; int i; unsigned u; - char * fname = NULL; + char *fname = NULL; h5tools_setprogname(PROGRAMNAME); h5tools_setstatus(EXIT_SUCCESS); diff --git a/tools/h5dump/h5dump.h b/tools/h5dump/h5dump.h index 518d17f..7689477 100644 --- a/tools/h5dump/h5dump.h +++ b/tools/h5dump/h5dump.h @@ -39,9 +39,9 @@ typedef struct dump_functions_t { typedef struct h5dump_table_items_t { unsigned long fileno; /* File number that these tables refer to */ hid_t oid; /* ID of an object in this file, held open so fileno is consistent */ - table_t * group_table; /* Table of groups */ - table_t * dset_table; /* Table of datasets */ - table_t * type_table; /* Table of datatypes */ + table_t *group_table; /* Table of groups */ + table_t *dset_table; /* Table of datasets */ + table_t *type_table; /* Table of datatypes */ } h5dump_table_items_t; typedef struct h5dump_table_list_t { @@ -51,13 +51,13 @@ typedef struct h5dump_table_list_t { } h5dump_table_list_t; h5dump_table_list_t table_list = {0, 0, NULL}; -table_t * group_table = NULL, *dset_table = NULL, *type_table = NULL; +table_t *group_table = NULL, *dset_table = NULL, *type_table = NULL; unsigned dump_indent = 0; /* how far in to indent the line */ int unamedtype = 0; /* shared datatype with no name */ hbool_t hit_elink = FALSE; /* whether we have traversed an external link */ size_t prefix_len = 1024; -char * prefix = NULL; +char *prefix = NULL; const char *fp_format = NULL; /* things to display or which are set via command line parameters */ diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index 241f5f9..5394a06 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -47,7 +47,7 @@ void dump_datatype(hid_t type) { h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; @@ -71,7 +71,7 @@ void dump_dataspace(hid_t space) { h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; @@ -94,7 +94,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED * void H5_ATTR_UNUSED *_op_data) { h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; hid_t attr_id; @@ -156,10 +156,10 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR hid_t obj; hid_t dapl_id = H5P_DEFAULT; /* dataset access property list ID */ herr_t ret = SUCCEED; - char * obj_path = NULL; /* Full path of object */ + char *obj_path = NULL; /* Full path of object */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -617,7 +617,7 @@ dump_named_datatype(hid_t tid, const char *name) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; /* setup */ @@ -750,7 +750,7 @@ dump_group(hid_t gid, const char *name) char type_name[1024]; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -898,7 +898,7 @@ void dump_dataset(hid_t did, const char *name, struct subset_t *sset) { h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; hid_t type, space; unsigned attr_crt_order_flags; @@ -1072,7 +1072,7 @@ void dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index) { h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; int print_dataset = FALSE; @@ -1247,11 +1247,11 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a { herr_t ret = SUCCEED; int j; - char * obj_op_name; - char * obj_name; + char *obj_op_name; + char *obj_name; trav_attr_udata_t *attr_data = (trav_attr_udata_t *)_op_data; - const char * buf = attr_data->path; - const char * op_name = attr_data->op_name; + const char *buf = attr_data->path; + const char *op_name = attr_data->op_name; j = (int)HDstrlen(op_name) - 1; /* find the last / */ @@ -1302,7 +1302,7 @@ static herr_t obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *already_visited, void *_op_data) { trav_handle_udata_t *handle_data = (trav_handle_udata_t *)_op_data; - const char * op_name = handle_data->op_name; + const char *op_name = handle_data->op_name; trav_attr_udata_t attr_data; attr_data.path = path; @@ -1340,9 +1340,9 @@ lnk_search(const char *path, const H5L_info_t *li, void *_op_data) { size_t search_len; size_t k; - char * search_name; + char *search_name; trav_handle_udata_t *handle_data = (trav_handle_udata_t *)_op_data; - const char * op_name = handle_data->op_name; + const char *op_name = handle_data->op_name; search_len = HDstrlen(op_name); if (search_len > 0 && op_name[0] != '/') @@ -1453,12 +1453,12 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5 { hid_t oid = H5I_INVALID_HID; hid_t attr_id = H5I_INVALID_HID; - char * obj_name = NULL; - char * attr_name = NULL; + char *obj_name = NULL; + char *attr_name = NULL; int j; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &h5tools_dataformat; + h5tool_format_t *outputformat = &h5tools_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -1597,7 +1597,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis hid_t dsetid; hid_t dapl_id = H5P_DEFAULT; /* dataset access property list ID */ struct subset_t *sset = (struct subset_t *)data; - const char * real_name = display_name ? display_name : dset; + const char *real_name = display_name ? display_name : dset; if ((dsetid = H5Dopen2(fid, dset, dapl_id)) < 0) { if (pe) @@ -1942,9 +1942,9 @@ dump_extlink(hid_t group, const char *linkname, const char *objname) { hid_t oid; H5O_info_t oi; - table_t * old_group_table = group_table; - table_t * old_dset_table = dset_table; - table_t * old_type_table = type_table; + table_t *old_group_table = group_table; + table_t *old_dset_table = dset_table; + table_t *old_type_table = type_table; hbool_t old_hit_elink; ssize_t idx; diff --git a/tools/h5dump/h5dump_extern.h b/tools/h5dump/h5dump_extern.h index c4eb2ed..e987181 100644 --- a/tools/h5dump/h5dump_extern.h +++ b/tools/h5dump/h5dump_extern.h @@ -42,20 +42,20 @@ typedef struct h5dump_table_list_t { struct { unsigned long fileno; /* File number that these tables refer to */ hid_t oid; /* ID of an object in this file, held open so fileno is consistent */ - table_t * group_table; /* Table of groups */ - table_t * dset_table; /* Table of datasets */ - table_t * type_table; /* Table of datatypes */ + table_t *group_table; /* Table of groups */ + table_t *dset_table; /* Table of datasets */ + table_t *type_table; /* Table of datatypes */ } * tables; } h5dump_table_list_t; extern h5dump_table_list_t table_list; -extern table_t * group_table, *dset_table, *type_table; +extern table_t *group_table, *dset_table, *type_table; extern unsigned dump_indent; /* how far in to indent the line */ extern int unamedtype; /* shared datatype with no name */ extern hbool_t hit_elink; /* whether we have traversed an external link */ extern size_t prefix_len; -extern char * prefix; +extern char *prefix; extern const char *fp_format; /* things to display or which are set via command line parameters */ diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c index dd27bb4..62f7cf1 100644 --- a/tools/h5dump/h5dump_xml.c +++ b/tools/h5dump/h5dump_xml.c @@ -133,10 +133,10 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ { hid_t obj; herr_t ret = SUCCEED; - char * obj_path = NULL; /* Full path of object */ + char *obj_path = NULL; /* Full path of object */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -643,8 +643,8 @@ xml_escape_the_name(const char *str) size_t len; size_t i; const char *cp; - char * ncp; - char * rcp; + char *ncp; + char *rcp; size_t ncp_len; if (!str) @@ -733,8 +733,8 @@ xml_escape_the_string(const char *str, int slen) size_t len; size_t i; const char *cp = NULL; - char * ncp = NULL; - char * rcp = NULL; + char *ncp = NULL; + char *rcp = NULL; size_t ncp_len; if (!str) @@ -835,7 +835,7 @@ xml_escape_the_string(const char *str, int slen) static void xml_print_datatype(hid_t type, unsigned in_group) { - char * mname; + char *mname; hid_t mtype; unsigned nmembers; unsigned ndims; @@ -857,7 +857,7 @@ xml_print_datatype(hid_t type, unsigned in_group) htri_t is_vlstr = FALSE; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -887,7 +887,7 @@ xml_print_datatype(hid_t type, unsigned in_group) if (!in_group && H5Tcommitted(type) > 0) { H5O_info_t oinfo; - obj_t * found_obj; /* Found object */ + obj_t *found_obj; /* Found object */ /* detect a shared datatype, output only once */ H5Oget_info(type, &oinfo); @@ -1555,7 +1555,7 @@ xml_dump_datatype(hid_t type) { h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -1588,7 +1588,7 @@ xml_dump_datatype(hid_t type) if (H5Tcommitted(type) > 0) { H5O_info_t oinfo; - obj_t * found_obj; /* Found object */ + obj_t *found_obj; /* Found object */ /* Datatype is a shared or named datatype */ H5Oget_info(type, &oinfo); @@ -1687,7 +1687,7 @@ xml_dump_dataspace(hid_t space) int i; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -1866,7 +1866,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset, hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); @@ -2033,7 +2033,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; char *t_aname = xml_escape_the_name(attr_name); @@ -2349,14 +2349,14 @@ xml_dump_named_datatype(hid_t type, const char *name) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; - char * tmp; - char * dtxid; - char * parentxid; - char * t_tmp; - char * t_prefix; - char * t_name; + char *tmp; + char *dtxid; + char *parentxid; + char *t_tmp; + char *t_prefix; + char *t_name; tmp = (char *)HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2); HDstrcpy(tmp, prefix); @@ -2550,14 +2550,14 @@ xml_dump_group(hid_t gid, const char *name) unsigned attr_crt_order_flags; int isRoot = 0; char type_name[1024]; - char * t_objname = NULL; - char * par_name = NULL; - char * cp = NULL; - char * tmp = NULL; - char * par = NULL; + char *t_objname = NULL; + char *par_name = NULL; + char *cp = NULL; + char *tmp = NULL; + char *par = NULL; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -2914,11 +2914,11 @@ xml_print_refs(hid_t did, int source) hssize_t ssiz = -1; hsize_t i; size_t tsiz; - hobj_ref_t * refbuf = NULL; - char * buf = NULL; + hobj_ref_t *refbuf = NULL; + char *buf = NULL; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -3069,12 +3069,12 @@ xml_print_strs(hid_t did, int source) size_t tsiz = 0; hsize_t i; size_t str_size = 0; - char * bp = NULL; - char * onestring = NULL; - void * buf = NULL; + char *bp = NULL; + char *onestring = NULL; + void *buf = NULL; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -3238,7 +3238,7 @@ check_filters(hid_t dcpl) unsigned int flags; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -3375,11 +3375,11 @@ xml_dump_fill_value(hid_t dcpl, hid_t type) size_t sz; size_t i; hsize_t space; - void * buf; - char * name; + void *buf; + char *name; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -3722,20 +3722,20 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss hid_t dcpl; H5D_fill_value_t fvstatus; int maxdims; - hsize_t * chsize; + hsize_t *chsize; int ndims; int i; H5D_alloc_time_t at; H5D_fill_time_t ft; hsize_t tempi; - char * tmp; - char * t_name; - char * t_tmp; - char * t_prefix; + char *tmp; + char *t_name; + char *t_tmp; + char *t_prefix; unsigned attr_crt_order_flags; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ @@ -4325,8 +4325,8 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss static void xml_print_enum(hid_t type) { - char ** name = NULL; /*member names */ - unsigned char * value = NULL; /*value array */ + char **name = NULL; /*member names */ + unsigned char *value = NULL; /*value array */ unsigned nmembs; /*number of members */ hid_t super; /*enum base integer type */ hid_t native = H5I_INVALID_HID; /*native integer datatype */ @@ -4335,7 +4335,7 @@ xml_print_enum(hid_t type) size_t j; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * outputformat = &xml_dataformat; + h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; hsize_t curr_pos = 0; /* total data element position */ diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 1272ba2..13ebe7f 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -435,10 +435,10 @@ gent_dataset(void) { hid_t fid, dataset, space; hsize_t dims[2]; - int ** dset1 = NULL; - int * dset1_data = NULL; + int **dset1 = NULL; + int *dset1_data = NULL; double **dset2 = NULL; - double * dset2_data = NULL; + double *dset2_data = NULL; int i, j; /* Set up data arrays */ @@ -1776,7 +1776,7 @@ gent_str(void) } compound_t; compound_t **comp1 = NULL; - compound_t * comp1_data = NULL; + compound_t *comp1_data = NULL; hsize_t mdims[2]; /* Set up data array */ @@ -2092,7 +2092,7 @@ gent_objref(void) hobj_ref_t *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ - uint32_t * tu32; /* Temporary pointer to uint32 data */ + uint32_t *tu32; /* Temporary pointer to uint32 data */ int i; /* counting variables */ const char *write_comment = "Foo!"; /* Comments for group */ @@ -2325,9 +2325,9 @@ gent_attrreg(void) hsize_t coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */ hdset_reg_ref_t *wbuf; /* buffer to write to disk */ hdset_reg_ref_t *rbuf; /* buffer read from disk */ - uint8_t * dwbuf; /* Buffer for writing numeric data to disk */ - uint8_t * drbuf; /* Buffer for reading numeric data from disk */ - uint8_t * tu8; /* Temporary pointer to uint8 data */ + uint8_t *dwbuf; /* Buffer for writing numeric data to disk */ + uint8_t *drbuf; /* Buffer for reading numeric data from disk */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ int i; /* counting variables */ /* Allocate write & read buffers */ @@ -2741,7 +2741,7 @@ static void gent_vldatatypes2(void) { hvl_t wdata[SPACE1_DIM1]; /* Information to write */ - hvl_t * t1; /* Temporary pointer to VL information */ + hvl_t *t1; /* Temporary pointer to VL information */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -3019,7 +3019,7 @@ gent_vldatatypes5(void) static void gent_array1_big(void) { - int * wdata; /* Information to write */ + int *wdata; /* Information to write */ hid_t fid1; /* HDF5 File IDs */ hid_t dataset; /* Dataset ID */ hid_t sid1; /* Dataspace ID */ @@ -3929,10 +3929,10 @@ gent_char(void) "men are created equal. Now we are engaged in a great " "civil war, testing whether that nation or any nation " "so conceived and so dedicated can long endure."; - hid_t fid1; /* HDF5 File IDs */ - hid_t dataset; /* Dataset ID */ - hid_t sid1; /* Dataspace ID */ - hsize_t dims1[1]; + hid_t fid1; /* HDF5 File IDs */ + hid_t dataset; /* Dataset ID */ + hid_t sid1; /* Dataspace ID */ + hsize_t dims1[1]; dims1[0] = HDstrlen(wdata); @@ -6182,7 +6182,7 @@ gent_longlinks(void) hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group ID */ hid_t gid2 = (-1); /* Datatype ID */ - char * objname = NULL; /* Name of object [Long] */ + char *objname = NULL; /* Name of object [Long] */ size_t u; /* Local index variable */ /* Create files */ @@ -6404,7 +6404,7 @@ gent_bigdims(void) hsize_t hs_size[1]; /* hyperslab dimensions */ size_t size; char fillvalue = 0; - char * buf = NULL; + char *buf = NULL; hsize_t i; char c; size_t nelmts; @@ -8325,15 +8325,15 @@ gent_intscalars(void) hid_t tid = H5I_INVALID_HID; hsize_t dims[2]; - uint8_t ** dsetu8 = NULL; + uint8_t **dsetu8 = NULL; uint16_t **dsetu16 = NULL; uint32_t **dsetu32 = NULL; uint64_t **dsetu64 = NULL; - int8_t ** dset8 = NULL; - int16_t ** dset16 = NULL; - int32_t ** dset32 = NULL; - int64_t ** dset64 = NULL; - double ** dsetdbl = NULL; + int8_t **dset8 = NULL; + int16_t **dset16 = NULL; + int32_t **dset32 = NULL; + int64_t **dset64 = NULL; + double **dsetdbl = NULL; uint8_t valu8bits; uint16_t valu16bits; @@ -8568,15 +8568,15 @@ gent_attr_intscalars(void) hid_t tid = H5I_INVALID_HID; hsize_t dims[2]; - uint8_t ** dsetu8 = NULL; + uint8_t **dsetu8 = NULL; uint16_t **dsetu16 = NULL; uint32_t **dsetu32 = NULL; uint64_t **dsetu64 = NULL; - int8_t ** dset8 = NULL; - int16_t ** dset16 = NULL; - int32_t ** dset32 = NULL; - int64_t ** dset64 = NULL; - double ** dsetdbl = NULL; + int8_t **dset8 = NULL; + int16_t **dset16 = NULL; + int32_t **dset32 = NULL; + int64_t **dset64 = NULL; + double **dsetdbl = NULL; uint8_t valu8bits; uint16_t valu16bits; @@ -9342,15 +9342,15 @@ gent_intattrscalars(void) hid_t tid = H5I_INVALID_HID; hsize_t dims[2]; - uint8_t ** dsetu8 = NULL; + uint8_t **dsetu8 = NULL; uint16_t **dsetu16 = NULL; uint32_t **dsetu32 = NULL; uint64_t **dsetu64 = NULL; - int8_t ** dset8 = NULL; - int16_t ** dset16 = NULL; - int32_t ** dset32 = NULL; - int64_t ** dset64 = NULL; - double ** dsetdbl = NULL; + int8_t **dset8 = NULL; + int16_t **dset16 = NULL; + int32_t **dset32 = NULL; + int64_t **dset64 = NULL; + double **dsetdbl = NULL; uint8_t valu8bits; uint16_t valu16bits; @@ -9620,25 +9620,25 @@ gent_intsattrs(void) hid_t aspace = H5I_INVALID_HID; hsize_t dims[2], adims[1]; - uint8_t ** dsetu8 = NULL; + uint8_t **dsetu8 = NULL; uint16_t **dsetu16 = NULL; uint32_t **dsetu32 = NULL; uint64_t **dsetu64 = NULL; - int8_t ** dset8 = NULL; - int16_t ** dset16 = NULL; - int32_t ** dset32 = NULL; - int64_t ** dset64 = NULL; - double ** dsetdbl = NULL; + int8_t **dset8 = NULL; + int16_t **dset16 = NULL; + int32_t **dset32 = NULL; + int64_t **dset64 = NULL; + double **dsetdbl = NULL; - uint8_t * asetu8 = NULL; + uint8_t *asetu8 = NULL; uint16_t *asetu16 = NULL; uint32_t *asetu32 = NULL; uint64_t *asetu64 = NULL; - int8_t * aset8 = NULL; - int16_t * aset16 = NULL; - int32_t * aset32 = NULL; - int64_t * aset64 = NULL; - double * asetdbl = NULL; + int8_t *aset8 = NULL; + int16_t *aset16 = NULL; + int32_t *aset32 = NULL; + int64_t *aset64 = NULL; + double *asetdbl = NULL; uint8_t valu8bits; uint16_t valu16bits; @@ -9962,12 +9962,12 @@ gent_floatsattrs(void) hid_t aspace = H5I_INVALID_HID; hsize_t dims[2], adims[1]; - float ** dset32 = NULL; - double ** dset64 = NULL; + float **dset32 = NULL; + double **dset64 = NULL; long double **dset128 = NULL; - float * aset32 = NULL; - double * aset64 = NULL; + float *aset32 = NULL; + double *aset64 = NULL; long double *aset128 = NULL; float val32bits; @@ -10786,7 +10786,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - char * int_ptr = (char *)*buf; /* Pointer to the data values */ + char *int_ptr = (char *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index 2a65591..b475981 100644 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -78,7 +78,7 @@ main(int argc, char *argv[]) int token; int i; int state = 0; - struct Input * in = NULL; + struct Input *in = NULL; const char *err1 = "Invalid number of arguments: %d.\n"; const char *err2 = "Error in state table.\n"; @@ -352,7 +352,7 @@ gtoken(char *s) static int processDataFile(char *infile, struct Input *in, hid_t file_id) { - FILE * strm = NULL; + FILE *strm = NULL; const char *err1 = "Unable to open the input file %s for reading.\n"; const char *err2 = "Error in allocating integer data storage.\n"; const char *err3 = "Error in allocating floating-point data storage.\n"; @@ -462,7 +462,7 @@ error: static int readIntegerData(FILE *strm, struct Input *in) { - H5DT_INT8 * in08; + H5DT_INT8 *in08; H5DT_INT16 *in16; H5DT_INT16 temp16; H5DT_INT32 *in32; @@ -638,7 +638,7 @@ readIntegerData(FILE *strm, struct Input *in) static int readUIntegerData(FILE *strm, struct Input *in) { - H5DT_UINT8 * in08; + H5DT_UINT8 *in08; H5DT_UINT16 *in16; H5DT_UINT16 temp16; H5DT_UINT32 *in32; @@ -810,10 +810,10 @@ static int readFloatData(FILE *strm, struct Input *in) { H5DT_FLOAT32 *fp32; - uint32_t * bfp32; + uint32_t *bfp32; uint32_t temp32; H5DT_FLOAT64 *fp64; - uint64_t * bfp64; + uint64_t *bfp64; uint64_t temp64; hsize_t len = 1; @@ -1045,7 +1045,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id) i++; if (c == 10) { /* eol */ - char * str2 = str; + char *str2 = str; hid_t fspace_id; hsize_t start[1]; hsize_t count[1] = {1}; @@ -1103,9 +1103,9 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) hid_t mspace_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; hid_t handle = H5I_INVALID_HID; - char * str1 = NULL; - char * str2 = NULL; - char * str3 = NULL; + char *str1 = NULL; + char *str2 = NULL; + char *str3 = NULL; char str[1024] = ""; int j; hsize_t line; @@ -2530,7 +2530,7 @@ static int parsePathInfo(struct path_info *path, char *temp) { const char delimiter[] = "/\""; - char * token; + char *token; int i = 0; const char *err1 = "Path string larger than MAX_PATH_NAME_LENGTH.\n"; @@ -2560,7 +2560,7 @@ parseDimensions(struct Input *in, char *strm) { const char delimiter[] = ","; char temp[255]; - char * token; + char *token; int i = 0; const char *err1 = "Unable to allocate dynamic memory.\n"; @@ -4606,7 +4606,7 @@ static int process(struct Options *opt) { struct Input *in; - FILE * extfile; + FILE *extfile; hid_t file_id; hid_t group_id; hid_t handle; diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h index efd40e1..2ebeecc 100644 --- a/tools/h5import/h5import.h +++ b/tools/h5import/h5import.h @@ -84,16 +84,16 @@ struct Input { int inputArchitecture; int inputByteOrder; int rank; - hsize_t * sizeOfDimension; + hsize_t *sizeOfDimension; int outputClass; int outputSize; int outputArchitecture; int outputByteOrder; - hsize_t * sizeOfChunk; - hsize_t * maxsizeOfDimension; + hsize_t *sizeOfChunk; + hsize_t *maxsizeOfDimension; int compressionType; int compressionParam; - char * externFilename; + char *externFilename; VOIDP data; int configOptionVector[NUM_KEYS]; }; diff --git a/tools/h5jam/getub.c b/tools/h5jam/getub.c index 6f35518..869c4aa 100644 --- a/tools/h5jam/getub.c +++ b/tools/h5jam/getub.c @@ -21,7 +21,7 @@ void parse_command_line(int argc, const char *const *argv); #define PROGRAM_NAME "getub" char *nbytes = NULL; -static const char * s_opts = "c:"; /* add more later ? */ +static const char *s_opts = "c:"; /* add more later ? */ static struct long_options l_opts[] = {{"c", require_arg, 'c'}, /* input file */ {NULL, 0, '\0'}}; @@ -81,9 +81,9 @@ main(int argc, char *argv[]) { int fd = H5I_INVALID_HID; unsigned size; - char * filename = NULL; + char *filename = NULL; long res; - char * buf = NULL; + char *buf = NULL; h5tools_setprogname(PROGRAM_NAME); h5tools_setstatus(EXIT_SUCCESS); diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index cbbdc4a..43f3c3d 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -34,7 +34,7 @@ char *ub_file = NULL; * parameters. 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 = "hi:u:o:c:V"; /* add more later ? */ +static const char *s_opts = "hi:u:o:c:V"; /* add more later ? */ static struct long_options l_opts[] = { {"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {"i", require_arg, 'i'}, /* input file */ {"u", require_arg, 'u'}, /* user block file */ diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c index cade9df..c3e2bea 100644 --- a/tools/h5jam/h5jamgentest.c +++ b/tools/h5jam/h5jamgentest.c @@ -133,7 +133,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill) size_t u; float dset2_1[10], dset2_2[3][5]; int fd; - char * bp; + char *bp; if (ub_size > 0) { create_plist = H5Pcreate(H5P_FILE_CREATE); @@ -291,10 +291,10 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill) static void create_textfile(const char *name, size_t size) { - char * buf; + char *buf; int fd; size_t i; - char * bp; + char *bp; fd = HDcreat(name, 0777); HDassert(fd >= 0); diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c index 242a584..a74dd1a 100644 --- a/tools/h5jam/h5unjam.c +++ b/tools/h5jam/h5unjam.c @@ -35,7 +35,7 @@ char *ub_file = NULL; * parameters. 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 = "hu:i:o:d:V"; +static const char *s_opts = "hu:i:o:d:V"; static struct long_options l_opts[] = { {"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {"i", require_arg, 'i'}, /* input file */ {"u", require_arg, 'u'}, /* user block file */ diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c index 90e1072..70bb7d2 100644 --- a/tools/h5jam/tellub.c +++ b/tools/h5jam/tellub.c @@ -24,7 +24,7 @@ * parameters. 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 = "h"; +static const char *s_opts = "h"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {NULL, 0, '\0'}}; /*------------------------------------------------------------------------- @@ -100,7 +100,7 @@ leave(int ret) int main(int argc, char *argv[]) { - char * ifname; + char *ifname; hid_t ifile = H5I_INVALID_HID; hsize_t usize; htri_t testval; diff --git a/tools/h5ls/dynlib_ls.c b/tools/h5ls/dynlib_ls.c index 433522d..9d277e0 100644 --- a/tools/h5ls/dynlib_ls.c +++ b/tools/h5ls/dynlib_ls.c @@ -62,7 +62,7 @@ static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - char * int_ptr = (char *)*buf; /* Pointer to the data values */ + char *int_ptr = (char *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ /* Check for the correct number of parameters */ diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index a4eecdf..6bc42f7 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -108,7 +108,7 @@ static h5tool_format_t ls_dataformat = { /* Struct to pass through to visitors */ typedef struct { - const char * fname; /* Filename */ + const char *fname; /* Filename */ hid_t fid; /* File ID */ hid_t gid; /* Group ID */ hbool_t symlink_target; /* Whether this is the target of an symbolic link */ @@ -827,7 +827,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind) static hbool_t print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind) { - char * name = NULL; /* member name */ + char *name = NULL; /* member name */ size_t size; /* total size of type in bytes */ hid_t subtype; /* member data type */ int nmembs; /* number of members */ @@ -886,7 +886,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind) h5tools_str_append(buffer, " {"); if (nmembs > 0) { - char ** name; /* member names */ + char **name; /* member names */ unsigned char *value; /* value array */ hid_t native = H5I_INVALID_HID; /* native integer data type */ size_t dst_size; /* destination value type size */ @@ -1109,7 +1109,7 @@ print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind) static hbool_t print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind) { - char * tag; + char *tag; size_t size; if (H5T_OPAQUE != H5Tget_class(type)) @@ -1300,8 +1300,8 @@ dump_dataset_values(hid_t dset) h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ h5tool_format_t outputformat; - h5tool_format_t * info = &ls_dataformat; - unsigned char * region_buf = NULL; + h5tool_format_t *info = &ls_dataformat; + unsigned char *region_buf = NULL; H5TOOLS_START_DEBUG(" "); @@ -1469,8 +1469,8 @@ dump_attribute_values(hid_t attr) h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ h5tool_format_t outputformat; - h5tool_format_t * info = &ls_dataformat; - unsigned char * region_buf = NULL; + h5tool_format_t *info = &ls_dataformat; + unsigned char *region_buf = NULL; H5TOOLS_START_DEBUG(" "); @@ -1646,7 +1646,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; H5TOOLS_START_DEBUG(" "); @@ -1756,7 +1756,7 @@ dataset_list1(hid_t dset) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -1828,7 +1828,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -1954,7 +1954,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name) for (i = 0; i < nf; i++) { cd_nelmts = NELMTS(cd_values); filt_id = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts, cd_values, - sizeof(f_name), f_name, NULL); + sizeof(f_name), f_name, NULL); f_name[sizeof(f_name) - 1] = '\0'; HDsnprintf(s, sizeof(s), "Filter-%d:", i); h5tools_str_append(&buffer, " %-10s %s-%u %s {", s, (f_name[0] ? f_name : "method"), @@ -2010,7 +2010,7 @@ datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -2041,11 +2041,11 @@ static herr_t list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void *_iter) { H5O_type_t obj_type = oinfo->type; /* Type of the object */ - iter_t * iter = (iter_t *)_iter; + iter_t *iter = (iter_t *)_iter; hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; H5TOOLS_START_DEBUG(" "); @@ -2112,7 +2112,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void * which is common to all objects. */ if (verbose_g > 0) { size_t buf_size = 0; - char * comment = NULL; + char *comment = NULL; ssize_t cmt_bufsize = -1; /* Display attributes */ @@ -2206,14 +2206,14 @@ done: static herr_t list_lnk(const char *name, const H5L_info_t *linfo, void *_iter) { - char * buf = NULL; - iter_t * iter = (iter_t *)_iter; + char *buf = NULL; + iter_t *iter = (iter_t *)_iter; int ret; hsize_t curr_pos = 0; /* total data element position */ h5tool_link_info_t lnk_info; h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -2399,7 +2399,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -2590,9 +2590,9 @@ int main(int argc, char *argv[]) { hid_t file_id = H5I_INVALID_HID; - char * fname = NULL, *oname = NULL, *x = NULL; + char *fname = NULL, *oname = NULL, *x = NULL; const char *s = NULL; - char * rest; + char *rest; int argno; static char root_name[] = "/"; char drivername[50]; @@ -3010,7 +3010,7 @@ main(int argc, char *argv[]) hsize_t curr_pos = 0; /* total data element position */ h5tools_str_t buffer; /* string into which to render */ h5tools_context_t ctx; /* print context */ - h5tool_format_t * info = &ls_dataformat; + h5tool_format_t *info = &ls_dataformat; HDmemset(&ctx, 0, sizeof(ctx)); HDmemset(&buffer, 0, sizeof(h5tools_str_t)); diff --git a/tools/h5repack/dynlib_rpk.c b/tools/h5repack/dynlib_rpk.c index b228344..ed602ea 100644 --- a/tools/h5repack/dynlib_rpk.c +++ b/tools/h5repack/dynlib_rpk.c @@ -68,7 +68,7 @@ static size_t H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int add_on = 0; diff --git a/tools/h5repack/dynlib_vrpk.c b/tools/h5repack/dynlib_vrpk.c index 5eac4f2..65cb054 100644 --- a/tools/h5repack/dynlib_vrpk.c +++ b/tools/h5repack/dynlib_vrpk.c @@ -65,7 +65,7 @@ static size_t H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf) { - int * int_ptr = (int *)*buf; /* Pointer to the data values */ + int *int_ptr = (int *)*buf; /* Pointer to the data values */ size_t buf_left = *buf_size; /* Amount of data buffer left to process */ int add_on = 0; unsigned ver_info[3]; diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 6ea0178..4f50c99 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -115,7 +115,7 @@ h5repack_end(pack_opt_t *options) int h5repack_addfilter(const char *str, pack_opt_t *options) { - obj_list_t * obj_list = NULL; /* one object list for the -f and -l option entry */ + obj_list_t *obj_list = NULL; /* one object list for the -f and -l option entry */ filter_info_t filter; /* filter info for the current -f option entry */ unsigned n_objs; /* number of objects in the current -f or -l option entry */ int is_glb; /* is the filter global */ @@ -350,7 +350,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_ hid_t ftype_id = H5I_INVALID_HID; /* file type ID */ hid_t wtype_id = H5I_INVALID_HID; /* read/write type ID */ size_t msize; /* size of type */ - void * buf = NULL; /* data buffer */ + void *buf = NULL; /* data buffer */ hsize_t nelmts; /* number of elements in dataset */ int rank; /* rank of dataset */ htri_t is_named; /* Whether the datatype is named */ @@ -654,7 +654,7 @@ check_options(pack_opt_t *options) for (i = 0; i < options->op_tbl->nelems; i++) { pack_info_t pack = options->op_tbl->objs[i]; - char * name = pack.path; + char *name = pack.path; for (j = 0; j < pack.nfilters; j++) { if (options->verbose) { @@ -773,7 +773,7 @@ check_objects(const char *fname, pack_opt_t *options) for (i = 0; i < options->op_tbl->nelems; i++) { pack_info_t obj = options->op_tbl->objs[i]; - char * name = obj.path; + char *name = obj.path; if (options->verbose) HDprintf(" <%s>", name); diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index a52089d..20f7f73 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -183,13 +183,13 @@ void init_packobject(pack_info_t *obj); *------------------------------------------------------------------------- */ -int apply_filters(const char * name, /* object name from traverse list */ +int apply_filters(const char *name, /* object name from traverse list */ int rank, /* rank of dataset */ const hsize_t *dims, /* dimensions of dataset */ size_t msize, /* size of type */ hid_t dcpl_id, /* dataset creation property list */ - pack_opt_t * options, /* repack options */ - int * has_filter); /* (OUT) object NAME has a filter */ + pack_opt_t *options, /* repack options */ + int *has_filter); /* (OUT) object NAME has a filter */ /*------------------------------------------------------------------------- * options table diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 0726d27..02eab4f 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -548,7 +548,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti hid_t wtype_id = H5I_INVALID_HID; /* read/write type ID */ hid_t ocpl_id = H5I_INVALID_HID; /* property to pass copy options */ hid_t lcpl_id = H5I_INVALID_HID; /* link creation property list */ - named_dt_t * named_dt_head = NULL; /* Pointer to the stack of named datatypes copied */ + named_dt_t *named_dt_head = NULL; /* Pointer to the stack of named datatypes copied */ size_t msize; /* size of type */ hsize_t nelmts; /* number of elements in dataset */ H5D_space_status_t space_status; /* determines whether space has been allocated for the dataset */ @@ -558,8 +558,8 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti hsize_t dsize_out; /* output dataset size after filter */ int apply_s; /* flag for apply filter to small dataset sizes */ int apply_f; /* flag for apply filter to return error on H5Dcreate */ - void * buf = NULL; /* buffer for raw data */ - void * hslab_buf = NULL; /* hyperslab buffer for raw data */ + void *buf = NULL; /* buffer for raw data */ + void *hslab_buf = NULL; /* hyperslab buffer for raw data */ int has_filter; /* current object has a filter */ int req_filter; /* there was a request for a filter */ int req_obj_layout = 0; /* request layout to current object */ diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 1fca4e4..3fb49e5 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -34,7 +34,7 @@ */ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */ - const char * name, /* object name from traverse list */ + const char *name, /* object name from traverse list */ pack_info_t *objout /*OUT*/) /* info about object to filter */ { int nfilters; /* number of filters in DCPL */ @@ -84,12 +84,12 @@ done: *------------------------------------------------------------------------- */ static int -aux_find_obj(const char * name, /* object name from traverse list */ - pack_opt_t * options, /* repack options */ +aux_find_obj(const char *name, /* object name from traverse list */ + pack_opt_t *options, /* repack options */ pack_info_t *obj /*OUT*/) /* info about object to filter */ { - char * pdest = NULL; - const char * pname = NULL; + char *pdest = NULL; + const char *pname = NULL; unsigned int i; for (i = 0; i < options->op_tbl->nelems; i++) { @@ -124,8 +124,8 @@ aux_find_obj(const char * name, /* object name from traverse list */ *------------------------------------------------------------------------- */ static int -aux_assign_obj(const char * name, /* object name from traverse list */ - pack_opt_t * options, /* repack options */ +aux_assign_obj(const char *name, /* object name from traverse list */ + pack_opt_t *options, /* repack options */ pack_info_t *obj /*OUT*/) /* info about object to filter */ { int idx, i; @@ -233,13 +233,13 @@ aux_assign_obj(const char * name, /* object name from traverse list */ */ int -apply_filters(const char * name, /* object name from traverse list */ +apply_filters(const char *name, /* object name from traverse list */ int rank, /* rank of dataset */ const hsize_t *dims, /* dimensions of dataset */ size_t msize, /* size of type */ hid_t dcpl_id, /* dataset creation property list */ - pack_opt_t * options, /* repack options */ - int * has_filter) /* (OUT) object NAME has a filter */ + pack_opt_t *options, /* repack options */ + int *has_filter) /* (OUT) object NAME has a filter */ { int nfilters; /* number of filters in DCPL */ hsize_t chsize[64]; /* chunk size in elements */ diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index ee2fec5..e9b89df 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -31,7 +31,7 @@ const char *outfile = NULL; * Command-line options: The user can specify short or long-named * parameters. */ -static const char * s_opts = "a:b:c:d:e:f:hi:l:m:no:q:s:t:u:vz:ELM:VXW"; +static const char *s_opts = "a:b:c:d:e:f:hi:l:m:no:q:s:t:u:vz:ELM:VXW"; static struct long_options l_opts[] = {{"alignment", require_arg, 'a'}, {"block", require_arg, 'b'}, {"compact", require_arg, 'c'}, diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index 4524538..f10fbcc 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -53,7 +53,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti hsize_t dims[H5S_MAX_RANK]; /* dimensions of dataset */ unsigned int i, j; int k; - named_dt_t * named_dt_head = NULL; /* Pointer to the stack of named datatypes copied */ + named_dt_t *named_dt_head = NULL; /* Pointer to the stack of named datatypes copied */ int ret_value = 0; /*------------------------------------------------------------------------- @@ -224,7 +224,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti hid_t refobj_id = H5I_INVALID_HID; hdset_reg_ref_t *refbuf = NULL; /* input buffer for region references */ hdset_reg_ref_t *buf = NULL; /* output buffer */ - const char * refname; + const char *refname; unsigned u; /*------------------------------------------------------------------------- @@ -450,10 +450,10 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / int rank; H5T_class_t type_class = -1; hbool_t is_ref = 0, is_ref_vlen = 0, is_ref_array = 0, is_ref_comp = 0; - void * refbuf = NULL; - void * buf = NULL; - unsigned * ref_comp_index = NULL; - size_t * ref_comp_size = NULL; + void *refbuf = NULL; + void *buf = NULL; + unsigned *ref_comp_index = NULL; + size_t *ref_comp_size = NULL; int ref_comp_field_n = 0; int ret_value = 0; @@ -809,7 +809,7 @@ static const char * MapIdToName(hid_t refobj_id, trav_table_t *travt) { unsigned int u; - const char * ret = NULL; + const char *ret = NULL; /* linear search */ for (u = 0; u < travt->nobjs; u++) { diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c index ed29bd2..d07b443 100644 --- a/tools/h5repack/h5repack_verify.c +++ b/tools/h5repack/h5repack_verify.c @@ -54,7 +54,7 @@ h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options H5TOOLS_GOTO_ERROR((-1), "H5Fopen failed on <%s>", out_fname); for (i = 0; i < options->op_tbl->nelems; i++) { - char * name = options->op_tbl->objs[i].path; + char *name = options->op_tbl->objs[i].path; pack_info_t *obj = &options->op_tbl->objs[i]; /*------------------------------------------------------------------------- diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index f1f2115..72dc47b 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -2045,7 +2045,7 @@ make_szip(hid_t loc_id) unsigned szip_pixels_per_block = 8; hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; int szip_can_encode = 0; /* Create and fill array */ @@ -2083,7 +2083,7 @@ make_szip(hid_t loc_id) /* WARNING? SZIP is decoder only, can't generate test files */ if (H5Sclose(sid) < 0) - goto error; + goto error; if (H5Pclose(dcpl) < 0) goto error; @@ -2119,7 +2119,7 @@ make_deflate(hid_t loc_id) hid_t sid = H5I_INVALID_HID; /* dataspace ID */ hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; hobj_ref_t bufref[1]; /* reference */ hsize_t dims1r[1] = {1}; @@ -2198,7 +2198,7 @@ make_shuffle(hid_t loc_id) hid_t sid = H5I_INVALID_HID; /* dataspace ID */ hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; /* Create and fill array */ H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2); @@ -2267,7 +2267,7 @@ make_fletcher32(hid_t loc_id) hid_t sid = H5I_INVALID_HID; /* dataspace ID */ hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; /* Create and fill array */ H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2); @@ -2341,7 +2341,7 @@ make_nbit(hid_t loc_id) hid_t dsid = H5I_INVALID_HID; hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; /* Create and fill array */ H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2); @@ -2428,7 +2428,7 @@ make_scaleoffset(hid_t loc_id) hid_t dsid = H5I_INVALID_HID; hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; /* Create and fill array */ H5TEST_ALLOCATE_2D_ARRAY(buf, int, DIM1, DIM2); @@ -2513,7 +2513,7 @@ make_all_filters(hid_t loc_id) #endif /* H5_HAVE_FILTER_SZIP */ hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; #if defined(H5_HAVE_FILTER_SZIP) int szip_can_encode = 0; #endif @@ -2765,7 +2765,7 @@ make_layout(hid_t loc_id) hid_t sid = H5I_INVALID_HID; /* dataspace ID */ hsize_t dims[RANK] = {DIM1, DIM2}; hsize_t chunk_dims[RANK] = {CDIM1, CDIM2}; - int ** buf = NULL; + int **buf = NULL; int i; char name[16]; @@ -2956,8 +2956,8 @@ make_layout3(hid_t loc_id) hsize_t chunk_dims1[RANK] = {DIM1_L3 * 2, 5}; hsize_t chunk_dims2[RANK] = {SDIM1_L3 + 2, SDIM2_L3 / 2}; hsize_t chunk_dims3[RANK] = {SDIM1_L3 - 2, SDIM2_L3 / 2}; - int ** buf1 = NULL; - int ** buf2 = NULL; + int **buf1 = NULL; + int **buf2 = NULL; /* Create and fill arrays */ H5TEST_ALLOCATE_2D_ARRAY(buf1, int, DIM1_L3, DIM2_L3); @@ -3676,7 +3676,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da { hsize_t TEST_BUFSIZE = (128 * 1024 * 1024); /* 128MB */ - double * dbuf; /* information to write */ + double *dbuf; /* information to write */ size_t size; hsize_t sdims[] = {1}; hsize_t tdims[] = {TEST_BUFSIZE / sizeof(double) + 1}; @@ -4180,7 +4180,7 @@ make_dset_reg_ref(hid_t loc_id) hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */ hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */ hdset_reg_ref_t *wbuf = NULL; /* buffer to write to disk */ - int * dwbuf = NULL; /* Buffer for writing numeric data to disk */ + int *dwbuf = NULL; /* Buffer for writing numeric data to disk */ int i; /* counting variables */ int retval = -1; /* return value */ diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c index b9e3ea4..14cc518 100644 --- a/tools/h5stat/h5stat.c +++ b/tools/h5stat/h5stat.c @@ -74,7 +74,7 @@ typedef struct iter_t { unsigned long dset_layouts[H5D_NLAYOUTS]; /* Type of storage for each dataset */ unsigned long dset_comptype[H5_NFILTERS_IMPL]; /* Number of currently implemented filters */ unsigned long dset_ntypes; /* Number of diff. dataset datatypes found */ - dtype_info_t * dset_type_info; /* Pointer to dataset datatype information found */ + dtype_info_t *dset_type_info; /* Pointer to dataset datatype information found */ unsigned dset_dim_nbins; /* Number of bins for dataset dimensions */ unsigned long *dset_dim_bins; /* Pointer to array of bins for dataset dimensions */ ohdr_info_t dset_ohdr_info; /* Object header information for datasets */ @@ -1596,7 +1596,7 @@ int main(int argc, char *argv[]) { iter_t iter; - const char * fname = NULL; + const char *fname = NULL; hid_t fid = H5I_INVALID_HID; struct handler_t *hand = NULL; hid_t fapl_id = H5P_DEFAULT; diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 7fc4999..fae52de 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -342,8 +342,8 @@ build_match_list(const char *objname1, trav_info_t *info1, const char *objname2, size_t curr1 = 0; size_t curr2 = 0; unsigned infile[2]; - char * path1_lp = NULL; - char * path2_lp = NULL; + char *path1_lp = NULL; + char *path2_lp = NULL; h5trav_type_t type1_l; h5trav_type_t type2_l; size_t path1_offset = 0; @@ -476,11 +476,11 @@ trav_grp_objs(const char *path, const H5O_info_t *oinfo, const char *already_vis static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo, void *udata) { - trav_info_t * tinfo = (trav_info_t *)udata; - diff_opt_t * opts = (diff_opt_t *)tinfo->opts; + trav_info_t *tinfo = (trav_info_t *)udata; + diff_opt_t *opts = (diff_opt_t *)tinfo->opts; h5tool_link_info_t lnk_info; - const char * ext_fname; - const char * ext_path; + const char *ext_fname; + const char *ext_path; herr_t ret_value = SUCCEED; H5TOOLS_START_DEBUG(" "); @@ -587,8 +587,8 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char hsize_t nfound = 0; int l_ret1 = -1; int l_ret2 = -1; - char * obj1fullname = NULL; - char * obj2fullname = NULL; + char *obj1fullname = NULL; + char *obj2fullname = NULL; int both_objs_grp = 0; /* init to group type */ h5trav_type_t obj1type = H5TRAV_TYPE_GROUP; @@ -1070,8 +1070,8 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, unsigned i; const char *grp1_path = ""; const char *grp2_path = ""; - char * obj1_fullpath = NULL; - char * obj2_fullpath = NULL; + char *obj1_fullpath = NULL; + char *obj2_fullpath = NULL; diff_args_t argdata; size_t idx1 = 0; size_t idx2 = 0; @@ -1120,7 +1120,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, */ #ifdef H5_HAVE_PARALLEL { - char * workerTasks = (char *)HDmalloc((size_t)(g_nTasks - 1) * sizeof(char)); + char *workerTasks = (char *)HDmalloc((size_t)(g_nTasks - 1) * sizeof(char)); int n; int busyTasks = 0; struct diffs_found nFoundbyWorker; diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index e811041..548f019 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -36,7 +36,7 @@ typedef struct { */ /* linked list to keep exclude path list */ struct exclude_path_list { - const char * obj_path; + const char *obj_path; h5trav_type_t obj_type; struct exclude_path_list *next; }; @@ -86,8 +86,8 @@ typedef struct { hsize_t acc[H5S_MAX_RANK]; /* accumulator position */ hsize_t pos[H5S_MAX_RANK]; /* matrix position */ hsize_t sm_pos[H5S_MAX_RANK]; /* stripmine position */ - char * obj_name[2]; /* name for object */ - struct subset_t * sset[2]; /* subsetting parameters */ + char *obj_name[2]; /* name for object */ + struct subset_t *sset[2]; /* subsetting parameters */ hbool_t custom_vol[2]; /* Using a custom input, output VOL? */ } diff_opt_t; diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 57b8a5c..296c3a2 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -129,8 +129,8 @@ static hbool_t not_comparable; typedef struct mcomp_t { unsigned n; /* number of members */ - hid_t * ids; /* member type id */ - size_t * offsets; + hid_t *ids; /* member type id */ + size_t *offsets; struct mcomp_t **m; /* members */ } mcomp_t; @@ -528,10 +528,10 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co case H5T_STRING: H5TOOLS_DEBUG("H5T_STRING"); { - char * s = NULL; - char * sx = NULL; - char * s1 = NULL; - char * s2 = NULL; + char *s = NULL; + char *sx = NULL; + char *s1 = NULL; + char *s2 = NULL; size_t size1; size_t size2; size_t sizex; diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 1360efe..725e86c 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -19,7 +19,7 @@ #define ATTR_NAME_MAX 255 typedef struct table_attr_t { - char * name; + char *name; unsigned exist[2]; } match_attr_t; @@ -334,8 +334,8 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na hid_t mtype2_id = H5I_INVALID_HID; /* memory data type ID */ size_t msize1; /* memory size of memory type */ size_t msize2; /* memory size of memory type */ - void * buf1 = NULL; /* data buffer */ - void * buf2 = NULL; /* data buffer */ + void *buf1 = NULL; /* data buffer */ + void *buf2 = NULL; /* data buffer */ hbool_t buf1hasdata = FALSE; /* buffer has data */ hbool_t buf2hasdata = FALSE; /* buffer has data */ int rank1; /* rank of dataset */ @@ -600,8 +600,8 @@ diff_attr(hid_t loc1_id, hid_t loc2_id, const char *path1, const char *path2, di table_attrs_t *match_list_attrs = NULL; hid_t attr1_id = H5I_INVALID_HID; /* attr ID */ hid_t attr2_id = H5I_INVALID_HID; /* attr ID */ - char * name1 = NULL; - char * name2 = NULL; + char *name1 = NULL; + char *name2 = NULL; unsigned u; /* Local index variable */ hsize_t nfound = 0; hsize_t nfound_total = 0; diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index b2331f1..23d709b 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -182,10 +182,10 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n hsize_t storage_size2; hsize_t nfound = 0; /* number of differences found */ int can_compare = 1; /* do diff or not */ - void * buf1 = NULL; - void * buf2 = NULL; - void * sm_buf1 = NULL; - void * sm_buf2 = NULL; + void *buf1 = NULL; + void *buf2 = NULL; + void *sm_buf1 = NULL; + void *sm_buf2 = NULL; hid_t sm_space1 = H5I_INVALID_HID; /*stripmine data space */ hid_t sm_space2 = H5I_INVALID_HID; /*stripmine data space */ size_t need; /* bytes needed for malloc */ diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 2902bb4..675d6c4 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -30,8 +30,8 @@ int H5tools_INDENT_g = 0; /* global variables */ H5E_auto2_t lib_func; H5E_auto2_t tools_func; -void * lib_edata; -void * tools_edata; +void *lib_edata; +void *tools_edata; hid_t H5tools_ERR_STACK_g = H5I_INVALID_HID; hid_t H5tools_ERR_CLS_g = H5I_INVALID_HID; @@ -1136,8 +1136,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex hsize_t elmt_counter) { hbool_t dimension_break = TRUE; - char * s = NULL; - char * section = NULL; /* a section of output */ + char *s = NULL; + char *section = NULL; /* a section of output */ int secnum; /* section sequence number */ int multiline; /* datum was multiline */ @@ -1301,8 +1301,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools hsize_t local_elmt_counter, hsize_t elmt_counter) { hbool_t dimension_break = TRUE; - char * s = NULL; - char * section = NULL; /* a section of output */ + char *s = NULL; + char *section = NULL; /* a section of output */ int secnum; /* section sequence number */ int multiline; /* datum was multiline */ @@ -1545,7 +1545,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t case H5T_STRING: { unsigned int i; H5T_str_t pad; - char * s = NULL; + char *s = NULL; unsigned char tempuchar; H5TOOLS_DEBUG("H5T_STRING"); @@ -1738,7 +1738,7 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t contai unsigned jndx; size_t type_size; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; hbool_t past_catch = FALSE; hsize_t blkndx; hid_t sid1 = H5I_INVALID_HID; @@ -1902,7 +1902,7 @@ render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE * hsize_t *dims1 = NULL; size_t type_size; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = 0; H5TOOLS_START_DEBUG(" "); diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index 2ee83ef..90498ef 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -488,7 +488,7 @@ typedef struct h5tool_format_t { } h5tool_format_t; typedef struct subset_d { - hsize_t * data; + hsize_t *data; unsigned int len; } subset_d; @@ -563,29 +563,29 @@ extern "C" { H5TOOLS_DLLVAR const char *drivernames[]; -H5TOOLS_DLLVAR h5tool_format_t h5tools_dataformat; -H5TOOLS_DLLVAR const h5tools_dump_header_t h5tools_standardformat; +H5TOOLS_DLLVAR h5tool_format_t h5tools_dataformat; +H5TOOLS_DLLVAR const h5tools_dump_header_t h5tools_standardformat; H5TOOLS_DLLVAR const h5tools_dump_header_t *h5tools_dump_header_format; H5TOOLS_DLLVAR H5E_auto2_t lib_func; H5TOOLS_DLLVAR H5E_auto2_t tools_func; -H5TOOLS_DLLVAR void * lib_edata; -H5TOOLS_DLLVAR void * tools_edata; +H5TOOLS_DLLVAR void *lib_edata; +H5TOOLS_DLLVAR void *tools_edata; H5TOOLS_DLLVAR unsigned packed_bits_num; /* number of packed bits to display */ H5TOOLS_DLLVAR unsigned packed_data_offset; /* offset of packed bits to display */ H5TOOLS_DLLVAR unsigned packed_data_length; /* length of packed bits to display */ H5TOOLS_DLLVAR unsigned long long packed_data_mask; /* mask in which packed bits to display */ -H5TOOLS_DLLVAR FILE *rawattrstream; /* output stream for raw attribute data */ -H5TOOLS_DLLVAR FILE *rawdatastream; /* output stream for raw data */ -H5TOOLS_DLLVAR FILE *rawinstream; /* input stream for raw input */ -H5TOOLS_DLLVAR FILE *rawoutstream; /* output stream for raw output */ -H5TOOLS_DLLVAR FILE *rawerrorstream; /* output stream for raw error */ -H5TOOLS_DLLVAR int bin_output; /* binary output */ -H5TOOLS_DLLVAR int bin_form; /* binary form */ -H5TOOLS_DLLVAR int region_output; /* region output */ -H5TOOLS_DLLVAR int oid_output; /* oid output */ -H5TOOLS_DLLVAR int data_output; /* data output */ -H5TOOLS_DLLVAR int attr_data_output; /* attribute data output */ +H5TOOLS_DLLVAR FILE *rawattrstream; /* output stream for raw attribute data */ +H5TOOLS_DLLVAR FILE *rawdatastream; /* output stream for raw data */ +H5TOOLS_DLLVAR FILE *rawinstream; /* input stream for raw input */ +H5TOOLS_DLLVAR FILE *rawoutstream; /* output stream for raw output */ +H5TOOLS_DLLVAR FILE *rawerrorstream; /* output stream for raw error */ +H5TOOLS_DLLVAR int bin_output; /* binary output */ +H5TOOLS_DLLVAR int bin_form; /* binary form */ +H5TOOLS_DLLVAR int region_output; /* region output */ +H5TOOLS_DLLVAR int oid_output; /* oid output */ +H5TOOLS_DLLVAR int data_output; /* data output */ +H5TOOLS_DLLVAR int attr_data_output; /* attribute data output */ /* sort parameters */ H5TOOLS_DLLVAR H5_index_t sort_by; /* sort_by [creation_order | name] */ diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 6aa1a50..9ad78bd 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -175,13 +175,13 @@ const h5tools_dump_header_t h5tools_standardformat = { }; const h5tools_dump_header_t *h5tools_dump_header_format; -table_t * h5dump_type_table = NULL; /* type table reference for datatype dump */ +table_t *h5dump_type_table = NULL; /* type table reference for datatype dump */ /* local prototypes */ static int h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *cur_ctx, - h5tools_str_t * buffer, /* string into which to render */ + h5tools_str_t *buffer, /* string into which to render */ size_t ncols, unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata); @@ -328,14 +328,14 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont static int h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *cur_ctx, - h5tools_str_t * buffer, /* string into which to render */ + h5tools_str_t *buffer, /* string into which to render */ size_t ncols, unsigned ndims, hid_t type_id, hsize_t nblocks, hsize_t *ptdata) { hbool_t dimension_break = TRUE; - hsize_t * dims1 = NULL; - hsize_t * start = NULL; - hsize_t * count = NULL; + hsize_t *dims1 = NULL; + hsize_t *start = NULL; + hsize_t *count = NULL; hsize_t blkndx; hsize_t total_size[H5S_MAX_RANK]; hsize_t elmtno; /* element index */ @@ -350,7 +350,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for hid_t mem_space = H5I_INVALID_HID; hid_t sid1 = H5I_INVALID_HID; h5tools_context_t ctx; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = 0; HDassert(info); @@ -512,7 +512,7 @@ hbool_t h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, /* in,out */ h5tools_str_t *buffer, /* string into which to render */ - hsize_t * curr_pos, /* total data element position */ + hsize_t *curr_pos, /* total data element position */ size_t ncols, hsize_t region_elmt_counter, /* element counter */ hsize_t elmt_counter) { @@ -520,7 +520,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea hssize_t snblocks; hsize_t nblocks; hsize_t alloc_size; - hsize_t * ptdata = NULL; + hsize_t *ptdata = NULL; int sndims; unsigned ndims; hsize_t indx; @@ -733,7 +733,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre hsize_t npoints, hsize_t *ptdata) { hbool_t dimension_break = TRUE; - hsize_t * dims1 = NULL; + hsize_t *dims1 = NULL; hsize_t elmtno; /* element index */ hsize_t curr_pos = 0; hsize_t total_size[H5S_MAX_RANK]; @@ -742,7 +742,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre size_t type_size; unsigned int region_flags; /* buffer extent flags */ hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; h5tools_context_t ctx; hbool_t past_catch = FALSE; int ret_value = 0; @@ -877,7 +877,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea hssize_t snpoints; hsize_t npoints; hsize_t alloc_size; - hsize_t * ptdata; + hsize_t *ptdata; int sndims; unsigned ndims; hsize_t indx; @@ -1095,10 +1095,10 @@ done: static herr_t h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t dset, hid_t p_type, hid_t f_space, hsize_t hyperslab_count, - hsize_t * temp_start, /* start inside offset count loop */ - hsize_t * temp_count, /* count inside offset count loop */ - hsize_t * temp_block, /* block size used in loop */ - hsize_t * temp_stride, /* stride size used in loop */ + hsize_t *temp_start, /* start inside offset count loop */ + hsize_t *temp_count, /* count inside offset count loop */ + hsize_t *temp_block, /* block size used in loop */ + hsize_t *temp_stride, /* stride size used in loop */ const hsize_t *total_size, /* total size of dataset */ unsigned int row_dim) /* index of row_counter dimension */ { @@ -1893,7 +1893,7 @@ int h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t type, int object_search) { - char * mname; + char *mname; hid_t mtype = H5I_INVALID_HID; hid_t str_type = H5I_INVALID_HID; hid_t super = H5I_INVALID_HID; @@ -1922,7 +1922,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ H5TOOLS_THROW((-1), "H5Tget_class failed"); if (object_search && H5Tcommitted(type) > 0) { H5O_info_t oinfo; - obj_t * obj = NULL; /* Found object */ + obj_t *obj = NULL; /* Found object */ H5Oget_info(type, &oinfo); obj = search_obj(h5dump_type_table, oinfo.addr); @@ -2567,7 +2567,7 @@ int h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t type) { - char ** name = NULL; /*member names */ + char **name = NULL; /*member names */ unsigned char *value = NULL; /*value array */ unsigned char *copy = NULL; /*a pointer to value array */ unsigned i; @@ -2843,7 +2843,7 @@ h5tools_print_fill_value(h5tools_str_t *buffer /*in,out*/, const h5tool_format_t { size_t size; hid_t n_type = H5I_INVALID_HID; - void * buf = NULL; + void *buf = NULL; n_type = H5Tget_native_type(type_id, H5T_DIR_DEFAULT); @@ -2953,7 +2953,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * for (i = 0; i < nfilters && !ok; i++) { cd_nelmts = NELMTS(cd_values); filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts, cd_values, - sizeof(f_name), f_name, NULL); + sizeof(f_name), f_name, NULL); ok = (filtn >= 0); } @@ -3395,7 +3395,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * void h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, hid_t obj_id) { - char * comment = NULL; + char *comment = NULL; ssize_t cmt_bufsize = -1; size_t buf_size = 0; size_t ncols = 80; /* available output width */ @@ -3791,7 +3791,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * size_t ncols = 80; /* available output width */ h5tool_format_t string_dataformat; h5tool_format_t outputformat; - unsigned char * region_buf = NULL; + unsigned char *region_buf = NULL; H5TOOLS_START_DEBUG(" file=%p", (void *)stream); H5TOOLS_DEBUG("rawdata file=%p", (void *)rawdatastream); diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index 22416b9..b591b8e 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -34,7 +34,7 @@ typedef struct { haddr_t objno; /* Object ID (i.e. address) */ - char * path; /* Object path */ + char *path; /* Object path */ } ref_path_node_t; static H5SL_t *ref_path_table = NULL; /* the "table" (implemented with a skip list) */ diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index f23d726..571f27d 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -35,7 +35,7 @@ /* Variable length string datatype */ #define STR_INIT_LEN 4096 /*initial length */ -static char * h5tools_escape(char *s, size_t size); +static char *h5tools_escape(char *s, size_t size); static hbool_t h5tools_str_is_zero(const void *_mem, size_t size); static void h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch); void h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, h5tools_context_t *ctx); @@ -572,15 +572,15 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai { size_t nsize, offset, size = 0, nelmts, start; H5T_sign_t nsign; - char * name = NULL; + char *name = NULL; unsigned char *ucp_vp = (unsigned char *)vp; - char * cp_vp = (char *)vp; + char *cp_vp = (char *)vp; hid_t memb = H5I_INVALID_HID; hid_t obj = H5I_INVALID_HID; static char fmt_llong[8], fmt_ullong[8]; H5T_str_t pad; H5T_class_t type_class; - char * ret_value = NULL; + char *ret_value = NULL; H5TOOLS_START_DEBUG(" "); /* Build default formats for long long types */ @@ -644,7 +644,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai case H5T_STRING: { unsigned int i; char quote = '\0'; - char * s; + char *s; H5TOOLS_DEBUG("H5T_STRING"); quote = '\0'; @@ -1182,7 +1182,7 @@ static char * h5tools_escape(char *s /*in,out*/, size_t size) { register size_t i; - const char * escape; + const char *escape; char octal[8]; size_t n = HDstrlen(s); diff --git a/tools/lib/h5tools_str.h b/tools/lib/h5tools_str.h index ad43590..2c27691 100644 --- a/tools/lib/h5tools_str.h +++ b/tools/lib/h5tools_str.h @@ -19,18 +19,18 @@ #define H5TOOLS_STR_H typedef struct h5tools_str_t { - char * s; /*allocate string */ + char *s; /*allocate string */ size_t len; /*length of actual value */ size_t nalloc; /*allocated size of string */ } h5tools_str_t; H5TOOLS_DLL void h5tools_str_close(h5tools_str_t *str); H5TOOLS_DLL size_t h5tools_str_len(h5tools_str_t *str); -H5TOOLS_DLL char * h5tools_str_append(h5tools_str_t *str, const char *fmt, ...); -H5TOOLS_DLL char * h5tools_str_reset(h5tools_str_t *str); -H5TOOLS_DLL char * h5tools_str_trunc(h5tools_str_t *str, size_t size); -H5TOOLS_DLL char * h5tools_str_fmt(h5tools_str_t *str, size_t start, const char *fmt); -H5TOOLS_DLL char * h5tools_str_prefix(h5tools_str_t *str, const h5tool_format_t *info, hsize_t elmtno, +H5TOOLS_DLL char *h5tools_str_append(h5tools_str_t *str, const char *fmt, ...); +H5TOOLS_DLL char *h5tools_str_reset(h5tools_str_t *str); +H5TOOLS_DLL char *h5tools_str_trunc(h5tools_str_t *str, size_t size); +H5TOOLS_DLL char *h5tools_str_fmt(h5tools_str_t *str, size_t start, const char *fmt); +H5TOOLS_DLL char *h5tools_str_prefix(h5tools_str_t *str, const h5tool_format_t *info, hsize_t elmtno, h5tools_context_t *ctx); /* * new functions needed to display region reference data diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 0f2279c..3a6c7f0 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -30,7 +30,7 @@ unsigned h5tools_nCols = 80; /* ``get_option'' variables */ int opt_err = 1; /*get_option prints errors if this is on */ int opt_ind = 1; /*token pointer */ -const char * opt_arg; /*flag argument (or value) */ +const char *opt_arg; /*flag argument (or value) */ static int h5tools_d_status = 0; static const char *h5tools_progname = "h5tools"; @@ -49,7 +49,7 @@ hsize_t H5TOOLS_BUFSIZE = (32 * 1024 * 1024); /* 32 MB */ unsigned char g_Parallel = 0; /*0 for serial, 1 for parallel */ char outBuff[OUTBUFF_SIZE]; unsigned outBuffOffset; -FILE * overflow_file = NULL; +FILE *overflow_file = NULL; /* local functions */ static void init_table(table_t **tbl); @@ -196,7 +196,7 @@ get_option(int argc, char **argv, const char *opts, const struct long_options *l /* long command line option */ int i; const char ch = '='; - char * arg = HDstrdup(&argv[opt_ind][2]); + char *arg = HDstrdup(&argv[opt_ind][2]); size_t arg_len = 0; opt_arg = strchr(&argv[opt_ind][2], ch); @@ -389,12 +389,12 @@ get_option(int argc, char **argv, const char *opts, const struct long_options *l herr_t parse_tuple(const char *start, int sep, char **cpy_out, unsigned *nelems, char ***ptrs_out) { - char * elem_ptr = NULL; - char * dest_ptr = NULL; + char *elem_ptr = NULL; + char *dest_ptr = NULL; unsigned elems_count = 0; - char ** elems = NULL; /* more like *elems[], but complier... */ - char ** elems_re = NULL; /* temporary pointer, for realloc */ - char * cpy = NULL; + char **elems = NULL; /* more like *elems[], but complier... */ + char **elems_re = NULL; /* temporary pointer, for realloc */ + char *cpy = NULL; herr_t ret_value = SUCCEED; unsigned init_slots = 2; @@ -1064,8 +1064,8 @@ h5tools_parse_ros3_fapl_tuple(const char *tuple_str, int delim, H5FD_ros3_fapl_t { const char *ccred[3]; unsigned nelems = 0; - char * s3cred_src = NULL; - char ** s3cred = NULL; + char *s3cred_src = NULL; + char **s3cred = NULL; herr_t ret_value = SUCCEED; /* Attempt to parse S3 credentials tuple */ @@ -1217,8 +1217,8 @@ h5tools_parse_hdfs_fapl_tuple(const char *tuple_str, int delim, H5FD_hdfs_fapl_t { unsigned long k = 0; unsigned nelems = 0; - char * props_src = NULL; - char ** props = NULL; + char *props_src = NULL; + char **props = NULL; herr_t ret_value = SUCCEED; /* Attempt to parse HDFS configuration tuple */ diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h index 6ed5aa4..e9560d6 100644 --- a/tools/lib/h5tools_utils.h +++ b/tools/lib/h5tools_utils.h @@ -34,7 +34,7 @@ H5TOOLS_DLLVAR int g_nTasks; H5TOOLS_DLLVAR unsigned char g_Parallel; H5TOOLS_DLLVAR char outBuff[]; H5TOOLS_DLLVAR unsigned outBuffOffset; -H5TOOLS_DLLVAR FILE *overflow_file; +H5TOOLS_DLLVAR FILE *overflow_file; /* Maximum size used in a call to malloc for a dataset */ H5TOOLS_DLLVAR hsize_t H5TOOLS_MALLOCSIZE; @@ -96,7 +96,7 @@ H5TOOLS_DLL int get_option(int argc, char **argv, const char *opt, const struct /*struct taken from the dumper. needed in table struct*/ typedef struct obj_t { haddr_t objno; - char * objname; + char *objname; hbool_t displayed; /* Flag to indicate that the object has been displayed */ hbool_t recorded; /* Flag for named datatypes to indicate they were found in the group hierarchy */ } obj_t; @@ -160,7 +160,7 @@ typedef struct { /* obtain link info from H5tools_get_symlink_info() */ typedef struct { H5O_type_t trg_type; /* OUT: target type */ - char * trg_path; /* OUT: target obj path. This must be freed + char *trg_path; /* OUT: target obj path. This must be freed * when used with H5tools_get_symlink_info() */ haddr_t objno; /* OUT: target object address */ unsigned long fileno; /* OUT: File number that target object is located in */ diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 57d71ac..23def21 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -21,7 +21,7 @@ */ typedef struct trav_addr_path_t { haddr_t addr; - char * path; + char *path; } trav_addr_path_t; typedef struct trav_addr_t { @@ -33,14 +33,14 @@ typedef struct trav_addr_t { typedef struct { h5trav_obj_func_t visit_obj; /* Callback for visiting objects */ h5trav_lnk_func_t visit_lnk; /* Callback for visiting links */ - void * udata; /* User data to pass to callbacks */ + void *udata; /* User data to pass to callbacks */ } trav_visitor_t; typedef struct { - trav_addr_t * seen; /* List of addresses seen already */ + trav_addr_t *seen; /* List of addresses seen already */ const trav_visitor_t *visitor; /* Information for visiting each link/object */ hbool_t is_absolute; /* Whether the traversal has absolute paths */ - const char * base_grp_name; /* Name of the group that serves as the base + const char *base_grp_name; /* Name of the group that serves as the base * for iteration */ } trav_ud_traverse_t; @@ -168,9 +168,9 @@ static herr_t traverse_cb(hid_t loc_id, const char *path, const H5L_info_t *linfo, void *_udata) { trav_ud_traverse_t *udata = (trav_ud_traverse_t *)_udata; /* User data */ - char * new_name = NULL; - const char * full_name; - const char * already_visited = NULL; /* Whether the link/object was already visited */ + char *new_name = NULL; + const char *full_name; + const char *already_visited = NULL; /* Whether the link/object was already visited */ /* Create the full path name for the link */ if (udata->is_absolute) { @@ -694,7 +694,7 @@ trav_table_addlink(trav_table_t *table, haddr_t objno, const char *path) if (table->objs[i].nlinks == (unsigned)table->objs[i].sizelinks) { table->objs[i].sizelinks = MAX(1, table->objs[i].sizelinks * 2); table->objs[i].links = (trav_link_t *)HDrealloc( - table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t)); + table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t)); } /* end if */ /* insert it */ @@ -800,7 +800,7 @@ trav_attr(hid_t const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data) { trav_path_op_data_t *op_data = (trav_path_op_data_t *)_op_data; - const char * buf = op_data->path; + const char *buf = op_data->path; if ((strlen(buf) == 1) && (*buf == '/')) HDprintf(" %-10s %s%s", "attribute", buf, attr_name); @@ -949,7 +949,7 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata) case H5L_TYPE_EXTERNAL: if (linfo->u.val_size > 0) { - char * targbuf = NULL; + char *targbuf = NULL; const char *filename = NULL; const char *objname = NULL; diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h index 2525e2b..92cf0f9 100644 --- a/tools/lib/h5trav.h +++ b/tools/lib/h5trav.h @@ -50,8 +50,8 @@ typedef enum { */ typedef struct symlink_trav_path_t { H5L_type_t type; - char * file; - char * path; + char *file; + char *path; } symlink_trav_path_t; typedef struct symlink_trav_t { @@ -62,7 +62,7 @@ typedef struct symlink_trav_t { } symlink_trav_t; typedef struct trav_path_t { - char * path; + char *path; h5trav_type_t type; haddr_t objno; /* object address */ unsigned long fileno; /* File number that object is located in */ @@ -71,11 +71,11 @@ typedef struct trav_path_t { typedef struct trav_info_t { size_t nalloc; size_t nused; - const char * fname; + const char *fname; hid_t fid; /* File ID */ - trav_path_t * paths; + trav_path_t *paths; symlink_trav_t symlink_visited; /* already visited symbolic links */ - void * opts; /* optional data passing */ + void *opts; /* optional data passing */ } trav_info_t; /*------------------------------------------------------------------------- @@ -95,9 +95,9 @@ typedef struct trav_obj_t { haddr_t objno; /* object address */ unsigned flags[2]; /* h5diff.object is present or not in both files*/ hbool_t is_same_trgobj; /* same target object? no need to compare */ - char * name; /* name */ + char *name; /* name */ h5trav_type_t type; /* type of object */ - trav_link_t * links; /* array of possible link names */ + trav_link_t *links; /* array of possible link names */ size_t sizelinks; /* size of links array */ size_t nlinks; /* number of links */ } trav_obj_t; diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 069d62f..e2abfaa 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -513,8 +513,8 @@ test_parse_tuple(void) unsigned i = 0; unsigned count = 0; unsigned elem_i = 0; - char ** parsed = NULL; - char * cpy = NULL; + char **parsed = NULL; + char *cpy = NULL; herr_t success = TRUE; hbool_t show_progress = FALSE; @@ -665,7 +665,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, TRUE, "u", "v", "w"}; - const char * values[] = {"", "", ""}; + const char *values[] = {"", "", ""}; if (show_progress) { HDprintf("all empty values\n"); @@ -684,7 +684,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "y", "z", "a"}; + const char *values[] = {"x", "y", "z", "a"}; if (show_progress) { HDprintf("successful full set\n"); @@ -703,7 +703,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {NULL, "y", "z", NULL}; + const char *values[] = {NULL, "y", "z", NULL}; if (show_progress) { HDprintf("NULL region\n"); @@ -722,7 +722,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"", "y", "z", NULL}; + const char *values[] = {"", "y", "z", NULL}; if (show_progress) { HDprintf("empty region; non-empty id, key\n"); @@ -741,8 +741,8 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"somewhere over the rainbow not too high " - "there is another rainbow bounding some darkened sky", + const char *values[] = {"somewhere over the rainbow not too high " + "there is another rainbow bounding some darkened sky", "y", "z"}; if (show_progress) { @@ -764,7 +764,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", NULL, "z", NULL}; + const char *values[] = {"x", NULL, "z", NULL}; if (show_progress) { HDprintf("NULL id\n"); @@ -783,7 +783,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "", "z", NULL}; + const char *values[] = {"x", "", "z", NULL}; if (show_progress) { HDprintf("empty id; non-empty region and key\n"); @@ -802,17 +802,17 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", + const char *values[] = {"x", "Why is it necessary to solve the problem? " - "What benefits will you receive by solving the problem? " - "What is the unknown? " - "What is it you don't yet understand? " - "What is the information you have? " - "What isn't the problem? " - "Is the information insufficient, redundant, or contradictory? " - "Should you draw a diagram or figure of the problem? " - "What are the boundaries of the problem? " - "Can you separate the various parts of the problem?", + "What benefits will you receive by solving the problem? " + "What is the unknown? " + "What is it you don't yet understand? " + "What is the information you have? " + "What isn't the problem? " + "Is the information insufficient, redundant, or contradictory? " + "Should you draw a diagram or figure of the problem? " + "What are the boundaries of the problem? " + "Can you separate the various parts of the problem?", "z"}; if (show_progress) { @@ -834,7 +834,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "y", NULL, NULL}; + const char *values[] = {"x", "y", NULL, NULL}; if (show_progress) { HDprintf("NULL key\n"); @@ -853,7 +853,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "y", "", NULL}; + const char *values[] = {"x", "y", "", NULL}; if (show_progress) { HDprintf("empty key; non-empty region and id\n"); @@ -872,7 +872,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"", "y", "", NULL}; + const char *values[] = {"", "y", "", NULL}; if (show_progress) { HDprintf("empty key and region; non-empty id\n"); @@ -891,7 +891,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "", "", NULL}; + const char *values[] = {"x", "", "", NULL}; if (show_progress) { HDprintf("empty key and id; non-empty region\n"); @@ -910,17 +910,17 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {bad_version, FALSE, "a", "b", "c"}; - const char * values[] = {"x", "y", + const char *values[] = {"x", "y", "Why is it necessary to solve the problem? " - "What benefits will you receive by solving the problem? " - "What is the unknown? " - "What is it you don't yet understand? " - "What is the information you have? " - "What isn't the problem? " - "Is the information insufficient, redundant, or contradictory? " - "Should you draw a diagram or figure of the problem? " - "What are the boundaries of the problem? " - "Can you separate the various parts of the problem?"}; + "What benefits will you receive by solving the problem? " + "What is the unknown? " + "What is it you don't yet understand? " + "What is the information you have? " + "What isn't the problem? " + "Is the information insufficient, redundant, or contradictory? " + "Should you draw a diagram or figure of the problem? " + "What are the boundaries of the problem? " + "Can you separate the various parts of the problem?"}; if (show_progress) { HDprintf("key overflow\n"); @@ -940,7 +940,7 @@ test_populate_ros3_fa(void) */ { H5FD_ros3_fapl_t fa = {0, 0, "", "", ""}; - const char * values[] = {"us-east-2", "AKIAIMC3D3XLYXLN5COA", + const char *values[] = {"us-east-2", "AKIAIMC3D3XLYXLN5COA", "ugs5aVVnLFCErO/8uW14iWE3K5AgXMpsMlWneO/+"}; JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "unable to set use case") JSVERIFY(1, fa.version, "version check") @@ -992,7 +992,7 @@ test_set_configured_fapl(void) int expected; int fapl_choice; const char vfdname[12]; - void * conf_fa; + void *conf_fa; } testcase; typedef struct other_fa_t { diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 9128706..bc3e150 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -140,12 +140,12 @@ main(int argc, char *argv[]) hid_t fid = H5I_INVALID_HID; hid_t fapl = H5I_INVALID_HID; hid_t dxpl = H5I_INVALID_HID; - H5F_t * f; + H5F_t *f; haddr_t addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0; uint8_t sig[H5F_SIGNATURE_LEN]; size_t u; H5E_auto2_t func = NULL; - void * edata = NULL; + void *edata = NULL; herr_t status = SUCCEED; int exit_value = 0; diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c index 9b0d8f0..2bab6b0 100644 --- a/tools/misc/h5mkgrp.c +++ b/tools/misc/h5mkgrp.c @@ -22,19 +22,19 @@ int d_status = EXIT_SUCCESS; /* command-line options: short and long-named parameters */ -static const char * s_opts = "hlpvV"; +static const char *s_opts = "hlpvV"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"latest", no_arg, 'l'}, {"parents", no_arg, 'p'}, {"verbose", no_arg, 'v'}, {"version", no_arg, 'V'}, {NULL, 0, '\0'}}; /* Command line parameter settings */ typedef struct mkgrp_opt_t { - char * fname; /* File name to operate on */ + char *fname; /* File name to operate on */ hbool_t latest; /* Whether file should use latest format versions */ hbool_t verbose; /* Whether output should be verbose */ hbool_t parents; /* Whether to create intermediate groups */ size_t ngroups; /* Number of groups to create */ - char ** groups; /* Pointer to array of group names */ + char **groups; /* Pointer to array of group names */ hid_t fapl_id; /* fapl to use when opening the file */ } mkgrp_opt_t; diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c index 7f00d30..cd8be0e 100644 --- a/tools/misc/h5repart.c +++ b/tools/misc/h5repart.c @@ -165,7 +165,7 @@ main(int argc, char *argv[]) { const char *prog_name; /*program name */ size_t blk_size = 1024; /*size of each I/O block */ - char * buf = NULL; /*I/O block buffer */ + char *buf = NULL; /*I/O block buffer */ size_t n, i; /*counters */ ssize_t nio; /*I/O return value */ int argno = 1; /*program argument number */ @@ -177,13 +177,13 @@ main(int argc, char *argv[]) int verbose = FALSE; /*display file names? */ const char *src_gen_name; /*general source name */ - char * src_name = NULL; /*source member name */ + char *src_name = NULL; /*source member name */ int src_is_family; /*is source name a family name? */ int src_membno = 0; /*source member number */ const char *dst_gen_name; /*general destination name */ - char * dst_name = NULL; /*destination member name */ + char *dst_name = NULL; /*destination member name */ int dst_is_family; /*is dst name a family name? */ int dst_membno = 0; /*destination member number */ diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c index 1b6793a..8be50c7 100644 --- a/tools/perform/chunk.c +++ b/tools/perform/chunk.c @@ -331,7 +331,7 @@ main(void) { size_t io_size; double effic, io_percent; - FILE * f, *d; + FILE *f, *d; size_t cache_size; double w0; diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c index 2687ce9..41eef0c 100644 --- a/tools/perform/overhead.c +++ b/tools/perform/overhead.c @@ -181,7 +181,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc hsize_t hs_start[1]; /*hyperslab start offset*/ hsize_t hs_count[1] = {1}; /*hyperslab nelmts */ int fd = (-1); /*h5 file direct */ - int * had = NULL; /*for random filling */ + int *had = NULL; /*for random filling */ const char *sname = NULL; /*fill style nam */ int mdc_nelmts; /*num meta objs to cache*/ hsize_t i, k; diff --git a/tools/perform/perf.c b/tools/perform/perf.c index 30bda7b..aecc861 100644 --- a/tools/perform/perf.c +++ b/tools/perform/perf.c @@ -88,7 +88,7 @@ hid_t dataset; /* Dataset ID */ hsize_t opt_alignment = 1; hsize_t opt_threshold = 1; int opt_split_vfd = 0; -char * meta_ext, *raw_ext; /* holds the meta and raw file extension if */ +char *meta_ext, *raw_ext; /* holds the meta and raw file extension if */ /* opt_split_vfd is set */ /* DEFAULT VALUES FOR OPTIONS */ @@ -114,7 +114,7 @@ extern char *optarg; int main(int argc, char **argv) { - char * buf, *tmp, *buf2 = NULL, *tmp2 = NULL, *check; + char *buf, *tmp, *buf2 = NULL, *tmp2 = NULL, *check; int i, j, mynod = 0, nprocs = 1, my_correct = 1, correct, myerrno; double stim, etim; double write_tim = 0; diff --git a/tools/perform/pio_engine.c b/tools/perform/pio_engine.c index 65194b0..f090a53 100644 --- a/tools/perform/pio_engine.c +++ b/tools/perform/pio_engine.c @@ -120,7 +120,7 @@ typedef union _file_descr { } file_descr; /* local functions */ -static char * pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size); +static char *pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size); static herr_t do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nelmts, size_t buf_size, void *buffer); static herr_t do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nelmts, @@ -155,7 +155,7 @@ do_pio(parameters param) off_t snbytes; /*general dataset size */ /*for 1D, it is the actual dataset size */ /*for 2D, it is the size of a side of the dataset square */ - char * buffer = NULL; /*data buffer pointer */ + char *buffer = NULL; /*data buffer pointer */ size_t buf_size; /*general buffer size in bytes */ /*for 1D, it is the actual buffer size */ /*for 2D, it is the length of the buffer rectangle */ @@ -387,7 +387,7 @@ static char * pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size) { const char *prefix, *suffix = ""; - char * ptr, last = '\0'; + char *ptr, last = '\0'; size_t i, j; if (!base_name || !fullname || size < 1) @@ -1223,15 +1223,14 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby /* Interleaved access pattern */ else { /* Compute offset in file */ - mpi_offset = - mpi_file_offset + - (MPI_Offset)( - ((((size_t)nbytes_xfer / buf_size) * (size_t)pio_mpi_nprocs_g) / - (size_t)snbytes) * - (buf_size * (size_t)snbytes)) + - (MPI_Offset)( - (((size_t)nbytes_xfer / buf_size) * (size_t)pio_mpi_nprocs_g) % - (size_t)snbytes); + mpi_offset = mpi_file_offset + + (MPI_Offset)(((((size_t)nbytes_xfer / buf_size) * + (size_t)pio_mpi_nprocs_g) / + (size_t)snbytes) * + (buf_size * (size_t)snbytes)) + + (MPI_Offset)((((size_t)nbytes_xfer / buf_size) * + (size_t)pio_mpi_nprocs_g) % + (size_t)snbytes); /* Number of bytes to be transferred per I/O operation */ nbytes_xfer_advance = blk_size; @@ -2194,15 +2193,14 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt /* Interleaved access pattern */ else { /* Compute offset in file */ - mpi_offset = - mpi_file_offset + - (MPI_Offset)( - ((((size_t)nbytes_xfer / buf_size) * (size_t)pio_mpi_nprocs_g) / - (size_t)snbytes) * - (buf_size * (size_t)snbytes)) + - (MPI_Offset)( - (((size_t)nbytes_xfer / buf_size) * (size_t)pio_mpi_nprocs_g) % - (size_t)snbytes); + mpi_offset = mpi_file_offset + + (MPI_Offset)(((((size_t)nbytes_xfer / buf_size) * + (size_t)pio_mpi_nprocs_g) / + (size_t)snbytes) * + (buf_size * (size_t)snbytes)) + + (MPI_Offset)((((size_t)nbytes_xfer / buf_size) * + (size_t)pio_mpi_nprocs_g) % + (size_t)snbytes); /* Number of bytes to be transferred per I/O operation */ nbytes_xfer_advance = blk_size; diff --git a/tools/perform/pio_perf.c b/tools/perform/pio_perf.c index 333e209..e85d440 100644 --- a/tools/perform/pio_perf.c +++ b/tools/perform/pio_perf.c @@ -96,7 +96,7 @@ #endif /* FALSE */ /* global variables */ -FILE * output; /* output file */ +FILE *output; /* output file */ int comm_world_rank_g; /* my rank in MPI_COMM_RANK */ int comm_world_nprocs_g; /* num. of processes of MPI_COMM_WORLD */ MPI_Comm pio_comm_g; /* Communicator to run the PIO */ @@ -525,18 +525,18 @@ run_test(iotype iot, parameters parms, struct options *opts) register int i, ret_value = SUCCESS; int comm_size; off_t raw_size; - minmax * write_mpi_mm_table = NULL; - minmax * write_mm_table = NULL; - minmax * write_gross_mm_table = NULL; - minmax * write_raw_mm_table = NULL; - minmax * read_mpi_mm_table = NULL; - minmax * read_mm_table = NULL; - minmax * read_gross_mm_table = NULL; - minmax * read_raw_mm_table = NULL; - minmax * read_open_mm_table = NULL; - minmax * read_close_mm_table = NULL; - minmax * write_open_mm_table = NULL; - minmax * write_close_mm_table = NULL; + minmax *write_mpi_mm_table = NULL; + minmax *write_mm_table = NULL; + minmax *write_gross_mm_table = NULL; + minmax *write_raw_mm_table = NULL; + minmax *read_mpi_mm_table = NULL; + minmax *read_mm_table = NULL; + minmax *read_gross_mm_table = NULL; + minmax *read_raw_mm_table = NULL; + minmax *read_open_mm_table = NULL; + minmax *read_close_mm_table = NULL; + minmax *write_open_mm_table = NULL; + minmax *write_close_mm_table = NULL; minmax write_mpi_mm = {0.0, 0.0, 0.0, 0}; minmax write_mm = {0.0, 0.0, 0.0, 0}; minmax write_gross_mm = {0.0, 0.0, 0.0, 0}; diff --git a/tools/perform/pio_perf.h b/tools/perform/pio_perf.h index 24621da..88ea11c 100644 --- a/tools/perform/pio_perf.h +++ b/tools/perform/pio_perf.h @@ -67,7 +67,7 @@ typedef struct results_ { #define FAIL -1 #endif /* !FAIL */ -extern FILE * output; /* output file */ +extern FILE *output; /* output file */ extern io_time_t *timer_g; /* timer: global for stub functions */ extern int comm_world_rank_g; /* my rank in MPI_COMM_RANK */ extern int comm_world_nprocs_g; /* num. of processes of MPI_COMM_WORLD */ diff --git a/tools/perform/pio_standalone.c b/tools/perform/pio_standalone.c index c046d65..a80346a 100644 --- a/tools/perform/pio_standalone.c +++ b/tools/perform/pio_standalone.c @@ -197,7 +197,7 @@ h5_set_info_object(void) do { size_t len; - char * key_val, *endp, *namep; + char *key_val, *endp, *namep; if (*valp == ';') valp++; diff --git a/tools/perform/pio_standalone.h b/tools/perform/pio_standalone.h index f08cbd0..2985221 100644 --- a/tools/perform/pio_standalone.h +++ b/tools/perform/pio_standalone.h @@ -446,7 +446,7 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base); #else /* H5_HAVE_WIN32_API */ #if !defined strdup && !defined H5_HAVE_STRDUP -extern char * strdup(const char *s); +extern char *strdup(const char *s); #endif #define HDstrdup(S) strdup(S) diff --git a/tools/perform/sio_engine.c b/tools/perform/sio_engine.c index d42a450..c36e4a4 100644 --- a/tools/perform/sio_engine.c +++ b/tools/perform/sio_engine.c @@ -86,7 +86,7 @@ typedef union _file_descr { } file_descr; /* local functions */ -static char * sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size, +static char *sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size, parameters *param); static herr_t do_write(results *res, file_descr *fd, parameters *parms, void *buffer); static herr_t do_read(results *res, file_descr *fd, parameters *parms, void *buffer); @@ -109,7 +109,7 @@ static int cont_dim; /* lowest dimension for contigu static size_t cont_size; /* size of contiguous POSIX access */ static hid_t fapl; /* file access list */ static unsigned char *buf_p; /* buffer pointer */ -static const char * multi_letters = "msbrglo"; /* string for multi driver */ +static const char *multi_letters = "msbrglo"; /* string for multi driver */ /* HDF5 global variables */ static hsize_t h5count[MAX_DIMS]; /*selection count */ @@ -130,7 +130,7 @@ static hid_t h5dxpl = H5I_INVALID_HID; /* Dataset transfer property void do_sio(parameters param, results *res) { - char * buffer = NULL; /*data buffer pointer */ + char *buffer = NULL; /*data buffer pointer */ size_t buf_size[MAX_DIMS]; /* general buffer size in bytes */ file_descr fd; /* file handles */ iotype iot; /* API type */ @@ -289,7 +289,7 @@ static char * sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t size, parameters *param) { const char *prefix, *suffix = ""; - char * ptr, last = '\0'; + char *ptr, last = '\0'; size_t i, j; vfdtype vfd; vfd = param->vfd; @@ -768,7 +768,7 @@ done: static herr_t do_read(results *res, file_descr *fd, parameters *parms, void *buffer) { - char * buffer2 = NULL; /* Buffer for data verification */ + char *buffer2 = NULL; /* Buffer for data verification */ int ret_code = SUCCESS; char dname[64]; int i; diff --git a/tools/perform/sio_perf.c b/tools/perform/sio_perf.c index d7f13c6..90793f1 100644 --- a/tools/perform/sio_perf.c +++ b/tools/perform/sio_perf.c @@ -98,7 +98,7 @@ static const char *progname = "h5perf_serial"; * It seems that only the options that accept additional information * such as dataset size (-e) require the colon next to it. */ -static const char * s_opts = "a:A:B:c:Cd:D:e:F:ghi:Imno:p:P:r:stT:v:wx:X:"; +static const char *s_opts = "a:A:B:c:Cd:D:e:F:ghi:Imno:p:P:r:stT:v:wx:X:"; static struct long_options l_opts[] = {{"align", require_arg, 'a'}, {"alig", require_arg, 'a'}, {"ali", require_arg, 'a'}, @@ -439,14 +439,14 @@ run_test(iotype iot, parameters parms, struct options *opts) results res; register int i, ret_value = SUCCESS; off_t raw_size; - minmax * write_sys_mm_table = NULL; - minmax * write_mm_table = NULL; - minmax * write_gross_mm_table = NULL; - minmax * write_raw_mm_table = NULL; - minmax * read_sys_mm_table = NULL; - minmax * read_mm_table = NULL; - minmax * read_gross_mm_table = NULL; - minmax * read_raw_mm_table = NULL; + minmax *write_sys_mm_table = NULL; + minmax *write_mm_table = NULL; + minmax *write_gross_mm_table = NULL; + minmax *write_raw_mm_table = NULL; + minmax *read_sys_mm_table = NULL; + minmax *read_mm_table = NULL; + minmax *read_gross_mm_table = NULL; + minmax *read_raw_mm_table = NULL; minmax write_sys_mm = {0.0F, 0.0F, 0.0F, 0}; minmax write_mm = {0.0F, 0.0F, 0.0F, 0}; minmax write_gross_mm = {0.0F, 0.0F, 0.0F, 0}; @@ -1325,7 +1325,7 @@ static hsize_t parse_size_directive(const char *size) { hsize_t s; - char * endptr; + char *endptr; s = HDstrtoull(size, &endptr, 10); diff --git a/tools/perform/sio_perf.h b/tools/perform/sio_perf.h index 6242782..610ebc0 100644 --- a/tools/perform/sio_perf.h +++ b/tools/perform/sio_perf.h @@ -82,7 +82,7 @@ typedef struct results_ { #define FAIL -1 #endif /* !FAIL */ -extern FILE * output; /* output file */ +extern FILE *output; /* output file */ extern io_time_t *timer_g; /* timer: global for stub functions */ extern int sio_debug_level; /* The debug level: * 0 - Off diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h index 48d9ed4..289efb1 100644 --- a/tools/perform/sio_standalone.h +++ b/tools/perform/sio_standalone.h @@ -461,7 +461,7 @@ H5_DLL int64_t HDstrtoll(const char *s, const char **rest, int base); #else /* H5_HAVE_WIN32_API */ #if !defined strdup && !defined H5_HAVE_STRDUP -extern char * strdup(const char *s); +extern char *strdup(const char *s); #endif #define HDstrdup(S) strdup(S) diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c index 53a9678..a7b35f1 100644 --- a/tools/perform/zip_perf.c +++ b/tools/perform/zip_perf.c @@ -52,7 +52,7 @@ /* internal variables */ static const char *prog = NULL; static const char *option_prefix = NULL; -static char * filename = NULL; +static char *filename = NULL; static int compress_percent = 0; static int compress_level = Z_DEFAULT_COMPRESSION; static int output, random_test = FALSE; @@ -64,7 +64,7 @@ static void error(const char *fmt, ...); static void compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen); /* commandline options : long and short form */ -static const char * s_opts = "hB:b:c:p:rs:0123456789"; +static const char *s_opts = "hB:b:c:p:rs:0123456789"; static struct long_options l_opts[] = {{"help", no_arg, 'h'}, {"compressability", require_arg, 'c'}, {"compressabilit", require_arg, 'c'}, @@ -162,7 +162,7 @@ cleanup(void) static void write_file(Bytef *source, uLongf sourceLen) { - Bytef * d_ptr, *dest; + Bytef *d_ptr, *dest; uLongf d_len, destLen; struct timeval timer_start, timer_stop; @@ -354,7 +354,7 @@ static unsigned long parse_size_directive(const char *size) { unsigned long s; - char * endptr; + char *endptr; s = HDstrtoul(size, &endptr, 10); @@ -434,7 +434,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long uLongf src_len, total_len; struct timeval timer_start, timer_stop; double total_time; - Bytef * src; + Bytef *src; for (src_len = min_buf_size; src_len <= max_buf_size; src_len <<= 1) { register unsigned long i, iters; |