diff options
685 files changed, 6992 insertions, 6967 deletions
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 0343f4b..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 and java 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,java' - clangFormatVersion: 10 + 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 abdd069..a390a8b 100644 --- a/.github/workflows/clang-format-fix.yml +++ b/.github/workflows/clang-format-fix.yml @@ -10,11 +10,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run clang-format style check for C and Java programs. - uses: DoozyX/clang-format-lint-action@v0.11 + uses: DoozyX/clang-format-lint-action@v0.13 with: source: '.' extensions: 'c,h,cpp,hpp,java' - clangFormatVersion: 10 + 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 f9ec176..6ab7c62 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -70,7 +70,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 c9490ee..8fd2543 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -517,7 +517,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 8430f7a..104638e 100644 --- a/c++/src/H5DataSet.h +++ b/c++/src/H5DataSet.h @@ -78,20 +78,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 e22f74b..0607803 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -41,9 +41,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 daed073..67c033c 100644 --- a/c++/src/H5File.h +++ b/c++/src/H5File.h @@ -27,10 +27,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, @@ -77,9 +77,9 @@ class H5_DLLCPP H5File : public Group { static bool isHdf5(const H5std_string &name); // Determines if a file, specified by its name, can be accessed as HDF5 - static bool isAccessible(const char * name, + static bool isAccessible(const char *name, const FileAccPropList &access_plist = FileAccPropList::DEFAULT); - static bool isAccessible(const H5std_string & name, + static bool isAccessible(const H5std_string &name, const FileAccPropList &access_plist = FileAccPropList::DEFAULT); // Reopens this file. diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp index e128303..a203863 100644 --- a/c++/src/H5Location.cpp +++ b/c++/src/H5Location.cpp @@ -1817,7 +1817,7 @@ H5std_string H5Location::getLinkval(const char *name, size_t size) const { H5L_info2_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 0aec4d2..b08a252 100644 --- a/c++/src/H5Location.h +++ b/c++/src/H5Location.h @@ -108,11 +108,11 @@ class H5_DLLCPP H5Location : public IdComponent { // Creates a new dataset in this location. DataSet createDataSet(const char *name, const DataType &data_type, const DataSpace &data_space, const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT, - const DSetAccPropList & dapl = DSetAccPropList::DEFAULT, + const DSetAccPropList &dapl = DSetAccPropList::DEFAULT, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT) const; DataSet createDataSet(const H5std_string &name, const DataType &data_type, const DataSpace &data_space, const DSetCreatPropList &create_plist = DSetCreatPropList::DEFAULT, - const DSetAccPropList & dapl = DSetAccPropList::DEFAULT, + const DSetAccPropList &dapl = DSetAccPropList::DEFAULT, const LinkCreatPropList &lcpl = LinkCreatPropList::DEFAULT) const; // Deprecated to add LinkCreatPropList and DSetAccPropList - 1.10.3 @@ -124,12 +124,12 @@ class H5_DLLCPP H5Location : public IdComponent { // Opens an existing dataset at this location. // DSetAccPropList is added - 1.10.3 DataSet openDataSet(const char *name, const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const; - DataSet openDataSet(const H5std_string & name, + DataSet openDataSet(const H5std_string &name, const DSetAccPropList &dapl = DSetAccPropList::DEFAULT) const; - H5L_info2_t getLinkInfo(const char * link_name, + H5L_info2_t getLinkInfo(const char *link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; - H5L_info2_t getLinkInfo(const H5std_string & link_name, + H5L_info2_t getLinkInfo(const H5std_string &link_name, const LinkAccPropList &lapl = LinkAccPropList::DEFAULT) const; // Returns the value of a symbolic link. @@ -216,26 +216,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 Group &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 Group &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; // Creates a link of the specified type from new_name to current_name; // both names are interpreted relative to the specified location id. @@ -258,34 +258,34 @@ class H5_DLLCPP H5Location : public IdComponent { // Copies a link from a group to another. void copyLink(const char *src_name, const Group &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 Group &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 group. 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 group and moves to a new location. void moveLink(const char *src_name, const Group &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 Group &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 group. 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; // Renames an object at this location. // Deprecated due to inadequate functionality. diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h index 9e5a541..25ab4e8 100644 --- a/c++/src/H5Object.h +++ b/c++/src/H5Object.h @@ -50,16 +50,16 @@ typedef int (*visit_operator_t)(H5Object &obj, const H5std_string attr_name, con class UserData4Aiterate { public: attr_operator_t op; - void * opData; - H5Object * location; // Consider changing to H5Location + void *opData; + H5Object *location; // Consider changing to H5Location }; // User data for visit iteration class UserData4Visit { public: visit_operator_t op; - void * opData; - H5Object * obj; + void *opData; + H5Object *obj; }; class H5_DLLCPP H5Object : public H5Location { diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 432abb8..6d2753e 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -455,7 +455,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 0a1402c..42ef910 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -297,7 +297,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); @@ -1585,7 +1585,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 c27171b..b7355d2 100644 --- a/c++/test/tcompound.cpp +++ b/c++/test/tcompound.cpp @@ -89,13 +89,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"); @@ -202,13 +202,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"); @@ -317,13 +317,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"); @@ -440,8 +440,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 @@ -530,8 +530,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 d692a5b..aec911b 100644 --- a/c++/test/tdspl.cpp +++ b/c++/test/tdspl.cpp @@ -61,7 +61,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 size_t tran_len = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL)); - char * c_to_f_read = static_cast<char *>(HDmalloc(tran_len + 1)); + char *c_to_f_read = static_cast<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_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f), diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp index 57761ea..0ed5633 100644 --- a/c++/test/titerate.cpp +++ b/c++/test/titerate.cpp @@ -136,7 +136,7 @@ test_iter_group(FileAccPropList &fapl) { 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 */ iter_info info; /* Custom iteration information */ herr_t ret; /* Generic return value */ diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index 8c7f0cd..ebb457a 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -642,7 +642,7 @@ test_visit(hid_t fapl_id, hbool_t new_format) dims[1] = 2; cdims[0] = 2; cdims[1] = 2; - 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++/test/ttypes.cpp b/c++/test/ttypes.cpp index db32cc0..c488f0e 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -644,7 +644,7 @@ test_named() { static hsize_t ds_size[2] = {10, 20}; unsigned attr_data[10][20]; - DataType * ds_type = NULL; + DataType *ds_type = NULL; SUBTEST("Named datatypes"); try { @@ -974,7 +974,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(static_cast<long>(int_sign), static_cast<long>(H5T_SGN_NONE), "DataType::decode", __LINE__, __FILE__); diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index 6ace763..2da487a 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -285,7 +285,7 @@ test_vlstring_array_dataset() // Create and write another dataset. DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space)); - char * wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char))); + char *wdata2 = static_cast<char *>(HDcalloc(65534, sizeof(char))); HDmemset(wdata2, 'A', 65533); dataset2.write(&wdata2, vlst); @@ -334,7 +334,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"); @@ -396,7 +396,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); @@ -627,7 +627,7 @@ test_compact_vlstring() * *------------------------------------------------------------------------- */ -static char * string_att_write = NULL; +static char *string_att_write = NULL; const H5std_string ATTRSTR_NAME("String_attr"); const H5std_string ATTRSTR_DATA("String Attribute"); @@ -860,7 +860,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/H5DO_examples.c b/doxygen/examples/H5DO_examples.c index 7a33c6b..7f4096e 100644 --- a/doxygen/examples/H5DO_examples.c +++ b/doxygen/examples/H5DO_examples.c @@ -9,7 +9,7 @@ : size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int); const Bytef *z_src = (const Bytef *)(direct_buf); - 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; int aggression = 9; /* Compression aggression setting */ @@ -103,14 +103,14 @@ size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int); : size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int); const Bytef *z_src = (const Bytef *)(direct_buf); - 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; int aggression = 9; /* Compression aggression setting */ uint32_t filter_mask = 0; size_t buf_size = CHUNK_NX * CHUNK_NY * sizeof(int); /* For H5DOread_chunk() */ - void * readbuf = NULL; /* Buffer for reading data */ + void *readbuf = NULL; /* Buffer for reading data */ const Bytef *pt_readbuf; /* Point to the buffer for data read */ hsize_t read_chunk_nbytes; /* Size of chunk on disk */ int read_dst_buf[CHUNK_NX][CHUNK_NY]; /* Buffer to hold un-compressed data */ diff --git a/doxygen/examples/H5D_examples.c b/doxygen/examples/H5D_examples.c index 4e54c1d..7af3cc4 100644 --- a/doxygen/examples/H5D_examples.c +++ b/doxygen/examples/H5D_examples.c @@ -20,7 +20,7 @@ herr_t H5Ovisit_cb(hid_t obj, const char *name, const H5O_info2_t *info, void *op_data) { herr_t retval = 0; - char * base_path = (char *)op_data; + char *base_path = (char *)op_data; if (info->type == H5O_TYPE_DATASET) // current object is a dataset { 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 97be7f5..75041f4 100644 --- a/examples/h5_attribute.c +++ b/examples/h5_attribute.c @@ -192,7 +192,7 @@ main(void) ret = H5Oget_info3(dataset, &oinfo, H5O_INFO_NUM_ATTRS); 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) { @@ -232,7 +232,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 */ (void)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 6eca266..11b0ee6 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 40acafe..d5aa675 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/examples/h5_vds-eiger.c b/examples/h5_vds-eiger.c index 281db3c..9608319 100644 --- a/examples/h5_vds-eiger.c +++ b/examples/h5_vds-eiger.c @@ -48,8 +48,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); diff --git a/examples/h5_vds-exc.c b/examples/h5_vds-exc.c index 00b8c6b..e03ffd8 100644 --- a/examples/h5_vds-exc.c +++ b/examples/h5_vds-exc.c @@ -57,8 +57,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); diff --git a/examples/h5_vds-exclim.c b/examples/h5_vds-exclim.c index c90941d..f7b3fdd 100644 --- a/examples/h5_vds-exclim.c +++ b/examples/h5_vds-exclim.c @@ -56,8 +56,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); diff --git a/examples/h5_vds-percival-unlim-maxmin.c b/examples/h5_vds-percival-unlim-maxmin.c index f459c20..507f088 100644 --- a/examples/h5_vds-percival-unlim-maxmin.c +++ b/examples/h5_vds-percival-unlim-maxmin.c @@ -61,8 +61,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; int wdata[DIM0_1 * DIM1 * DIM2]; /* diff --git a/examples/h5_vds-percival-unlim.c b/examples/h5_vds-percival-unlim.c index a4c853d..badead3 100644 --- a/examples/h5_vds-percival-unlim.c +++ b/examples/h5_vds-percival-unlim.c @@ -58,8 +58,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; int wdata[DIM0_1 * DIM1 * DIM2]; int rdata[80][10][10]; int a_rdata[20][10][10]; diff --git a/examples/h5_vds-percival.c b/examples/h5_vds-percival.c index 12397be..9507931 100644 --- a/examples/h5_vds-percival.c +++ b/examples/h5_vds-percival.c @@ -62,8 +62,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; int wdata[DIM0 * DIM1 * DIM2]; /* @@ -84,7 +84,7 @@ main(void) file = H5Fcreate(SRC_FILE[i], H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); src_space = H5Screate_simple(RANK, dims, NULL); dset = H5Dcreate2(file, SRC_DATASET[i], H5T_NATIVE_INT, src_space, H5P_DEFAULT, H5P_DEFAULT, - H5P_DEFAULT); + H5P_DEFAULT); status = H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata); status = H5Sclose(src_space); status = H5Dclose(dset); diff --git a/examples/h5_vds-simpleIO.c b/examples/h5_vds-simpleIO.c index 6472766..cb69645 100644 --- a/examples/h5_vds-simpleIO.c +++ b/examples/h5_vds-simpleIO.c @@ -50,8 +50,8 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; /* * Initialize data. */ diff --git a/examples/h5_vds.c b/examples/h5_vds.c index e036204..48c6d7d 100644 --- a/examples/h5_vds.c +++ b/examples/h5_vds.c @@ -65,10 +65,10 @@ main(void) H5D_layout_t layout; /* Storage layout */ size_t num_map; /* Number of mappings */ ssize_t len; /* Length of the string; also a return value */ - char * filename; - char * dsetname; + char *filename; + char *dsetname; hsize_t nblocks; - hsize_t * buf; /* Buffer to hold hyperslab coordinates */ + hsize_t *buf; /* Buffer to hold hyperslab coordinates */ /* * Create source files and datasets. This step is optional. diff --git a/examples/ph5_filtered_writes.c b/examples/ph5_filtered_writes.c index 0f399dd..f5c1169 100644 --- a/examples/ph5_filtered_writes.c +++ b/examples/ph5_filtered_writes.c @@ -361,7 +361,7 @@ main(int argc, char **argv) hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; - char * par_prefix = NULL; + char *par_prefix = NULL; char filename[PATH_MAX]; MPI_Init(&argc, &argv); diff --git a/examples/ph5_filtered_writes_no_sel.c b/examples/ph5_filtered_writes_no_sel.c index 2e29838..05367d7 100644 --- a/examples/ph5_filtered_writes_no_sel.c +++ b/examples/ph5_filtered_writes_no_sel.c @@ -254,7 +254,7 @@ main(int argc, char **argv) hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; - char * par_prefix = NULL; + char *par_prefix = NULL; char filename[PATH_MAX]; MPI_Init(&argc, &argv); diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c index db1c040..64a972e 100644 --- a/fortran/src/H5Af.c +++ b/fortran/src/H5Af.c @@ -178,7 +178,7 @@ h5aget_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; @@ -465,10 +465,10 @@ h5aget_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 */ /* @@ -668,7 +668,7 @@ h5aget_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 */ @@ -734,8 +734,8 @@ h5aget_info_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fc 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 a780683..ba3e5d4 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -532,7 +532,7 @@ h5dvlen_get_max_len_c(hid_t_f *dset_id, hid_t_f *type_id, hid_t_f *space_id, siz 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; @@ -605,7 +605,7 @@ h5dwrite_vl_integer_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space int_f *tmp; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hsize_t num_elem; @@ -681,7 +681,7 @@ h5dread_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; @@ -753,10 +753,10 @@ h5dwrite_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; @@ -844,10 +844,10 @@ h5dread_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i 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; @@ -935,7 +935,7 @@ h5dwrite_vl_real_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id real_f *tmp; size_t max_len; - hvl_t * c_buf; + hvl_t *c_buf; hsize_t i; hsize_t num_elem; @@ -1011,7 +1011,7 @@ h5dread_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 ec38fd7..13bd5c8 100644 --- a/fortran/src/H5Ef.c +++ b/fortran/src/H5Ef.c @@ -160,7 +160,7 @@ int_f h5eget_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 h5eget_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 339f8b7..2cb8654 100644 --- a/fortran/src/H5Ff.c +++ b/fortran/src/H5Ff.c @@ -48,7 +48,7 @@ h5fcreate_c(_fcd name, int_f *namelen, int_f *access_flags, hid_t_f *crt_prp, hi /******/ { 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 @@ h5fmount_c(hid_t_f *loc_id, _fcd dsetname, int_f *namelen, hid_t_f *file_id, hid /******/ { 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 @@ h5funmount_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 @@ h5fopen_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; @@ -506,7 +506,7 @@ h5fget_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; @@ -578,7 +578,7 @@ int_f h5fget_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 0201761..7bf4529 100644 --- a/fortran/src/H5Gf.c +++ b/fortran/src/H5Gf.c @@ -173,9 +173,9 @@ h5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx, _f { H5O_info2_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 h5gn_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 h5gget_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 @@ h5gget_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 @@ h5gget_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 c51f3ec..2305550 100644 --- a/fortran/src/H5If.c +++ b/fortran/src/H5If.c @@ -89,7 +89,7 @@ h5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_size 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 b71ab45..461e39d 100644 --- a/fortran/src/H5Lf.c +++ b/fortran/src/H5Lf.c @@ -342,7 +342,7 @@ h5ldelete_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, in 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 */ @@ -455,7 +455,7 @@ h5lget_info_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, int_ int_f *corder_valid, int_f *link_type, H5O_token_t *token, size_t_f *val_size, 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_info2_t link_buff; @@ -524,7 +524,7 @@ h5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, int_f *cset, H5O_token_t *token, 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 */ @@ -698,8 +698,8 @@ h5lget_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 */ @@ -1039,7 +1039,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 269e37e..6a3c530 100644 --- a/fortran/src/H5Of.c +++ b/fortran/src/H5Of.c @@ -308,7 +308,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, int_f *fields) /******/ { - 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_info2_t Oinfo; @@ -358,7 +358,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, int_f *fields) /******/ { - 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_info2_t Oinfo; H5_index_t c_index_field; @@ -512,7 +512,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 @@ -758,7 +758,7 @@ h5oopen_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; @@ -807,7 +807,7 @@ int_f h5oget_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; @@ -864,8 +864,8 @@ h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, _fcd c 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 ab09ab9..876457f 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -1438,8 +1438,8 @@ h5pset_fapl_split_c(hid_t_f *prp_id, int_f *meta_len, _fcd meta_ext, hid_t_f *me 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) @@ -1817,7 +1817,7 @@ h5pget_filter_c(hid_t_f *prp_id, int_f *filter_number, int_f *flags, size_t_f *c 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; @@ -1885,7 +1885,7 @@ h5pset_external_c(hid_t_f *prp_id, _fcd name, int_f *namelen, off_t_f *offset, h 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; @@ -1982,7 +1982,7 @@ h5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f *name_size, _fcd name, o 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; @@ -2859,7 +2859,7 @@ h5pexist_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); @@ -2941,7 +2941,7 @@ h5pget_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); @@ -3537,11 +3537,11 @@ h5pset_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd m 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; @@ -3670,11 +3670,11 @@ h5pget_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd m 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; @@ -3843,7 +3843,7 @@ h5pget_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; @@ -4628,7 +4628,7 @@ int_f h5pget_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; @@ -5370,7 +5370,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 88aa158..1814020 100644 --- a/fortran/src/H5Rf.c +++ b/fortran/src/H5Rf.c @@ -48,7 +48,7 @@ int_f h5rcreate_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; @@ -311,7 +311,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 ea42a31..3c6832d 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -1250,7 +1250,7 @@ h5sselect_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 f3016f1..d9f75d9 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1297,7 +1297,7 @@ h5tget_member_name_c(hid_t_f *type_id, int_f *idx, _fcd member_name, int_f *name 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 @@ h5tinsert_c(hid_t_f *type_id, _fcd name, int_f *namelen, size_t_f *offset, hid_t /******/ { 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 @@ h5tenum_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 @@ h5tenum_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 @@ h5tenum_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 @@ h5tset_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 7b7d484..31e5425 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -599,7 +599,7 @@ error: *------------------------------------------------------------------------- */ #pragma pack() // default alignment -const char * ABHI_PT("/abhiTest"); +const char *ABHI_PT("/abhiTest"); const hsize_t NUM_PACKETS = 5; const int STRING_LENGTH = 19; // including terminating NULL int diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c index be9fc4b..52e8228 100644 --- a/hl/examples/ex_image2.c +++ b/hl/examples/ex_image2.c @@ -118,8 +118,8 @@ out: static int read_data(const char *fname, /*IN*/ - hsize_t * width, /*OUT*/ - hsize_t * height /*OUT*/) + hsize_t *width, /*OUT*/ + hsize_t *height /*OUT*/) { int i, n; int color_planes; diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c index 3294ef4..d23a975 100644 --- a/hl/examples/ex_table_01.c +++ b/hl/examples/ex_table_01.c @@ -61,7 +61,7 @@ main(void) hid_t string_type; hid_t file_id; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; int i; diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c index fb2cad6..7d1482e 100644 --- a/hl/examples/ex_table_02.c +++ b/hl/examples/ex_table_02.c @@ -61,7 +61,7 @@ main(void) hid_t string_type; hid_t file_id; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; int i; diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c index 1063172..831dcf5 100644 --- a/hl/examples/ex_table_08.c +++ b/hl/examples/ex_table_08.c @@ -63,7 +63,7 @@ main(void) hid_t file_id; hsize_t chunk_size = 10; int compress = 0; - int * fill_data = NULL; + int *fill_data = NULL; hsize_t start; /* Record to start reading */ hsize_t nrecords; /* Number of records to insert/delete */ hsize_t nfields_out; diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c index c974e84..b38ba16 100644 --- a/hl/examples/ex_table_10.c +++ b/hl/examples/ex_table_10.c @@ -60,7 +60,7 @@ main(void) hid_t file_id; hsize_t chunk_size = 10; int compress = 0; - int * fill_data = NULL; + int *fill_data = NULL; hsize_t nfields_out; hsize_t nrecords_out; int i; diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c index a47b1c2..24f060a 100644 --- a/hl/fortran/src/H5DSfc.c +++ b/hl/fortran/src/H5DSfc.c @@ -256,7 +256,7 @@ done: int_f h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size) { - char * c_label = NULL; + char *c_label = NULL; ssize_t size_c = -1; int_f ret_value = 0; @@ -306,7 +306,7 @@ done: int_f h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size) { - char * c_scale_name = NULL; + char *c_scale_name = NULL; ssize_t size_c = -1; int_f ret_value = 0; diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c index b8897cc..339f08a 100644 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -43,7 +43,7 @@ h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f * int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t w = (hsize_t)*width; hsize_t h = (hsize_t)*height; @@ -96,7 +96,7 @@ h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf) { int ret_value = -1; herr_t ret; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -148,8 +148,8 @@ h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f * int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_il = NULL; + char *c_name = NULL; + char *c_il = NULL; hsize_t w = (hsize_t)*width; hsize_t h = (hsize_t)*height; @@ -211,12 +211,12 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t c_width; hsize_t c_height; hsize_t c_planes; hssize_t c_npals; - char * c_buf = NULL; /* buffer to hold C string */ + char *c_buf = NULL; /* buffer to hold C string */ /* * convert FORTRAN name to C name @@ -285,7 +285,7 @@ int_f h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; herr_t ret; /* @@ -330,7 +330,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) int_f h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dims, void *buf) { - char * c_name = NULL; + char *c_name = NULL; hsize_t c_dims[H5S_MAX_RANK]; int i; int rank = 2; @@ -383,8 +383,8 @@ h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_namepal = NULL; + char *c_name = NULL; + char *c_namepal = NULL; /* * convert FORTRAN name to C name @@ -443,8 +443,8 @@ h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *il int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_namepal = NULL; + char *c_name = NULL; + char *c_namepal = NULL; /* * convert FORTRAN name to C name @@ -503,7 +503,7 @@ h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *np int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hssize_t c_npals; /* @@ -559,7 +559,7 @@ h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; hsize_t c_dims[2]; int i; @@ -618,7 +618,7 @@ h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_numb int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -669,7 +669,7 @@ int_f h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name; + char *c_name; herr_t ret; /* diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index 8847c01..499a166 100644 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -169,8 +169,8 @@ int_f h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size void *fill_data, int_f *compress, size_t_f *char_len_field_names, /* field_names lengths */ size_t_f *max_char_size_field_names, /* char len of fields */ - char * field_names, /* field_names */ - void * data); + char *field_names, /* field_names */ + void *data); HDF5_HL_F90CSTUBDLL int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 4cb9265..eed2c36 100644 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -42,7 +42,7 @@ h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, h { int ret_value = -1; herr_t ret; - char * c_name = NULL; + char *c_name = NULL; hsize_t *c_dims = NULL; int i; @@ -107,7 +107,7 @@ h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_ herr_t ret; hid_t c_loc_id; hid_t c_type_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -161,8 +161,8 @@ h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_ int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_buf = NULL; /* * convert FORTRAN name to C name @@ -221,7 +221,7 @@ h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *b int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; /* * convert FORTRAN name to C name @@ -275,9 +275,9 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f int ret_value = -1; herr_t ret = SUCCEED; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_attrname = NULL; + char *c_buf = NULL; size_t c_size; /* @@ -375,8 +375,8 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f int ret_value = -1; herr_t ret = SUCCEED; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; /* * convert FORTRAN name to C name @@ -456,9 +456,9 @@ h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si { int ret_value = -1; herr_t ret; - char * c_name = NULL; - char * c_attrname = NULL; - char * c_buf = NULL; + char *c_name = NULL; + char *c_attrname = NULL; + char *c_buf = NULL; /* * Convert FORTRAN name to C name @@ -526,7 +526,7 @@ h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *ra int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; int c_rank; /* @@ -579,7 +579,7 @@ int_f h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name) { hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; herr_t ret; /* @@ -628,7 +628,7 @@ h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; + char *c_name = NULL; H5T_class_t c_classtype; size_t c_type_size; hsize_t c_dims[32]; @@ -701,8 +701,8 @@ h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, siz int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; int c_rank; /* @@ -764,8 +764,8 @@ h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f int ret_value = -1; herr_t ret; hid_t c_loc_id; - char * c_name = NULL; - char * c_attrname = NULL; + char *c_name = NULL; + char *c_attrname = NULL; H5T_class_t c_classtype; size_t c_type_size; hsize_t c_dims[32]; @@ -841,7 +841,7 @@ int_f h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c) { htri_t ret = -1; - char * c_path = NULL; + char *c_path = NULL; hbool_t check_object_valid; /* diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c index 91c420b..0997c68 100644 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -40,17 +40,17 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name hid_t_f *field_types, hsize_t_f *chunk_size, int_f *compress, size_t_f *char_len_field_names, /* field_names lengths */ size_t_f *max_char_size_field_names, /* char len of fields */ - char * field_names) /* field_names */ + char *field_names) /* field_names */ { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; hsize_t num_elem; hsize_t i; hsize_t c_nfields = (hsize_t)*nfields; size_t *c_field_offset = NULL; - hid_t * c_field_types = NULL; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + hid_t *c_field_types = NULL; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; int_f ret_value = 0; num_elem = (hsize_t)*nfields; @@ -147,15 +147,15 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f * size_t_f *max_char_size_field_names, /* char len of fields */ char *field_names, void *data) /* field_names */ { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; hsize_t num_elem; hsize_t i; hsize_t c_nfields = (hsize_t)*nfields; size_t *c_field_offset = NULL; - hid_t * c_field_types = NULL; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + hid_t *c_field_types = NULL; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; int_f ret_value = 0; num_elem = (hsize_t)*nfields; @@ -248,7 +248,7 @@ int_f h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfields, size_t_f *dst_size, size_t_f *dst_offset, size_t_f *dst_sizes, void *dst_buf) { - char * c_name = NULL; + char *c_name = NULL; size_t *c_dst_offset = NULL; size_t *c_dst_sizes = NULL; hsize_t c_nfields = (hsize_t)*nfields; @@ -308,8 +308,8 @@ int_f h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; @@ -356,8 +356,8 @@ int_f h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; - char * c_name1 = NULL; + char *c_name = NULL; + char *c_name1 = NULL; size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; @@ -404,7 +404,7 @@ int_f h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; + char *c_name = NULL; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; @@ -448,7 +448,7 @@ int_f h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, void *buf) { - char * c_name = NULL; + char *c_name = NULL; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; @@ -583,7 +583,7 @@ done: int_f h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords) { - char * c_name = NULL; + char *c_name = NULL; hsize_t c_nfields; hsize_t c_nrecords; int_f ret_value = 0; @@ -634,14 +634,14 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n size_t_f *maxlen_out) { - char * c_name = NULL; + char *c_name = NULL; hsize_t num_elem; hsize_t c_nfields = *nfields; size_t *c_field_sizes = NULL; size_t *c_field_offsets = NULL; size_t c_type_size; - char ** c_field_names = NULL; - char * tmp = NULL, *tmp_p; + char **c_field_names = NULL; + char *tmp = NULL, *tmp_p; hsize_t i; int_f ret_value = 0; size_t c_lenmax; diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c index 1703669..d58957f 100644 --- a/hl/src/H5DO.c +++ b/hl/src/H5DO.c @@ -118,9 +118,9 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, hid_t hsize_t stride[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements to move when selecting */ hsize_t block[H5S_MAX_RANK]; /* H5Sselect_hyperslab: # of elements in a block */ - hsize_t * boundary = NULL; /* Boundary set in append flush property */ + hsize_t *boundary = NULL; /* Boundary set in append flush property */ H5D_append_cb_t append_cb; /* Callback function set in append flush property */ - void * udata; /* User data set in append flush property */ + void *udata; /* User data set in append flush property */ hbool_t hit = FALSE; /* Boundary is hit or not */ hsize_t k; /* Local index variable */ unsigned u; /* Local index variable */ diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index d55512f..91f0e0c 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -164,7 +164,7 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx) H5R_ref_t nref_j; hbool_t is_new_ref; - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ H5O_info2_t oi1, oi2; H5I_type_t it1, it2; @@ -740,14 +740,14 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx) hid_t ntid = H5I_INVALID_HID; /* attribute native type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - nds_list_t * ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - nds_list_t * ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ - ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - ds_list_t * dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ + nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + nds_list_t *ndsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf_w = NULL; /* array of attribute data in the DS pointing to the dataset to write*/ hsize_t dims[1]; /* dimension of the "REFERENCE_LIST" array */ H5R_ref_t nref; hobj_ref_t ref; /* reference to the DS */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ int i; size_t j; hssize_t ii; @@ -1237,10 +1237,10 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx) hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ nds_list_t *ndsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ - ds_list_t * dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ + ds_list_t *dsbuf = NULL; /* array of attribute data in the DS pointing to the dataset */ H5R_ref_t nref; /* reference to the DS */ hobj_ref_t ref; /* reference to the DS */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */ hid_t did_i; /* dataset ID in REFERENCE_LIST */ H5O_info2_t oi1, oi2, oi3, oi4; @@ -1605,7 +1605,7 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visi hid_t sid; /* space ID */ hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ herr_t ret_value = 0; int j_idx; @@ -1796,7 +1796,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; @@ -1995,7 +1995,7 @@ H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - char ** buf = NULL; /* buffer to store in the attribute */ + char **buf = NULL; /* buffer to store in the attribute */ H5I_type_t it; /* ID type */ size_t nbytes = 0; size_t copy_len; @@ -2145,7 +2145,7 @@ H5DSget_scale_name(hid_t did, char *name, size_t size) size_t nbytes; size_t copy_len; htri_t has_name; - char * buf = NULL; + char *buf = NULL; /*------------------------------------------------------------------------- * parameter checking @@ -2259,7 +2259,7 @@ H5DSis_scale(hid_t did) htri_t attr_class; /* has the "CLASS" attribute */ htri_t is_ds = -1; /* set to "not a dimension scale" */ H5I_type_t it; /* type of identifier */ - char * buf = NULL; /* buffer to read name of attribute */ + char *buf = NULL; /* buffer to read name of attribute */ size_t string_size; /* size of storage for the attribute */ H5T_class_t type_class; H5T_str_t strpad; @@ -2372,7 +2372,7 @@ H5DSget_num_scales(hid_t did, unsigned int idx) hid_t tid = H5I_INVALID_HID; /* attribute type ID */ hid_t aid = H5I_INVALID_HID; /* attribute ID */ int rank; /* rank of dataset */ - hvl_t * buf = NULL; /* VL buffer to store in the attribute */ + hvl_t *buf = NULL; /* VL buffer to store in the attribute */ H5I_type_t it; /* ID type */ int nscales; @@ -2484,7 +2484,7 @@ H5DS_is_reserved(hid_t did, hbool_t *is_reserved) htri_t has_class; hid_t tid = H5I_INVALID_HID; hid_t aid = H5I_INVALID_HID; - char * buf = NULL; /* Name of attribute */ + char *buf = NULL; /* Name of attribute */ size_t string_size; /* Size of storage for attribute */ /* Try to find the attribute "CLASS" on the dataset */ diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 75f2e28..390f222 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -1064,7 +1064,7 @@ H5IMis_image(hid_t loc_id, const char *dset_name) htri_t 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; @@ -1165,7 +1165,7 @@ H5IMis_palette(hid_t loc_id, const char *dset_name) htri_t has_class; hid_t atid; hid_t aid = -1; - char * attr_data; /* Name of attribute */ + char *attr_data; /* Name of attribute */ hsize_t storage_size; /* Size of storage for attribute */ herr_t ret; diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c index 2368127..0cbf65d 100644 --- a/hl/src/H5LD.c +++ b/hl/src/H5LD.c @@ -157,7 +157,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) { int nfields; /* The # of comma-separated fields in "fields" */ hbool_t end_of_fields = FALSE; /* end of "fields" */ - char * fields_ptr; /* Pointer to "fields" */ + char *fields_ptr; /* Pointer to "fields" */ int ret_value = FAIL; /* Return value */ HDassert(listv); @@ -169,7 +169,7 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) /* Process till end of "fields" */ while (!end_of_fields) { H5LD_memb_t *memb = NULL; /* Pointer to structure for storing a field's info */ - char * cur; /* Pointer to a member in a field */ + char *cur; /* Pointer to a member in a field */ size_t len; /* Estimated # of members in a field */ hbool_t gotcomma = FALSE; /* A comma encountered */ hbool_t gotmember = FALSE; /* Getting member in a field */ @@ -335,7 +335,7 @@ H5LD_get_dset_type_size(hid_t did, const char *fields) hid_t dset_tid = -1; /* Dataset's type identifier */ hid_t tid = -1; /* Native Type identifier */ H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */ - char * dup_fields = NULL; /* A copy of "fields" */ + char *dup_fields = NULL; /* A copy of "fields" */ size_t ret_value = 0; /* Return value */ /* Get the datatype of the dataset */ @@ -421,8 +421,8 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims hsize_t start[H5S_MAX_RANK]; /* Starting offset */ hsize_t count[H5S_MAX_RANK]; /* ??offset */ H5LD_memb_t **listv = NULL; /* Vector for storing information in "fields" */ - char * dup_fields = NULL; /* A copy of "fields" */ - char * sav_buf = NULL; /* Saved pointer temporary buffer */ + char *dup_fields = NULL; /* A copy of "fields" */ + char *sav_buf = NULL; /* Saved pointer temporary buffer */ unsigned ctr; /* Counter for # of curr_dims > prev_dims */ int ndims; /* Number of dimensions for the dataset */ int i; /* Local index variable */ @@ -494,7 +494,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims } /* end if */ else { /* "fields" is specified */ unsigned char *buf_p = (unsigned char *)buf; /* Pointer to the destination buffer */ - char * tmp_buf; /* Temporary buffer for data read */ + char *tmp_buf; /* Temporary buffer for data read */ size_t tot_tsize; /* Total datatype size */ size_t len; /* Estimate the number of comma-separated fields in "fields" */ diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 78cc301..54bb9c4 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)) @@ -2196,7 +2196,7 @@ out: static char * print_enum(hid_t type, char *str, size_t *str_len, hbool_t no_ubuf, size_t indt) { - char ** name = NULL; /*member names */ + char **name = NULL; /*member names */ unsigned char *value = NULL; /*value array */ int nmembs; /*number of members */ char tmp_str[TMP_LEN]; @@ -2332,7 +2332,7 @@ herr_t H5LTdtype_to_text(hid_t dtype, char *str, H5LT_lang_t lang_type, size_t *len) { size_t str_len = INCREMENT; - char * text_str = NULL; + char *text_str = NULL; herr_t ret = SUCCEED; if (lang_type <= H5LT_LANG_ERR || lang_type >= H5LT_NO_LANG) @@ -2723,7 +2723,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"); @@ -2770,7 +2770,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"); @@ -2813,7 +2813,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; @@ -2871,12 +2871,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) @@ -3575,9 +3575,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/H5LTprivate.h b/hl/src/H5LTprivate.h index e5c4e4e..4e9a25c 100644 --- a/hl/src/H5LTprivate.h +++ b/hl/src/H5LTprivate.h @@ -24,7 +24,7 @@ H5_HLDLL herr_t H5LT_get_attribute_disk(hid_t obj_id, const char *attr_name, voi H5_HLDLL herr_t H5LT_set_attribute_numerical(hid_t loc_id, const char *obj_name, const char *attr_name, size_t size, hid_t type_id, const void *data); H5_HLDLL herr_t H5LT_set_attribute_string(hid_t dset_id, const char *name, const char *buf); -H5_HLDLL char * H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen, +H5_HLDLL char *H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *slen, hbool_t no_user_buf); H5_HLDLL hid_t H5LTyyparse(void); diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c index f5fb99f..5e453e4 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -858,7 +858,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 eda3a35..7c8df6c 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -66,7 +66,7 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi hsize_t dims_chunk[1]; hsize_t maxdims[1] = {H5S_UNLIMITED}; char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; hsize_t i; herr_t ret_val = -1; @@ -437,7 +437,7 @@ H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_nam hssize_t i, j; hsize_t count[1]; hsize_t offset[1]; - char * member_name = NULL; + char *member_name = NULL; size_t size_native; herr_t ret_val = -1; @@ -595,7 +595,7 @@ H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, con hsize_t offset[1]; hsize_t i; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; herr_t ret_val = -1; /* check the arguments */ @@ -899,7 +899,7 @@ H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_name hsize_t offset[1]; hsize_t mem_size[1]; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; hssize_t i, j; herr_t ret_val = -1; @@ -1056,7 +1056,7 @@ H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, cons hsize_t mem_size[1]; hsize_t i; size_t size_native; - char * member_name = NULL; + char *member_name = NULL; herr_t ret_val = -1; /* check the arguments */ @@ -1212,8 +1212,8 @@ H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nr hsize_t mem_size[1]; hsize_t dims[1]; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; unsigned char *tmp_buf = NULL; herr_t ret_val = -1; @@ -1524,8 +1524,8 @@ H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize hsize_t ntotal_records; size_t type_size1; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; unsigned char *tmp_buf = NULL; herr_t ret_val = -1; @@ -1672,8 +1672,8 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c size_t type_size; size_t member_offset; size_t src_size; - size_t * src_offset = NULL; - size_t * src_sizes = NULL; + size_t *src_offset = NULL; + size_t *src_sizes = NULL; char attr_name[255]; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; @@ -2033,7 +2033,7 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi hsize_t i; char table_title[255]; char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; hbool_t inserted; @@ -2446,7 +2446,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name) hsize_t i; char attr_name[255]; char table_title[255]; - char * member_name = NULL; + char *member_name = NULL; unsigned char *tmp_buf = NULL; unsigned char *tmp_fill_buf = NULL; htri_t has_fill = FALSE; @@ -3207,7 +3207,7 @@ H5TB_attach_attributes(const char *table_title, hid_t loc_id, const char *dset_n hid_t tid) { char attr_name[255]; - char * member_name = NULL; + char *member_name = NULL; hsize_t i; herr_t ret_val = -1; @@ -3272,7 +3272,7 @@ H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const si hid_t nmtype_id = H5I_INVALID_HID; size_t size_native; hsize_t nfields = 0; - char ** fnames = NULL; + char **fnames = NULL; unsigned i; hid_t ret_val = -1; diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c index d7a9f44..d6c6a3d 100644 --- a/hl/test/gen_test_ds.c +++ b/hl/test/gen_test_ds.c @@ -256,7 +256,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename herr_t ret_value = FAIL; hid_t dsid = -1; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if (H5DSis_attached(did, dsid, idx) == 1) { diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c index cc716aa..bdbd4d4 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -1171,7 +1171,7 @@ test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename herr_t ret_value = FAIL; hid_t dsid = -1; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; if ((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if (H5DSis_attached(did, dsid, idx) == 1) { @@ -1204,7 +1204,7 @@ test_detachscales(void) int rank1 = 1; int rank3 = 3; hsize_t dims[] = {1, 2, 3}; /*some bogus numbers, not important for the test*/ - int * buf = NULL; + int *buf = NULL; char dname[16]; int i; @@ -2358,8 +2358,8 @@ test_simple(void) int s22_wbuf[DIM2_SIZE] = {5, 10, 50, 300}; char dim0_label[16]; char dim1_label[16]; - char * dim0_labeld; - char * dim1_labeld; + char *dim0_labeld; + char *dim1_labeld; char dim0_labels[3]; char dim1_labels[3]; ssize_t dim0_label_size; @@ -2368,7 +2368,7 @@ test_simple(void) int scale_idx; int nscales; ssize_t name_len; - char * name_out = NULL; + char *name_out = NULL; char snames[3]; int i, j; @@ -3602,10 +3602,10 @@ read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data) hid_t tid = -1; /* file type ID */ hid_t mtid = -1; /* memory type ID */ hssize_t nelmts; /* number of data elements */ - char * buf = NULL; /* data buffer */ + char *buf = NULL; /* data buffer */ size_t size; int i; - char * data = (char *)visitor_data; + char *data = (char *)visitor_data; /* unused */ (void)dset; @@ -4608,8 +4608,8 @@ test_types(void) hsize_t s2_dim[1] = {DIM2_SIZE}; /* size of DS 2 dataset */ float s1_float[DIM1_SIZE] = {10, 20, 30}; /* data of DS 1 dataset */ unsigned short s2_ushort[DIM2_SIZE] = {10, 20, 30, 40}; /* data of DS 2 dataset */ - const char * s1_str = "ABC"; - const char * s2_str = "ABCD"; + const char *s1_str = "ABC"; + const char *s2_str = "ABCD"; HDprintf("Testing scales with several datatypes\n"); @@ -4781,9 +4781,9 @@ test_data(void) hid_t dsid = -1; /* DS dataset ID */ hid_t dcpl; /* dataset creation property list */ hid_t sid; /* dataspace ID */ - float * vals = NULL; /* array to hold data values */ - float * latbuf = NULL; /* array to hold the latitude values */ - float * lonbuf = NULL; /* array to hold the longitude values */ + float *vals = NULL; /* array to hold data values */ + float *latbuf = NULL; /* array to hold the latitude values */ + float *lonbuf = NULL; /* array to hold the longitude values */ hsize_t dims[2]; /* array to hold dimensions */ hsize_t latdims[1]; /* array to hold dimensions */ hsize_t londims[1]; /* array to hold dimensions */ @@ -4953,7 +4953,7 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf) unsigned j; char str[20]; size_t nelms; - FILE * f; + FILE *f; float val; const char *data_file = H5_get_srcdir_filename(fname); diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c index 4448e41..318e13d 100644 --- a/hl/test/test_file_image.c +++ b/hl/test/test_file_image.c @@ -53,7 +53,7 @@ static int test_file_image(size_t open_images, size_t nflags, const unsigned *flags) { - hid_t * file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */ + hid_t *file_id = NULL, *dset_id = NULL, file_space, plist; /* HDF5 ids */ hsize_t dims1[RANK] = {2, 3}; /* original dimension of datasets */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; int data1[6] = {1, 2, 3, 4, 5, 6}; /* original contents of dataset */ @@ -63,13 +63,13 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) hsize_t dims4[RANK] = {3, 5}; /* extended dimensions of datasets */ int data4[15] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; /* extended contents of dataset */ - ssize_t * buf_size = NULL; /* pointer to array of buffer sizes */ - void ** buf_ptr = NULL; /* pointer to array of pointers to image buffers */ - char ** filename = NULL; /* pointer to array of pointers to filenames */ - unsigned * input_flags = NULL; /* pointer to array of flag combinations */ + ssize_t *buf_size = NULL; /* pointer to array of buffer sizes */ + void **buf_ptr = NULL; /* pointer to array of pointers to image buffers */ + char **filename = NULL; /* pointer to array of pointers to filenames */ + unsigned *input_flags = NULL; /* pointer to array of flag combinations */ size_t i, j, k, nrow, n_values; herr_t status1; - void * handle_ptr = NULL; /* pointers to driver buffer */ + void *handle_ptr = NULL; /* pointers to driver buffer */ unsigned char **core_buf_ptr_ptr = NULL; VERIFY(open_images > 1, "The number of open images must be greater than 1"); diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 4997df6..5d203e9 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -519,11 +519,11 @@ test_generate(void) { hid_t fid; hsize_t pal_dims[2] = {256, 3}; - float * data = NULL; + float *data = NULL; int imax, jmax, kmax; int n_elements; float valex, xmin, xmax, value; - FILE * f = NULL; + FILE *f = NULL; const char *data_file = H5_get_srcdir_filename(DATA_FILE4); int i; int retval = FAIL; @@ -757,13 +757,13 @@ out: static int read_data(const char *fname, /*IN*/ - hsize_t * width, /*OUT*/ - hsize_t * height /*OUT*/) + hsize_t *width, /*OUT*/ + hsize_t *height /*OUT*/) { int i, n; int color_planes; char str[20]; - FILE * f = NULL; + FILE *f = NULL; int w, h; int n_elements; const char *data_file = H5_get_srcdir_filename(fname); @@ -876,14 +876,14 @@ out: static int read_palette(const char *fname, rgb_t *palette, size_t palette_size) { - FILE * file; + FILE *file; char buffer[80]; unsigned u; unsigned int red; unsigned int green; unsigned int blue; unsigned nentries; - const char * data_file = H5_get_srcdir_filename(fname); + const char *data_file = H5_get_srcdir_filename(fname); /* ensure the given palette is valid */ if (!palette) diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c index 4b01f49..0331737 100644 --- a/hl/test/test_ld.c +++ b/hl/test/test_ld.c @@ -130,13 +130,13 @@ char g_tmp_buf[TMP_BUF_SIZE]; } \ else if (type == TWO_CMPD_VALID1) { \ test_valid_fields1 *vb1 = (test_valid_fields1 *)_ldbuf; \ - set_t * cb = (set_t *)_buf; \ + set_t *cb = (set_t *)_buf; \ \ VERIFY_ELMTS_VALID1(vb1[k], cb[ind + n]) \ } \ else if (type == TWO_CMPD_VALID2) { \ test_valid_fields2 *vb2 = (test_valid_fields2 *)_ldbuf; \ - set_t * cb = (set_t *)_buf; \ + set_t *cb = (set_t *)_buf; \ \ VERIFY_ELMTS_VALID2(vb2[k], cb[ind + n]) \ } \ @@ -211,10 +211,10 @@ typedef struct test_valid_fields2 { /* Temporary buffers for tests: test_LD_elmts_one() & test_LD_elmts_two() */ #define TEST_BUF_SIZE 100 -int * iibuf; /* buffer for storing retrieved elements */ -int * ibuf; /* buffer for storing retrieved elements (integer) */ -set_t * cbuf; /* buffer for storing retrieved elements (compound) */ -set_t * ccbuf; /* buffer for storing retrieved elements (compound) */ +int *iibuf; /* buffer for storing retrieved elements */ +int *ibuf; /* buffer for storing retrieved elements (integer) */ +set_t *cbuf; /* buffer for storing retrieved elements (compound) */ +set_t *ccbuf; /* buffer for storing retrieved elements (compound) */ test_valid_fields1 *vbuf1; /* buffer for storing retrieved elements (FIELDS1) */ test_valid_fields2 *vbuf2; /* buffer for storing retrieved elements (FIELDS2) */ diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index 53f834a..e5d8e6e 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -468,7 +468,7 @@ make_attributes(hid_t loc_id, const char *obj_name) { int rank_out; - hsize_t * dims_out = 0; + hsize_t *dims_out = 0; H5T_class_t type_class; size_t type_size; int i; @@ -1073,7 +1073,7 @@ static int test_integers(void) { hid_t dtype; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3("\n text for integer types"); @@ -1131,7 +1131,7 @@ static int test_fps(void) { hid_t dtype; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for floating-point types"); @@ -1193,7 +1193,7 @@ test_strings(void) H5T_str_t str_pad; H5T_cset_t str_cset; H5T_class_t type_class; - char * dt_str = NULL; + char *dt_str = NULL; size_t str_len; HL_TESTING3(" text for string types"); @@ -1338,7 +1338,7 @@ test_opaques(void) hid_t dtype; size_t opq_size; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for opaque types"); @@ -1400,7 +1400,7 @@ test_enums(void) const char *name2 = "WHITE"; int value2; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for enum types"); @@ -1476,7 +1476,7 @@ test_variables(void) { hid_t dtype; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for variable types"); @@ -1538,7 +1538,7 @@ test_arrays(void) int ndims; hsize_t dims[3]; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for array types"); @@ -1601,10 +1601,10 @@ test_compounds(void) { hid_t dtype; int nmembs; - char * memb_name = NULL; + char *memb_name = NULL; H5T_class_t memb_class; H5T_class_t type_class; - char * dt_str; + char *dt_str; size_t str_len; HL_TESTING3(" text for compound types"); @@ -1682,41 +1682,41 @@ test_compound_bug(void) hid_t dtype; H5T_class_t type_class; int nmembs; - char * memb_name = NULL; - char * dt_str; + char *memb_name = NULL; + char *dt_str; size_t str_len; - char text[] = "H5T_COMPOUND { H5T_STD_I32LE " - "\"state_________________________________________________________________________________" - "\"; H5T_STD_I32LE " - "\"desc____________________________________________________________________________________" - "_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; " - "\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE " - "\"sub_____________________________________________________________________________________" - "__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; " - "CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE " - "\"final___________________________________________________________________________________" - "________________\"; } } \"sub\"; }"; - char text2[] = "H5T_COMPOUND {\n" - " H5T_STD_I16LE \"state___________________________" - "__________________________________________________" - "____\" : 0;\n" - " H5T_STD_I16LE \"desc____________________________" - "__________________________________________________" - "___________\" : 2;\n" - " H5T_VLEN { H5T_COMPOUND {\n" - " H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" " - "1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n" - " H5T_STD_I32LE \"sub___________________________" - "__________________________________________________" - "__________________________________1\" : 4;\n" - " H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_" - "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;" - " } \"sub_desc\" : 8;\n" - " H5T_STD_I32LE \"final_________________________" - "__________________________________________________" - "________________________\" : 16;\n" - " } } \"sub\" : 8;\n" - "}\n"; + char text[] = "H5T_COMPOUND { H5T_STD_I32LE " + "\"state_________________________________________________________________________________" + "\"; H5T_STD_I32LE " + "\"desc____________________________________________________________________________________" + "_____\"; H5T_VLEN { H5T_COMPOUND { H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" 1; " + "\"TWO\" 2; \"THREE\" 3; } \"type____\"; H5T_STD_I32LE " + "\"sub_____________________________________________________________________________________" + "__________________________\"; H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_STR_SPACEPAD; " + "CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } \"sub_desc\"; H5T_STD_I32LE " + "\"final___________________________________________________________________________________" + "________________\"; } } \"sub\"; }"; + char text2[] = "H5T_COMPOUND {\n" + " H5T_STD_I16LE \"state___________________________" + "__________________________________________________" + "____\" : 0;\n" + " H5T_STD_I16LE \"desc____________________________" + "__________________________________________________" + "___________\" : 2;\n" + " H5T_VLEN { H5T_COMPOUND {\n" + " H5T_ENUM { H5T_STD_I16LE; \"ZERO\" 0; \"ONE\" " + "1; \"TWO\" 2; \"THREE\" 3; } \"type____\" : 0;\n" + " H5T_STD_I32LE \"sub___________________________" + "__________________________________________________" + "__________________________________1\" : 4;\n" + " H5T_STRING { STRSIZE H5T_VARIABLE; STRPAD H5T_" + "STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1;" + " } \"sub_desc\" : 8;\n" + " H5T_STD_I32LE \"final_________________________" + "__________________________________________________" + "________________________\" : 16;\n" + " } } \"sub\" : 8;\n" + "}\n"; HL_TESTING3(" text for compound type of bug fix"); @@ -1806,8 +1806,8 @@ test_complicated_compound(void) hid_t dtype; int nmembs; H5T_class_t type_class; - char * line = NULL; - FILE * fp = NULL; + char *line = NULL; + FILE *fp = NULL; size_t size = 1024; const char *filename = H5_get_srcdir_filename(INPUT_FILE); diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c index e8b90f7..2c003d5 100644 --- a/hl/test/test_packet.c +++ b/hl/test/test_packet.c @@ -116,7 +116,7 @@ create_hl_table(hid_t fid) hid_t field_type[NFIELDS]; hid_t string_type; hsize_t chunk_size = 10; - int * fill_data = NULL; + int *fill_data = NULL; int compress = 0; herr_t status; diff --git a/hl/test/test_packet_vlen.c b/hl/test/test_packet_vlen.c index aa88a6c..5e06c85 100644 --- a/hl/test/test_packet_vlen.c +++ b/hl/test/test_packet_vlen.c @@ -333,7 +333,7 @@ test_compound_VL_VLtype(void) hsize_t count; /* Number of records in the table */ compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */ - hvl_t * t1, *t2; + hvl_t *t1, *t2; unsigned uu, vv, ww; /* Loop variables */ char msg[80]; /* For error message */ herr_t ret; /* Returned status from a callee */ @@ -516,7 +516,7 @@ test_VLof_VLtype(void) hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */ hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */ hsize_t count; /* Number of records in the table */ - hvl_t * t1; /* pointer to advance */ + hvl_t *t1; /* pointer to advance */ unsigned uu, vv, ww; /* Loop variables */ hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */ @@ -1368,7 +1368,7 @@ testfl_compound_VL_VLtype(void) hsize_t count; /* Number of records in the table */ compVLVL_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ compVLVL_t readBuf[NRECORDS]; /* Buffer to hold read data */ - hvl_t * t1, *t2; + hvl_t *t1, *t2; unsigned uu, vv, ww; /* Loop variables */ char msg[80]; /* For error message */ herr_t ret; /* Returned status from a callee */ @@ -1551,7 +1551,7 @@ testfl_VLof_VLtype(void) hid_t vlatomic = H5I_INVALID_HID; /* Variable length datatype */ hid_t vlofvl = H5I_INVALID_HID; /* VL datatype of VL datatypes */ hsize_t count; /* Number of records in the table */ - hvl_t * t1; /* pointer to advance */ + hvl_t *t1; /* pointer to advance */ unsigned uu, vv, ww; /* Loop variables */ hvl_t writeBuf[NRECORDS]; /* Buffer to hold data to be written */ hvl_t readBuf[NRECORDS]; /* Buffer to hold read data */ diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 90a930c..24b7336 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -198,7 +198,7 @@ test_table(hid_t fid, int do_write) hid_t fid2; hsize_t chunk_size = 10; int compress = 0; - int * fill = NULL; + int *fill = NULL; particle_t fill1[1] = {{"no data", -1, -99.0, -99.0, -1}}; int fill1_new[1] = {-100}; hsize_t position; diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c index ca33f86..9d55ab8 100644 --- a/hl/tools/gif2h5/decompress.c +++ b/hl/tools/gif2h5/decompress.c @@ -17,7 +17,7 @@ GIFWORD iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip; unsigned long cols[256]; -char * cmd; +char *cmd; FILE *fp; diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h index 5ea8633..b193d8d 100644 --- a/hl/tools/gif2h5/gif.h +++ b/hl/tools/gif2h5/gif.h @@ -133,12 +133,12 @@ typedef struct _GifCommentExtension { ** extension. */ typedef struct _GifToMem { - GIFHEAD * GifHeader; - GIFIMAGEDESC ** GifImageDesc; + GIFHEAD *GifHeader; + GIFIMAGEDESC **GifImageDesc; GIFGRAPHICCONTROL **GifGraphicControlExtension; - GIFPLAINTEXT ** GifPlainTextExtension; - GIFAPPLICATION ** GifApplicationExtension; - GIFCOMMENT ** GifCommentExtension; + GIFPLAINTEXT **GifPlainTextExtension; + GIFAPPLICATION **GifApplicationExtension; + GIFCOMMENT **GifCommentExtension; } GIFTOMEM; /* diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c index 44e18e0..82cb15b 100644 --- a/hl/tools/gif2h5/gif2mem.c +++ b/hl/tools/gif2h5/gif2mem.c @@ -42,11 +42,11 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct) * The gif structure outline for passing data to memory is given in gif.h. * These pointers are redundant, should take them out in ver. 2 */ - GIFHEAD * gifHead; /* GIF Header structure */ - GIFIMAGEDESC ** gifImageDesc; /* Logical Image Descriptor struct */ - GIFPLAINTEXT ** gifPlainText; /* Plain Text Extension structure */ - GIFAPPLICATION ** gifApplication; /* Application Extension structure */ - GIFCOMMENT ** gifComment; /* Comment Extension structure */ + GIFHEAD *gifHead; /* GIF Header structure */ + GIFIMAGEDESC **gifImageDesc; /* Logical Image Descriptor struct */ + GIFPLAINTEXT **gifPlainText; /* Plain Text Extension structure */ + GIFAPPLICATION **gifApplication; /* Application Extension structure */ + GIFCOMMENT **gifComment; /* Comment Extension structure */ GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */ GIFWORD i; /* Loop counter */ diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c index 3a6bcae..3e1a477 100644 --- a/hl/tools/gif2h5/gifread.c +++ b/hl/tools/gif2h5/gifread.c @@ -54,7 +54,7 @@ GetByte(const GIFBYTE *MemGif) * otherwise 0 if no error occurred. */ int -ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */ +ReadGifHeader(GIFHEAD *GifHead, /* Pointer to GIF header structure */ GIFBYTE **MemGif2) /* GIF image file input FILE stream */ { GIFWORD i; /* Loop counter */ @@ -121,7 +121,7 @@ ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure */ */ int ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { GIFWORD i; /* Loop counter */ @@ -210,7 +210,7 @@ ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor */ int ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -233,7 +233,7 @@ ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Ext */ int ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -270,7 +270,7 @@ ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension */ int ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { int i; @@ -306,7 +306,7 @@ ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Ext */ int ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */ - GIFBYTE ** MemGif2 /* GIF image file input FILE stream */ + GIFBYTE **MemGif2 /* GIF image file input FILE stream */ ) { @@ -331,7 +331,7 @@ ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension struc */ static GIFBYTE * ReadDataSubBlocks(GIFBYTE **MemGif2, /* GIF image file input FILE stream */ - GIFWORD * DSize) + GIFWORD *DSize) { GIFBYTE *ptr1; /* Pointer used to "walk the heap" */ GIFBYTE *ptr2; /* Pointer used to mark the top of the heap */ diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c index 7126da9..313606f 100644 --- a/hl/tools/gif2h5/hdfgifwr.c +++ b/hl/tools/gif2h5/hdfgifwr.c @@ -83,7 +83,7 @@ static int maxbits = XV_BITS; /* user settable max # bits/code */ static int maxcode; /* maximum code, given n_bits */ static int maxmaxcode = 1 << XV_BITS; /* NEVER generate this */ -static count_int * htab; +static count_int *htab; static unsigned short *codetab; #define HashTabOf(i) htab[i] diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c index 7756506..6fb06a4 100644 --- a/hl/tools/h5watch/extend_dset.c +++ b/hl/tools/h5watch/extend_dset.c @@ -82,8 +82,8 @@ extend_dset_two(const char *file, char *dname, int action1, int action2) hsize_t cur_dims[2]; /* current dimension sizes */ size_t dtype_size; /* size of the dataset's datatype */ unsigned num_elmts; /* number of elements in the dataset */ - int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */ - set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */ + int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */ + set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */ /* Allocate memory */ if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int)))) @@ -236,8 +236,8 @@ extend_dset_one(const char *file, char *dname, int action) hsize_t offset[1]; /* starting offsets of appended data */ hsize_t count[1]; /* dimension sizes of appended data */ size_t dtype_size; /* size of the dataset's datatype */ - int * ibuf = NULL; /* buffer for storing retrieved elements (integer) */ - set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */ + int *ibuf = NULL; /* buffer for storing retrieved elements (integer) */ + set_t *cbuf = NULL; /* buffer for storing retrieved elements (compound) */ /* Allocate memory */ if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int)))) diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c index 5a6fe6f..29aa87e 100644 --- a/hl/tools/h5watch/h5watch.c +++ b/hl/tools/h5watch/h5watch.c @@ -28,9 +28,9 @@ * This tool uses H5LD_memb_t data structure declared in H5LDprivate.h */ -const char * progname = "h5watch"; /* tool name */ -static char * g_list_of_fields = NULL; /* command line input for "list_of_fields" */ -static char * g_dup_fields = NULL; /* copy of "list_of_fields" */ +const char *progname = "h5watch"; /* tool name */ +static char *g_list_of_fields = NULL; /* command line input for "list_of_fields" */ +static char *g_dup_fields = NULL; /* copy of "list_of_fields" */ static H5LD_memb_t **g_listv = NULL; /* vector info for "list_of_fields" */ static hbool_t g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */ @@ -58,7 +58,7 @@ static void parse_command_line(int argc, const char *const *argv); * The long-named ones can be partially spelled. When * adding more, make sure that they don't clash with each other. */ -static const char * s_opts = "?"; +static const char *s_opts = "?"; static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg, 'h'}, {"dim", no_arg, 'd'}, {"di", no_arg, 'd'}, {"label", no_arg, 'l'}, {"labe", no_arg, 'l'}, @@ -498,7 +498,7 @@ check_dataset(hid_t fid, char *dsetname) hsize_t cur_dims[H5S_MAX_RANK]; /* size of dataspace dimensions */ hsize_t max_dims[H5S_MAX_RANK]; /* maximum size of dataspace dimensions */ hbool_t unlim_max_dims = FALSE; /* whether dataset has unlimited or max. dimension setting */ - void * edata; + void *edata; H5E_auto2_t func; H5D_layout_t layout; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/java/examples/datasets/H5Ex_D_Shuffle.java b/java/examples/datasets/H5Ex_D_Shuffle.java index 54a77c7..3d80f7d 100644 --- a/java/examples/datasets/H5Ex_D_Shuffle.java +++ b/java/examples/datasets/H5Ex_D_Shuffle.java @@ -277,7 +277,7 @@ public class H5Ex_D_Shuffle { int[] filter_config = {0}; int filter_type = -1; filter_type = H5.H5Pget_filter(dcpl_id, indx, flags, cd_nelmts, cd_values, 120, - filter_name, filter_config); + filter_name, filter_config); System.out.print("Filter " + indx + ": Type is: "); switch (H5Z_filter.get(filter_type)) { case H5Z_FILTER_DEFLATE: diff --git a/java/examples/groups/H5Ex_G_Corder.java b/java/examples/groups/H5Ex_G_Corder.java index 86a790d..79bbad6 100644 --- a/java/examples/groups/H5Ex_G_Corder.java +++ b/java/examples/groups/H5Ex_G_Corder.java @@ -42,7 +42,7 @@ public class H5Ex_G_Corder { // Create group creation property list and enable link creation order tracking. gcpl_id = H5.H5Pcreate(HDF5Constants.H5P_GROUP_CREATE); status = H5.H5Pset_link_creation_order(gcpl_id, HDF5Constants.H5P_CRT_ORDER_TRACKED + - HDF5Constants.H5P_CRT_ORDER_INDEXED); + HDF5Constants.H5P_CRT_ORDER_INDEXED); // Create primary group using the property list. if (status >= 0) diff --git a/java/examples/groups/H5Ex_G_Traverse.java b/java/examples/groups/H5Ex_G_Traverse.java index cd60f6b..61a269c 100644 --- a/java/examples/groups/H5Ex_G_Traverse.java +++ b/java/examples/groups/H5Ex_G_Traverse.java @@ -131,8 +131,8 @@ class H5L_iter_callbackT implements H5L_iterate_t { nextod.obj_token = infobuf.token; H5L_iterate_t iter_cb2 = new H5L_iter_callbackT(); return_val = H5.H5Literate_by_name(group, name, HDF5Constants.H5_INDEX_NAME, - HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5_ITER_NATIVE, 0L, iter_cb2, nextod, + HDF5Constants.H5P_DEFAULT); } for (int i = 0; i < spaces; i++) System.out.print(" "); diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 4aae921..ecf5eff 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -5360,7 +5360,7 @@ public class H5 implements java.io.Serializable { String n[] = new String[1]; n[0] = new String(""); oname[0] = H5Lget_name_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, - idx, HDF5Constants.H5P_DEFAULT); + idx, HDF5Constants.H5P_DEFAULT); H5L_info_t info = H5Lget_info_by_idx(loc_id, name, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, idx, HDF5Constants.H5P_DEFAULT); type[0] = info.type; diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c index 3ccb6ef..0f135cd 100644 --- a/java/src/jni/exceptionImp.c +++ b/java/src/jni/exceptionImp.c @@ -33,7 +33,7 @@ extern "C" { #include "exceptionImp.h" extern H5E_auto2_t efunc; -extern void * edata; +extern void *edata; /*******************/ /* Local Variables */ @@ -158,7 +158,7 @@ Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss) JNIEXPORT void JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, jstring file_name) { - FILE * stream = NULL; + FILE *stream = NULL; const char *file = NULL; UNUSED(obj); @@ -237,7 +237,7 @@ static jboolean H5JNIErrorClass(JNIEnv *env, const char *message, const char *className) { jstring str; - char * args[2]; + char *args[2]; jboolean retVal = JNI_FALSE; if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, message))) @@ -371,8 +371,8 @@ h5libraryError(JNIEnv *env) hid_t min_num; hid_t maj_num; hid_t stk_id = H5I_INVALID_HID; - char * args[2]; - char * msg_str = NULL; + char *args[2]; + char *msg_str = NULL; jboolean retVal = JNI_FALSE; exceptionNumbers.maj_num = 0; diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c index 691c98c..b742e21 100644 --- a/java/src/jni/h5Imp.c +++ b/java/src/jni/h5Imp.c @@ -106,7 +106,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5get_1libversion(JNIEnv *env, jclass clss, jintArray libversion) { jboolean libversionArrayIsCopy; - int * libversionArray = NULL; + int *libversionArray = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c index 32bae07..b139239 100644 --- a/java/src/jni/h5aImp.c +++ b/java/src/jni/h5aImp.c @@ -157,7 +157,7 @@ Java_hdf_hdf5lib_H5_H5Aread(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_t jboolean isCriticalPinning) { jboolean readBufIsCopy; - jbyte * readBuf = NULL; + jbyte *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -224,7 +224,7 @@ Java_hdf_hdf5lib_H5_H5Awrite(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_ jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jbyte * writeBuf = NULL; + jbyte *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -286,7 +286,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1short(JNIEnv *env, jclass clss, jlong attr_id, jlon jshortArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jshort * readBuf = NULL; + jshort *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -353,7 +353,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1short(JNIEnv *env, jclass clss, jlong attr_id, jlo jshortArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jshort * writeBuf = NULL; + jshort *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -415,7 +415,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean readBufIsCopy; - jint * readBuf = NULL; + jint *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jint * writeBuf = NULL; + jint *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -544,7 +544,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1long(JNIEnv *env, jclass clss, jlong attr_id, jlong jboolean isCriticalPinning) { jboolean readBufIsCopy; - jlong * readBuf = NULL; + jlong *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -611,7 +611,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1long(JNIEnv *env, jclass clss, jlong attr_id, jlon jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jlong * writeBuf = NULL; + jlong *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -673,7 +673,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1float(JNIEnv *env, jclass clss, jlong attr_id, jlon jfloatArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jfloat * readBuf = NULL; + jfloat *readBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -740,7 +740,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1float(JNIEnv *env, jclass clss, jlong attr_id, jlo jfloatArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jfloat * writeBuf = NULL; + jfloat *writeBuf = NULL; hsize_t dims[H5S_MAX_RANK]; hid_t sid = H5I_INVALID_HID; jsize n; @@ -933,8 +933,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1string(JNIEnv *env, jclass clss, jlong attr_id, jlo size_t str_len; size_t pos; jsize i, n; - char * c_buf = NULL; - char * cstr = NULL; + char *c_buf = NULL; + char *cstr = NULL; herr_t status = FAIL; UNUSED(clss); @@ -999,7 +999,7 @@ Java_hdf_hdf5lib_H5_H5Awrite_1string(JNIEnv *env, jclass clss, jlong attr_id, jl jstring obj; size_t i, str_len; jsize n; - char * c_buf = NULL; + char *c_buf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1100,11 +1100,11 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1247,7 +1247,7 @@ Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem } case H5T_REFERENCE: { jboolean bb; - jbyte * barray = NULL; + jbyte *barray = NULL; if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -1336,11 +1336,11 @@ Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *env, jclass clss, jlong attr_id, jlong me hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1581,7 +1581,7 @@ H5AreadVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) { jstring jstr; jsize i, n; - char ** strs = NULL; + char **strs = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -1644,7 +1644,7 @@ H5AreadVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) size_t i; hid_t sid = H5I_INVALID_HID; jsize n; - void * readBuf = NULL; + void *readBuf = NULL; herr_t status = FAIL; HDmemset(&h5str, 0, sizeof(h5str_t)); @@ -1786,7 +1786,7 @@ H5AwriteVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) jstring obj; jsize size; jint i; - char ** writeBuf = NULL; + char **writeBuf = NULL; herr_t status = FAIL; if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) { @@ -1861,7 +1861,7 @@ H5AwriteVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf) size_t i; hid_t sid = H5I_INVALID_HID; jsize n; - void * writeBuf = NULL; + void *writeBuf = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -2040,7 +2040,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name(JNIEnv *env, jclass clss, jlong attr_id) { jstring str = NULL; ssize_t buf_size; - char * attrName = NULL; + char *attrName = NULL; UNUSED(clss); @@ -2388,7 +2388,7 @@ Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id const char *objName = NULL; jstring str = NULL; ssize_t status_size = -1; - char * attrName = NULL; + char *attrName = NULL; UNUSED(clss); @@ -2711,10 +2711,10 @@ H5A_iterate_cb(hid_t g_id, const char *name, const H5A_info_t *info, void *cb_da jobject cb_info_t = NULL; jobject visit_callback = wrapper->visit_callback; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[4]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c index a20bb6c..244d13c 100644 --- a/java/src/jni/h5dImp.c +++ b/java/src/jni/h5dImp.c @@ -183,7 +183,7 @@ Java_hdf_hdf5lib_H5_H5Dread(JNIEnv *env, jclass clss, jlong dataset_id, jlong me jboolean isCriticalPinning) { jboolean readBufIsCopy; - jbyte * readBuf = NULL; + jbyte *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite(JNIEnv *env, jclass clss, jlong dataset_id, jlong m jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jbyte * writeBuf = NULL; + jbyte *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -338,7 +338,7 @@ Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim(JNIEnv *env, jclass clss, jlong type_id, jl { #ifndef H5_NO_DEPRECATED_SYMBOLS jboolean vlenBufIsCopy; - jbyte * vlenBuf = NULL; + jbyte *vlenBuf = NULL; #endif herr_t status = FAIL; @@ -380,7 +380,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1short(JNIEnv *env, jclass clss, jlong dataset_id, j jshortArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jshort * readBuf = NULL; + jshort *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -437,7 +437,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1short(JNIEnv *env, jclass clss, jlong dataset_id, jshortArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jshort * writeBuf = NULL; + jshort *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -494,7 +494,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1int(JNIEnv *env, jclass clss, jlong dataset_id, jlo jboolean isCriticalPinning) { jboolean readBufIsCopy; - jint * readBuf = NULL; + jint *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -551,7 +551,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1int(JNIEnv *env, jclass clss, jlong dataset_id, jl jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jint * writeBuf = NULL; + jint *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -608,7 +608,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1long(JNIEnv *env, jclass clss, jlong dataset_id, jl jlongArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jlong * readBuf = NULL; + jlong *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -665,7 +665,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1long(JNIEnv *env, jclass clss, jlong dataset_id, j jlongArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jlong * writeBuf = NULL; + jlong *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -722,7 +722,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1float(JNIEnv *env, jclass clss, jlong dataset_id, j jfloatArray buf, jboolean isCriticalPinning) { jboolean readBufIsCopy; - jfloat * readBuf = NULL; + jfloat *readBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -779,7 +779,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1float(JNIEnv *env, jclass clss, jlong dataset_id, jfloatArray buf, jboolean isCriticalPinning) { jboolean writeBufIsCopy; - jfloat * writeBuf = NULL; + jfloat *writeBuf = NULL; htri_t vl_data_class; herr_t status = FAIL; @@ -952,8 +952,8 @@ Java_hdf_hdf5lib_H5_H5Dread_1string(JNIEnv *env, jclass clss, jlong dataset_id, size_t str_len; size_t pos; jsize i, n; - char * c_buf = NULL; - char * cstr = NULL; + char *c_buf = NULL; + char *cstr = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1020,7 +1020,7 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1string(JNIEnv *env, jclass clss, jlong dataset_id, jstring obj; size_t i, str_len; jsize n; - char * c_buf = NULL; + char *c_buf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1115,11 +1115,11 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1263,7 +1263,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong } case H5T_REFERENCE: { jboolean bb; - jbyte * barray = NULL; + jbyte *barray = NULL; if (NULL == (jobj = ENVPTR->NewByteArray(ENVONLY, vlSize))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -1345,11 +1345,11 @@ Java_hdf_hdf5lib_H5_H5DwriteVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong hid_t memb = H5I_INVALID_HID; H5T_class_t vlClass; size_t vlSize; - void * rawBuf = NULL; - jobject * jList = NULL; + void *rawBuf = NULL; + jobject *jList = NULL; size_t i, j, x; - char * cp_vp = NULL; + char *cp_vp = NULL; if (!(typeSize = H5Tget_size(mem_type_id))) H5_LIBRARY_ERROR(ENVONLY); @@ -1595,7 +1595,7 @@ H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, { jstring jstr; jsize i, n; - char ** strs = NULL; + char **strs = NULL; herr_t status = FAIL; if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) { @@ -1660,7 +1660,7 @@ H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid size_t i; hid_t mem_space = mem_sid; jsize n; - void * readBuf = NULL; + void *readBuf = NULL; herr_t status = FAIL; HDmemset(&h5str, 0, sizeof(h5str_t)); @@ -1821,7 +1821,7 @@ H5DwriteVL_str(JNIEnv *env, hid_t dataset_id, hid_t mem_type_id, hid_t mem_space jstring obj; jsize size; jint i; - char ** writeBuf = NULL; + char **writeBuf = NULL; herr_t status = FAIL; if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) { @@ -1898,7 +1898,7 @@ H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_si size_t i; hid_t mem_space = mem_sid; jsize n; - void * writeBuf = NULL; + void *writeBuf = NULL; herr_t status = FAIL; if (mem_space == H5S_ALL) { @@ -2206,8 +2206,8 @@ Java_hdf_hdf5lib_H5_H5Dfill(JNIEnv *env, jclass clss, jbyteArray fill, jlong fil jboolean isCopy1; jboolean isCopy2; herr_t status = FAIL; - jbyte * fillP = NULL; - jbyte * buffP = NULL; + jbyte *fillP = NULL; + jbyte *buffP = NULL; UNUSED(clss); @@ -2248,7 +2248,7 @@ Java_hdf_hdf5lib_H5_H5Dset_1extent(JNIEnv *env, jclass clss, jlong loc_id, jlong hsize_t *dims = NULL; herr_t status; jsize rank; - jlong * dimsBuf = NULL; + jlong *dimsBuf = NULL; int i = 0; UNUSED(clss); @@ -2288,10 +2288,10 @@ H5D_iterate_cb(void *elem, hid_t elem_id, unsigned ndim, const hsize_t *point, v jmethodID mid; jobject visit_callback = wrapper->visit_callback; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = FAIL; jsize size; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE); @@ -2350,7 +2350,7 @@ Java_hdf_hdf5lib_H5_H5Diterate(JNIEnv *env, jclass clss, jbyteArray buf, jlong b { cb_wrapper wrapper = {callback_op, op_data}; jboolean isCopy; - jbyte * iterBuf = NULL; + jbyte *iterBuf = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c index 5bdeae8..0eec54f 100644 --- a/java/src/jni/h5eImp.c +++ b/java/src/jni/h5eImp.c @@ -284,7 +284,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1class_1name(JNIEnv *env, jclass clss, jlong cls_id) { jstring str = NULL; ssize_t buf_size; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -435,8 +435,8 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg(JNIEnv *env, jclass clss, jlong msg_id, jintArra H5E_type_t error_msg_type; jstring str = NULL; ssize_t buf_size; - jint * theArray = NULL; - char * namePtr = NULL; + jint *theArray = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -506,9 +506,9 @@ H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data) jstring str1, str2, str3; jobject cb_info_t = NULL; jvalue args[7]; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = FAIL; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index e59a69e..2d2b0f2 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -119,7 +119,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id) { jstring str = NULL; ssize_t buf_size; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -416,8 +416,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, ji ssize_t ret_val = -1; size_t i; jsize rank; - jlong * obj_id_listP = NULL; - hid_t * id_list = NULL; + jlong *obj_id_listP = NULL; + hid_t *id_list = NULL; UNUSED(clss); @@ -517,7 +517,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size(JNIEnv *env, jclass clss, jlong file_id, j { jboolean isCopy; size_t max_size = 0, min_clean_size = 0, cur_size = 0; - jlong * metadata_cache_ptr = NULL; + jlong *metadata_cache_ptr = NULL; jsize size = 0; int cur_num_entries = -1; diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c index a0011d8..a61cf39 100644 --- a/java/src/jni/h5gImp.c +++ b/java/src/jni/h5gImp.c @@ -276,7 +276,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id H5_iter_order_t corder = (H5_iter_order_t)order; H5_index_t cindex_type = (H5_index_t)index_type; H5G_info_t group_info; - const char * grpName = NULL; + const char *grpName = NULL; jobject obj = NULL; herr_t ret_val = FAIL; diff --git a/java/src/jni/h5iImp.c b/java/src/jni/h5iImp.c index 1e7821a..7bfe03c 100644 --- a/java/src/jni/h5iImp.c +++ b/java/src/jni/h5iImp.c @@ -62,7 +62,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name_1long(JNIEnv *env, jclass clss, jlong obj_id, j { ssize_t size = -1; jstring str; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); @@ -99,7 +99,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name(JNIEnv *env, jclass clss, jlong obj_id) { jstring str = NULL; ssize_t buf_size = -1; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c index 43db4e9..1f2e8d8 100644 --- a/java/src/jni/h5lImp.c +++ b/java/src/jni/h5lImp.c @@ -408,7 +408,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id const char *groupName = NULL; jstring str = NULL; ssize_t status_size = -1; - char * linkName = NULL; + char *linkName = NULL; UNUSED(clss); @@ -460,7 +460,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstrin const char *linkName = NULL; jstring str; herr_t status; - char * linkValue = NULL; + char *linkValue = NULL; UNUSED(clss); @@ -550,7 +550,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_i const char *grpName = NULL; jstring str; herr_t status; - void * linkValue = NULL; + void *linkValue = NULL; UNUSED(clss); @@ -674,10 +674,10 @@ H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_d jobject cb_info_t = NULL; jobject visit_callback = wrapper->visit_callback; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[5]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c index 3037bc6..998a607 100644 --- a/java/src/jni/h5oImp.c +++ b/java/src/jni/h5oImp.c @@ -50,7 +50,7 @@ create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical jbyteArray tokenByteBuf; jboolean token_buf_is_copy; jvalue constructor_args[1]; - jbyte * token_buf = NULL; + jbyte *token_buf = NULL; jobject ret_token_obj = NULL; if (NULL == (tokenByteBuf = (*envptr)->NewByteArray(envptr, H5O_MAX_TOKEN_SIZE))) @@ -386,7 +386,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name(JNIEnv *env, jclass clss, jlo jint fields, jlong access_id) { H5O_native_info_t infobuf; - const char * objName = NULL; + const char *objName = NULL; jobject hdrinfobuf; jobject obj_ihinfobuf; jobject attr_ihinfobuf; @@ -458,7 +458,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx(JNIEnv *env, jclass clss, jlon jlong access_id) { H5O_native_info_t infobuf; - const char * grpName = NULL; + const char *grpName = NULL; jobject hdrinfobuf; jobject obj_ihinfobuf; jobject attr_ihinfobuf; @@ -557,10 +557,10 @@ H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_d jobject visit_callback = wrapper->visit_callback; jobject token; jstring str; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cbcls; jvalue args[12]; - void * op_data = (void *)wrapper->op_data; + void *op_data = (void *)wrapper->op_data; jint status = FAIL; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -747,7 +747,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id) jstring str = NULL; ssize_t buf_size; ssize_t status = -1; - char * oComment = NULL; + char *oComment = NULL; UNUSED(clss); @@ -787,7 +787,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong lo jstring str = NULL; ssize_t buf_size; ssize_t status; - char * objComment = NULL; + char *objComment = NULL; UNUSED(clss); @@ -899,7 +899,7 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *env, jclass clss, jlong loc_id, jboolean token_buf_is_copy; jfieldID token_data_field_id; jclass token_cls; - jbyte * token_buf = NULL; + jbyte *token_buf = NULL; jobject token_data; hid_t retVal = H5I_INVALID_HID; diff --git a/java/src/jni/h5pDAPLImp.c b/java/src/jni/h5pDAPLImp.c index 82802b9..01108b3 100644 --- a/java/src/jni/h5pDAPLImp.c +++ b/java/src/jni/h5pDAPLImp.c @@ -66,8 +66,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, j { jboolean isCopy; jdouble *w0Array = NULL; - jlong * rdcc_nslotsArray = NULL; - jlong * nbytesArray = NULL; + jlong *rdcc_nslotsArray = NULL; + jlong *nbytesArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -140,7 +140,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix(JNIEnv *env, jclass clss, jlong dapl_id) { ssize_t prefix_size = -1; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); @@ -282,8 +282,8 @@ H5D_append_cb(hid_t dataset_id, hsize_t *cur_dims, void *cb_data) jmethodID mid; jobject visit_callback = wrapper->visit_callback; jclass cls; - JNIEnv * cbenv = NULL; - void * op_data = (void *)wrapper->op_data; + JNIEnv *cbenv = NULL; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5pDCPLImp.c b/java/src/jni/h5pDCPLImp.c index 760a5a8..f549800 100644 --- a/java/src/jni/h5pDCPLImp.c +++ b/java/src/jni/h5pDCPLImp.c @@ -82,8 +82,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1chunk(JNIEnv *env, jclass clss, jlong plist, jint nd size_t i; size_t rank; jsize arrLen; - jbyte * theArray = NULL; - jlong * jlp = NULL; + jbyte *theArray = NULL; + jlong *jlp = NULL; herr_t status = FAIL; UNUSED(clss); @@ -136,7 +136,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk(JNIEnv *env, jclass clss, jlong plist, jint ma { jboolean isCopy; hsize_t *da = NULL; - jlong * theArray = NULL; + jlong *theArray = NULL; jsize arrLen; int i; herr_t status = FAIL; @@ -285,7 +285,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id jbyteArray value) { jboolean isCopy; - jbyte * byteP = NULL; + jbyte *byteP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -319,7 +319,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id { jboolean isCopy; herr_t status = FAIL; - jbyte * byteP = NULL; + jbyte *byteP = NULL; UNUSED(clss); @@ -348,7 +348,7 @@ Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined(JNIEnv *env, jclass clss, jlong plis { H5D_fill_value_t value = H5D_FILL_VALUE_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -399,7 +399,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fill_1time(JNIEnv *env, jclass clss, jlong plist, ji { H5D_fill_time_t time = H5D_FILL_TIME_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -450,7 +450,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time(JNIEnv *env, jclass clss, jlong plist, j { H5D_alloc_time_t time = H5D_ALLOC_TIME_ERROR; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -482,7 +482,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1filter(JNIEnv *env, jclass clss, jlong plist, jint f jlong cd_nelmts, jintArray cd_values) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -559,10 +559,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter(JNIEnv *env, jclass clss, jlong plist, jint f { jboolean isCopy; jstring str; - jint * flagsArray = NULL; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - char * filter = NULL; + jint *flagsArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + char *filter = NULL; herr_t status = FAIL; UNUSED(clss); @@ -633,11 +633,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2(JNIEnv *env, jclass clss, jlong plist, jint { jboolean isCopy; jstring str; - jint * flagsArray = NULL; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * filter_configArray = NULL; - char * filter = NULL; + jint *flagsArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *filter_configArray = NULL; + char *filter = NULL; herr_t status = FAIL; UNUSED(clss); @@ -731,10 +731,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id(JNIEnv *env, jclass clss, jlong plist { jboolean isCopy; jstring str; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * flagsArray = NULL; - char * aName = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *flagsArray = NULL; + char *aName = NULL; long bs; int rank; herr_t status = FAIL; @@ -817,12 +817,12 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2(JNIEnv *env, jclass clss, jlong plis { jboolean isCopy; jstring str; - jlong * cd_nelmtsArray = NULL; - jint * cd_valuesArray = NULL; - jint * flagsArray = NULL; - jint * filter_configArray = NULL; + jlong *cd_nelmtsArray = NULL; + jint *cd_valuesArray = NULL; + jint *flagsArray = NULL; + jint *filter_configArray = NULL; long bs; - char * aName = NULL; + char *aName = NULL; herr_t status = FAIL; UNUSED(clss); @@ -901,7 +901,7 @@ Java_hdf_hdf5lib_H5_H5Pmodify_1filter(JNIEnv *env, jclass clss, jlong plist, jin jlong cd_nelmts, jintArray cd_values) { jboolean isCopy; - jint * cd_valuesP = NULL; + jint *cd_valuesP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1086,8 +1086,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1external(JNIEnv *env, jclass clss, jlong plist, jint hsize_t s; off_t o; jsize arrLen; - jlong * theArray = NULL; - char * file = NULL; + jlong *theArray = NULL; + char *file = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1219,7 +1219,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx) { ssize_t buf_size; - char * dname = NULL; + char *dname = NULL; jstring str = NULL; UNUSED(clss); @@ -1258,7 +1258,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx) { ssize_t buf_size; - char * fname = NULL; + char *fname = NULL; jstring str = NULL; UNUSED(clss); @@ -1361,7 +1361,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix(JNIEnv *env, jclass clss, jlong dapl_id) { ssize_t prefix_size = -1; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/h5pDXPLImp.c b/java/src/jni/h5pDXPLImp.c index c555d53..6a11c0e 100644 --- a/java/src/jni/h5pDXPLImp.c +++ b/java/src/jni/h5pDXPLImp.c @@ -41,8 +41,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1buffer(JNIEnv *env, jclass clss, jlong plist, jlong { #ifdef notdef jboolean isCopy; - jbyte * tconvP = NULL; - jbyte * bkgP = NULL; + jbyte *tconvP = NULL; + jbyte *bkgP = NULL; #endif herr_t status = FAIL; @@ -88,8 +88,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1buffer(JNIEnv *env, jclass clss, jlong plist, jbyteA { #ifdef notdef jboolean isCopy; - jbyte * tconvP = NULL; - jbyte * bkgP = NULL; + jbyte *tconvP = NULL; + jbyte *bkgP = NULL; #endif herr_t status = FAIL; @@ -290,7 +290,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plis jlong size) { jstring str = NULL; - char * express = NULL; + char *express = NULL; ssize_t express_size = -1; UNUSED(clss); @@ -361,7 +361,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size(JNIEnv *env, jclass clss, jlong { jboolean isCopy; size_t size; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pFAPLImp.c b/java/src/jni/h5pFAPLImp.c index ad85aae..f094aaf 100644 --- a/java/src/jni/h5pFAPLImp.c +++ b/java/src/jni/h5pFAPLImp.c @@ -127,7 +127,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id, { jboolean isCopy; jboolean *backArray = NULL; - jlong * incArray = NULL; + jlong *incArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -208,7 +208,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct(JNIEnv *env, jclass clss, jlong fapl_id { #ifdef H5_HAVE_DIRECT jboolean isCopy; - jlong * theArray = NULL; + jlong *theArray = NULL; size_t alignment = 0; size_t block_size = 0; size_t cbuf_size = 0; @@ -283,8 +283,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family(JNIEnv *env, jclass clss, jlong tid, jl jboolean isCopy; hsize_t *sa = NULL; size_t i; - jlong * sizeArray = NULL; - jlong * plistArray = NULL; + jlong *sizeArray = NULL; + jlong *plistArray = NULL; jsize rank; herr_t status = FAIL; @@ -433,7 +433,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs(JNIEnv *env, jclass clss, jlong fapl_id, { #ifdef H5_HAVE_LIBHDFS H5FD_hdfs_fapl_t instance; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -591,7 +591,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jboolean relax) { const char *const *mName = NULL; - const char * utf8 = NULL; + const char *utf8 = NULL; jboolean isCopy; jboolean bb; jobject o; @@ -599,10 +599,10 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jstring obj; jclass Sjc; size_t i; - jlong * thefaplArray = NULL; - jlong * theaddrArray = NULL; - jint * themapArray = NULL; - char * member_name[H5FD_MEM_NTYPES]; + jlong *thefaplArray = NULL; + jlong *theaddrArray = NULL; + jint *themapArray = NULL; + char *member_name[H5FD_MEM_NTYPES]; herr_t status = FAIL; UNUSED(clss); @@ -725,10 +725,10 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin jstring str; herr_t status = FAIL; size_t i; - jlong * thefaplArray = NULL; - jlong * theaddrArray = NULL; - jint * themapArray = NULL; - char ** mName = NULL; + jlong *thefaplArray = NULL; + jlong *theaddrArray = NULL; + jint *themapArray = NULL; + char **mName = NULL; int relax = 0; int retVal = 0; @@ -853,7 +853,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id, { #ifdef H5_HAVE_ROS3_VFD H5FD_ros3_fapl_t instance; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -1175,7 +1175,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alignment(JNIEnv *env, jclass clss, jlong plist, jlo hsize_t t = 0; hsize_t a = 0; jsize arrLen; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1237,8 +1237,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1cache(JNIEnv *env, jclass clss, jlong plist, jintArr { jboolean isCopy; jdouble *w0Array = NULL; - jlong * rdcc_nelmtsArray = NULL; - jlong * nbytesArray = NULL; + jlong *rdcc_nelmtsArray = NULL; + jlong *nbytesArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1479,7 +1479,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config(JNIEnv *env, jclass clss, jlong plist, jobject cache_config) { H5AC_cache_config_t cacheinfo; - const char * str = NULL; + const char *str = NULL; jfieldID fid; jstring j_str; jclass cls; @@ -1817,7 +1817,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fa ssize_t status = -1; size_t location_size; jsize arrLen; - char * lname = NULL; + char *lname = NULL; jstring str = NULL; UNUSED(clss); @@ -1997,7 +1997,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds(JNIEnv *env, jclass clss, jlong fapl_id, jintArray libver) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pFCPLImp.c b/java/src/jni/h5pFCPLImp.c index ded3248..72c8869 100644 --- a/java/src/jni/h5pFCPLImp.c +++ b/java/src/jni/h5pFCPLImp.c @@ -60,7 +60,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1userblock(JNIEnv *env, jclass clss, jlong plist, jlo { jboolean isCopy; hsize_t s; - jlong * theArray = NULL; + jlong *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -110,7 +110,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1sizes(JNIEnv *env, jclass clss, jlong plist, jlongArray size) { jboolean isCopy; - jlong * theArray = NULL; + jlong *theArray = NULL; jsize arrLen; size_t ss; size_t sa; @@ -172,7 +172,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1sym_1k(JNIEnv *env, jclass clss, jlong plist, jintAr { jboolean isCopy; jsize arrLen; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -227,7 +227,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1istore_1k(JNIEnv *env, jclass clss, jlong plist, jintArray ik) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -313,8 +313,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy(JNIEnv *env, jclass clss, jlon { H5F_fspace_strategy_t thestrategy = H5F_FSPACE_STRATEGY_FSM_AGGR; /* Library default */ jboolean isCopy; - jboolean * persistArray = NULL; - jlong * thresholdArray = NULL; + jboolean *persistArray = NULL; + jlong *thresholdArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -466,7 +466,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index(JNIEnv *env, jclass clss, jlong { jboolean isCopy; unsigned nindexes; /* Number of SOHM indexes */ - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -545,7 +545,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change(JNIEnv *env, jclass clss jintArray size) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pGCPLImp.c b/java/src/jni/h5pGCPLImp.c index 2ba140d..e7d4dd2 100644 --- a/java/src/jni/h5pGCPLImp.c +++ b/java/src/jni/h5pGCPLImp.c @@ -142,7 +142,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray link_info) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); @@ -200,7 +200,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray links) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c index 175794d..c12337c 100644 --- a/java/src/jni/h5pImp.c +++ b/java/src/jni/h5pImp.c @@ -232,7 +232,7 @@ Java_hdf_hdf5lib_H5_H5Pregister2(JNIEnv *env, jclass clss, jlong cls_id, jstring const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -279,7 +279,7 @@ Java_hdf_hdf5lib_H5_H5Pregister2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, j const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -316,7 +316,7 @@ Java_hdf_hdf5lib_H5_H5Pinsert2(JNIEnv *env, jclass clss, jlong cls_id, jstring n const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -360,7 +360,7 @@ Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, jst const char *cstr = NULL; jboolean isCopy; herr_t status = FAIL; - jbyte * propValBuf = NULL; + jbyte *propValBuf = NULL; UNUSED(clss); @@ -497,7 +497,7 @@ done: JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1class_1name(JNIEnv *env, jclass clss, jlong plid) { - char * c_str = NULL; + char *c_str = NULL; jstring j_str = NULL; UNUSED(clss); @@ -615,7 +615,7 @@ Java_hdf_hdf5lib_H5_H5Piterate(JNIEnv *env, jclass clss, jlong prop_id, jintArra { cb_wrapper wrapper = {callback_op, op_data}; jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t status = FAIL; UNUSED(clss); @@ -754,7 +754,7 @@ static herr_t H5P_cls_create_cb(hid_t prop_id, void *create_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -784,7 +784,7 @@ static herr_t H5P_cls_copy_cb(hid_t new_prop_id, hid_t old_prop_id, void *copy_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -814,7 +814,7 @@ static herr_t H5P_cls_close_cb(hid_t prop_id, void *close_data) { jmethodID mid; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jclass cls; jint status = -1; @@ -846,7 +846,7 @@ H5P_prp_create_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -879,7 +879,7 @@ H5P_prp_set_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -912,7 +912,7 @@ H5P_prp_get_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -945,7 +945,7 @@ H5P_prp_delete_cb(hid_t prop_id, const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -978,7 +978,7 @@ H5P_prp_copy_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1010,7 +1010,7 @@ H5P_prp_compare_cb(void *value1, void *value2, size_t size) { jmethodID mid; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1040,7 +1040,7 @@ H5P_prp_close_cb(const char *name, size_t size, void *value) jmethodID mid; jstring str; jclass cls; - JNIEnv * cbenv = NULL; + JNIEnv *cbenv = NULL; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { @@ -1075,8 +1075,8 @@ H5P_iterate_cb(hid_t prop_id, const char *name, void *cb_data) jobject visit_callback = wrapper->visit_callback; jstring str; jclass cls; - JNIEnv * cbenv = NULL; - void * op_data = (void *)wrapper->op_data; + JNIEnv *cbenv = NULL; + void *op_data = (void *)wrapper->op_data; jint status = -1; if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) { diff --git a/java/src/jni/h5pLAPLImp.c b/java/src/jni/h5pLAPLImp.c index 1db495c..81d99fa 100644 --- a/java/src/jni/h5pLAPLImp.c +++ b/java/src/jni/h5pLAPLImp.c @@ -117,7 +117,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix(JNIEnv *env, jclass clss, jlong lapl_i { ssize_t prefix_size = -1; size_t size = 0; - char * pre = NULL; + char *pre = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/h5pOCPLImp.c b/java/src/jni/h5pOCPLImp.c index bdcba46..e287962 100644 --- a/java/src/jni/h5pOCPLImp.c +++ b/java/src/jni/h5pOCPLImp.c @@ -141,7 +141,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change(JNIEnv *env, jclass clss, jlong ocpl_id, jintArray attributes) { jboolean isCopy; - jint * theArray = NULL; + jint *theArray = NULL; herr_t retVal = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c index 9193028..2324402 100644 --- a/java/src/jni/h5plImp.c +++ b/java/src/jni/h5plImp.c @@ -205,7 +205,7 @@ Java_hdf_hdf5lib_H5_H5PLget(JNIEnv *env, jclass clss, jint idx) { jstring str = NULL; ssize_t buf_size; - char * aName = NULL; + char *aName = NULL; UNUSED(clss); diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c index 58b5522..527c801 100644 --- a/java/src/jni/h5rImp.c +++ b/java/src/jni/h5rImp.c @@ -38,7 +38,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *env, jclass clss, jlong loc_id, js { const char *refName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -80,7 +80,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *env, jclass clss, jlong loc_id, js { const char *refName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -124,7 +124,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *env, jclass clss, jlong loc_id, jstr const char *refName = NULL; const char *attrName = NULL; jbyteArray ref = NULL; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -171,7 +171,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Rdestroy(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; herr_t status = FAIL; @@ -204,7 +204,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1type(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; H5R_type_t ref_type = -1; @@ -239,8 +239,8 @@ JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Requal(JNIEnv *env, jclass clss, jbyteArray ref1, jbyteArray ref2) { jboolean isCopy; - jbyte * refBuf1 = NULL; - jbyte * refBuf2 = NULL; + jbyte *refBuf1 = NULL; + jbyte *refBuf2 = NULL; jsize refBufLen; htri_t bval = JNI_FALSE; herr_t status = FAIL; @@ -291,10 +291,10 @@ JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *env, jclass clss, jbyteArray src_ref) { jboolean isCopy; - jbyte * src_refBuf = NULL; + jbyte *src_refBuf = NULL; jsize refBufLen; jbyteArray dst_ref = NULL; - jbyte * dst_refBuf = NULL; + jbyte *dst_refBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -339,7 +339,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -374,7 +374,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -409,7 +409,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -445,7 +445,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3(JNIEnv *env, jclass clss, jbyteArray ref, { H5O_type_t object_info = -1; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; int retVal = -1; UNUSED(clss); @@ -477,11 +477,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -522,11 +522,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -568,11 +568,11 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *env, jclass clss, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jstring str = NULL; ssize_t buf_size; ssize_t check_size = -1; - char * namePtr = NULL; + char *namePtr = NULL; UNUSED(clss); @@ -617,7 +617,7 @@ Java_hdf_hdf5lib_H5_H5Rcreate(JNIEnv *env, jclass clss, jbyteArray ref, jlong lo { const char *refName = NULL; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; herr_t status = FAIL; @@ -667,7 +667,7 @@ Java_hdf_hdf5lib_H5__1H5Rdereference(JNIEnv *env, jclass clss, jlong dataset, jl jint ref_type, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -711,7 +711,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Rget_1region(JNIEnv *env, jclass clss, jlong dataset, jint ref_type, jbyteArray ref) { jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; jsize refBufLen; hid_t retVal = H5I_INVALID_HID; @@ -753,7 +753,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type(JNIEnv *env, jclass clss, jlong loc_id, ji { H5O_type_t object_info; jboolean isCopy; - jbyte * refBuf = NULL; + jbyte *refBuf = NULL; int retVal = -1; UNUSED(clss); @@ -786,8 +786,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2(JNIEnv *env, jclass clss, jlong loc_id, j jintArray ref_obj) { jboolean isCopy, isCopy2; - jbyte * refBuf = NULL; - jint * ref_objP = NULL; + jbyte *refBuf = NULL; + jint *ref_objP = NULL; jint status = -1; int retVal = -1; @@ -828,8 +828,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *env, jclass clss, jlong loc_id, jint re jboolean isCopy; jstring str; jsize refBufLen; - jbyte * refBuf = NULL; - char * aName = NULL; + jbyte *refBuf = NULL; + char *aName = NULL; jlong ret_val = -1; UNUSED(clss); @@ -889,8 +889,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1name_1string(JNIEnv *env, jclass clss, jlong loc_id, jboolean isCopy; jstring str; jsize refBufLen; - jbyte * refBuf = NULL; - char * aName = NULL; + jbyte *refBuf = NULL; + char *aName = NULL; ssize_t buf_size = -1; jlong ret_val = -1; diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c index c3a8460..82fa3c7 100644 --- a/java/src/jni/h5sImp.c +++ b/java/src/jni/h5sImp.c @@ -63,8 +63,8 @@ Java_hdf_hdf5lib_H5__1H5Screate_1simple(JNIEnv *env, jclass clss, jint rank, jlo hsize_t *sa = NULL; hsize_t *msa = NULL; hsize_t *lp = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; - jlong * jlp = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; + jlong *jlp = NULL; jsize drank = 0, mrank = 0; int i; hid_t retVal = H5I_INVALID_HID; @@ -180,7 +180,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id { jboolean isCopy; hssize_t *sa = NULL; - jlong * P = NULL; + jlong *P = NULL; jint i; int rank; herr_t status = FAIL; @@ -224,8 +224,8 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id jboolean isCopy; hsize_t *lp = NULL; hsize_t *llp = NULL; - jlong * jlp = NULL; - jbyte * P = NULL; + jlong *jlp = NULL; + jbyte *P = NULL; jsize size; int ii; int nlongs; @@ -416,7 +416,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims(JNIEnv *env, jclass clss, jlong jboolean isCopy; hsize_t *sa = NULL; hsize_t *msa = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; int i; int rank = -1; int mrank; @@ -525,8 +525,8 @@ Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple(JNIEnv *env, jclass clss, jlong space hsize_t *sa = NULL; hsize_t *msa = NULL; hsize_t *lp = NULL; - jlong * dimsP = NULL, *maxdimsP = NULL; - jlong * jlp = NULL; + jlong *dimsP = NULL, *maxdimsP = NULL; + jlong *jlp = NULL; jsize drank, mrank; int i; herr_t status = FAIL; @@ -635,8 +635,8 @@ Java_hdf_hdf5lib_H5_H5Soffset_1simple(JNIEnv *env, jclass clss, jlong space_id, hssize_t *lp = NULL; size_t rank; jsize i; - jbyte * P = NULL; - jlong * jlp = NULL; + jbyte *P = NULL; + jlong *jlp = NULL; herr_t status = FAIL; UNUSED(clss); @@ -749,8 +749,8 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab(JNIEnv *env, jclass clss, jlong space_i jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; hsize_t *lp = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; - jlong * jlp = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *jlp = NULL; jsize start_rank, stride_rank, count_rank, block_rank; int i; herr_t status = FAIL; @@ -944,7 +944,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist(JNIEnv *env, jclass clss, j jboolean isCopy; hsize_t *ba = NULL; size_t i, buf_size; - jlong * bufP = NULL; + jlong *bufP = NULL; jsize buflen; int rank; herr_t status = FAIL; @@ -1005,7 +1005,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist(JNIEnv *env, jclass clss, jl { jboolean isCopy; hsize_t *ba = NULL; - jlong * bufP = NULL; + jlong *bufP = NULL; jsize buflen; int i, rank; herr_t status = FAIL; @@ -1064,7 +1064,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds(JNIEnv *env, jclass clss, jlong space hsize_t *strt = NULL; hsize_t *en = NULL; size_t i; - jlong * startP = NULL, *endP = NULL; + jlong *startP = NULL, *endP = NULL; jsize rank; herr_t status = FAIL; @@ -1163,7 +1163,7 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sdecode(JNIEnv *env, jclass clss, jbyteArray buf) { jboolean isCopy; - jbyte * bufP = NULL; + jbyte *bufP = NULL; hid_t sid = H5I_INVALID_HID; UNUSED(clss); @@ -1215,7 +1215,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab(JNIEnv *env, jclass clss, jlong s { jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; jsize start_rank = -1, stride_rank = -1, count_rank = -1, block_rank = -1; int i, rank = -1; herr_t status = FAIL; @@ -1390,7 +1390,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1adjust(JNIEnv *env, jclass clss, jlong space_id, { jboolean isCopy; hssize_t *offst = NULL; - jlong * offsetP = NULL; + jlong *offsetP = NULL; jsize offset_rank = -1; int i, rank = -1; herr_t status = FAIL; @@ -1450,7 +1450,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1intersect_1block(JNIEnv *env, jclass clss, jlong htri_t bval = JNI_FALSE; jboolean isCopy; hsize_t *strt = NULL, *nd = NULL; - jlong * startP = NULL, *endP = NULL; + jlong *startP = NULL, *endP = NULL; jsize start_rank = -1, end_rank = -1; int i, rank = -1; @@ -1558,8 +1558,8 @@ Java_hdf_hdf5lib_H5_H5Scombine_1hyperslab(JNIEnv *env, jclass clss, jlong space_ jboolean isCopy; hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL; hsize_t *lp = NULL; - jlong * startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; - jlong * jlp = NULL; + jlong *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL; + jlong *jlp = NULL; jsize start_rank, stride_rank, count_rank, block_rank; int i; hid_t sid = H5I_INVALID_HID; diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c index 8cd1afb..5a1d398 100644 --- a/java/src/jni/h5tImp.c +++ b/java/src/jni/h5tImp.c @@ -361,7 +361,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1pad(JNIEnv *env, jclass clss, jlong type_id, jintArray pad) { jboolean isCopy; - jint * P = NULL; + jint *P = NULL; herr_t status = FAIL; UNUSED(clss); @@ -448,7 +448,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1fields_1int(JNIEnv *env, jclass clss, jlong type_id, { jboolean isCopy; jsize arrLen; - jint * P = NULL; + jint *P = NULL; herr_t status = FAIL; UNUSED(clss); @@ -485,7 +485,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tget_1fields(JNIEnv *env, jclass clss, jlong type_id, jlongArray fields) { jboolean isCopy; - jlong * fieldsArray = NULL; + jlong *fieldsArray = NULL; jsize arrLen; herr_t status = FAIL; @@ -792,7 +792,7 @@ done: JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1name(JNIEnv *env, jclass clss, jlong type_id, jint field_idx) { - char * member_name = NULL; + char *member_name = NULL; jstring str = NULL; UNUSED(clss); @@ -949,7 +949,7 @@ Java_hdf_hdf5lib_H5_H5Treclaim(JNIEnv *env, jclass clss, jlong type_id, jlong sp jbyteArray buf) { jboolean bufIsCopy; - jbyte * pinBuf = NULL; + jbyte *pinBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1042,7 +1042,7 @@ JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1tag(JNIEnv *env, jclass clss, jlong type) { jstring str = NULL; - char * tag = NULL; + char *tag = NULL; UNUSED(clss); @@ -1108,7 +1108,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int(JNIEnv *env, jclass clss, jlong type_id { const char *memberName = NULL; jboolean isCopy; - jint * intBuf = NULL; + jint *intBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1144,7 +1144,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1insert(JNIEnv *env, jclass clss, jlong type_id, jst { const char *memberName = NULL; jboolean isCopy; - jbyte * memberBuf = NULL; + jbyte *memberBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1179,8 +1179,8 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int(JNIEnv *env, jclass clss, jlong type_id { jboolean isCopy; jstring str; - jint * intP = NULL; - char * nameP = NULL; + jint *intP = NULL; + char *nameP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1224,8 +1224,8 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof(JNIEnv *env, jclass clss, jlong type_id, jby { jboolean isCopy; jstring str = NULL; - jbyte * byteP = NULL; - char * nameP = NULL; + jbyte *byteP = NULL; + char *nameP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1267,7 +1267,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int(JNIEnv *env, jclass clss, jlong type_i { const char *enumValue = NULL; jboolean isCopy; - jint * enumValueBuf = NULL; + jint *enumValueBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1303,7 +1303,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1valueof(JNIEnv *env, jclass clss, jlong type_id, js { const char *enumValue = NULL; jboolean isCopy; - jbyte * enumValueBuf = NULL; + jbyte *enumValueBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1337,7 +1337,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int(JNIEnv *env, jclass clss, jlong t jintArray value) { jboolean isCopy; - jint * intP = NULL; + jint *intP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1367,7 +1367,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1member_1value(JNIEnv *env, jclass clss, jlong type_i jbyteArray value) { jboolean isCopy; - jbyte * byteP = NULL; + jbyte *byteP = NULL; herr_t status = FAIL; UNUSED(clss); @@ -1417,7 +1417,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *env, jclass clss, jlong type_id, hsize_t *cdims = NULL; size_t i; jsize dlen; - jint * dimsP = NULL; + jint *dimsP = NULL; int ndims = -1; UNUSED(clss); @@ -1552,7 +1552,7 @@ Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *env, jclass clss, jlong base_id, jboolean isCopy; hsize_t *cdims = NULL; size_t i; - jlong * dimsP = NULL; + jlong *dimsP = NULL; jsize dlen; hid_t retVal = H5I_INVALID_HID; @@ -1603,7 +1603,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *env, jclass clss, jlong type_id jboolean isCopy; hsize_t *cdims = NULL; size_t i; - jlong * dimsP = NULL; + jlong *dimsP = NULL; jsize dlen; int ndims = -1; @@ -1648,8 +1648,8 @@ Java_hdf_hdf5lib_H5_H5Tconvert(JNIEnv *env, jclass clss, jlong src_id, jlong dst jbyteArray buf, jbyteArray background, jlong plist_id) { jboolean isCopy; - jbyte * bufP = NULL; - jbyte * bgP = NULL; + jbyte *bufP = NULL; + jbyte *bgP = NULL; herr_t status = FAIL; UNUSED(clss); diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c index d661acb..31eb320 100644 --- a/java/src/jni/h5util.c +++ b/java/src/jni/h5util.c @@ -46,7 +46,7 @@ jobject set_callback; jobject delete_callback; H5E_auto2_t efunc; -void * edata; +void *edata; /********************/ /* Local Prototypes */ @@ -190,9 +190,9 @@ h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_ size_t retVal = 0; size_t typeSize = 0; hid_t mtid = H5I_INVALID_HID; - char * this_str = NULL; - char * cptr = NULL; - char * token; + char *this_str = NULL; + char *cptr = NULL; + char *token; int n; if (!in_str) @@ -680,7 +680,7 @@ int h5str_sprint_reference(JNIEnv *env, h5str_t *out_str, void *ref_p) { ssize_t buf_size; - char * ref_name = NULL; + char *ref_name = NULL; H5R_ref_t *ref_vp = (H5R_ref_t *)ref_p; int ret_value = FAIL; @@ -833,8 +833,8 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i size_t typeSize = 0; H5T_sign_t nsign = H5T_SGN_ERROR; hid_t mtid = H5I_INVALID_HID; - char * cptr = (char *)in_buf; - char * this_str = NULL; + char *cptr = (char *)in_buf; + char *this_str = NULL; int n; size_t retVal = 0; @@ -916,7 +916,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i case H5T_STRING: { htri_t is_variable; - char * tmp_str; + char *tmp_str; typeSize = 0; @@ -1182,7 +1182,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i else if (H5R_OBJ_REF_BUF_SIZE == typeSize) { H5O_info2_t oi; hid_t obj = H5I_INVALID_HID; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; /* * Object references -- show the type and OID of the referenced @@ -1262,7 +1262,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i /* Object references -- show the type and * OID of the referenced object. */ H5O_info2_t oi; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; if ((new_obj_id = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { H5Oget_info3(new_obj_id, &oi, H5O_INFO_BASIC); @@ -1435,7 +1435,7 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i case H5T_VLEN: { unsigned int i; size_t baseSize; - hvl_t * vl_buf = (hvl_t *)in_buf; + hvl_t *vl_buf = (hvl_t *)in_buf; if ((mtid = H5Tget_super(tid)) < 0) H5_LIBRARY_ERROR(ENVONLY); @@ -1541,7 +1541,7 @@ h5str_print_region_data_blocks(JNIEnv *env, hid_t region_id, h5str_t *str, int n size_t type_size; hid_t mem_space = H5I_INVALID_HID; hid_t sid1 = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = FAIL; if (ndims < 0) @@ -1753,7 +1753,7 @@ h5str_print_region_data_points(JNIEnv *env, hid_t region_space, hid_t region_id, size_t jndx; size_t type_size; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int ret_value = FAIL; UNUSED(ptdata); @@ -2276,7 +2276,7 @@ h5str_render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hs unsigned char tempuchar; unsigned int i; H5T_str_t pad; - char * s; + char *s; if ((pad = H5Tget_strpad(tid)) < 0) { ret_value = FAIL; @@ -2492,7 +2492,7 @@ render_bin_output_region_data_blocks(FILE *stream, hid_t region_id, hid_t contai size_t type_size; hid_t sid1 = H5I_INVALID_HID; hid_t mem_space = H5I_INVALID_HID; - void * region_buf = NULL; + void *region_buf = NULL; int blkndx; int jndx; int ret_value = SUCCEED; @@ -2681,7 +2681,7 @@ render_bin_output_region_data_points(FILE *stream, hid_t region_space, hid_t reg 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 = SUCCEED; UNUSED(ptdata); @@ -2878,7 +2878,7 @@ h5str_dump_region_attribute(JNIEnv *env, h5str_t *str, hid_t region_id) for (i = 0; i < p_nelmts; i++) { size_t bytes_in = 0; /* # of bytes to write */ - void * memref = buf + i * size; + void *memref = buf + i * size; if (!(bytes_in = h5str_sprintf(ENVONLY, str, region_id, type_id, memref, 1))) CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); @@ -2928,7 +2928,7 @@ h5str_dump_simple_dset(JNIEnv *env, FILE *stream, hid_t dset, int binary_order) size_t p_type_nbytes; /* size of memory type */ /* Stripmine info */ - void * sm_buf = NULL; /* buffer for raw data */ + void *sm_buf = NULL; /* buffer for raw data */ hsize_t sm_size[H5S_MAX_RANK]; /* stripmine size */ hsize_t sm_nbytes; /* bytes per stripmine */ hsize_t sm_nelmts; /* elements per stripmine */ @@ -3147,7 +3147,7 @@ h5str_dump_simple_mem(JNIEnv *env, FILE *stream, hid_t attr_id, int binary_order hsize_t total_size[H5S_MAX_RANK]; /* total size of dataset*/ hsize_t p_nelmts; /* total selected elmts */ - void * sm_buf = NULL; /* buffer for raw data */ + void *sm_buf = NULL; /* buffer for raw data */ hsize_t sm_size[H5S_MAX_RANK]; /* stripmine size */ int ret_value = 0; @@ -3355,7 +3355,7 @@ h5str_dump_simple_data(JNIEnv *env, FILE *stream, hid_t container, hid_t type, v for (i = 0, line_count = 0; i < nelmts; i++, line_count++) { size_t bytes_in = 0; /* # of bytes to write */ - void * memref = mem + i * size; + void *memref = mem + i * size; /* Render the data element*/ h5str_new(&buffer, 32 * size); @@ -3413,7 +3413,7 @@ Java_hdf_hdf5lib_H5_H5AreadComplex(JNIEnv *env, jclass clss, jlong attr_id, jlon size_t i; hid_t p_type = H5I_INVALID_HID; jsize n; - char * readBuf = NULL; + char *readBuf = NULL; herr_t status = FAIL; UNUSED(clss); @@ -3480,7 +3480,7 @@ Java_hdf_hdf5lib_H5_H5Acopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id hssize_t npoints; hsize_t total_size = 0; size_t type_size; - jbyte * buf = NULL; + jbyte *buf = NULL; hid_t tid = H5I_INVALID_HID; hid_t sid = H5I_INVALID_HID; herr_t retVal = FAIL; @@ -3538,7 +3538,7 @@ Java_hdf_hdf5lib_H5_H5Dcopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id hssize_t npoints; hsize_t total_size = 0, total_allocated_size; size_t type_size; - jbyte * buf = NULL; + jbyte *buf = NULL; hid_t tid = H5I_INVALID_HID; hid_t sid = H5I_INVALID_HID; herr_t retVal = FAIL; @@ -3613,10 +3613,10 @@ static int H5Gget_obj_info_full(hid_t loc_id, char **objname, int *otype, int #endif typedef struct info_all { - char ** objname; - int * otype; - int * ltype; - H5O_token_t * obj_token; + char **objname; + int *otype; + int *ltype; + H5O_token_t *obj_token; unsigned long *fno; unsigned long idxnum; int count; @@ -3639,15 +3639,15 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full(JNIEnv *env, jclass clss, jlong loc_ jint indx_order) { unsigned long *fnos = NULL; - H5O_token_t * tokens = NULL; - const char * gName = NULL; - char ** oName = NULL; + H5O_token_t *tokens = NULL; + const char *gName = NULL; + char **oName = NULL; jboolean isCopy; jstring str; jobject token; - jint * otarr = NULL; - jint * ltarr = NULL; - jlong * fnoP = NULL; + jint *otarr = NULL; + jint *ltarr = NULL; + jlong *fnoP = NULL; hid_t gid = (hid_t)loc_id; int i; int indexType = indx_type; @@ -3753,9 +3753,9 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max(JNIEnv *env, jclass clss, jlong loc_i jboolean isCopy; jstring str; jobject token; - char ** oName = NULL; - jint * otarr = NULL; - jint * ltarr = NULL; + char **oName = NULL; + jint *otarr = NULL; + jint *ltarr = NULL; int i; herr_t ret_val = FAIL; @@ -3947,7 +3947,7 @@ Java_hdf_hdf5lib_H5_H5export_1dataset(JNIEnv *env, jclass clss, jstring file_exp jboolean isCopy; herr_t ret_val = FAIL; hid_t dataset_id = H5I_INVALID_HID; - FILE * stream = NULL; + FILE *stream = NULL; UNUSED(clss); @@ -4001,7 +4001,7 @@ Java_hdf_hdf5lib_H5_H5export_1attribute(JNIEnv *env, jclass clss, jstring file_e jboolean isCopy; herr_t ret_val = FAIL; hid_t attr_id = H5I_INVALID_HID; - FILE * stream = NULL; + FILE *stream = NULL; UNUSED(clss); diff --git a/java/src/jni/h5util.h b/java/src/jni/h5util.h index 3146c06..24c1116 100644 --- a/java/src/jni/h5util.h +++ b/java/src/jni/h5util.h @@ -31,14 +31,14 @@ #endif typedef struct h5str_t { - char * s; + char *s; size_t max; /* the allocated size of the string */ } h5str_t; extern void h5str_new(h5str_t *str, size_t len); extern void h5str_free(h5str_t *str); extern void h5str_resize(h5str_t *str, size_t new_len); -extern char * h5str_append(h5str_t *str, const char *cstr); +extern char *h5str_append(h5str_t *str, const char *cstr); extern htri_t h5str_detect_vlen(hid_t tid); extern size_t h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf, size_t out_buf_offset); diff --git a/java/src/jni/h5vlImp.c b/java/src/jni/h5vlImp.c index 40f8863..770fc45 100644 --- a/java/src/jni/h5vlImp.c +++ b/java/src/jni/h5vlImp.c @@ -211,7 +211,7 @@ JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1name(JNIEnv *env, jclass clss, jlong object_id) { ssize_t buf_size, status; - char * volName = NULL; + char *volName = NULL; jstring str = NULL; UNUSED(clss); diff --git a/java/src/jni/nativeData.c b/java/src/jni/nativeData.c index ac9168b..8bcfac1 100644 --- a/java/src/jni/nativeData.c +++ b/java/src/jni/nativeData.c @@ -50,10 +50,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B(JNIEnv *env, jclass clss, jbyteArr { jintArray rarray = NULL; jboolean bb; - jbyte * barr = NULL; - jint * iarray = NULL; - jint * iap = NULL; - char * bp = NULL; + jbyte *barr = NULL; + jint *iarray = NULL; + jint *iap = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -101,10 +101,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B(JNIEnv *env, jclass clss, { jfloatArray rarray = NULL; jboolean bb; - jfloat * farray = NULL; - jfloat * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jfloat *farray = NULL; + jfloat *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -152,10 +152,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B(JNIEnv *env, jclass clss, { jshortArray rarray = NULL; jboolean bb; - jshort * sarray = NULL; - jshort * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jshort *sarray = NULL; + jshort *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -203,10 +203,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B(JNIEnv *env, jclass clss, { jlongArray rarray = NULL; jboolean bb; - jlong * larray = NULL; - jlong * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jlong *larray = NULL; + jlong *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -254,10 +254,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B(JNIEnv *env, jclass clss, { jdoubleArray rarray = NULL; jboolean bb; - jdouble * darray = NULL; - jdouble * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jdouble *darray = NULL; + jdouble *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; int len; @@ -305,10 +305,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B(JNIEnv *env, jclass clss, jint s { jintArray rarray = NULL; jboolean bb; - jint * iarray = NULL; - jint * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jint *iarray = NULL; + jint *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -357,10 +357,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B(JNIEnv *env, jclass clss, jint { jshortArray rarray = NULL; jboolean bb; - jshort * sarray = NULL; - jshort * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jshort *sarray = NULL; + jshort *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -409,10 +409,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B(JNIEnv *env, jclass clss, jint { jfloatArray rarray = NULL; jboolean bb; - jfloat * farray = NULL; - jfloat * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jfloat *farray = NULL; + jfloat *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -461,10 +461,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B(JNIEnv *env, jclass clss, jint { jlongArray rarray = NULL; jboolean bb; - jlong * larray = NULL; - jlong * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jlong *larray = NULL; + jlong *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -513,10 +513,10 @@ Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B(JNIEnv *env, jclass clss, jin { jdoubleArray rarray = NULL; jboolean bb; - jdouble * darray = NULL; - jdouble * iap = NULL; - jbyte * barr = NULL; - char * bp = NULL; + jdouble *darray = NULL; + jdouble *iap = NULL; + jbyte *barr = NULL; + char *bp = NULL; int blen; int ii; @@ -565,10 +565,10 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I(JNIEnv *env, jclass clss, jint s { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; - jint * ip = NULL; - jint * iarr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; + jint *ip = NULL; + jint *iarr = NULL; int ilen; int blen; int ii; @@ -627,10 +627,10 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jshort * ip = NULL; - jshort * sarr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jshort *ip = NULL; + jshort *sarr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -689,10 +689,10 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jfloat * ip = NULL; - jfloat * farr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jfloat *ip = NULL; + jfloat *farr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -751,10 +751,10 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D(JNIEnv *env, jclass clss, jin { jbyteArray rarray = NULL; jboolean bb; - jdouble * ip = NULL; - jdouble * darr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jdouble *ip = NULL; + jdouble *darr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -813,10 +813,10 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J(JNIEnv *env, jclass clss, jint { jbyteArray rarray = NULL; jboolean bb; - jlong * ip = NULL; - jlong * larr = NULL; - jbyte * barray = NULL; - jbyte * bap = NULL; + jlong *ip = NULL; + jlong *larr = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ilen; int blen; int ii; @@ -874,8 +874,8 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__I(JNIEnv *env, jclass clss, jint idata { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { int ival; @@ -909,8 +909,8 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__F(JNIEnv *env, jclass clss, jfloat f { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { float ival; @@ -944,8 +944,8 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__S(JNIEnv *env, jclass clss, jshort s { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { short ival; @@ -979,8 +979,8 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D(JNIEnv *env, jclass clss, jdouble { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { double ival; @@ -1014,8 +1014,8 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__J(JNIEnv *env, jclass clss, jlong lda { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { jlong ival; @@ -1049,8 +1049,8 @@ Java_hdf_hdf5lib_HDFNativeData_byteToByte__B(JNIEnv *env, jclass clss, jbyte bda { jbyteArray rarray = NULL; jboolean bb; - jbyte * barray = NULL; - jbyte * bap = NULL; + jbyte *barray = NULL; + jbyte *bap = NULL; int ij; union things { jbyte ival; diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 67a522c..722ab65 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -107,7 +107,7 @@ public class TestH5 { { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); } diff --git a/java/test/TestH5A.java b/java/test/TestH5A.java index 96ce5b5..4437ec7 100644 --- a/java/test/TestH5A.java +++ b/java/test/TestH5A.java @@ -547,7 +547,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, "dset", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attribute_id = H5.H5Aopen(H5did, "dset", HDF5Constants.H5P_DEFAULT); // Calling H5Aget_info with attribute_id returned from H5Aopen. attr_info = H5.H5Aget_info(attribute_id); @@ -588,7 +588,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, ".", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attribute_id = H5.H5Aopen_by_idx(H5did, ".", HDF5Constants.H5_INDEX_CRT_ORDER, order, 0, HDF5Constants.H5P_DEFAULT, lapl_id); // Calling H5Aget_info with attribute_id returned from @@ -631,7 +631,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate(H5did, "dset1", type_id, space_id, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); attr2_id = H5.H5Acreate(H5did, "dataset2", type_id, space_id, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT); @@ -708,7 +708,7 @@ public class TestH5A { try { attr_id = H5.H5Acreate_by_name(H5fid, obj_name, attr_name, type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr_info = H5.H5Aget_info_by_name(H5fid, obj_name, attr_name, lapl_id); assertNotNull(attr_info); } @@ -1221,13 +1221,13 @@ public class TestH5A { } try { attr1_id = H5.H5Acreate_by_name(H5fid, ".", "attribute1", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr2_id = H5.H5Acreate_by_name(H5fid, ".", "attribute2", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr3_id = H5.H5Acreate_by_name(H5fid, ".", "attribute3", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr4_id = H5.H5Acreate_by_name(H5fid, ".", "attribute4", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); H5A_iterate_cb iter_cb = new H5A_iter_callback(); try { H5.H5Aiterate(H5fid, HDF5Constants.H5_INDEX_CRT_ORDER, HDF5Constants.H5_ITER_INC, 0L, iter_cb, @@ -1314,13 +1314,13 @@ public class TestH5A { } try { attr1_id = H5.H5Acreate_by_name(H5fid, ".", "attribute4", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr2_id = H5.H5Acreate_by_name(H5fid, ".", "attribute3", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr3_id = H5.H5Acreate_by_name(H5fid, ".", "attribute2", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); attr4_id = H5.H5Acreate_by_name(H5fid, ".", "attribute1", type_id, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, lapl_id); H5A_iterate_cb iter_cb = new H5A_iter_callback(); try { H5.H5Aiterate_by_name(H5fid, ".", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0L, diff --git a/java/test/TestH5Dplist.java b/java/test/TestH5Dplist.java index b9e97f4..c3e4d69 100644 --- a/java/test/TestH5Dplist.java +++ b/java/test/TestH5Dplist.java @@ -125,7 +125,7 @@ public class TestH5Dplist { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(RANK, H5dims, H5maxdims); } catch (Throwable err) { diff --git a/java/test/TestH5Ocopy.java b/java/test/TestH5Ocopy.java index e429fef..18cb71a 100644 --- a/java/test/TestH5Ocopy.java +++ b/java/test/TestH5Ocopy.java @@ -98,7 +98,7 @@ public class TestH5Ocopy { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(FILENAME, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid2 = H5.H5Screate(HDF5Constants.H5S_SCALAR); H5did1 = _createDataset(H5fid, H5dsid2, "DS2", HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(1, dims, null); diff --git a/java/test/TestH5OcopyOld.java b/java/test/TestH5OcopyOld.java index 2cfccc7..6353df5 100644 --- a/java/test/TestH5OcopyOld.java +++ b/java/test/TestH5OcopyOld.java @@ -98,7 +98,7 @@ public class TestH5OcopyOld { System.out.print(testname.getMethodName()); try { H5fid = H5.H5Fcreate(FILENAME, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid2 = H5.H5Screate(HDF5Constants.H5S_SCALAR); H5did1 = _createDataset(H5fid, H5dsid2, "DS2", HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(1, dims, null); diff --git a/java/test/TestH5PData.java b/java/test/TestH5PData.java index 49a0b7d..da45715 100644 --- a/java/test/TestH5PData.java +++ b/java/test/TestH5PData.java @@ -104,7 +104,7 @@ public class TestH5PData { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createFloatDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); plist_id = H5.H5Pcreate(HDF5Constants.H5P_DATASET_XFER); diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 307ee74..e5c04ee 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -247,7 +247,7 @@ public class TestH5Pfapl { { try { H5fid = H5.H5Fcreate(H5_FAMILY_FILE + ".h5", HDF5Constants.H5F_ACC_TRUNC, - HDF5Constants.H5P_DEFAULT, fapl); + HDF5Constants.H5P_DEFAULT, fapl); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5did = _createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT); } diff --git a/java/test/TestH5Pvirtual.java b/java/test/TestH5Pvirtual.java index 41ae6d1..b743f09 100644 --- a/java/test/TestH5Pvirtual.java +++ b/java/test/TestH5Pvirtual.java @@ -107,11 +107,11 @@ public class TestH5Pvirtual { try { file_id = H5.H5Fcreate(SRC_FILE[i], HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); space_id = H5.H5Screate_simple(1, H5dims, null); dset_id = H5.H5Dcreate(file_id, SRC_DATASET[i], HDF5Constants.H5T_NATIVE_INT, space_id, - HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, + HDF5Constants.H5P_DEFAULT); H5.H5Dwrite(dset_id, HDF5Constants.H5T_NATIVE_INT, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL, HDF5Constants.H5P_DEFAULT, dset_data); } @@ -144,7 +144,7 @@ public class TestH5Pvirtual { try { int[] fill_value = {-1}; H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, VDSH5dims, null); H5dcplid = H5.H5Pcreate(HDF5Constants.H5P_DATASET_CREATE); H5.H5Pset_fill_value(H5dcplid, HDF5Constants.H5T_NATIVE_INT, fill_value); diff --git a/java/test/TestH5R.java b/java/test/TestH5R.java index dd8634b..221a71e 100644 --- a/java/test/TestH5R.java +++ b/java/test/TestH5R.java @@ -111,7 +111,7 @@ public class TestH5R { try { H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT, - HDF5Constants.H5P_DEFAULT); + HDF5Constants.H5P_DEFAULT); H5dsid = H5.H5Screate_simple(2, H5dims, null); H5gid = _createGroup(H5fid, "Group1"); H5did2 = _createDataset(H5gid, H5dsid, "dset2", HDF5Constants.H5P_DEFAULT); @@ -50,7 +50,7 @@ /* Node for list of 'atclose' routines to invoke at library shutdown */ typedef struct H5_atclose_node_t { H5_atclose_func_t func; /* Function to invoke */ - void * ctx; /* Context to pass to function */ + void *ctx; /* Context to pass to function */ struct H5_atclose_node_t *next; /* Pointer to next node in list */ } H5_atclose_node_t; @@ -146,7 +146,7 @@ herr_t H5_init_library(void) { size_t i; - char * env_use_select_io = NULL; + char *env_use_select_io = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) @@ -782,7 +782,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; @@ -964,8 +964,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 @@ -156,7 +156,7 @@ static hid_t H5A__create_api_common(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -255,8 +255,8 @@ H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -302,7 +302,7 @@ H5A__create_by_name_api_common(hid_t loc_id, const char *obj_name, const char *a hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -404,8 +404,8 @@ H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -491,7 +491,7 @@ static hid_t H5A__open_api_common(hid_t loc_id, const char *attr_name, hid_t aapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -569,8 +569,8 @@ H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid const char *attr_name, hid_t aapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -613,7 +613,7 @@ static hid_t H5A__open_by_name_api_common(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -698,8 +698,8 @@ H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_l const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) @@ -745,7 +745,7 @@ H5A__open_by_idx_api_common(hid_t loc_id, const char *obj_name, H5_index_t idx_t hsize_t n, hid_t aapl_id, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -838,8 +838,8 @@ H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li hid_t aapl_id, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) @@ -882,7 +882,7 @@ static herr_t H5A__write_api_common(hid_t attr_id, hid_t type_id, const void *buf, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ herr_t ret_value = SUCCEED; /* Return value */ @@ -952,8 +952,8 @@ H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hi const void *buf, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for attr_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -990,7 +990,7 @@ done: static herr_t H5A__read_api_common(hid_t attr_id, hid_t dtype_id, void *buf, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1060,8 +1060,8 @@ H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid void *buf /*out*/, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for attr_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1106,7 +1106,7 @@ done: hid_t H5Aget_space(hid_t attr_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1151,7 +1151,7 @@ done: hid_t H5Aget_type(hid_t attr_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1199,7 +1199,7 @@ done: hid_t H5Aget_create_plist(hid_t attr_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1252,7 +1252,7 @@ done: ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ size_t attr_name_len = 0; /* Length of attribute name */ ssize_t ret_value = -1; /* Return value */ @@ -1306,7 +1306,7 @@ ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ size_t attr_name_len = 0; /* Length of attribute name */ ssize_t ret_value; /* Return value */ @@ -1378,7 +1378,7 @@ done: hsize_t H5Aget_storage_size(hid_t attr_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ hsize_t storage_size = 0; /* Storage size of attribute */ hsize_t ret_value; /* Return value */ @@ -1421,7 +1421,7 @@ done: herr_t H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1466,7 +1466,7 @@ herr_t H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H5A_info_t *ainfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1526,7 +1526,7 @@ herr_t H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5A_info_t *ainfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Attribute object for ID */ + H5VL_object_t *vol_obj = NULL; /* Attribute object for ID */ H5VL_attr_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1626,7 +1626,7 @@ static herr_t H5A__rename_api_common(hid_t loc_id, const char *old_name, const char *new_name, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -1700,8 +1700,8 @@ H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, h const char *old_name, const char *new_name, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1739,7 +1739,7 @@ static herr_t H5A__rename_by_name_api_common(hid_t loc_id, const char *obj_name, const char *old_name, const char *new_name, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -1818,8 +1818,8 @@ H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1892,7 +1892,7 @@ herr_t H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx /*in,out */, H5A_operator2_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5VL_attr_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value; /* Return value */ @@ -1980,7 +1980,7 @@ herr_t H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx /*in,out */, H5A_operator2_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5VL_attr_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2046,7 +2046,7 @@ done: herr_t H5Adelete(hid_t loc_id, const char *name) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5VL_attr_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2105,7 +2105,7 @@ done: herr_t H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5VL_attr_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2175,7 +2175,7 @@ herr_t H5Adelete_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 lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5VL_attr_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2267,9 +2267,9 @@ herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - H5VL_t * connector = NULL; /* VOL connector */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + H5VL_t *connector = NULL; /* VOL connector */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -2365,7 +2365,7 @@ static herr_t H5A__exists_api_common(hid_t obj_id, const char *attr_name, hbool_t *attr_exists, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -2441,8 +2441,8 @@ H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, h const char *attr_name, hbool_t *attr_exists, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -2481,7 +2481,7 @@ H5A__exists_by_name_api_common(hid_t loc_id, const char *obj_name, const char *a hbool_t *attr_exists, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -2558,8 +2558,8 @@ H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -61,7 +61,7 @@ static herr_t H5AC__check_if_write_permitted(const H5F_t *f, hbool_t *write_permitted_ptr); static herr_t H5AC__ext_config_2_int_config(const H5AC_cache_config_t *ext_conf_ptr, - H5C_auto_size_ctl_t * int_conf_ptr); + H5C_auto_size_ctl_t *int_conf_ptr); #if H5AC_DO_TAGGING_SANITY_CHECKS static herr_t H5AC__verify_tag(const H5AC_class_t *type); #endif /* H5AC_DO_TAGGING_SANITY_CHECKS */ @@ -202,7 +202,7 @@ H5AC_term_package(void) hbool_t H5AC_cache_image_pending(const H5F_t *f) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -878,7 +878,7 @@ herr_t H5AC_mark_entry_dirty(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -932,7 +932,7 @@ herr_t H5AC_mark_entry_clean(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -985,7 +985,7 @@ herr_t H5AC_mark_entry_unserialized(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1027,7 +1027,7 @@ herr_t H5AC_mark_entry_serialized(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1125,7 +1125,7 @@ herr_t H5AC_pin_protected_entry(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1306,7 +1306,7 @@ herr_t H5AC_create_flush_dependency(void *parent_thing, void *child_thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1428,7 +1428,7 @@ herr_t H5AC_resize_entry(void *thing, size_t new_size) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1543,7 +1543,7 @@ herr_t H5AC_unpin_entry(void *thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1585,7 +1585,7 @@ herr_t H5AC_destroy_flush_dependency(void *parent_thing, void *child_thing) { H5AC_info_t *entry_ptr = NULL; /* Pointer to the cache entry */ - H5C_t * cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache_ptr = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -2746,7 +2746,7 @@ herr_t H5AC_remove_entry(void *_entry) { H5AC_info_t *entry = (H5AC_info_t *)_entry; /* Entry to remove */ - H5C_t * cache = NULL; /* Pointer to the entry's associated metadata cache */ + H5C_t *cache = NULL; /* Pointer to the entry's associated metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5ACdbg.c b/src/H5ACdbg.c index 5e24517..97b0ba3 100644 --- a/src/H5ACdbg.c +++ b/src/H5ACdbg.c @@ -299,7 +299,7 @@ done: hbool_t H5AC_get_serialization_in_progress(H5F_t *f) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -337,7 +337,7 @@ H5AC_get_serialization_in_progress(H5F_t *f) hbool_t H5AC_cache_is_clean(const H5F_t *f, H5AC_ring_t inner_ring) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t ret_value = FALSE; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c index 36629db..a64c4a4 100644 --- a/src/H5ACmpio.c +++ b/src/H5ACmpio.c @@ -75,7 +75,7 @@ typedef struct H5AC_slist_entry_t { /* User data for address list building callbacks */ typedef struct H5AC_addr_list_ud_t { H5AC_aux_t *aux_ptr; /* 'Auxiliary' parallel cache info */ - haddr_t * addr_buf_ptr; /* Array to store addresses */ + haddr_t *addr_buf_ptr; /* Array to store addresses */ unsigned u; /* Counter for position in array */ } H5AC_addr_list_ud_t; @@ -207,7 +207,7 @@ H5AC__set_write_done_callback(H5C_t *cache_ptr, H5AC_write_done_cb_t write_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 */ @@ -268,7 +268,7 @@ static herr_t H5AC__broadcast_candidate_list(H5AC_t *cache_ptr, unsigned *num_entries_ptr, haddr_t **haddr_buf_ptr_ptr) { H5AC_aux_t *aux_ptr = NULL; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; int mpi_result; unsigned num_entries; herr_t ret_value = SUCCEED; /* Return value */ @@ -349,7 +349,7 @@ done: static herr_t H5AC__broadcast_clean_list_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5AC_slist_entry_t * slist_entry_ptr = (H5AC_slist_entry_t *)_item; /* Address of item */ + H5AC_slist_entry_t *slist_entry_ptr = (H5AC_slist_entry_t *)_item; /* Address of item */ H5AC_addr_list_ud_t *udata = (H5AC_addr_list_ud_t *)_udata; /* Context for callback */ haddr_t addr; @@ -400,7 +400,7 @@ H5AC__broadcast_clean_list_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_uda static herr_t H5AC__broadcast_clean_list(H5AC_t *cache_ptr) { - haddr_t * addr_buf_ptr = NULL; + haddr_t *addr_buf_ptr = NULL; H5AC_aux_t *aux_ptr; int mpi_result; unsigned num_entries = 0; @@ -546,7 +546,7 @@ done: static herr_t H5AC__copy_candidate_list_to_buffer_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5AC_slist_entry_t * slist_entry_ptr = (H5AC_slist_entry_t *)_item; /* Address of item */ + H5AC_slist_entry_t *slist_entry_ptr = (H5AC_slist_entry_t *)_item; /* Address of item */ H5AC_addr_list_ud_t *udata = (H5AC_addr_list_ud_t *)_udata; /* Context for callback */ FUNC_ENTER_PACKAGE_NOERR @@ -600,9 +600,9 @@ static herr_t H5AC__copy_candidate_list_to_buffer(const H5AC_t *cache_ptr, unsigned *num_entries_ptr, haddr_t **haddr_buf_ptr_ptr) { - H5AC_aux_t * aux_ptr = NULL; + H5AC_aux_t *aux_ptr = NULL; H5AC_addr_list_ud_t udata; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; size_t buf_size; unsigned num_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -674,8 +674,8 @@ done: herr_t H5AC__log_deleted_entry(const H5AC_info_t *entry_ptr) { - H5AC_t * cache_ptr; - H5AC_aux_t * aux_ptr; + H5AC_t *cache_ptr; + H5AC_aux_t *aux_ptr; H5AC_slist_entry_t *slist_entry_ptr = NULL; haddr_t addr; @@ -728,7 +728,7 @@ H5AC__log_deleted_entry(const H5AC_info_t *entry_ptr) herr_t H5AC__log_dirtied_entry(const H5AC_info_t *entry_ptr) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -806,7 +806,7 @@ done: herr_t H5AC__log_cleaned_entry(const H5AC_info_t *entry_ptr) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; FUNC_ENTER_PACKAGE_NOERR @@ -869,7 +869,7 @@ herr_t H5AC__log_flushed_entry(H5C_t *cache_ptr, haddr_t addr, hbool_t was_dirty, unsigned flags) { hbool_t cleared; - 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 */ @@ -936,7 +936,7 @@ done: herr_t H5AC__log_inserted_entry(const H5AC_info_t *entry_ptr) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -1034,7 +1034,7 @@ done: 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; H5AC_aux_t *aux_ptr; hbool_t entry_in_cache; hbool_t entry_dirty; @@ -1214,9 +1214,9 @@ done: static herr_t H5AC__propagate_and_apply_candidate_list(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; - haddr_t * candidates_list_ptr = NULL; + haddr_t *candidates_list_ptr = NULL; int mpi_result; unsigned num_candidates = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -1380,7 +1380,7 @@ done: static herr_t H5AC__propagate_flushed_and_still_clean_entries_list(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; herr_t ret_value = SUCCEED; /* Return value */ @@ -1501,9 +1501,9 @@ done: static herr_t H5AC__receive_and_apply_clean_list(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; unsigned num_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -1641,9 +1641,9 @@ done: static herr_t H5AC__rsp__dist_md_write__flush(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; - haddr_t * haddr_buf_ptr = NULL; + haddr_t *haddr_buf_ptr = NULL; int mpi_result; unsigned num_entries = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -1787,7 +1787,7 @@ done: static herr_t H5AC__rsp__dist_md_write__flush_to_min_clean(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; hbool_t evictions_enabled; herr_t ret_value = SUCCEED; /* Return value */ @@ -1868,7 +1868,7 @@ done: static herr_t H5AC__rsp__p0_only__flush(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; int mpi_result; herr_t ret_value = SUCCEED; /* Return value */ @@ -1982,7 +1982,7 @@ done: static herr_t H5AC__rsp__p0_only__flush_to_min_clean(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5AC_aux_t *aux_ptr; hbool_t evictions_enabled; herr_t ret_value = SUCCEED; /* Return value */ @@ -2097,7 +2097,7 @@ done: herr_t H5AC__run_sync_point(H5F_t *f, 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 d252d85..67a310b 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -388,7 +388,7 @@ H5_DLL herr_t H5AC_prep_for_file_close(H5F_t *f); H5_DLL herr_t H5AC_prep_for_file_flush(H5F_t *f); H5_DLL herr_t H5AC_secure_from_file_flush(H5F_t *f); H5_DLL herr_t H5AC_create_flush_dependency(void *parent_thing, void *child_thing); -H5_DLL void * H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *udata, unsigned flags); +H5_DLL void *H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *udata, unsigned flags); H5_DLL herr_t H5AC_resize_entry(void *thing, size_t new_size); H5_DLL herr_t H5AC_unpin_entry(void *thing); H5_DLL herr_t H5AC_destroy_flush_dependency(void *parent_thing, void *child_thing); diff --git a/src/H5ACproxy_entry.c b/src/H5ACproxy_entry.c index c280831..765a163 100644 --- a/src/H5ACproxy_entry.c +++ b/src/H5ACproxy_entry.c @@ -245,7 +245,7 @@ done: static int H5AC__proxy_entry_add_child_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5AC_info_t * parent = (H5AC_info_t *)_item; /* Pointer to the parent entry */ + H5AC_info_t *parent = (H5AC_info_t *)_item; /* Pointer to the parent entry */ H5AC_proxy_entry_t *pentry = (H5AC_proxy_entry_t *)_udata; /* Pointer to the proxy entry */ int ret_value = H5_ITER_CONT; /* Callback return value */ @@ -338,7 +338,7 @@ done: static int H5AC__proxy_entry_remove_child_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5AC_info_t * parent = (H5AC_info_t *)_item; /* Pointer to the parent entry */ + H5AC_info_t *parent = (H5AC_info_t *)_item; /* Pointer to the parent entry */ H5AC_proxy_entry_t *pentry = (H5AC_proxy_entry_t *)_udata; /* Pointer to the proxy entry */ int ret_value = H5_ITER_CONT; /* Callback return value */ diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c index cc95d62..bef63f6 100644 --- a/src/H5Abtree2.c +++ b/src/H5Abtree2.c @@ -51,11 +51,11 @@ */ typedef struct H5A_fh_ud_cmp_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ - const char * name; /* Name of attribute to compare */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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 */ @@ -148,7 +148,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 */ @@ -200,7 +200,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_PACKAGE_NOERR @@ -231,7 +231,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 */ @@ -248,7 +248,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); @@ -386,7 +386,7 @@ H5A__dense_btree2_name_debug(FILE *stream, int indent, int fwidth, const void *_ 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_PACKAGE_NOERR @@ -416,7 +416,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_PACKAGE_NOERR diff --git a/src/H5Adense.c b/src/H5Adense.c index 26dcb8b..f0b64d1 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -68,10 +68,10 @@ */ 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 */ 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; @@ -81,7 +81,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 */ H5HF_t *fheap; /* Fractal heap handle */ H5HF_t *shared_fheap; /* Fractal heap handle for shared messages */ hsize_t count; /* # of attributes examined */ @@ -90,7 +90,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 */ @@ -103,7 +103,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 */ const H5A_dense_bt2_name_rec_t *record; /* v2 B-tree record for attribute */ /* upward */ @@ -126,9 +126,9 @@ 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 */ - H5HF_t * fheap; /* Fractal heap handle */ - H5HF_t * shared_fheap; /* Fractal heap handle for shared messages */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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; @@ -170,9 +170,9 @@ H5A__dense_create(H5F_t *f, 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_PACKAGE @@ -334,12 +334,12 @@ H5A_t * H5A__dense_open(H5F_t *f, 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 shareable */ hbool_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_PACKAGE @@ -422,11 +422,11 @@ herr_t H5A__dense_insert(H5F_t *f, 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 shareable */ @@ -488,7 +488,7 @@ H5A__dense_insert(H5F_t *f, 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 */ @@ -611,9 +611,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 */ @@ -662,7 +662,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 */ @@ -724,9 +724,9 @@ H5A__dense_write(H5F_t *f, 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 shareable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -860,11 +860,11 @@ herr_t H5A__dense_rename(H5F_t *f, const H5O_ainfo_t *ainfo, const char *old_name, 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 shareable */ htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */ hbool_t attr_exists; /* Attribute exists in v2 B-tree */ @@ -1053,7 +1053,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) @@ -1139,10 +1139,10 @@ H5A__dense_iterate(H5F_t *f, hid_t loc_id, const H5O_ainfo_t *ainfo, H5_index_t 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 = FAIL; /* Return value */ @@ -1271,8 +1271,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 */ @@ -1334,10 +1334,10 @@ herr_t H5A__dense_remove(H5F_t *f, 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 shareable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1419,10 +1419,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 */ @@ -1546,10 +1546,10 @@ herr_t H5A__dense_remove_by_idx(H5F_t *f, 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 */ @@ -1672,9 +1672,9 @@ herr_t H5A__dense_exists(H5F_t *f, const H5O_ainfo_t *ainfo, const char *name, hbool_t *attr_exists) { 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 shareable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1759,7 +1759,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_PACKAGE @@ -1820,7 +1820,7 @@ herr_t H5A__dense_delete(H5F_t *f, 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_PACKAGE diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 05e4eed..6ec05b7 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -106,8 +106,8 @@ hid_t H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id) { - void * attr = NULL; /* attr object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *attr = NULL; /* attr object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -180,8 +180,8 @@ done: hid_t H5Aopen_name(hid_t loc_id, const char *name) { - void * attr = NULL; /* attr object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *attr = NULL; /* attr object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -245,8 +245,8 @@ done: hid_t H5Aopen_idx(hid_t loc_id, unsigned idx) { - void * attr = NULL; /* attr object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *attr = NULL; /* attr object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -309,7 +309,7 @@ done: int H5Aget_num_attrs(hid_t loc_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5O_info2_t oinfo; @@ -380,7 +380,7 @@ done: herr_t H5Aiterate1(hid_t loc_id, unsigned *attr_num /*in,out*/, H5A_operator1_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_attr_optional_args_t attr_opt_args; /* Arguments for optional operation */ herr_t ret_value; /* Return value */ diff --git a/src/H5Aint.c b/src/H5Aint.c index 16a573f..f74c8a8 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -53,7 +53,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 */ H5A_attr_table_t *atable; /* Pointer to attribute table to build */ size_t curr_attr; /* Current attribute to operate on */ hbool_t bogus_crt_idx; /* Whether bogus creation index values need to be set */ @@ -68,11 +68,11 @@ 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 */ - const H5O_loc_t * oloc_src; - H5O_loc_t * oloc_dst; + H5F_t *file; /* file */ + hbool_t *recompute_size; /* Flag to indicate if size changed */ + H5O_copy_t *cpy_info; /* Information on copying options */ + const H5O_loc_t *oloc_src; + H5O_loc_t *oloc_dst; } H5A_dense_file_cp_ud_t; /********************/ @@ -245,11 +245,11 @@ H5A_term_package(void) H5A_t * H5A__create(const H5G_loc_t *loc, const char *attr_name, const H5T_t *type, const H5S_t *space, hid_t acpl_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 */ hbool_t exists; /* Whether attribute exists */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_TAG(loc->oloc->addr) @@ -412,8 +412,8 @@ H5A__create_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr 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_PACKAGE @@ -572,8 +572,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_PACKAGE @@ -634,8 +634,8 @@ H5A__open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_n 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_PACKAGE @@ -697,8 +697,8 @@ done: herr_t H5A__read(const H5A_t *attr, const H5T_t *mem_type, void *buf) { - 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 */ @@ -804,9 +804,9 @@ done: herr_t H5A__write(H5A_t *attr, const H5T_t *mem_type, const void *buf) { - 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*/ @@ -1139,9 +1139,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_PACKAGE @@ -1549,11 +1549,12 @@ H5A__compact_build_table(H5F_t *f, H5O_t *oh, H5_index_t idx_type, H5_iter_order atable->nattrs = 0; /* Set up user data for iteration */ - udata.f = f; - 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.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; @@ -2128,18 +2129,18 @@ H5A_t * H5A__attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_size, H5O_copy_t H5_ATTR_NDEBUG_UNUSED *cpy_info) { - H5A_t * attr_dst = NULL; /* Destination attribute */ + H5A_t *attr_dst = NULL; /* Destination attribute */ 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 * reclaim_buf = NULL; /* Buffer for reclaiming data */ - void * bkg_buf = NULL; /* Background buffer */ + void *buf = NULL; /* Buffer for copying data */ + void *reclaim_buf = NULL; /* Buffer for reclaiming data */ + void *bkg_buf = NULL; /* Background buffer */ hid_t buf_sid = -1; /* ID for buffer dataspace */ hssize_t sdst_nelmts; /* # of elements in destination attribute (signed) */ size_t dst_nelmts; /* # of elements in destination attribute */ size_t dst_dt_size; /* Size of destination attribute datatype */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -2245,11 +2246,11 @@ H5A__attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_s /* 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 */ @@ -2500,7 +2501,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_PACKAGE @@ -2686,7 +2687,7 @@ H5A__iterate(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5 hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ hid_t obj_loc_id = H5I_INVALID_HID; /* ID for object located */ H5A_attr_iter_op_t attr_op; /* Attribute operator */ - void * temp_obj = NULL; + void *temp_obj = NULL; H5I_type_t obj_type; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Apkg.h b/src/H5Apkg.h index b50cbc4..a250973 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,15 +126,15 @@ 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 */ - H5HF_t * fheap; /* Fractal heap handle */ - H5HF_t * shared_fheap; /* Fractal heap handle for shared messages */ - const char * name; /* Name of attribute to compare */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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; /* diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h index 3ed0239..1a184b3 100644 --- a/src/H5Aprivate.h +++ b/src/H5Aprivate.h @@ -71,11 +71,11 @@ typedef struct H5A_attr_iter_op_t { /* General attribute routines */ H5_DLL herr_t H5A_init(void); 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 hid_t H5A_get_space(H5A_t *attr); -H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, 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); +H5_DLL H5G_name_t *H5A_nameof(H5A_t *attr); +H5_DLL H5T_t *H5A_type(const H5A_t *attr); +H5_DLL hid_t H5A_get_space(H5A_t *attr); +H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, 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); #endif /* H5Aprivate_H */ diff --git a/src/H5Atest.c b/src/H5Atest.c index 6537a9d..af183c4 100644 --- a/src/H5Atest.c +++ b/src/H5Atest.c @@ -113,7 +113,7 @@ done: herr_t H5A__get_shared_rc_test(hid_t attr_id, hsize_t *ref_count) { - H5A_t * attr; /* Attribute object for ID */ + H5A_t *attr; /* Attribute object for ID */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -130,13 +130,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, 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: herr_t H5B_find(H5F_t *f, const H5B_class_t *type, haddr_t addr, hbool_t *found, void *udata) { - H5B_t * bt = NULL; - H5UC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5UC_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 @@ done: static herr_t H5B__split(H5F_t *f, H5B_ins_ud_t *bt_ud, unsigned idx, void *udata, H5B_ins_ud_t *split_bt_ud /*out*/) { - 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 */ @@ -547,9 +547,9 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) 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 */ - H5UC_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 */ + H5UC_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; @@ -691,7 +691,7 @@ H5B__insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5 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_PACKAGE_NOERR @@ -776,9 +776,9 @@ H5B__insert_helper(H5F_t *f, H5B_ins_ud_t *bt_ud, const H5B_class_t *type, uint8 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 */ - H5UC_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 */ + H5UC_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 */ @@ -1037,7 +1037,7 @@ H5B__insert_helper(H5F_t *f, H5B_ins_ud_t *bt_ud, const H5B_class_t *type, uint8 } else if (H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) { unsigned *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. @@ -1113,9 +1113,9 @@ done: static herr_t H5B__iterate_helper(H5F_t *f, const H5B_class_t *type, haddr_t addr, H5B_operator_t op, void *udata) { - H5B_t * bt = NULL; /* Pointer to current B-tree node */ - H5UC_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 */ + H5UC_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 */ @@ -1226,10 +1226,10 @@ H5B__remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, int level, u 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; - H5UC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5UC_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 */ @@ -1597,9 +1597,9 @@ done: herr_t H5B_delete(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) { - H5B_t * bt = NULL; /* B-tree node being operated on */ - H5UC_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 */ + H5UC_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 */ @@ -1774,9 +1774,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_PACKAGE @@ -1838,9 +1838,9 @@ done: static herr_t H5B__get_info_helper(H5F_t *f, 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 */ - H5UC_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 */ + H5UC_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 */ @@ -1993,8 +1993,8 @@ done: htri_t H5B_valid(H5F_t *f, const H5B_class_t *type, haddr_t addr) { - H5B_t * bt = NULL; /* The B-tree */ - H5UC_t * rc_shared; /* Ref-counted shared info */ + H5B_t *bt = NULL; /* The B-tree */ + H5UC_t *rc_shared; /* Ref-counted shared info */ H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */ htri_t ret_value = SUCCEED; /* Return value */ @@ -123,10 +123,10 @@ H5FL_DEFINE_STATIC(H5B2_t); H5B2_t * H5B2_create(H5F_t *f, const H5B2_create_t *cparam, void *ctx_udata) { - H5B2_t * bt2 = NULL; /* Pointer to the B-tree */ + H5B2_t *bt2 = NULL; /* Pointer to the B-tree */ H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ 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) @@ -194,9 +194,9 @@ done: H5B2_t * H5B2_open(H5F_t *f, haddr_t addr, void *ctx_udata) { - H5B2_t * bt2 = NULL; /* Pointer to the B-tree */ + H5B2_t *bt2 = NULL; /* Pointer to the B-tree */ H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ - H5B2_t * ret_value = NULL; /* Return value */ + H5B2_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -299,7 +299,7 @@ done: herr_t H5B2_update(H5B2_t *bt2, 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_update_status_t status = H5B2_UPDATE_UNKNOWN; /* Whether the record was inserted/modified */ herr_t ret_value = SUCCEED; /* Return value */ @@ -452,9 +452,9 @@ H5B2_iterate(H5B2_t *bt2, H5B2_operator_t op, void *op_data) herr_t H5B2_find(H5B2_t *bt2, void *udata, hbool_t *found, 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 */ - void * parent = NULL; /* Parent of current node */ + void *parent = NULL; /* Parent of current node */ uint16_t depth; /* Current depth of the tree */ int cmp; /* Comparison value of records */ unsigned idx; /* Location of record which matches key */ @@ -715,9 +715,9 @@ done: herr_t H5B2_index(H5B2_t *bt2, 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 */ - void * parent = NULL; /* Parent of current node */ + void *parent = NULL; /* Parent of current node */ uint16_t depth; /* Current depth of the tree */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1158,9 +1158,9 @@ done: herr_t H5B2_modify(H5B2_t *bt2, 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 */ - void * parent = NULL; /* Parent of current node */ + void *parent = NULL; /* Parent of current node */ H5B2_nodepos_t curr_pos; /* Position of current node */ uint16_t depth; /* Current depth of the tree */ int cmp; /* Comparison value of records */ diff --git a/src/H5B2cache.c b/src/H5B2cache.c index a2be781..681cf04 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -60,7 +60,7 @@ /* Metadata cache callbacks */ static herr_t H5B2__cache_hdr_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5B2__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata); -static void * H5B2__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5B2__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5B2__cache_hdr_image_len(const void *thing, size_t *image_len); static herr_t H5B2__cache_hdr_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5B2__cache_hdr_notify(H5AC_notify_action_t action, void *thing); @@ -68,7 +68,7 @@ static herr_t H5B2__cache_hdr_free_icr(void *thing); static herr_t H5B2__cache_int_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5B2__cache_int_verify_chksum(const void *image_ptr, size_t len, void *udata); -static void * H5B2__cache_int_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5B2__cache_int_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5B2__cache_int_image_len(const void *thing, size_t *image_len); static herr_t H5B2__cache_int_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5B2__cache_int_notify(H5AC_notify_action_t action, void *thing); @@ -76,7 +76,7 @@ static herr_t H5B2__cache_int_free_icr(void *thing); static herr_t H5B2__cache_leaf_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5B2__cache_leaf_verify_chksum(const void *image_ptr, size_t len, void *udata); -static void * H5B2__cache_leaf_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5B2__cache_leaf_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5B2__cache_leaf_image_len(const void *thing, size_t *image_len); static herr_t H5B2__cache_leaf_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5B2__cache_leaf_notify(H5AC_notify_action_t action, void *thing); @@ -230,14 +230,14 @@ static void * H5B2__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - 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 */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ - H5B2_hdr_t * ret_value = NULL; /* Return value */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + H5B2_hdr_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -356,7 +356,7 @@ static herr_t H5B2__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5B2_hdr_t *hdr = (H5B2_hdr_t *)_thing; /* Pointer to the B-tree header */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ FUNC_ENTER_PACKAGE_NOERR @@ -575,7 +575,7 @@ H5B2__cache_int_get_initial_load_size(void *_udata, size_t *image_len) static htri_t H5B2__cache_int_verify_chksum(const void *_image, size_t H5_ATTR_UNUSED len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5B2_internal_cache_ud_t *udata = (H5B2_internal_cache_ud_t *)_udata; /* Pointer to user data */ size_t chk_size; /* Exact size of the node with checksum at the end */ uint32_t stored_chksum; /* Stored metadata checksum value */ @@ -619,13 +619,13 @@ H5B2__cache_int_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void hbool_t H5_ATTR_UNUSED *dirty) { 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 * image = (const uint8_t *)_image; /* 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 *image = (const uint8_t *)_image; /* 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 */ unsigned u; /* Local index variable */ - H5B2_internal_t * ret_value = NULL; /* Return value */ + H5B2_internal_t *ret_value = NULL; /* Return value */ int node_nrec = 0; FUNC_ENTER_PACKAGE @@ -771,8 +771,8 @@ static herr_t H5B2__cache_int_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5B2_internal_t *internal = (H5B2_internal_t *)_thing; /* Pointer to the B-tree internal node */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native record info */ + uint8_t *image = (uint8_t *)_image; /* 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 */ @@ -994,7 +994,7 @@ H5B2__cache_leaf_get_initial_load_size(void *_udata, size_t *image_len) static htri_t H5B2__cache_leaf_verify_chksum(const void *_image, size_t H5_ATTR_UNUSED len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5B2_internal_cache_ud_t *udata = (H5B2_internal_cache_ud_t *)_udata; /* Pointer to user data */ size_t chk_size; /* Exact size of the node with checksum at the end */ uint32_t stored_chksum; /* Stored metadata checksum value */ @@ -1037,12 +1037,12 @@ H5B2__cache_leaf_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void hbool_t H5_ATTR_UNUSED *dirty) { 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 * image = (const uint8_t *)_image; /* 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 *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native keys */ uint32_t stored_chksum; /* Stored metadata checksum value */ unsigned u; /* Local index variable */ - H5B2_leaf_t * ret_value = NULL; /* Return value */ + H5B2_leaf_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1164,8 +1164,8 @@ H5B2__cache_leaf_serialize(const H5F_t H5_ATTR_UNUSED *f, void *_image, size_t H void *_thing) { H5B2_leaf_t *leaf = (H5B2_leaf_t *)_thing; /* Pointer to the B-tree leaf node */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ - uint8_t * native; /* Pointer to native keys */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *native; /* Pointer to native keys */ uint32_t metadata_chksum; /* Computed metadata checksum value */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c index 711b200..330a923 100644 --- a/src/H5B2dbg.c +++ b/src/H5B2dbg.c @@ -159,7 +159,7 @@ herr_t H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, unsigned depth, haddr_t H5_ATTR_NDEBUG_UNUSED obj_addr) { - H5B2_hdr_t * hdr = NULL; /* B-tree header */ + H5B2_hdr_t *hdr = NULL; /* B-tree header */ H5B2_internal_t *internal = NULL; /* B-tree internal node */ H5B2_node_ptr_t node_ptr; /* Fake node pointer for protect */ unsigned u; /* Local index variable */ @@ -260,8 +260,8 @@ herr_t H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B2_class_t *type, haddr_t hdr_addr, unsigned nrec, haddr_t H5_ATTR_NDEBUG_UNUSED 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_node_ptr_t node_ptr; /* Fake node pointer for protect */ unsigned u; /* Local index variable */ char temp_str[128]; /* Temporary string, for formatting */ diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index bdde5ba..af592eb 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -507,8 +507,8 @@ H5B2_hdr_t * H5B2__hdr_protect(H5F_t *f, haddr_t hdr_addr, void *ctx_udata, unsigned flags) { H5B2_hdr_cache_ud_t udata; /* User data for cache callbacks */ - H5B2_hdr_t * hdr = NULL; /* v2 B-tree header */ - H5B2_hdr_t * ret_value = NULL; /* Return value */ + H5B2_hdr_t *hdr = NULL; /* v2 B-tree header */ + H5B2_hdr_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5B2int.c b/src/H5B2int.c index f9be132..01acc56 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -140,9 +140,9 @@ H5B2__split1(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, { 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 */ @@ -425,9 +425,9 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *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 */ @@ -697,16 +697,16 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *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, @@ -1124,9 +1124,9 @@ H5B2__merge2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, { 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, @@ -1300,12 +1300,12 @@ H5B2__merge3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, 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 */ @@ -1621,10 +1621,10 @@ H5B2__iterate_node(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node, 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 */ hbool_t node_pinned = FALSE; /* Whether node is pinned */ unsigned u; /* Local index */ herr_t ret_value = H5_ITER_CONT; /* Iterator return value */ @@ -1742,8 +1742,8 @@ H5B2__delete_node(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node, v 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_PACKAGE @@ -1912,7 +1912,7 @@ H5B2__update_flush_depend(H5B2_hdr_t *hdr, unsigned depth, H5B2_node_ptr_t *node void *new_parent) { const H5AC_class_t *child_class; /* Pointer to child node's class info */ - void * child = NULL; /* Pointer to child node */ + void *child = NULL; /* Pointer to child node */ unsigned node_status = 0; /* Node's status in the metadata cache */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1931,7 +1931,7 @@ H5B2__update_flush_depend(H5B2_hdr_t *hdr, unsigned depth, H5B2_node_ptr_t *node /* If the node is in the cache, check for retargeting its parent */ if (node_status & H5AC_ES__IN_CACHE) { - void ** parent_ptr = NULL; /* Pointer to child node's parent */ + void **parent_ptr = NULL; /* Pointer to child node's parent */ hbool_t update_deps = FALSE; /* Whether to update flush dependencies */ /* Get child node pointer */ diff --git a/src/H5B2internal.c b/src/H5B2internal.c index 754083d..05b4f96 100644 --- a/src/H5B2internal.c +++ b/src/H5B2internal.c @@ -185,8 +185,8 @@ H5B2__protect_internal(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr, hbool_t shadow, unsigned flags) { H5B2_internal_cache_ud_t udata; /* User data to pass through to cache 'deserialize' callback */ - H5B2_internal_t * internal = NULL; /* v2 B-tree internal node */ - H5B2_internal_t * ret_value = NULL; /* Return value */ + H5B2_internal_t *internal = NULL; /* v2 B-tree internal node */ + H5B2_internal_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -806,8 +806,8 @@ H5B2__remove_internal(H5B2_hdr_t *hdr, hbool_t *depth_decreased, void *swap_loc, 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 */ @@ -1050,8 +1050,8 @@ H5B2__remove_internal_by_idx(H5B2_hdr_t *hdr, hbool_t *depth_decreased, void *sw 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 */ diff --git a/src/H5B2leaf.c b/src/H5B2leaf.c index 9cfc670..cc8c089 100644 --- a/src/H5B2leaf.c +++ b/src/H5B2leaf.c @@ -173,8 +173,8 @@ H5B2_leaf_t * H5B2__protect_leaf(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr, hbool_t shadow, unsigned flags) { H5B2_leaf_cache_ud_t udata; /* User-data for callback */ - H5B2_leaf_t * leaf; /* v2 B-tree leaf node */ - H5B2_leaf_t * ret_value = NULL; /* Return value */ + H5B2_leaf_t *leaf; /* v2 B-tree leaf node */ + H5B2_leaf_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -609,8 +609,8 @@ H5B2__swap_leaf(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, unsi { const H5AC_class_t *child_class; /* Pointer to child node's class info */ haddr_t child_addr = HADDR_UNDEF; /* 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_PACKAGE diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 66d04fa..8f441ee 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -160,7 +160,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 */ @@ -169,17 +169,17 @@ 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 */ - void * min_native_rec; /* Pointer to minimum native record */ - void * max_native_rec; /* Pointer to maximum native record */ + void *min_native_rec; /* Pointer to minimum native record */ + void *max_native_rec; /* Pointer to maximum native record */ /* SWMR / Flush dependency information (not stored) */ hbool_t swmr_write; /* Whether we are doing SWMR writes */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all B-tree entries */ - void * parent; /* Pointer to 'top' proxy flush dependency + void *parent; /* Pointer to 'top' proxy flush dependency * parent, if it exists, otherwise NULL. * If the v2 B-tree is being used to index a * chunked dataset and the dataset metadata is @@ -198,7 +198,7 @@ typedef struct H5B2_hdr_t { /* 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 */ @@ -208,12 +208,12 @@ 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 */ /* SWMR / Flush dependency information (not stored) */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all B-tree entries */ - void * parent; /* Flush dependency parent for leaf */ + void *parent; /* Flush dependency parent for leaf */ uint64_t shadow_epoch; /* Epoch of node, for making shadow copies */ } H5B2_leaf_t; @@ -223,22 +223,22 @@ 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 */ /* SWMR / Flush dependency information (not stored) */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all B-tree entries */ - void * parent; /* Flush dependency parent for internal node */ + void *parent; /* Flush dependency parent for internal node */ uint64_t shadow_epoch; /* Epoch of node, for making shadow copies */ } 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 */ @@ -260,25 +260,25 @@ typedef enum H5B2_update_status_t { /* Callback info for loading a v2 B-tree header into the cache */ typedef struct H5B2_hdr_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 */ haddr_t addr; /* Address of B-tree header in the file */ - void * ctx_udata; /* User-data for protecting */ + void *ctx_udata; /* User-data for protecting */ } H5B2_hdr_cache_ud_t; /* Callback info for loading a v2 B-tree 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 */ - void * parent; /* Flush dependency parent */ + void *parent; /* Flush dependency parent */ uint16_t nrec; /* Number of records in node to load */ uint16_t depth; /* Depth of node to load */ } H5B2_internal_cache_ud_t; /* Callback info for loading a v2 B-tree 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 */ - void * parent; /* Flush dependency parent */ + void *parent; /* Flush dependency parent */ uint16_t nrec; /* Number of records in node to load */ } H5B2_leaf_cache_ud_t; @@ -415,7 +415,7 @@ H5_DLL herr_t H5B2__remove_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, void *parent, void *udata, H5B2_remove_t op, void *op_data); H5_DLL herr_t H5B2__remove_internal_by_idx(H5B2_hdr_t *hdr, hbool_t *depth_decreased, void *swap_loc, void *swap_parent, uint16_t 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, H5B2_node_ptr_t *curr_node_ptr, diff --git a/src/H5B2private.h b/src/H5B2private.h index a65a533..a60ee7c 100644 --- a/src/H5B2private.h +++ b/src/H5B2private.h @@ -85,7 +85,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 4735276..1a727a8 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -128,7 +128,7 @@ H5B2_size(H5B2_t *bt2, hsize_t *btree_size) else /* Iterate through nodes */ if (H5B2__node_size(hdr, hdr->depth, &hdr->root, hdr, 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 c7ae456..b8fb130 100644 --- a/src/H5B2test.c +++ b/src/H5B2test.c @@ -54,7 +54,7 @@ typedef struct H5B2_test_ctx_t { /********************/ /* v2 B-tree driver callbacks for 'test' B-trees */ -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); @@ -130,9 +130,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_PACKAGE @@ -483,9 +483,9 @@ H5B2__get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr) herr_t H5B2__get_node_info_test(H5B2_t *bt2, 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 */ - void * parent = NULL; /* Parent of current node */ + void *parent = NULL; /* Parent of current node */ uint16_t depth; /* Current depth of the tree */ int cmp; /* Comparison value of records */ unsigned idx; /* Location of record which matches key */ diff --git a/src/H5Bcache.c b/src/H5Bcache.c index 0c179d7..fd992c2 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -50,7 +50,7 @@ /* Metadata cache callbacks */ static herr_t H5B__cache_get_initial_load_size(void *udata, size_t *image_len); -static void * H5B__cache_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5B__cache_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5B__cache_image_len(const void *thing, size_t *image_len); static herr_t H5B__cache_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5B__cache_free_icr(void *thing); @@ -97,7 +97,7 @@ static herr_t H5B__cache_get_initial_load_size(void *_udata, size_t *image_len) { H5B_cache_ud_t *udata = (H5B_cache_ud_t *)_udata; /* User data for callback */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ FUNC_ENTER_PACKAGE_NOERR @@ -132,13 +132,13 @@ static void * H5B__cache_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - 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 * image = (const uint8_t *)_image; /* Pointer into image buffer */ - uint8_t * native; /* Pointer to native keys */ + H5B_shared_t *shared; /* Pointer to shared B-tree info */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into image buffer */ + uint8_t *native; /* Pointer to native keys */ unsigned u; /* Local index variable */ - H5B_t * ret_value = NULL; /* Return value */ + H5B_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -235,7 +235,7 @@ done: static herr_t H5B__cache_image_len(const void *_thing, size_t *image_len) { - const H5B_t * bt = (const H5B_t *)_thing; /* Pointer to the B-tree node */ + const H5B_t *bt = (const H5B_t *)_thing; /* Pointer to the B-tree node */ H5B_shared_t *shared; /* Pointer to shared B-tree info */ FUNC_ENTER_PACKAGE_NOERR @@ -269,10 +269,10 @@ H5B__cache_image_len(const void *_thing, size_t *image_len) static herr_t H5B__cache_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { - H5B_t * bt = (H5B_t *)_thing; /* Pointer to the B-tree node */ + H5B_t *bt = (H5B_t *)_thing; /* Pointer to the B-tree node */ H5B_shared_t *shared; /* Pointer to shared B-tree info */ - uint8_t * image = (uint8_t *)_image; /* Pointer into image buffer */ - uint8_t * native; /* Pointer to native keys */ + uint8_t *image = (uint8_t *)_image; /* Pointer into image buffer */ + uint8_t *native; /* Pointer to native keys */ unsigned u; /* Local index counter */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c index de07442..3b53317 100644 --- a/src/H5Bdbg.c +++ b/src/H5Bdbg.c @@ -51,9 +51,9 @@ herr_t H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B_class_t *type, void *udata) { - H5B_t * bt = NULL; - H5UC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5UC_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 */ @@ -153,9 +153,9 @@ done: herr_t H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata) { - H5B_t * bt = NULL; - H5UC_t * rc_shared; /* Ref-counted shared info */ - H5B_shared_t * shared; /* Pointer to shared B-tree info */ + H5B_t *bt = NULL; + H5UC_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 0a79628..3a27acb 100644 --- a/src/H5Bpkg.h +++ b/src/H5Bpkg.h @@ -49,7 +49,7 @@ typedef struct H5B_t { H5AC_info_t cache_info; /* Information for H5AC cache functions */ /* _must_ be first field in structure */ - H5UC_t * rc_shared; /*ref-counted shared info */ + H5UC_t *rc_shared; /*ref-counted shared info */ unsigned level; /*node level */ unsigned nchildren; /*number of child pointers */ haddr_t left; /*address of left sibling */ @@ -60,9 +60,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 */ - H5UC_t * rc_shared; /* Ref-counted shared info */ + H5UC_t *rc_shared; /* Ref-counted shared info */ } H5B_cache_ud_t; /*****************************/ diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index 2203ebd..b3311f0 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -90,9 +90,9 @@ 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 */ - void * udata; /* 'Local' info for a B-tree */ + uint8_t *page; /* Disk page */ + size_t *nkey; /* Offsets of each native key in native key buffer */ + void *udata; /* 'Local' info for a B-tree */ } H5B_shared_t; /* @@ -678,7 +678,7 @@ H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr, herr_t H5C_prep_for_file_close(H5F_t *f) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t image_generated = FALSE; /* Whether a cache image was generated */ herr_t ret_value = SUCCEED; /* Return value */ @@ -938,7 +938,7 @@ done: herr_t H5C_expunge_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = NULL; unsigned flush_flags = (H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG); herr_t ret_value = SUCCEED; /* Return value */ @@ -1056,7 +1056,7 @@ H5C_flush_cache(H5F_t *f, unsigned flags) uint32_t slist_len = 0; #endif /* H5C_DO_SANITY_CHECKS */ H5C_ring_t ring; - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t destroy; herr_t ret_value = SUCCEED; @@ -1189,7 +1189,7 @@ done: herr_t H5C_flush_to_min_clean(H5F_t *f) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t write_permitted; herr_t ret_value = SUCCEED; @@ -1239,7 +1239,7 @@ done: herr_t H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5AC_ring_t ring = H5C_RING_UNDEFINED; hbool_t insert_pinned; hbool_t flush_last; @@ -1543,7 +1543,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 */ @@ -1641,7 +1641,7 @@ done: herr_t H5C_mark_entry_clean(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 */ @@ -1959,7 +1959,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 */ @@ -2101,7 +2101,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 */ @@ -2163,7 +2163,7 @@ done: void * H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5AC_ring_t ring = H5C_RING_UNDEFINED; hbool_t hit; hbool_t have_write_permitted = FALSE; @@ -2175,9 +2175,9 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign hbool_t write_permitted = FALSE; hbool_t was_loaded = FALSE; /* Whether the entry was loaded as a result of the protect */ 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) @@ -2802,9 +2802,10 @@ H5C_set_cache_auto_resize_config(H5C_t *cache_ptr, H5C_auto_size_ctl_t *config_p 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 */ @@ -3043,7 +3044,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 */ @@ -3178,7 +3179,7 @@ done: herr_t H5C_unprotect(H5F_t *f, haddr_t addr, void *thing, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t deleted; hbool_t dirtied; hbool_t set_flush_marker; @@ -3541,7 +3542,7 @@ herr_t H5C_unsettle_entry_ring(void *_entry) { H5C_cache_entry_t *entry = (H5C_cache_entry_t *)_entry; /* Entry whose ring to unsettle */ - H5C_t * cache; /* Cache for file */ + H5C_t *cache; /* Cache for file */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -3825,7 +3826,7 @@ done: herr_t H5C_create_flush_dependency(void *parent_thing, void *child_thing) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *parent_entry = (H5C_cache_entry_t *)parent_thing; /* Ptr to parent thing's entry */ H5C_cache_entry_t *child_entry = (H5C_cache_entry_t *)child_thing; /* Ptr to child thing's entry */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3966,7 +3967,7 @@ done: herr_t H5C_destroy_flush_dependency(void *parent_thing, void *child_thing) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *parent_entry = (H5C_cache_entry_t *)parent_thing; /* Ptr to parent entry */ H5C_cache_entry_t *child_entry = (H5C_cache_entry_t *)child_thing; /* Ptr to child entry */ unsigned u; /* Local index variable */ @@ -4094,7 +4095,7 @@ H5C__pin_entry_from_client(H5C_t #if !H5C_COLLECT_CACHE_STATS H5_ATTR_UNUSED #endif - * cache_ptr, + *cache_ptr, H5C_cache_entry_t *entry_ptr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -4233,7 +4234,7 @@ done: static herr_t H5C__auto_adjust_cache_size(H5F_t *f, hbool_t write_permitted) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; hbool_t reentrant_call = FALSE; hbool_t inserted_epoch_marker = FALSE; size_t new_max_cache_size = 0; @@ -4466,8 +4467,9 @@ H5C__auto_adjust_cache_size(H5F_t *f, hbool_t write_permitted) 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 */ @@ -4714,7 +4716,7 @@ done: static herr_t H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hbool_t write_permitted) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; size_t eviction_size_limit; size_t bytes_evicted = 0; hbool_t prev_is_dirty = FALSE; @@ -5190,8 +5192,9 @@ H5C__flash_increase_cache_size(H5C_t *cache_ptr, size_t old_entry_size, size_t n 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 */ @@ -5309,7 +5312,7 @@ done: static herr_t H5C__flush_invalidate_cache(H5F_t *f, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_ring_t ring; herr_t ret_value = SUCCEED; @@ -5489,7 +5492,7 @@ done: static herr_t H5C__flush_invalidate_ring(H5F_t *f, H5C_ring_t ring, unsigned flags) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t restart_slist_scan; uint32_t protected_entries = 0; int32_t i; @@ -5497,7 +5500,7 @@ H5C__flush_invalidate_ring(H5F_t *f, H5C_ring_t ring, unsigned flags) uint32_t old_ring_pel_len; unsigned cooked_flags; unsigned evict_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 @@ -6011,14 +6014,14 @@ done: static herr_t H5C__flush_ring(H5F_t *f, H5C_ring_t ring, unsigned flags) { - H5C_t * cache_ptr = f->shared->cache; + H5C_t *cache_ptr = f->shared->cache; hbool_t flushed_entries_last_pass; hbool_t flush_marked_entries; hbool_t ignore_protected; hbool_t tried_to_flush_protected_entry = FALSE; hbool_t restart_slist_scan; uint32_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 @@ -6376,7 +6379,7 @@ done: herr_t H5C__flush_single_entry(H5F_t *f, H5C_cache_entry_t *entry_ptr, unsigned flags) { - H5C_t * cache_ptr; /* Cache for file */ + H5C_t *cache_ptr; /* Cache for file */ hbool_t destroy; /* external flag */ hbool_t clear_only; /* external flag */ hbool_t free_file_space; /* external flag */ @@ -7073,8 +7076,8 @@ H5C__load_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata) { hbool_t dirty = FALSE; /* Flag indicating whether thing was dirtied during deserialize */ - uint8_t * image = NULL; /* Buffer for disk image */ - void * thing = NULL; /* Pointer to thing loaded */ + uint8_t *image = NULL; /* Buffer for disk image */ + void *thing = NULL; /* Pointer to thing loaded */ H5C_cache_entry_t *entry = NULL; /* Alias for thing loaded, as cache entry */ size_t len; /* Size of image in file */ #ifdef H5_HAVE_PARALLEL @@ -7137,7 +7140,7 @@ H5C__load_entry(H5F_t *f, htri_t chk_ret; /* return from verify_chksum callback */ size_t actual_len = len; /* The actual length, after speculative reads have been resolved */ uint64_t nanosec = 1; /* # of nanoseconds to sleep between retries */ - void * new_image; /* Pointer to image */ + void *new_image; /* Pointer to image */ hbool_t len_changed = TRUE; /* Whether to re-check speculative entries */ /* Get the # of read attempts */ @@ -8434,7 +8437,7 @@ H5C__serialize_cache(H5F_t *f) uint32_t slist_len = 0; #endif /* H5C_DO_SANITY_CHECKS */ H5C_ring_t ring; - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -8603,7 +8606,7 @@ static herr_t H5C__serialize_ring(H5F_t *f, H5C_ring_t ring) { hbool_t done = FALSE; - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr; herr_t ret_value = SUCCEED; @@ -9115,7 +9118,7 @@ herr_t H5C_remove_entry(void *_entry) { H5C_cache_entry_t *entry = (H5C_cache_entry_t *)_entry; /* Entry to remove */ - H5C_t * cache; /* Cache for file */ + H5C_t *cache; /* Cache for file */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -244,10 +244,10 @@ H5CS_pop(void) H5CS_t * H5CS_copy_stack(void) { - H5CS_t * old_stack = H5CS_get_my_stack(); /* Existing function stack for library */ - H5CS_t * new_stack; /* New function stack, for copy */ + H5CS_t *old_stack = H5CS_get_my_stack(); /* Existing function stack for library */ + H5CS_t *new_stack; /* New function stack, for copy */ unsigned u; /* Local index variable */ - H5CS_t * ret_value = NULL; /* Return value */ + H5CS_t *ret_value = NULL; /* Return value */ /* Don't push this function on the function stack... :-) */ FUNC_ENTER_NOAPI_NOFS @@ -218,9 +218,9 @@ typedef struct H5CX_t { /* Cached DXPL properties */ size_t max_temp_buf; /* Maximum temporary buffer size */ hbool_t max_temp_buf_valid; /* Whether maximum temporary buffer size is valid */ - void * tconv_buf; /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */ + void *tconv_buf; /* Temporary conversion buffer (H5D_XFER_TCONV_BUF_NAME) */ hbool_t tconv_buf_valid; /* Whether temporary conversion buffer is valid */ - void * bkgr_buf; /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */ + void *bkgr_buf; /* Background conversion buffer (H5D_XFER_BKGR_BUF_NAME) */ hbool_t bkgr_buf_valid; /* Whether background conversion buffer is valid */ H5T_bkg_t bkgr_buf_type; /* Background buffer type (H5D_XFER_BKGR_BUF_NAME) */ hbool_t bkgr_buf_type_valid; /* Whether background buffer type is valid */ @@ -246,7 +246,7 @@ typedef struct H5CX_t { hbool_t err_detect_valid; /* Whether error detection info is valid */ H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */ hbool_t filter_cb_valid; /* Whether filter callback function is valid */ - H5Z_data_xform_t * data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */ + H5Z_data_xform_t *data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */ hbool_t data_transform_valid; /* Whether data transform info is valid */ H5T_vlen_alloc_info_t vl_alloc_info; /* VL datatype alloc info (H5D_XFER_VLEN_*_NAME) */ hbool_t vl_alloc_info_valid; /* Whether VL datatype alloc info is valid */ @@ -332,7 +332,7 @@ typedef struct H5CX_t { /* Cached VOL settings */ H5VL_connector_prop_t vol_connector_prop; /* Property for VOL connector ID & info */ hbool_t vol_connector_prop_valid; /* Whether property for VOL connector ID & info is valid */ - void * vol_wrap_ctx; /* VOL connector's "wrap context" for creating IDs */ + void *vol_wrap_ctx; /* VOL connector's "wrap context" for creating IDs */ hbool_t vol_wrap_ctx_valid; /* Whether VOL connector's "wrap context" for creating IDs is valid */ } H5CX_t; @@ -356,8 +356,8 @@ typedef struct H5CX_node_t { */ typedef struct H5CX_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) */ double btree_split_ratio[3]; /* B-tree split ratios (H5D_XFER_BTREE_SPLIT_RATIO_NAME) */ size_t vec_size; /* Size of hyperslab vector (H5D_XFER_HYPER_VECTOR_SIZE_NAME) */ @@ -376,7 +376,7 @@ typedef struct H5CX_dxpl_cache_t { #endif /* H5_HAVE_PARALLEL */ H5Z_EDC_t err_detect; /* Error detection info (H5D_XFER_EDC_NAME) */ H5Z_cb_t filter_cb; /* Filter callback function (H5D_XFER_FILTER_CB_NAME) */ - H5Z_data_xform_t * data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */ + H5Z_data_xform_t *data_transform; /* Data transform info (H5D_XFER_XFORM_NAME) */ H5T_vlen_alloc_info_t vl_alloc_info; /* VL datatype alloc info (H5D_XFER_VLEN_*_NAME) */ H5T_conv_cb_t dt_conv_cb; /* Datatype conversion struct (H5D_XFER_CONV_CB_NAME) */ } H5CX_dxpl_cache_t; @@ -941,7 +941,7 @@ H5CX_retrieve_state(H5CX_state_t **api_state) /* Copy connector info, if it exists */ if ((*api_state)->vol_connector_prop.connector_info) { H5VL_class_t *connector; /* Pointer to connector */ - void * new_connector_info = NULL; /* Copy of connector info */ + void *new_connector_info = NULL; /* Copy of connector info */ /* Retrieve the connector for the ID */ if (NULL == @@ -1371,7 +1371,7 @@ H5CX_set_apl(hid_t *acspl_id, const H5P_libclass_t *libclass, * specified a collective metadata read for just this operation. */ if (!is_collective) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5P_coll_md_read_flag_t md_coll_read; /* Collective metadata read flag */ /* Get the plist structure for the access property list */ @@ -3585,7 +3585,7 @@ static H5CX_node_t * H5CX__pop_common(hbool_t update_dxpl_props) { H5CX_node_t **head = NULL; /* Pointer to head of API context list */ - H5CX_node_t * ret_value = NULL; /* Return value */ + H5CX_node_t *ret_value = NULL; /* Return value */ #ifdef H5_HAVE_PARALLEL FUNC_ENTER_PACKAGE diff --git a/src/H5CXprivate.h b/src/H5CXprivate.h index 878bcf6..4c034c1 100644 --- a/src/H5CXprivate.h +++ b/src/H5CXprivate.h @@ -38,7 +38,7 @@ typedef struct H5CX_state_t { hid_t dxpl_id; /* DXPL for operation */ hid_t lapl_id; /* LAPL for operation */ hid_t lcpl_id; /* LCPL for operation */ - void * vol_wrap_ctx; /* VOL connector's "wrap context" for creating IDs */ + void *vol_wrap_ctx; /* VOL connector's "wrap context" for creating IDs */ H5VL_connector_prop_t vol_connector_prop; /* VOL connector property */ #ifdef H5_HAVE_PARALLEL diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c index de9019c..c0a3e33 100644 --- a/src/H5Cdbg.c +++ b/src/H5Cdbg.c @@ -79,7 +79,7 @@ herr_t H5C_dump_cache(H5C_t *cache_ptr, const char *cache_name) { H5C_cache_entry_t *entry_ptr; - H5SL_t * slist_ptr = NULL; + H5SL_t *slist_ptr = NULL; int i; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -275,7 +275,7 @@ H5C_dump_cache_skip_list(H5C_t *cache_ptr, char *calling_fcn) herr_t ret_value = SUCCEED; /* Return value */ int i; H5C_cache_entry_t *entry_ptr = NULL; - H5SL_node_t * node_ptr = NULL; + H5SL_node_t *node_ptr = NULL; FUNC_ENTER_NOAPI_NOERR diff --git a/src/H5Cepoch.c b/src/H5Cepoch.c index 37b83f3..09faf98 100644 --- a/src/H5Cepoch.c +++ b/src/H5Cepoch.c @@ -54,7 +54,7 @@ static herr_t H5C__epoch_marker_get_initial_load_size(void *udata_ptr, size_t *i static herr_t H5C__epoch_marker_get_final_load_size(const void *image_ptr, size_t image_len_ptr, void *udata_ptr, size_t *actual_len); static htri_t H5C__epoch_marker_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5C__epoch_marker_deserialize(const void *image_ptr, size_t len, void *udata, +static void *H5C__epoch_marker_deserialize(const void *image_ptr, size_t len, void *udata, hbool_t *dirty_ptr); static herr_t H5C__epoch_marker_image_len(const void *thing, size_t *image_len_ptr); static herr_t H5C__epoch_marker_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, @@ -64,7 +64,7 @@ static herr_t H5C__epoch_marker_serialize(const H5F_t *f, void *image_ptr, size_ static herr_t H5C__epoch_marker_notify(H5C_notify_action_t action, void *thing); static herr_t H5C__epoch_marker_free_icr(void *thing); static herr_t H5C__epoch_marker_fsf_size(const void H5_ATTR_UNUSED *thing, - hsize_t H5_ATTR_UNUSED *fsf_size_ptr); + hsize_t H5_ATTR_UNUSED *fsf_size_ptr); /*********************/ /* Package Variables */ diff --git a/src/H5Cimage.c b/src/H5Cimage.c index 899d6d7..2a94fca 100644 --- a/src/H5Cimage.c +++ b/src/H5Cimage.c @@ -277,7 +277,7 @@ H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr) { uint32_t old_chksum; const uint8_t *q; - H5C_t * fake_cache_ptr = NULL; + H5C_t *fake_cache_ptr = NULL; unsigned v; herr_t status; /* Status from decoding */ @@ -356,7 +356,7 @@ H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr) /* compute the checksum */ old_chksum = chksum; chksum = H5_checksum_metadata(cache_ptr->image_buffer, - (size_t)(cache_ptr->image_data_len - H5F_SIZEOF_CHKSUM), 0); + (size_t)(cache_ptr->image_data_len - H5F_SIZEOF_CHKSUM), 0); HDassert(chksum == old_chksum); fake_cache_ptr->image_entries = (H5C_image_entry_t *)H5MM_xfree(fake_cache_ptr->image_entries); @@ -467,7 +467,7 @@ H5C__deserialize_prefetched_entry(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t * dirtied during deserialize */ size_t len; /* Size of image in file */ - void * thing = NULL; /* Pointer to thing loaded */ + void *thing = NULL; /* Pointer to thing loaded */ H5C_cache_entry_t *pf_entry_ptr; /* pointer to the prefetched entry */ /* supplied in *entry_ptr_ptr. */ H5C_cache_entry_t *ds_entry_ptr; /* Alias for thing loaded, as cache @@ -1273,7 +1273,7 @@ H5C__image_entry_cmp(const void *_entry1, const void *_entry2) herr_t H5C__prep_image_for_file_close(H5F_t *f, hbool_t *image_generated) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; haddr_t eoa_frag_addr = HADDR_UNDEF; hsize_t eoa_frag_size = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -1417,7 +1417,8 @@ H5C__prep_image_for_file_close(H5F_t *f, hbool_t *image_generated) if (HADDR_UNDEF == (cache_ptr->image_addr = H5FD_alloc(f->shared->lf, H5FD_MEM_SUPER, f, (hsize_t)(cache_ptr->image_data_len), &eoa_frag_addr, &eoa_frag_size))) - HGOTO_ERROR(H5E_CACHE, H5E_NOSPACE, FAIL, "can't allocate file space for metadata cache image") + HGOTO_ERROR(H5E_CACHE, H5E_NOSPACE, FAIL, + "can't allocate file space for metadata cache image") /* Make note of the eoa after allocation of the cache image * block. This value is used for sanity checking when we @@ -1846,7 +1847,7 @@ H5C__decode_cache_image_entry(const H5F_t *f, const H5C_t *cache_ptr, const uint hbool_t is_fd_child = FALSE; /* Only used in assertions */ haddr_t addr; hsize_t size = 0; - void * image_ptr; + void *image_ptr; uint8_t flags = 0; uint8_t type_id; uint8_t ring; @@ -1854,10 +1855,10 @@ H5C__decode_cache_image_entry(const H5F_t *f, const H5C_t *cache_ptr, const uint uint16_t fd_child_count; uint16_t fd_dirty_child_count; uint16_t fd_parent_count; - haddr_t * fd_parent_addrs = NULL; + haddr_t *fd_parent_addrs = NULL; int32_t lru_rank; H5C_image_entry_t *ie_ptr = NULL; - const uint8_t * p; + const uint8_t *p; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -2204,7 +2205,7 @@ H5C__encode_cache_image_entry(H5F_t *f, H5C_t *cache_ptr, uint8_t **buf, unsigne { H5C_image_entry_t *ie_ptr; /* Pointer to entry to encode */ uint8_t flags = 0; /* Flags for entry */ - uint8_t * p; /* Pointer into cache image buffer */ + uint8_t *p; /* Pointer into cache image buffer */ unsigned u; /* Local index value */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3019,7 +3020,7 @@ H5C__reconstruct_cache_contents(H5F_t *f, H5C_t *cache_ptr) { H5C_cache_entry_t *pf_entry_ptr; /* Pointer to prefetched entry */ H5C_cache_entry_t *parent_ptr; /* Pointer to parent of prefetched entry */ - const uint8_t * p; /* Pointer into image buffer */ + const uint8_t *p; /* Pointer into image buffer */ unsigned u, v; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3231,7 +3232,7 @@ H5C__reconstruct_cache_entry(const H5F_t *f, H5C_t *cache_ptr, const uint8_t **b hbool_t is_fd_parent = FALSE; hbool_t is_fd_child = FALSE; #endif /* NDEBUG */ /* only used in assertions */ - const uint8_t * p; + const uint8_t *p; hbool_t file_is_rw; H5C_cache_entry_t *ret_value = NULL; /* Return value */ @@ -3398,7 +3399,7 @@ done: static herr_t H5C__write_cache_image_superblock_msg(H5F_t *f, hbool_t create) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5O_mdci_t mdci_msg; /* metadata cache image message */ /* to insert in the superblock */ /* extension. */ diff --git a/src/H5Clog.h b/src/H5Clog.h index 790a073..ae06525 100644 --- a/src/H5Clog.h +++ b/src/H5Clog.h @@ -82,7 +82,7 @@ struct H5C_log_info_t { hbool_t enabled; /* Was the logging set up? */ hbool_t logging; /* Are we currently logging? */ const H5C_log_class_t *cls; /* Callbacks for writing log messages */ - void * udata; /* Log-specific data */ + void *udata; /* Log-specific data */ }; /*****************************/ diff --git a/src/H5Clog_json.c b/src/H5Clog_json.c index cf7cc76..05b1533 100644 --- a/src/H5Clog_json.c +++ b/src/H5Clog_json.c @@ -209,7 +209,7 @@ herr_t H5C_log_json_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank) { H5C_log_json_udata_t *json_udata = NULL; - char * file_name = NULL; + char *file_name = NULL; size_t n_chars; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Clog_trace.c b/src/H5Clog_trace.c index 758a153..7424c9d 100644 --- a/src/H5Clog_trace.c +++ b/src/H5Clog_trace.c @@ -204,7 +204,7 @@ herr_t H5C_log_trace_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank) { H5C_log_trace_udata_t *trace_udata = NULL; - char * file_name = NULL; + char *file_name = NULL; size_t n_chars; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index 01c377b..c7542d4 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -164,7 +164,7 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha unsigned last_entry_to_flush; unsigned total_entries_to_clear = 0; unsigned total_entries_to_flush = 0; - unsigned * candidate_assignment_table = NULL; + unsigned *candidate_assignment_table = NULL; unsigned entries_to_flush[H5C_RING_NTYPES]; unsigned entries_to_clear[H5C_RING_NTYPES]; haddr_t addr; @@ -673,7 +673,7 @@ done: herr_t H5C_mark_entries_as_clean(H5F_t *f, unsigned ce_array_len, haddr_t *ce_array_ptr) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; unsigned entries_cleared; unsigned pinned_entries_cleared; hbool_t progress; @@ -945,12 +945,12 @@ done: static herr_t H5C__collective_write(H5F_t *f) { - H5AC_t * cache_ptr; + H5AC_t *cache_ptr; H5FD_mpio_xfer_t orig_xfer_mode = H5FD_MPIO_COLLECTIVE; - const void ** bufs = NULL; - H5FD_mem_t * types = NULL; - haddr_t * addrs = NULL; - size_t * sizes = NULL; + const void **bufs = NULL; + H5FD_mem_t *types = NULL; + haddr_t *addrs = NULL; + size_t *sizes = NULL; uint32_t count32; size_t count; herr_t ret_value = SUCCEED; @@ -976,9 +976,9 @@ H5C__collective_write(H5F_t *f) H5_CHECKED_ASSIGN(count32, uint32_t, count, size_t); if (count > 0) { - H5SL_node_t * node; + H5SL_node_t *node; H5C_cache_entry_t *entry_ptr; - void * base_buf; + void *base_buf; int i; if (NULL == (addrs = H5MM_malloc(count * sizeof(*addrs)))) @@ -1099,7 +1099,7 @@ H5C__flush_candidate_entries(H5F_t *f, unsigned entries_to_flush[H5C_RING_NTYPES uint32_t slist_len = 0; #endif /* H5C_DO_SANITY_CHECKS */ H5C_ring_t ring; - H5C_t * cache_ptr; + H5C_t *cache_ptr; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1206,7 +1206,7 @@ done: static herr_t H5C__flush_candidates_in_ring(H5F_t *f, H5C_ring_t ring, unsigned entries_to_flush, unsigned entries_to_clear) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; hbool_t progress; hbool_t restart_scan = FALSE; unsigned entries_flushed = 0; diff --git a/src/H5Cprefetched.c b/src/H5Cprefetched.c index c5f391e..04b6710 100644 --- a/src/H5Cprefetched.c +++ b/src/H5Cprefetched.c @@ -51,7 +51,7 @@ static herr_t H5C__prefetched_entry_get_initial_load_size(void *udata_ptr, size_ static herr_t H5C__prefetched_entry_get_final_load_size(const void *image_ptr, size_t image_len, void *udata_ptr, size_t *actual_len_ptr); static htri_t H5C__prefetched_entry_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5C__prefetched_entry_deserialize(const void *image_ptr, size_t len, void *udata, +static void *H5C__prefetched_entry_deserialize(const void *image_ptr, size_t len, void *udata, hbool_t *dirty_ptr); static herr_t H5C__prefetched_entry_image_len(const void *thing, size_t *image_len_ptr); static herr_t H5C__prefetched_entry_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, @@ -106,7 +106,7 @@ const H5AC_class_t H5AC_PREFETCHED_ENTRY[1] = {{ ***************************************************************************/ static herr_t -H5C__prefetched_entry_get_initial_load_size(void H5_ATTR_UNUSED *udata_ptr, +H5C__prefetched_entry_get_initial_load_size(void H5_ATTR_UNUSED *udata_ptr, size_t H5_ATTR_UNUSED *image_len_ptr) { FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */ diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index 9514443..bf11414 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -884,7 +884,7 @@ typedef herr_t (*H5C_get_fsf_size_t)(const void *thing, hsize_t *fsf_size_ptr); /* Metadata cache client class definition */ typedef struct H5C_class_t { int id; - const char * name; + const char *name; H5FD_mem_t mem_type; unsigned flags; H5C_get_initial_load_size_func_t get_initial_load_size; @@ -1591,10 +1591,10 @@ typedef int H5C_ring_t; ****************************************************************************/ typedef struct H5C_cache_entry_t { uint32_t magic; - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t addr; size_t size; - void * image_ptr; + void *image_ptr; hbool_t image_up_to_date; const H5C_class_t *type; hbool_t is_dirty; @@ -1666,7 +1666,7 @@ typedef struct H5C_cache_entry_t { /* fields supporting tag lists */ struct H5C_cache_entry_t *tl_next; struct H5C_cache_entry_t *tl_prev; - struct H5C_tag_info_t * tag_info; + struct H5C_tag_info_t *tag_info; #if H5C_COLLECT_CACHE_ENTRY_STATS /* cache entry stats fields */ @@ -1832,10 +1832,10 @@ typedef struct H5C_image_entry_t { hbool_t is_dirty; unsigned image_fd_height; uint64_t fd_parent_count; - haddr_t * fd_parent_addrs; + haddr_t *fd_parent_addrs; uint64_t fd_child_count; uint64_t fd_dirty_child_count; - void * image_ptr; + void *image_ptr; } H5C_image_entry_t; /**************************************************************************** @@ -2221,7 +2221,7 @@ typedef enum H5C_log_style_t { H5C_LOG_STYLE_JSON, H5C_LOG_STYLE_TRACE } H5C_log /***************************************/ H5_DLL H5C_t *H5C_create(size_t max_cache_size, size_t min_clean_size, int max_type_id, - const H5C_class_t *const * class_table_ptr, + const H5C_class_t *const *class_table_ptr, H5C_write_permitted_func_t check_write_permitted, hbool_t write_permitted, H5C_log_flush_func_t log_flush, void *aux_ptr); H5_DLL void H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr, int32_t version, double hit_rate, @@ -2251,7 +2251,7 @@ H5_DLL herr_t H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_pt hbool_t *is_corked_ptr, hbool_t *is_flush_dep_parent_ptr, hbool_t *is_flush_dep_child_ptr, hbool_t *image_up_to_date_ptr); H5_DLL herr_t H5C_get_evictions_enabled(const H5C_t *cache_ptr, hbool_t *evictions_enabled_ptr); -H5_DLL void * H5C_get_aux_ptr(const H5C_t *cache_ptr); +H5_DLL void *H5C_get_aux_ptr(const H5C_t *cache_ptr); H5_DLL herr_t H5C_image_stats(H5C_t *cache_ptr, hbool_t print_header); H5_DLL herr_t H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, unsigned int flags); @@ -2264,7 +2264,7 @@ H5_DLL herr_t H5C_move_entry(H5C_t *cache_ptr, const H5C_class_t *type, haddr_t H5_DLL herr_t H5C_pin_protected_entry(void *thing); H5_DLL herr_t H5C_prep_for_file_close(H5F_t *f); H5_DLL herr_t H5C_create_flush_dependency(void *parent_thing, void *child_thing); -H5_DLL void * H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsigned flags); +H5_DLL void *H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsigned flags); H5_DLL herr_t H5C_reset_cache_hit_rate_stats(H5C_t *cache_ptr); H5_DLL herr_t H5C_resize_entry(void *thing, size_t new_size); H5_DLL herr_t H5C_set_cache_auto_resize_config(H5C_t *cache_ptr, H5C_auto_size_ctl_t *config_ptr); diff --git a/src/H5Cquery.c b/src/H5Cquery.c index 710ce2a..4be62d0 100644 --- a/src/H5Cquery.c +++ b/src/H5Cquery.c @@ -235,7 +235,7 @@ H5C_get_entry_status(const H5F_t *f, haddr_t addr, size_t *size_ptr, hbool_t *in hbool_t *is_corked_ptr, hbool_t *is_flush_dep_parent_ptr, hbool_t *is_flush_dep_child_ptr, hbool_t *image_up_to_date_ptr) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; H5C_cache_entry_t *entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -367,7 +367,7 @@ H5C_get_aux_ptr(const H5C_t *cache_ptr) herr_t H5C_get_entry_ring(const H5F_t *f, haddr_t addr, H5C_ring_t *ring) { - H5C_t * cache_ptr; /* Pointer to cache */ + H5C_t *cache_ptr; /* Pointer to cache */ H5C_cache_entry_t *entry_ptr; /* Pointer to cache entry at address */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Ctag.c b/src/H5Ctag.c index 08141a8..556d0e5 100644 --- a/src/H5Ctag.c +++ b/src/H5Ctag.c @@ -52,7 +52,7 @@ /* Typedef for tagged entry iterator callback context - evict tagged entries */ typedef struct { - H5F_t * f; /* File pointer for evicting entry */ + H5F_t *f; /* File pointer for evicting entry */ hbool_t evicted_entries_last_pass; /* Flag to indicate that an entry * was evicted when iterating over * cache @@ -69,7 +69,7 @@ typedef struct { /* Typedef for tagged entry iterator callback context - expunge tag type metadata */ typedef struct { - H5F_t * f; /* File pointer for evicting entry */ + H5F_t *f; /* File pointer for evicting entry */ int type_id; /* Cache entry type to expunge */ unsigned flags; /* Flags for expunging entry */ } H5C_tag_iter_ettm_ctx_t; @@ -501,7 +501,7 @@ done: herr_t H5C_evict_tagged_entries(H5F_t *f, haddr_t tag, hbool_t match_global) { - H5C_t * cache; /* Pointer to cache structure */ + H5C_t *cache; /* Pointer to cache structure */ H5C_tag_iter_evict_ctx_t ctx; /* Context for iterator callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -839,7 +839,7 @@ done: herr_t H5C_expunge_tag_type_metadata(H5F_t *f, haddr_t tag, int type_id, unsigned flags) { - H5C_t * cache; /* Pointer to cache structure */ + H5C_t *cache; /* Pointer to cache structure */ H5C_tag_iter_ettm_ctx_t ctx; /* Context for iterator callback */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Ctest.c b/src/H5Ctest.c index 44192f6..915f28d 100644 --- a/src/H5Ctest.c +++ b/src/H5Ctest.c @@ -124,8 +124,8 @@ done: herr_t H5C__verify_cork_tag_test(hid_t fid, H5O_token_t tag_token, hbool_t status) { - H5F_t * f; /* File Pointer */ - H5C_t * cache; /* Cache Pointer */ + H5F_t *f; /* File Pointer */ + H5C_t *cache; /* Cache Pointer */ H5C_tag_iter_vct_ctx_t ctx; /* Context for iterator callback */ haddr_t tag; /* Tagged address */ herr_t ret_value = SUCCEED; /* Return value */ @@ -90,8 +90,8 @@ static hid_t H5D__create_api_common(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * dset = NULL; /* New dataset's info */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *dset = NULL; /* New dataset's info */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -204,8 +204,8 @@ H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -271,8 +271,8 @@ done: hid_t H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id) { - void * dset = NULL; /* dset object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + void *dset = NULL; /* dset object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -333,8 +333,8 @@ static hid_t H5D__open_api_common(hid_t loc_id, const char *name, hid_t dapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * dset = NULL; /* dset object from VOL connector */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *dset = NULL; /* dset object from VOL connector */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -415,8 +415,8 @@ H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t dapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -490,10 +490,10 @@ done: herr_t H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, hid_t es_id) { - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ H5VL_object_t *vol_obj = NULL; /* VOL object of dset_id */ - H5VL_t * connector = NULL; /* VOL connector */ + H5VL_t *connector = NULL; /* VOL connector */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -552,7 +552,7 @@ done: static hid_t H5D__get_space_api_common(hid_t dset_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -625,8 +625,8 @@ hid_t H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -668,7 +668,7 @@ done: herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation /*out*/) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -707,7 +707,7 @@ done: hid_t H5Dget_type(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -752,7 +752,7 @@ done: hid_t H5Dget_create_plist(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -814,7 +814,7 @@ done: hid_t H5Dget_access_plist(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -858,7 +858,7 @@ done: hsize_t H5Dget_storage_size(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ hsize_t storage_size = 0; /* Storage size of dataset */ hsize_t ret_value = 0; /* Return value */ @@ -899,7 +899,7 @@ done: haddr_t H5Dget_offset(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ haddr_t dset_offset = HADDR_UNDEF; /* Dataset's offset */ @@ -941,7 +941,7 @@ static herr_t H5D__read_api_common(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1041,8 +1041,8 @@ H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf /*out*/, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Dataset VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1085,7 +1085,7 @@ done: herr_t H5Dread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters, void *buf /*out*/) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1140,7 +1140,7 @@ static herr_t H5D__write_api_common(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, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1243,8 +1243,8 @@ H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hi hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Dataset VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1288,7 +1288,7 @@ herr_t H5Dwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset, size_t data_size, const void *buf) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ uint32_t data_size_32; /* Chunk data size (limited to 32-bits currently) */ @@ -1353,11 +1353,11 @@ done: herr_t H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id, void *dst_buf /*out*/) { - H5T_t * type; /* Datatype */ - H5S_t * dst_space; /* Dataspace */ + H5T_t *type; /* Datatype */ + H5S_t *dst_space; /* Dataspace */ H5S_sel_iter_t *iter = NULL; /* 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 */ @@ -1450,8 +1450,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 /*out*/, 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 = NULL; /* Selection iteration info*/ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ size_t type_size; /* Datatype element size */ @@ -1643,8 +1643,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 */ @@ -1754,7 +1754,7 @@ static herr_t H5D__set_extent_api_common(hid_t dset_id, const hsize_t size[], void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_dataset_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1824,8 +1824,8 @@ H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_lin const hsize_t size[], hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1863,7 +1863,7 @@ done: herr_t H5Dflush(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1905,7 +1905,7 @@ done: herr_t H5Drefresh(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1952,7 +1952,7 @@ done: herr_t H5Dformat_convert(hid_t dset_id) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1994,7 +1994,7 @@ done: herr_t H5Dget_chunk_index_type(hid_t dset_id, H5D_chunk_index_t *idx_type /*out*/) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2039,7 +2039,7 @@ done: herr_t H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_nbytes /*out*/) { - H5VL_object_t * vol_obj; /* Dataset for this operation */ + H5VL_object_t *vol_obj; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2093,7 +2093,7 @@ done: herr_t H5Dget_num_chunks(hid_t dset_id, hid_t fspace_id, hsize_t *nchunks /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Dataset for this operation */ + H5VL_object_t *vol_obj = NULL; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; @@ -2147,7 +2147,7 @@ herr_t H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t chk_index, hsize_t *offset /*out*/, unsigned *filter_mask /*out*/, haddr_t *addr /*out*/, hsize_t *size /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Dataset for this operation */ + H5VL_object_t *vol_obj = NULL; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ hsize_t nchunks = 0; /* Number of chunks */ @@ -2220,7 +2220,7 @@ herr_t H5Dget_chunk_info_by_coord(hid_t dset_id, const hsize_t *offset, unsigned *filter_mask /*out*/, haddr_t *addr /*out*/, hsize_t *size /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Dataset for this operation */ + H5VL_object_t *vol_obj = NULL; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; @@ -2300,7 +2300,7 @@ done: herr_t H5Dchunk_iter(hid_t dset_id, hid_t dxpl_id, H5D_chunk_iter_op_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Dataset for this operation */ + H5VL_object_t *vol_obj = NULL; /* Dataset for this operation */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_dataset_optional_args_t dset_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index e8ebb64..46ea256 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -75,7 +75,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 */ @@ -97,7 +97,7 @@ static int H5D__btree_idx_iterate_cb(H5F_t *f, const void *left_key, haddr_t add void *_udata); /* B-tree callbacks */ -static H5UC_t * H5D__btree_get_shared(const H5F_t *f, const void *_udata); +static H5UC_t *H5D__btree_get_shared(const H5F_t *f, const void *_udata); static herr_t H5D__btree_new_node(H5F_t *f, 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); @@ -241,7 +241,7 @@ H5D__btree_new_node(H5F_t H5_ATTR_NDEBUG_UNUSED *f, H5B_ins_t op, void *_lt_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_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 */ @@ -307,8 +307,8 @@ H5D__btree_new_node(H5F_t H5_ATTR_NDEBUG_UNUSED *f, H5B_ins_t op, void *_lt_key, 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 */ @@ -355,8 +355,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; @@ -419,7 +419,7 @@ H5D__btree_cmp3(void *_lt_key, void *_udata, void *_rt_key) static htri_t H5D__btree_found(H5F_t H5_ATTR_UNUSED *f, haddr_t addr, const void *_lt_key, hbool_t *found, 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; herr_t ret_value = SUCCEED; /* Return value */ @@ -524,7 +524,7 @@ H5D__btree_insert(H5F_t H5_ATTR_NDEBUG_UNUSED *f, haddr_t H5_ATTR_NDEBUG_UNUSED 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 */ @@ -643,7 +643,7 @@ static herr_t H5D__btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key) { const H5O_layout_chunk_t *layout; /* Chunk layout description */ - H5D_btree_key_t * key = (H5D_btree_key_t *)_key; /* Pointer to decoded key */ + H5D_btree_key_t *key = (H5D_btree_key_t *)_key; /* Pointer to decoded key */ hsize_t tmp_offset; /* Temporary coordinate offset, from file */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -693,7 +693,7 @@ static herr_t H5D__btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key) { const H5O_layout_chunk_t *layout; /* Chunk layout description */ - const H5D_btree_key_t * key = (const H5D_btree_key_t *)_key; + const H5D_btree_key_t *key = (const H5D_btree_key_t *)_key; hsize_t tmp_offset; /* Temporary coordinate offset, from file */ unsigned u; /* Local index variable */ @@ -798,7 +798,7 @@ done: static herr_t H5D__btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, const H5O_layout_chunk_t *layout) { - H5B_shared_t * shared; /* Shared B-tree node info */ + H5B_shared_t *shared; /* Shared B-tree node info */ H5O_layout_chunk_t *my_layout = NULL; /* Pointer to copy of layout info */ size_t sizeof_rkey; /* Size of raw (disk) key */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1037,7 +1037,7 @@ static int H5D__btree_idx_iterate_cb(H5F_t H5_ATTR_UNUSED *f, 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/H5Dbtree2.c b/src/H5Dbtree2.c index 6e05d6b..a5b527c 100644 --- a/src/H5Dbtree2.c +++ b/src/H5Dbtree2.c @@ -46,7 +46,7 @@ typedef struct H5D_bt2_ctx_ud_t { const H5F_t *f; /* Pointer to file info */ uint32_t chunk_size; /* Size of chunk (bytes; for filtered object) */ unsigned ndims; /* Number of dimensions */ - uint32_t * dim; /* Size of chunk in elements */ + uint32_t *dim; /* Size of chunk in elements */ } H5D_bt2_ctx_ud_t; /* The callback context */ @@ -61,7 +61,7 @@ typedef struct H5D_bt2_ctx_t { /* Callback info for iteration over chunks in v2 B-tree */ typedef struct H5D_bt2_it_ud_t { H5D_chunk_cb_func_t cb; /* Callback routine for the chunk */ - void * udata; /* User data for the chunk's callback routine */ + void *udata; /* User data for the chunk's callback routine */ } H5D_bt2_it_ud_t; /* User data for compare callback */ @@ -75,7 +75,7 @@ typedef struct H5D_bt2_ud_t { /********************/ /* Shared v2 B-tree methods for indexing filtered and non-filtered chunked datasets */ -static void * H5D__bt2_crt_context(void *udata); +static void *H5D__bt2_crt_context(void *udata); static herr_t H5D__bt2_dst_context(void *ctx); static herr_t H5D__bt2_store(void *native, const void *udata); static herr_t H5D__bt2_compare(const void *rec1, const void *rec2, int *result); @@ -215,9 +215,9 @@ static void * H5D__bt2_crt_context(void *_udata) { H5D_bt2_ctx_ud_t *udata = (H5D_bt2_ctx_ud_t *)_udata; /* User data for building callback context */ - H5D_bt2_ctx_t * ctx; /* Callback context structure */ - uint32_t * my_dim = NULL; /* Pointer to copy of chunk dimension size */ - void * ret_value = NULL; /* Return value */ + H5D_bt2_ctx_t *ctx; /* Callback context structure */ + uint32_t *my_dim = NULL; /* Pointer to copy of chunk dimension size */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -329,7 +329,7 @@ H5D__bt2_store(void *record, const void *_udata) static herr_t H5D__bt2_compare(const void *_udata, const void *_rec2, int *result) { - const H5D_bt2_ud_t * udata = (const H5D_bt2_ud_t *)_udata; /* User data */ + const H5D_bt2_ud_t *udata = (const H5D_bt2_ud_t *)_udata; /* User data */ const H5D_chunk_rec_t *rec1 = &(udata->rec); /* The search record */ const H5D_chunk_rec_t *rec2 = (const H5D_chunk_rec_t *)_rec2; /* The native record */ herr_t ret_value = SUCCEED; /* Return value */ @@ -362,7 +362,7 @@ H5D__bt2_compare(const void *_udata, const void *_rec2, int *result) static herr_t H5D__bt2_unfilt_encode(uint8_t *raw, const void *_record, void *_ctx) { - H5D_bt2_ctx_t * ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5D_bt2_ctx_t *ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* The native record */ unsigned u; /* Local index variable */ @@ -396,7 +396,7 @@ H5D__bt2_unfilt_encode(uint8_t *raw, const void *_record, void *_ctx) static herr_t H5D__bt2_unfilt_decode(const uint8_t *raw, void *_record, void *_ctx) { - H5D_bt2_ctx_t * ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5D_bt2_ctx_t *ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ H5D_chunk_rec_t *record = (H5D_chunk_rec_t *)_record; /* The native record */ unsigned u; /* Local index variable */ @@ -431,7 +431,7 @@ static herr_t H5D__bt2_unfilt_debug(FILE *stream, int indent, int fwidth, const void *_record, const void *_ctx) { const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* The native record */ - const H5D_bt2_ctx_t * ctx = (const H5D_bt2_ctx_t *)_ctx; /* Callback context */ + const H5D_bt2_ctx_t *ctx = (const H5D_bt2_ctx_t *)_ctx; /* Callback context */ unsigned u; /* Local index variable */ FUNC_ENTER_PACKAGE_NOERR @@ -467,7 +467,7 @@ H5D__bt2_unfilt_debug(FILE *stream, int indent, int fwidth, const void *_record, static herr_t H5D__bt2_filt_encode(uint8_t *raw, const void *_record, void *_ctx) { - H5D_bt2_ctx_t * ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5D_bt2_ctx_t *ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* The native record */ unsigned u; /* Local index variable */ @@ -505,7 +505,7 @@ H5D__bt2_filt_encode(uint8_t *raw, const void *_record, void *_ctx) static herr_t H5D__bt2_filt_decode(const uint8_t *raw, void *_record, void *_ctx) { - H5D_bt2_ctx_t * ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ + H5D_bt2_ctx_t *ctx = (H5D_bt2_ctx_t *)_ctx; /* Callback context structure */ H5D_chunk_rec_t *record = (H5D_chunk_rec_t *)_record; /* The native record */ unsigned u; /* Local index variable */ @@ -545,7 +545,7 @@ static herr_t H5D__bt2_filt_debug(FILE *stream, int indent, int fwidth, const void *_record, const void *_ctx) { const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* The native record */ - const H5D_bt2_ctx_t * ctx = (const H5D_bt2_ctx_t *)_ctx; /* Callback context */ + const H5D_bt2_ctx_t *ctx = (const H5D_bt2_ctx_t *)_ctx; /* Callback context */ unsigned u; /* Local index variable */ FUNC_ENTER_PACKAGE_NOERR @@ -610,7 +610,7 @@ H5D__bt2_idx_init(const H5D_chk_idx_info_t H5_ATTR_UNUSED *idx_info, const H5S_t static herr_t H5D__btree2_idx_depend(const H5D_chk_idx_info_t *idx_info) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ H5O_loc_t oloc; /* Temporary object header location for dataset */ H5AC_proxy_entry_t *oh_proxy; /* Dataset's object header proxy */ herr_t ret_value = SUCCEED; /* Return value */ @@ -827,7 +827,7 @@ H5D__bt2_idx_is_space_alloc(const H5O_storage_chunk_t *storage) static herr_t H5D__bt2_mod_cb(void *_record, void *_op_data, hbool_t *changed) { - H5D_bt2_ud_t * op_data = (H5D_bt2_ud_t *)_op_data; /* User data for v2 B-tree calls */ + H5D_bt2_ud_t *op_data = (H5D_bt2_ud_t *)_op_data; /* User data for v2 B-tree calls */ H5D_chunk_rec_t *record = (H5D_chunk_rec_t *)_record; /* Chunk record */ FUNC_ENTER_PACKAGE_NOERR @@ -873,7 +873,7 @@ static herr_t H5D__bt2_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata, const H5D_t H5_ATTR_UNUSED *dset) { - H5B2_t * bt2; /* v2 B-tree handle for indexing chunks */ + H5B2_t *bt2; /* v2 B-tree handle for indexing chunks */ H5D_bt2_ud_t bt2_udata; /* User data for v2 B-tree calls */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -898,7 +898,7 @@ H5D__bt2_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata, } /* end if */ else /* Patch the top level file pointer contained in bt2 if needed */ if (H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") /* Set convenience pointer to v2 B-tree structure */ bt2 = idx_info->storage->u.btree2.bt2; @@ -965,7 +965,7 @@ H5D__bt2_found_cb(const void *nrecord, void *op_data) static herr_t H5D__bt2_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata) { - H5B2_t * bt2; /* v2 B-tree handle for indexing chunks */ + H5B2_t *bt2; /* v2 B-tree handle for indexing chunks */ H5D_bt2_ud_t bt2_udata; /* User data for v2 B-tree calls */ H5D_chunk_rec_t found_rec; /* Record found from searching for object */ unsigned u; /* Local index variable */ @@ -992,7 +992,7 @@ H5D__bt2_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata) } /* end if */ else /* Patch the top level file pointer contained in bt2 if needed */ if (H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") /* Set convenience pointer to v2 B-tree structure */ bt2 = idx_info->storage->u.btree2.bt2; @@ -1062,7 +1062,7 @@ done: static int H5D__bt2_idx_iterate_cb(const void *_record, void *_udata) { - H5D_bt2_it_ud_t * udata = (H5D_bt2_it_ud_t *)_udata; /* User data */ + H5D_bt2_it_ud_t *udata = (H5D_bt2_it_ud_t *)_udata; /* User data */ const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* Native record */ int ret_value = -1; /* Return value */ @@ -1090,7 +1090,7 @@ H5D__bt2_idx_iterate_cb(const void *_record, void *_udata) static int H5D__bt2_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb, void *chunk_udata) { - H5B2_t * bt2; /* v2 B-tree handle for indexing chunks */ + H5B2_t *bt2; /* v2 B-tree handle for indexing chunks */ H5D_bt2_it_ud_t udata; /* User data for B-tree iterator callback */ int ret_value = FAIL; /* Return value */ @@ -1114,7 +1114,7 @@ H5D__bt2_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chu } /* end if */ else /* Patch the top level file pointer contained in bt2 if needed */ if (H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") /* Set convenience pointer to v2 B-tree structure */ bt2 = idx_info->storage->u.btree2.bt2; @@ -1150,7 +1150,7 @@ static herr_t H5D__bt2_remove_cb(const void *_record, void *_udata) { const H5D_chunk_rec_t *record = (const H5D_chunk_rec_t *)_record; /* The native record */ - H5F_t * f = (H5F_t *)_udata; /* User data for removal callback */ + H5F_t *f = (H5F_t *)_udata; /* User data for removal callback */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1181,7 +1181,7 @@ done: static herr_t H5D__bt2_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata) { - H5B2_t * bt2; /* v2 B-tree handle for indexing chunks */ + H5B2_t *bt2; /* v2 B-tree handle for indexing chunks */ H5D_bt2_ud_t bt2_udata; /* User data for v2 B-tree find call */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1205,7 +1205,7 @@ H5D__bt2_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *u } /* end if */ else /* Patch the top level file pointer contained in bt2 if needed */ if (H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") /* Set convenience pointer to v2 B-tree structure */ bt2 = idx_info->storage->u.btree2.bt2; diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 6a89a99..4f628a7 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -129,7 +129,7 @@ typedef struct H5D_rdcc_ent_t { uint32_t wr_count; /*bytes remaining to be written */ H5F_block_t chunk_block; /*offset/length of chunk in file */ hsize_t chunk_idx; /*index of chunk in dataset */ - 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 */ @@ -142,12 +142,12 @@ typedef H5D_rdcc_ent_t *H5D_rdcc_ent_ptr_t; /* For free lists */ 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; @@ -165,10 +165,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 */ @@ -177,17 +177,17 @@ 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 */ unsigned dset_ndims; /* Number of dimensions in dataset */ - const hsize_t * dset_dims; /* Dataset dimensions */ + const hsize_t *dset_dims; /* Dataset dimensions */ /* needed for copy object pointed by refs */ H5O_copy_t *cpy_info; /* Copy options */ @@ -199,7 +199,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 */ uint32_t *chunk_dim; /* Chunk dimensions */ @@ -209,13 +209,13 @@ typedef struct H5D_chunk_it_ud4_t { typedef struct H5D_chunk_it_ud5_t { H5D_chk_idx_info_t *new_idx_info; /* Dest. chunk index info object */ unsigned dset_ndims; /* Number of dimensions in dataset */ - hsize_t * dset_dims; /* Dataset dimensions */ + hsize_t *dset_dims; /* Dataset dimensions */ } H5D_chunk_it_ud5_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 */ } H5D_chunk_readvv_ud_t; /* Typedef for chunk info iterator callback */ @@ -253,7 +253,7 @@ typedef struct H5D_chunk_coll_fill_info_t { typedef struct H5D_chunk_iter_ud_t { H5D_chunk_iter_op_t op; /* User defined callback */ - void * op_data; /* User data for user defined callback */ + void *op_data; /* User data for user defined callback */ } H5D_chunk_iter_ud_t; /********************/ @@ -310,7 +310,7 @@ static htri_t H5D__chunk_may_use_select_io(const H5D_io_info_t *io_info); static unsigned H5D__chunk_hash_val(const H5D_shared_t *shared, const hsize_t *scaled); static herr_t H5D__chunk_flush_entry(const H5D_t *dset, H5D_rdcc_ent_t *ent, hbool_t reset); static herr_t H5D__chunk_cache_evict(const H5D_t *dset, H5D_rdcc_ent_t *ent, hbool_t flush); -static void * H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax, +static void *H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax, hbool_t prev_unfilt_chunk); static 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); @@ -507,7 +507,7 @@ herr_t H5D__chunk_direct_read(const H5D_t *dset, 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 */ hsize_t scaled[H5S_MAX_RANK]; /* Scaled coordinates for this chunk */ herr_t ret_value = SUCCEED; /* Return value */ @@ -602,7 +602,7 @@ herr_t H5D__get_chunk_storage_size(H5D_t *dset, 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 */ hsize_t scaled[H5S_MAX_RANK]; /* Scaled coordinates for this chunk */ H5D_chunk_ud_t udata; /* User data for querying chunk info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -915,8 +915,8 @@ static herr_t H5D__chunk_init(H5F_t *f, const H5D_t *const 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 */ H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); herr_t ret_value = SUCCEED; /* Return value */ @@ -1167,8 +1167,8 @@ H5D__chunk_io_init_selections(const H5D_io_info_t *io_info, const H5D_type_info_ { 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 */ - H5T_t * file_type = NULL; /* Temporary copy of file datatype for iteration */ + H5S_t *tmp_mspace = NULL; /* Temporary memory dataspace */ + H5T_t *file_type = NULL; /* Temporary copy of file datatype for iteration */ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ char bogus; /* "bogus" buffer to pass to selection iterator */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1373,7 +1373,7 @@ void * H5D__chunk_mem_alloc(size_t size, void *pline) { H5O_pline_t *_pline = (H5O_pline_t *)pline; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -1608,7 +1608,7 @@ H5D__create_chunk_file_map_all(H5D_chunk_map_t *fm, const H5D_io_info_t #endif /* H5_HAVE_PARALLEL */ *io_info) { - H5S_t * tmp_fchunk = NULL; /* Temporary file dataspace */ + H5S_t *tmp_fchunk = NULL; /* Temporary file dataspace */ hsize_t file_dims[H5S_MAX_RANK]; /* File dataspace dims */ hsize_t sel_points; /* Number of elements in file selection */ hsize_t zeros[H5S_MAX_RANK]; /* All zero vector (for start parameter to setting hyperslab on partial @@ -1813,7 +1813,7 @@ H5D__create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t #endif /* H5_HAVE_PARALLEL */ *io_info) { - H5S_t * tmp_fchunk = NULL; /* Temporary file dataspace */ + H5S_t *tmp_fchunk = NULL; /* Temporary file dataspace */ hsize_t sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */ hsize_t sel_end[H5O_LAYOUT_NDIMS]; /* Offset of high bound of file selection */ hsize_t sel_points; /* Number of elements in file selection */ @@ -1989,7 +1989,7 @@ static herr_t H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm) { H5D_chunk_info_t *chunk_info; /* Pointer to chunk information */ - H5SL_node_t * curr_node; /* Current node in skip list */ + H5SL_node_t *curr_node; /* Current node in skip list */ hsize_t file_sel_start[H5S_MAX_RANK]; /* Offset of low bound of file selection */ hsize_t file_sel_end[H5S_MAX_RANK]; /* Offset of high bound of file selection */ hsize_t mem_sel_start[H5S_MAX_RANK]; /* Offset of low bound of file selection */ @@ -2117,7 +2117,7 @@ static herr_t H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm) { H5D_chunk_info_t *chunk_info; /* Pointer to chunk information */ - H5SL_node_t * curr_node; /* Current node in skip list */ + H5SL_node_t *curr_node; /* Current node in skip list */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -2198,8 +2198,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 */ hsize_t scaled[H5S_MAX_RANK]; /* Scaled coordinates for this chunk */ @@ -2314,7 +2314,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[H5S_MAX_RANK]; /* Coordinates of element in memory */ hsize_t chunk_index; /* Chunk index */ @@ -2551,15 +2551,15 @@ static herr_t H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t H5_ATTR_UNUSED nelmts, H5S_t H5_ATTR_UNUSED *file_space, 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 */ uint32_t src_accessed_bytes = 0; /* Total accessed size in a chunk */ hbool_t skip_missing_chunks = FALSE; /* Whether to skip missing chunks */ - H5S_t ** chunk_mem_spaces = NULL; /* Array of chunk memory spaces */ - H5S_t * chunk_mem_spaces_static[8]; /* Static buffer for chunk_mem_spaces */ - H5S_t ** chunk_file_spaces = NULL; /* Array of chunk file spaces */ - H5S_t * chunk_file_spaces_static[8]; /* Static buffer for chunk_file_spaces */ - haddr_t * chunk_addrs = NULL; /* Array of chunk addresses */ + H5S_t **chunk_mem_spaces = NULL; /* Array of chunk memory spaces */ + H5S_t *chunk_mem_spaces_static[8]; /* Static buffer for chunk_mem_spaces */ + H5S_t **chunk_file_spaces = NULL; /* Array of chunk file spaces */ + H5S_t *chunk_file_spaces_static[8]; /* Static buffer for chunk_file_spaces */ + haddr_t *chunk_addrs = NULL; /* Array of chunk addresses */ haddr_t chunk_addrs_static[8]; /* Static buffer for chunk_addrs */ herr_t ret_value = SUCCEED; /*return value */ @@ -2596,7 +2596,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_ if (io_info->use_select_io) { size_t num_chunks; size_t element_sizes[2] = {type_info->dst_type_size, 0}; - void * bufs[2] = {io_info->u.rbuf, NULL}; + void *bufs[2] = {io_info->u.rbuf, NULL}; /* Cache number of chunks */ num_chunks = H5D_CHUNK_GET_NODE_COUNT(fm); @@ -2733,7 +2733,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_ if (H5F_addr_defined(udata.chunk_block.offset) || UINT_MAX != udata.idx_hint || !skip_missing_chunks) { H5D_io_info_t *chk_io_info; /* Pointer to I/O info object for this chunk */ - void * chunk = NULL; /* Pointer to locked chunk buffer */ + void *chunk = NULL; /* Pointer to locked chunk buffer */ /* Set chunk's [scaled] coordinates */ io_info->store->chunk.scaled = chunk_info->scaled; @@ -2820,18 +2820,18 @@ static herr_t H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t H5_ATTR_UNUSED nelmts, H5S_t H5_ATTR_UNUSED *file_space, 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 */ H5D_storage_t cpt_store; /* Chunk storage information as compact dataset */ hbool_t cpt_dirty; /* Temporary placeholder for compact storage "dirty" flag */ uint32_t dst_accessed_bytes = 0; /* Total accessed size in a chunk */ - H5S_t ** chunk_mem_spaces = NULL; /* Array of chunk memory spaces */ - H5S_t * chunk_mem_spaces_static[8]; /* Static buffer for chunk_mem_spaces */ - H5S_t ** chunk_file_spaces = NULL; /* Array of chunk file spaces */ - H5S_t * chunk_file_spaces_static[8]; /* Static buffer for chunk_file_spaces */ - haddr_t * chunk_addrs = NULL; /* Array of chunk addresses */ + H5S_t **chunk_mem_spaces = NULL; /* Array of chunk memory spaces */ + H5S_t *chunk_mem_spaces_static[8]; /* Static buffer for chunk_mem_spaces */ + H5S_t **chunk_file_spaces = NULL; /* Array of chunk file spaces */ + H5S_t *chunk_file_spaces_static[8]; /* Static buffer for chunk_file_spaces */ + haddr_t *chunk_addrs = NULL; /* Array of chunk addresses */ haddr_t chunk_addrs_static[8]; /* Static buffer for chunk_addrs */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2897,7 +2897,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize /* Iterate through nodes in chunk skip list */ chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm); while (chunk_node) { - H5D_chunk_info_t * chunk_info; /* Chunk information */ + H5D_chunk_info_t *chunk_info; /* Chunk information */ H5D_chk_idx_info_t idx_info; /* Chunked index info */ H5D_chunk_ud_t udata; /* Index pass-through */ htri_t cacheable; /* Whether the chunk is cacheable */ @@ -2926,7 +2926,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize if (cacheable) { /* Load the chunk into cache. But if the whole chunk is written, * simply allocate space instead of load the chunk. */ - void * chunk; /* Pointer to locked chunk buffer */ + void *chunk; /* Pointer to locked chunk buffer */ hbool_t entire_chunk = TRUE; /* Whether whole chunk is selected */ /* Compute # of bytes accessed in chunk */ @@ -3024,10 +3024,10 @@ H5D__chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize /* Iterate through nodes in chunk skip list */ chunk_node = H5D_CHUNK_GET_FIRST_NODE(fm); while (chunk_node) { - H5D_chunk_info_t * chunk_info; /* Chunk information */ + H5D_chunk_info_t *chunk_info; /* Chunk information */ H5D_chk_idx_info_t idx_info; /* Chunked index info */ - 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 */ hbool_t need_insert = FALSE; /* Whether the chunk needs to be inserted into the index */ @@ -3168,7 +3168,7 @@ done: static herr_t H5D__chunk_flush(H5D_t *dset) { - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); + 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 */ @@ -3258,8 +3258,8 @@ static herr_t H5D__chunk_dest(H5D_t *dset) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - 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_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 */ H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); herr_t ret_value = SUCCEED; /* Return value */ @@ -3553,7 +3553,7 @@ H5D__chunk_hash_val(const H5D_shared_t *shared, const hsize_t *scaled) herr_t H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udata) { - H5D_rdcc_ent_t * ent = NULL; /* Cache entry */ + H5D_rdcc_ent_t *ent = NULL; /* Cache entry */ H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); unsigned idx = 0; /* Index of chunk in cache, if present */ hbool_t found = FALSE; /* In cache? */ @@ -3708,7 +3708,7 @@ done: static herr_t H5D__chunk_flush_entry(const H5D_t *dset, 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; H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); herr_t ret_value = SUCCEED; /* Return value */ @@ -3983,8 +3983,8 @@ H5D__chunk_cache_prune(const H5D_t *dset, size_t size) 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 */ @@ -4104,17 +4104,17 @@ H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t rel H5O_pline_t *pline = &(dset->shared->dcpl_cache .pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_mem_alloc */ - H5O_pline_t * old_pline = pline; /* Old pipeline, i.e. pipeline used to read the chunk */ + H5O_pline_t *old_pline = pline; /* Old pipeline, i.e. pipeline used to read the chunk */ 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; /*cache entry */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/ + H5D_rdcc_ent_t *ent; /*cache entry */ size_t chunk_size; /*size of a chunk */ hbool_t disable_filters = FALSE; /* Whether to disable filters (when adding to cache) */ - void * chunk = NULL; /*the file chunk */ - void * ret_value = NULL; /* Return value */ + void *chunk = NULL; /*the file chunk */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -4501,7 +4501,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 @@ -4624,8 +4624,8 @@ herr_t H5D__chunk_allocated(const H5D_t *dset, 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 */ hsize_t chunk_bytes = 0; /* Number of bytes allocated for chunks */ H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); herr_t ret_value = SUCCEED; /* Return value */ @@ -4677,7 +4677,7 @@ done: herr_t H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, const hsize_t old_dim[]) { - const H5D_t * dset = io_info->dset; /* the dataset pointer */ + const H5D_t *dset = io_info->dset; /* the dataset pointer */ H5D_chk_idx_info_t idx_info; /* Chunked index info */ const H5D_chunk_ops_t *ops = dset->shared->layout.storage.u.chunk.ops; /* Chunk operations */ hsize_t min_unalloc[H5O_LAYOUT_NDIMS]; /* First chunk in each dimension that is unallocated (in scaled @@ -4688,14 +4688,14 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, const size_t orig_chunk_size; /* Original size of chunk in bytes */ size_t chunk_size; /* Actual size of chunk in bytes, possibly filtered */ unsigned filter_mask = 0; /* Filter mask for chunks that have them */ - H5O_layout_t * layout = &(dset->shared->layout); /* Dataset layout */ - H5O_pline_t * pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */ + H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ + H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */ H5O_pline_t def_pline = H5O_CRT_PIPELINE_DEF; /* Default pipeline */ 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 */ - void * unfilt_fill_buf = NULL; /* Unfiltered fill value buffer */ - void ** fill_buf = NULL; /* Pointer to the fill buffer to use for a chunk */ + void *unfilt_fill_buf = NULL; /* Unfiltered fill value buffer */ + void **fill_buf = NULL; /* Pointer to the fill buffer to use for a chunk */ #ifdef H5_HAVE_PARALLEL hbool_t blocks_written = FALSE; /* Flag to indicate that chunk was actually written */ hbool_t using_mpi = @@ -4704,8 +4704,8 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, const #endif /* H5_HAVE_PARALLEL */ hbool_t carry; /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */ unsigned space_ndims; /* Dataset's space rank */ - const hsize_t * space_dim; /* Dataset's dataspace dimensions */ - const uint32_t * chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */ + const hsize_t *space_dim; /* Dataset's dataspace dimensions */ + const uint32_t *chunk_dim = layout->u.chunk.dim; /* Convenience pointer to chunk dimensions */ unsigned op_dim; /* Current operating 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 */ @@ -5162,14 +5162,14 @@ H5D__chunk_update_old_edge_chunks(H5D_t *dset, hsize_t old_dim[]) modified */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ hsize_t chunk_sc[H5O_LAYOUT_NDIMS]; /* Offset of current chunk */ - 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 */ unsigned space_ndims; /* Dataset's space rank */ - const hsize_t * space_dim; /* Dataset's dataspace dimensions */ + const hsize_t *space_dim; /* Dataset's dataspace dimensions */ unsigned op_dim; /* Current operationg dimension */ H5D_io_info_t chk_io_info; /* Chunked I/O info object */ H5D_chunk_ud_t chk_udata; /* User data for locking chunk */ H5D_storage_t chk_store; /* Chunk storage information */ - void * chunk; /* The file chunk */ + void *chunk; /* The file chunk */ hbool_t carry; /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */ herr_t ret_value = SUCCEED; /* Return value */ @@ -5333,9 +5333,9 @@ H5D__chunk_collective_fill(const H5D_t *dset, H5D_chunk_coll_fill_info_t *chunk_ size_t num_blocks; /* Number of blocks between processes. */ size_t leftover_blocks; /* Number of leftover blocks to handle */ int blocks, leftover; /* converted to int for MPI */ - MPI_Aint * chunk_disp_array = NULL; - MPI_Aint * block_disps = NULL; - int * block_lens = NULL; + MPI_Aint *chunk_disp_array = NULL; + MPI_Aint *block_disps = NULL; + int *block_lens = NULL; MPI_Datatype mem_type = MPI_BYTE, file_type = MPI_BYTE; H5FD_mpio_xfer_t prev_xfer_mode; /* Previous data xfer mode */ hbool_t have_xfer_mode = FALSE; /* Whether the previous xffer mode has been retrieved */ @@ -5602,16 +5602,16 @@ static herr_t H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata, hbool_t new_unfilt_chunk) { 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 * scaled = udata->common.scaled; /* Scaled chunk offset */ - H5S_sel_iter_t * chunk_iter = NULL; /* Memory selection iteration info */ + const hsize_t *scaled = udata->common.scaled; /* Scaled chunk offset */ + H5S_sel_iter_t *chunk_iter = NULL; /* Memory selection iteration info */ hbool_t chunk_iter_init = FALSE; /* Whether the chunk iterator has been initialized */ hsize_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 */ unsigned u; /* Local index variable */ @@ -5823,15 +5823,15 @@ H5D__chunk_prune_by_extent(H5D_t *dset, 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 */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset's 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 */ unsigned space_ndims; /* Dataset's space rank */ - const hsize_t * space_dim; /* Current dataspace dimensions */ + const hsize_t *space_dim; /* Current dataspace dimensions */ unsigned op_dim; /* Current operating dimension */ hbool_t shrunk_dim[H5O_LAYOUT_NDIMS]; /* Dimensions which have shrunk */ H5D_chunk_it_ud1_t udata; /* Chunk index iterator user data */ 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 */ - 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 scaled[H5O_LAYOUT_NDIMS]; /* Scaled offset of current chunk */ hsize_t hyper_start[H5O_LAYOUT_NDIMS]; /* Starting location of hyperslab */ @@ -6185,7 +6185,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 */ H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); herr_t ret_value = SUCCEED; /* Return value */ @@ -6311,7 +6311,7 @@ done: herr_t H5D__chunk_update_cache(H5D_t *dset) { - H5D_rdcc_t * rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ + H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ H5D_rdcc_ent_t *ent, *next; /*cache entry */ H5D_rdcc_ent_t tmp_head; /* Sentinel entry for temporary entry list */ H5D_rdcc_ent_t *tmp_tail; /* Tail pointer for temporary entry list */ @@ -6430,8 +6430,8 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) hbool_t need_insert = FALSE; /* Whether the chunk needs to be inserted into the index */ /* 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 */ @@ -6504,7 +6504,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 = (H5D_shared_t *)udata->cpy_info->shared_fo; + H5D_shared_t *shared_fo = (H5D_shared_t *)udata->cpy_info->shared_fo; /* See if the written chunk is in the chunk cache */ if (shared_fo && shared_fo->cache.chunk.nslots > 0) { @@ -6558,11 +6558,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 */ @@ -6681,16 +6681,16 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk hsize_t max_dims[H5O_LAYOUT_NDIMS]; /* Curr. size of dataset dimensions */ 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 */ @@ -6759,8 +6759,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 */ @@ -6891,7 +6891,7 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk if (udata.cpy_info->shared_fo) { H5D_rdcc_ent_t *ent, *next; H5D_chunk_rec_t chunk_rec; - H5D_shared_t * shared_fo = (H5D_shared_t *)udata.cpy_info->shared_fo; + H5D_shared_t *shared_fo = (H5D_shared_t *)udata.cpy_info->shared_fo; chunk_rec.nbytes = layout_src->size; chunk_rec.filter_mask = 0; @@ -6955,7 +6955,7 @@ herr_t H5D__chunk_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5O_layout_t *layout, hsize_t *index_size) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - H5S_t * space = NULL; /* Dataset's dataspace */ + H5S_t *space = NULL; /* Dataset's dataspace */ H5O_pline_t pline; /* I/O pipeline message */ H5O_storage_chunk_t *sc = &(layout->storage.u.chunk); htri_t exists; /* Flag if header message of interest exists */ @@ -7478,7 +7478,7 @@ H5D__chunk_format_convert_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) H5D_chunk_ud_t insert_udata; /* Chunk information to be inserted */ haddr_t chunk_addr; /* Chunk address */ size_t nbytes; /* Chunk size */ - void * buf = NULL; /* Pointer to buffer of chunk data */ + void *buf = NULL; /* Pointer to buffer of chunk data */ int ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_PACKAGE @@ -7637,8 +7637,8 @@ herr_t H5D__chunk_index_empty(const H5D_t *dset, hbool_t *empty) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ - H5D_rdcc_ent_t * ent; /* Cache entry */ - const H5D_rdcc_t * rdcc = NULL; /* Raw data chunk cache */ + H5D_rdcc_ent_t *ent; /* Cache entry */ + const H5D_rdcc_t *rdcc = NULL; /* Raw data chunk cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE_TAG(dset->oloc.addr) @@ -7728,8 +7728,8 @@ H5D__get_num_chunks(const H5D_t *dset, const H5S_t H5_ATTR_UNUSED *space, hsize_ { H5D_chk_idx_info_t idx_info; /* Chunked index info */ hsize_t num_chunks = 0; /* Number of written chunks */ - H5D_rdcc_ent_t * ent; /* Cache entry */ - const H5D_rdcc_t * rdcc = NULL; /* Raw data chunk cache */ + H5D_rdcc_ent_t *ent; /* Cache entry */ + const H5D_rdcc_t *rdcc = NULL; /* Raw data chunk cache */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE_TAG(dset->oloc.addr) @@ -7841,8 +7841,8 @@ H5D__get_chunk_info(const H5D_t *dset, const H5S_t H5_ATTR_UNUSED *space, hsize_ { H5D_chk_idx_info_t idx_info; /* Chunked index info */ H5D_chunk_info_iter_ud_t udata; /* User data for callback */ - const H5D_rdcc_t * rdcc = NULL; /* Raw data chunk cache */ - H5D_rdcc_ent_t * ent; /* Cache entry index */ + const H5D_rdcc_t *rdcc = NULL; /* Raw data chunk cache */ + H5D_rdcc_ent_t *ent; /* Cache entry index */ hsize_t ii = 0; /* Dimension index */ herr_t ret_value = SUCCEED; /* Return value */ @@ -7974,9 +7974,9 @@ herr_t H5D__get_chunk_info_by_coord(const H5D_t *dset, const hsize_t *offset, unsigned *filter_mask, haddr_t *addr, hsize_t *size) { - const H5O_layout_t * layout = NULL; /* Dataset layout */ - const H5D_rdcc_t * rdcc = NULL; /* Raw data chunk cache */ - H5D_rdcc_ent_t * ent; /* Cache entry index */ + const H5O_layout_t *layout = NULL; /* Dataset layout */ + const H5D_rdcc_t *rdcc = NULL; /* Raw data chunk cache */ + H5D_rdcc_ent_t *ent; /* Cache entry index */ H5D_chk_idx_info_t idx_info; /* Chunked index info */ H5D_chunk_info_iter_ud_t udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -8094,9 +8094,9 @@ H5D__chunk_iter_cb(const H5D_chunk_rec_t *chunk_rec, void *udata) herr_t H5D__chunk_iter(H5D_t *dset, H5D_chunk_iter_op_t op, void *op_data) { - const H5D_rdcc_t * rdcc = NULL; /* Raw data chunk cache */ - H5O_layout_t * layout = NULL; /* Dataset layout */ - H5D_rdcc_ent_t * ent; /* Cache entry index */ + const H5D_rdcc_t *rdcc = NULL; /* Raw data chunk cache */ + H5O_layout_t *layout = NULL; /* Dataset layout */ + H5D_rdcc_ent_t *ent; /* Cache entry index */ H5D_chk_idx_info_t idx_info; /* Chunked index info */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 94dc64d..6b9aa89 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -52,8 +52,8 @@ */ typedef struct H5D_compact_iovv_memmanage_ud_t { H5F_shared_t *f_sh; /* Shared file for dataset */ - void * dstbuf; /* Pointer to buffer to be read into/written into */ - const void * srcbuf; /* Pointer to buffer to be read from/written from */ + void *dstbuf; /* Pointer to buffer to be read into/written into */ + const void *srcbuf; /* Pointer to buffer to be read from/written from */ } H5D_compact_iovv_memmanage_ud_t; /********************/ @@ -275,7 +275,7 @@ H5D__compact_iovv_memmanage_cb(hsize_t dst_off, hsize_t src_off, size_t len, voi H5D_compact_iovv_memmanage_ud_t *udata = (H5D_compact_iovv_memmanage_ud_t *)_udata; H5FD_ctl_memcpy_args_t op_args; uint64_t op_flags; - H5FD_t * file_handle = NULL; + H5FD_t *file_handle = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -499,9 +499,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 = (H5D_shared_t *)cpy_info->shared_fo; /* Pointer to the shared struct for dataset object */ @@ -529,9 +529,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 b03ad47..d098758 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -56,30 +56,30 @@ /* Callback info for sieve buffer readvv operation */ typedef struct H5D_contig_readvv_sieve_ud_t { - H5F_shared_t * f_sh; /* Shared file for dataset */ - H5D_rdcdc_t * dset_contig; /* Cached information about contiguous data */ + H5F_shared_t *f_sh; /* Shared 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 */ } H5D_contig_readvv_sieve_ud_t; /* Callback info for [plain] readvv operation */ typedef struct H5D_contig_readvv_ud_t { - H5F_shared_t * f_sh; /* Shared file for dataset */ + H5F_shared_t *f_sh; /* Shared file for dataset */ haddr_t dset_addr; /* Address of dataset */ unsigned char *rbuf; /* Pointer to buffer to fill */ } H5D_contig_readvv_ud_t; /* Callback info for sieve buffer writevv operation */ typedef struct H5D_contig_writevv_sieve_ud_t { - H5F_shared_t * f_sh; /* Shared file for dataset */ - H5D_rdcdc_t * dset_contig; /* Cached information about contiguous data */ + H5F_shared_t *f_sh; /* Shared 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 */ } H5D_contig_writevv_sieve_ud_t; /* Callback info for [plain] writevv operation */ typedef struct H5D_contig_writevv_ud_t { - H5F_shared_t * f_sh; /* Shared file for dataset */ + H5F_shared_t *f_sh; /* Shared file for dataset */ haddr_t dset_addr; /* Address of dataset */ const unsigned char *wbuf; /* Pointer to buffer to write */ } H5D_contig_writevv_ud_t; @@ -185,7 +185,7 @@ done: herr_t H5D__contig_fill(const H5D_io_info_t *io_info) { - const H5D_t * dset = io_info->dset; /* the dataset pointer */ + const H5D_t *dset = io_info->dset; /* the dataset pointer */ H5D_io_info_t ioinfo; /* Dataset I/O info */ H5D_storage_t store; /* Union of storage info for dataset */ hssize_t snpoints; /* Number of points in space (for error checking) */ @@ -685,7 +685,7 @@ H5D__contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize else /* Read data through legacy (non-selection I/O) pathway */ if ((io_info->io_ops.single_read)(io_info, type_info, nelmts, file_space, mem_space) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "contiguous read failed") + HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "contiguous read failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -732,7 +732,7 @@ H5D__contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsiz else /* Write data through legacy (non-selection I/O) pathway */ if ((io_info->io_ops.single_write)(io_info, type_info, nelmts, file_space, mem_space) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "contiguous write failed") + HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "contiguous write failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -793,7 +793,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_shared_t *f_sh = udata->f_sh; /* Shared file for dataset */ - H5D_rdcdc_t * dset_contig = udata->dset_contig; /* Cached information about contiguous data */ + 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 */ unsigned char *buf; /* Pointer to buffer to fill */ @@ -1060,7 +1060,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_shared_t *f_sh = udata->f_sh; /* Shared file for dataset */ - H5D_rdcdc_t * dset_contig = udata->dset_contig; /* Cached information about contiguous data */ + 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 */ const unsigned char *buf; /* Pointer to buffer to fill */ @@ -1408,9 +1408,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 */ @@ -1424,10 +1424,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 */ @@ -1603,7 +1603,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, 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 61ecab26..9b0dfe7 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -103,8 +103,8 @@ hid_t H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id) { - void * dset = NULL; /* dset object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + void *dset = NULL; /* dset object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -175,8 +175,8 @@ done: hid_t H5Dopen1(hid_t loc_id, const char *name) { - void * dset = NULL; /* dset object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + void *dset = NULL; /* dset object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -233,11 +233,11 @@ done: herr_t H5Dextend(hid_t dset_id, const hsize_t size[]) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_dataset_get_args_t vol_get_cb_args; /* Arguments to VOL callback */ H5VL_dataset_specific_args_t vol_spec_cb_args; /* Arguments to VOL callback */ hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ - H5S_t * ds = NULL; /* Dataspace struct */ + H5S_t *ds = NULL; /* Dataspace struct */ int ndims; /* Dataset/space rank */ hsize_t dset_dims[H5S_MAX_RANK]; /* Current dataset dimensions */ int i; /* Local index variable */ diff --git a/src/H5Dearray.c b/src/H5Dearray.c index 8223ace..ad7c347 100644 --- a/src/H5Dearray.c +++ b/src/H5Dearray.c @@ -72,7 +72,7 @@ typedef struct H5D_earray_it_ud_t { H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */ hbool_t filtered; /* Whether the chunks are filtered */ 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_earray_it_ud_t; /* Native extensible array element for chunks w/filters */ @@ -90,13 +90,13 @@ static int H5D__earray_idx_iterate_cb(hsize_t idx, const void *_elmt, void *_uda static int H5D__earray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata); /* Extensible array class callbacks for chunks w/o filters */ -static void * H5D__earray_crt_context(void *udata); +static void *H5D__earray_crt_context(void *udata); static herr_t H5D__earray_dst_context(void *ctx); static herr_t H5D__earray_fill(void *nat_blk, size_t nelmts); static herr_t H5D__earray_encode(void *raw, const void *elmt, size_t nelmts, void *ctx); static herr_t H5D__earray_decode(const void *raw, void *elmt, size_t nelmts, void *ctx); static herr_t H5D__earray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); -static void * H5D__earray_crt_dbg_context(H5F_t *f, haddr_t obj_addr); +static void *H5D__earray_crt_dbg_context(H5F_t *f, haddr_t obj_addr); static herr_t H5D__earray_dst_dbg_context(void *dbg_ctx); /* Extensible array class callbacks for chunks w/filters */ @@ -215,9 +215,9 @@ H5FL_DEFINE_STATIC(H5D_earray_ctx_ud_t); static void * H5D__earray_crt_context(void *_udata) { - H5D_earray_ctx_t * ctx; /* Extensible array callback context */ + H5D_earray_ctx_t *ctx; /* Extensible array callback context */ H5D_earray_ctx_ud_t *udata = (H5D_earray_ctx_ud_t *)_udata; /* User data for extensible array context */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -323,7 +323,7 @@ static herr_t H5D__earray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx) { H5D_earray_ctx_t *ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ - const haddr_t * elmt = (const haddr_t *)_elmt; /* Convenience pointer to native elements */ + const haddr_t *elmt = (const haddr_t *)_elmt; /* Convenience pointer to native elements */ FUNC_ENTER_PACKAGE_NOERR @@ -366,8 +366,8 @@ static herr_t H5D__earray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx) { H5D_earray_ctx_t *ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ - haddr_t * elmt = (haddr_t *)_elmt; /* Convenience pointer to native elements */ - const uint8_t * raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ + haddr_t *elmt = (haddr_t *)_elmt; /* Convenience pointer to native elements */ + const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ FUNC_ENTER_PACKAGE_NOERR @@ -469,8 +469,8 @@ H5D__earray_filt_fill(void *nat_blk, size_t nelmts) static herr_t H5D__earray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx) { - H5D_earray_ctx_t * ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ - uint8_t * raw = (uint8_t *)_raw; /* Convenience pointer to raw elements */ + H5D_earray_ctx_t *ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ + uint8_t *raw = (uint8_t *)_raw; /* Convenience pointer to raw elements */ const H5D_earray_filt_elmt_t *elmt = (const H5D_earray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */ @@ -516,7 +516,7 @@ H5D__earray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx static herr_t H5D__earray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx) { - H5D_earray_ctx_t * ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ + H5D_earray_ctx_t *ctx = (H5D_earray_ctx_t *)_ctx; /* Extensible array callback context */ H5D_earray_filt_elmt_t *elmt = (H5D_earray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */ const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ @@ -600,7 +600,7 @@ H5D__earray_crt_dbg_context(H5F_t *f, haddr_t obj_addr) H5O_loc_t obj_loc; /* Pointer to an object's location */ hbool_t obj_opened = FALSE; /* Flag to indicate that the object header was opened */ H5O_layout_t layout; /* Layout message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -701,7 +701,7 @@ H5D__earray_dst_dbg_context(void *_dbg_ctx) static herr_t H5D__earray_idx_depend(const H5D_chk_idx_info_t *idx_info) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ H5O_loc_t oloc; /* Temporary object header location for dataset */ H5AC_proxy_entry_t *oh_proxy; /* Dataset's object header proxy */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1272,7 +1272,7 @@ H5D__earray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void * static int H5D__earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb, void *chunk_udata) { - H5EA_t * ea; /* Pointer to extensible array structure */ + H5EA_t *ea; /* Pointer to extensible array structure */ H5EA_stat_t ea_stat; /* Extensible array statistics */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -1367,7 +1367,7 @@ H5D__earray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t } else /* Patch the top level file pointer contained in ea if needed */ if (H5EA_patch_file(idx_info->storage->u.earray.ea, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch earray file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch earray file pointer") /* Set convenience pointer to extensible array structure */ ea = idx_info->storage->u.earray.ea; @@ -1645,7 +1645,7 @@ done: static herr_t H5D__earray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) { - H5EA_t * ea; /* Pointer to extensible array structure */ + H5EA_t *ea; /* Pointer to extensible array structure */ H5EA_stat_t ea_stat; /* Extensible array statistics */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Defl.c b/src/H5Defl.c index 8b8ecf3..d81ed13 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; @@ -247,7 +247,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_PACKAGE @@ -335,7 +335,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_PACKAGE diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index 31c8973..8c0e85e 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -70,7 +70,7 @@ typedef struct H5D_farray_it_ud_t { H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */ hbool_t filtered; /* Whether the chunks are filtered */ 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_farray_it_ud_t; /* Native fixed array element for chunks w/filters */ @@ -89,13 +89,13 @@ static int H5D__farray_idx_iterate_cb(hsize_t idx, const void *_elmt, void *_uda static int H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata); /* Fixed array class callbacks for chunks w/o filters */ -static void * H5D__farray_crt_context(void *udata); +static void *H5D__farray_crt_context(void *udata); static herr_t H5D__farray_dst_context(void *ctx); static herr_t H5D__farray_fill(void *nat_blk, size_t nelmts); static herr_t H5D__farray_encode(void *raw, const void *elmt, size_t nelmts, void *ctx); static herr_t H5D__farray_decode(const void *raw, void *elmt, size_t nelmts, void *ctx); static herr_t H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); -static void * H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr); +static void *H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr); static herr_t H5D__farray_dst_dbg_context(void *dbg_ctx); /* Fixed array class callbacks for chunks w/filters */ @@ -214,9 +214,9 @@ H5FL_DEFINE_STATIC(H5D_farray_ctx_ud_t); static void * H5D__farray_crt_context(void *_udata) { - H5D_farray_ctx_t * ctx; /* Fixed array callback context */ + H5D_farray_ctx_t *ctx; /* Fixed array callback context */ H5D_farray_ctx_ud_t *udata = (H5D_farray_ctx_ud_t *)_udata; /* User data for fixed array context */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -321,7 +321,7 @@ static herr_t H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx) { H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ - const haddr_t * elmt = (const haddr_t *)_elmt; /* Convenience pointer to native elements */ + const haddr_t *elmt = (const haddr_t *)_elmt; /* Convenience pointer to native elements */ FUNC_ENTER_PACKAGE_NOERR @@ -364,8 +364,8 @@ static herr_t H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx) { H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ - haddr_t * elmt = (haddr_t *)_elmt; /* Convenience pointer to native elements */ - const uint8_t * raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ + haddr_t *elmt = (haddr_t *)_elmt; /* Convenience pointer to native elements */ + const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ FUNC_ENTER_PACKAGE_NOERR @@ -442,7 +442,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr) H5O_loc_t obj_loc; /* Pointer to an object's location */ hbool_t obj_opened = FALSE; /* Flag to indicate that the object header was opened */ H5O_layout_t layout; /* Layout message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -571,8 +571,8 @@ H5D__farray_filt_fill(void *nat_blk, size_t nelmts) static herr_t H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx) { - H5D_farray_ctx_t * ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ - uint8_t * raw = (uint8_t *)_raw; /* Convenience pointer to raw elements */ + H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ + uint8_t *raw = (uint8_t *)_raw; /* Convenience pointer to raw elements */ const H5D_farray_filt_elmt_t *elmt = (const H5D_farray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */ @@ -618,7 +618,7 @@ H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx static herr_t H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx) { - H5D_farray_ctx_t * ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ + H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */ H5D_farray_filt_elmt_t *elmt = (H5D_farray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */ const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ @@ -699,7 +699,7 @@ H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const static herr_t H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info) { - H5O_t * oh = NULL; /* Object header */ + H5O_t *oh = NULL; /* Object header */ H5O_loc_t oloc; /* Temporary object header location for dataset */ H5AC_proxy_entry_t *oh_proxy; /* Dataset's object header proxy */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1151,7 +1151,7 @@ H5D__farray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void * static int H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb, void *chunk_udata) { - H5FA_t * fa; /* Pointer to fixed array structure */ + H5FA_t *fa; /* Pointer to fixed array structure */ H5FA_stat_t fa_stat; /* Fixed array statistics */ int ret_value = FAIL; /* Return value */ @@ -1247,7 +1247,7 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t } else /* Patch the top level file pointer contained in fa if needed */ if (H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer") + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer") /* Set convenience pointer to fixed array structure */ fa = idx_info->storage->u.farray.fa; @@ -1503,7 +1503,7 @@ done: static herr_t H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) { - H5FA_t * fa; /* Pointer to fixed array structure */ + H5FA_t *fa; /* Pointer to fixed array structure */ H5FA_stat_t fa_stat; /* Fixed array statistics */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dfill.c b/src/H5Dfill.c index c546494..b2ec46d 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -116,12 +116,12 @@ H5D__fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_ { H5S_sel_iter_t *mem_iter = NULL; /* Memory selection iteration info */ hbool_t mem_iter_init = FALSE; /* Whether the memory selection iterator has been initialized */ - 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 */ + uint8_t *bkg_buf = NULL; /* Background conversion buffer */ + uint8_t *tmp_buf = NULL; /* Temp conversion buffer */ hid_t src_id = -1, dst_id = -1; /* Temporary type IDs */ size_t dst_type_size; /* Size of destination type*/ herr_t ret_value = SUCCEED; /* Return value */ @@ -508,7 +508,7 @@ herr_t H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts) { 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 6c9e646..14c5dec 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -43,8 +43,8 @@ /* Shared data structure for computing variable-length dataset's total size */ /* (Used for both native and generic 'get vlen buf size' operation) */ typedef struct { - 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 */ + 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 */ size_t vl_tbuf_size; /* Current size of the temp. buffer for VL data */ hsize_t size; /* Accumulated number of bytes for the selection */ } H5D_vlen_bufsize_common_t; @@ -52,18 +52,18 @@ typedef struct { /* Internal data structure for computing variable-length dataset's total size */ /* (Used for native 'get vlen buf size' operation) */ typedef struct { - H5D_t * dset; /* Dataset for operation */ - H5S_t * fspace; /* Dataset's dataspace for operation */ - H5S_t * mspace; /* Memory dataspace for operation */ + H5D_t *dset; /* Dataset for operation */ + H5S_t *fspace; /* Dataset's dataspace for operation */ + H5S_t *mspace; /* Memory dataspace for operation */ H5D_vlen_bufsize_common_t common; /* VL data buffers & accumulatd size */ } H5D_vlen_bufsize_native_t; /* Internal data structure for computing variable-length dataset's total size */ /* (Used for generic 'get vlen buf size' operation) */ typedef struct { - H5VL_object_t * dset_vol_obj; /* VOL object for the dataset */ + H5VL_object_t *dset_vol_obj; /* VOL object for the dataset */ hid_t fspace_id; /* Dataset dataspace ID of the dataset we are working on */ - H5S_t * fspace; /* Dataset's dataspace for operation */ + H5S_t *fspace; /* Dataset's dataspace for operation */ hid_t mspace_id; /* Memory dataspace ID of the dataset we are working on */ hid_t dxpl_id; /* Dataset transfer property list to pass to dataset read */ H5D_vlen_bufsize_common_t common; /* VL data buffers & accumulatd size */ @@ -87,7 +87,7 @@ static herr_t H5D__close_cb(H5VL_object_t *dset_vol_obj, void **request); static herr_t H5D__use_minimized_dset_headers(H5F_t *file, hbool_t *minimize); static herr_t H5D__prepare_minimized_oh(H5F_t *file, H5D_t *dset, H5O_loc_t *oloc); static size_t H5D__calculate_minimum_header_size(H5F_t *file, H5D_t *dset, H5O_t *ohdr); -static void * H5D__vlen_get_buf_size_alloc(size_t size, void *info); +static void *H5D__vlen_get_buf_size_alloc(size_t size, void *info); static herr_t H5D__vlen_get_buf_size_cb(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point, void *op_data); static herr_t H5D__vlen_get_buf_size_gen_cb(void *elem, hid_t type_id, unsigned ndim, const hsize_t *point, @@ -321,7 +321,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 @@ -419,9 +419,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_PACKAGE @@ -686,7 +686,7 @@ done: static size_t H5D__calculate_minimum_header_size(H5F_t *file, H5D_t *dset, H5O_t *ohdr) { - H5T_t * type = NULL; + H5T_t *type = NULL; H5O_fill_t *fill_prop = NULL; hbool_t use_at_least_v18 = FALSE; const char continuation[1] = ""; /* required for work-around */ @@ -845,12 +845,12 @@ done: static herr_t H5D__update_oh_info(H5F_t *file, 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_fill_t * fill_prop; /* Pointer to dataset's fill value information */ + H5O_loc_t *oloc = NULL; /* Dataset's object location */ + H5O_layout_t *layout; /* Dataset's layout information */ + H5T_t *type; /* Dataset's datatype */ + 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 */ @@ -1054,7 +1054,7 @@ static herr_t H5D__build_file_prefix(const H5D_t *dset, H5F_prefix_open_t prefix_type, char **file_prefix /*out*/) { const char *prefix = NULL; /* prefix used to look for the file */ - char * filepath = NULL; /* absolute path of directory the HDF5 file is in */ + char *filepath = NULL; /* absolute path of directory the HDF5 file is in */ size_t filepath_len; /* length of file path */ size_t prefix_len; /* length of prefix */ size_t file_prefix_len; /* length of expanded prefix */ @@ -1138,9 +1138,9 @@ done: H5D_t * H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t dapl_id) { - H5T_t * type = NULL; /* Datatype for dataset (VOL pointer) */ - H5T_t * dt = NULL; /* Datatype for dataset (non-VOL pointer) */ - H5D_t * new_dset = NULL; + H5T_t *type = NULL; /* Datatype for dataset (VOL pointer) */ + H5T_t *dt = NULL; /* Datatype for dataset (non-VOL pointer) */ + 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 */ @@ -1149,7 +1149,7 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, hid_t hbool_t pline_copied = FALSE; /* Flag to indicate that pipeline message was copied */ hbool_t efl_copied = FALSE; /* Flag to indicate that external file list message was copied */ H5G_loc_t dset_loc; /* Dataset location */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1205,9 +1205,9 @@ 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_efl_t * efl; /* Dataset's external file list info */ + H5O_pline_t *pline; /* Dataset's I/O pipeline information */ + H5O_fill_t *fill; /* Dataset's fill value info */ + H5O_efl_t *efl; /* Dataset's external file list info */ htri_t ignore_filters = FALSE; /* Ignore optional filters or not */ if ((ignore_filters = H5Z_ignore_filters(new_dset->shared->dcpl_id, dt, space)) < 0) @@ -1400,13 +1400,13 @@ done: H5D_t * H5D__open_name(const H5G_loc_t *loc, const char *name, hid_t dapl_id) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5G_loc_t dset_loc; /* Object location of dataset */ H5G_name_t path; /* Dataset group hier. path */ H5O_loc_t oloc; /* Dataset object location */ H5O_type_t obj_type; /* Type of object at location */ hbool_t loc_found = FALSE; /* Location at 'name' found */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1460,10 +1460,10 @@ H5D_t * H5D_open(const H5G_loc_t *loc, hid_t dapl_id) { H5D_shared_t *shared_fo = NULL; - H5D_t * dataset = NULL; - char * extfile_prefix = NULL; /* Expanded external file prefix */ - char * vds_prefix = NULL; /* Expanded vds prefix */ - H5D_t * ret_value = NULL; /* Return value */ + H5D_t *dataset = NULL; + char *extfile_prefix = NULL; /* Expanded external file prefix */ + char *vds_prefix = NULL; /* Expanded vds prefix */ + H5D_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1671,7 +1671,7 @@ static herr_t H5D__open_oid(H5D_t *dataset, hid_t dapl_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 */ @@ -2018,7 +2018,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 */ @@ -2212,8 +2212,8 @@ herr_t H5D__alloc_storage(const H5D_io_info_t *io_info, H5D_time_alloc_t time_alloc, hbool_t full_overwrite, hsize_t old_dim[]) { - const H5D_t * dset = io_info->dset; /* The dataset object */ - H5F_t * f = dset->oloc.file; /* The dataset's file pointer */ + const H5D_t *dset = io_info->dset; /* The dataset object */ + 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 */ @@ -2563,7 +2563,7 @@ static void * H5D__vlen_get_buf_size_alloc(size_t size, void *info) { H5D_vlen_bufsize_common_t *vlen_bufsize_com = (H5D_vlen_bufsize_common_t *)info; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -2649,11 +2649,11 @@ herr_t H5D__vlen_get_buf_size(H5D_t *dset, hid_t type_id, hid_t space_id, hsize_t *size) { H5D_vlen_bufsize_native_t vlen_bufsize = {NULL, NULL, NULL, {NULL, NULL, 0, 0}}; - H5S_t * fspace = NULL; /* Dataset's dataspace */ - H5S_t * mspace = NULL; /* Memory dataspace */ + 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 */ - H5T_t * type; /* Datatype */ + H5S_t *space; /* Dataspace for iteration */ + H5T_t *type; /* Datatype */ H5S_sel_iter_op_t dset_op; /* Operator for iteration */ herr_t ret_value = FAIL; /* Return value */ @@ -2744,7 +2744,7 @@ H5D__vlen_get_buf_size_gen_cb(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned const hsize_t *point, void *op_data) { H5D_vlen_bufsize_generic_t *vlen_bufsize = (H5D_vlen_bufsize_generic_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 @@ -2794,11 +2794,11 @@ H5D__vlen_get_buf_size_gen(H5VL_object_t *vol_obj, hid_t type_id, hid_t space_id { H5D_vlen_bufsize_generic_t vlen_bufsize = { NULL, H5I_INVALID_HID, NULL, H5I_INVALID_HID, H5I_INVALID_HID, {NULL, NULL, 0, 0}}; - H5P_genplist_t * dxpl = NULL; /* DXPL for operation */ - H5S_t * mspace = NULL; /* Memory dataspace */ + H5P_genplist_t *dxpl = NULL; /* DXPL for operation */ + H5S_t *mspace = NULL; /* Memory dataspace */ char bogus; /* Bogus value to pass to H5Diterate() */ - H5S_t * space; /* Dataspace for iteration */ - H5T_t * type; /* Datatype */ + H5S_t *space; /* Dataspace for iteration */ + H5T_t *type; /* Datatype */ H5S_sel_iter_op_t dset_op; /* Operator for iteration */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3255,7 +3255,7 @@ H5D__format_convert(H5D_t *dataset) { H5D_chk_idx_info_t new_idx_info; /* Index info for the new layout */ H5D_chk_idx_info_t idx_info; /* Index info for the current layout */ - H5O_layout_t * newlayout = NULL; /* The new layout */ + H5O_layout_t *newlayout = NULL; /* The new layout */ hbool_t init_new_index = FALSE; /* Indicate that the new chunk index is initialized */ hbool_t delete_old_layout = FALSE; /* Indicate that the old layout message is deleted */ hbool_t add_new_layout = FALSE; /* Indicate that the new layout message is added */ @@ -3706,9 +3706,9 @@ done: hid_t H5D_get_access_plist(const H5D_t *dset) { - H5P_genplist_t * old_plist; /* Stored DAPL from dset */ - H5P_genplist_t * new_plist; /* New DAPL */ - H5P_genplist_t * def_dapl = NULL; /* Default DAPL */ + H5P_genplist_t *old_plist; /* Stored DAPL from dset */ + H5P_genplist_t *new_plist; /* New DAPL */ + H5P_genplist_t *def_dapl = NULL; /* Default DAPL */ H5D_append_flush_t def_append_flush_info = {0}; /* Default append flush property */ H5D_rdcc_t def_chunk_info; /* Default chunk cache property */ H5D_vds_view_t def_vds_view; /* Default virtual view property */ diff --git a/src/H5Dio.c b/src/H5Dio.c index a0f51cb..c1427d1 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -89,7 +89,7 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, H5S_t *mem_space, H5S_t *file_space H5D_type_info_t type_info; /* Datatype info for operation */ H5D_layout_t layout_type; /* Dataset's layout type (contig, chunked, compact, etc.) */ 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 */ /* dataspace with rank equal to that of */ /* file_space. */ @@ -307,7 +307,7 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, H5S_t *mem_space, H5S_t *file_spac H5D_layout_t layout_type; /* Dataset's layout type (contig, chunked, compact, etc.) */ hbool_t type_info_init = FALSE; /* Whether the datatype info has been initialized */ hbool_t should_alloc_space = FALSE; /* Whether or not to initialize dataset's storage */ - 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 */ /* dataspace with rank equal to that of */ /* file_space. */ @@ -614,8 +614,8 @@ H5D__ioinfo_init(H5D_t *dset, const H5D_type_info_t *type_info, H5D_storage_t *s static herr_t H5D__typeinfo_init(const H5D_t *dset, hid_t mem_type_id, hbool_t do_write, H5D_type_info_t *type_info) { - const H5T_t * src_type; /* Source datatype */ - const H5T_t * dst_type; /* Destination datatype */ + const H5T_t *src_type; /* Source datatype */ + const H5T_t *dst_type; /* Destination datatype */ H5Z_data_xform_t *data_transform; /* Data transform info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -675,8 +675,8 @@ H5D__typeinfo_init(const H5D_t *dset, hid_t mem_type_id, hbool_t do_write, H5D_t type_info->need_bkg = H5T_BKG_NO; } /* end if */ else { - void * tconv_buf; /* Temporary conversion buffer pointer */ - void * bkgr_buf; /* Background conversion buffer pointer */ + void *tconv_buf; /* Temporary conversion buffer pointer */ + void *bkgr_buf; /* Background conversion buffer pointer */ size_t max_temp_buf; /* Maximum temporary buffer size */ H5T_bkg_t bkgr_buf_type; /* Background buffer type */ size_t target_size; /* Desired buffer size */ diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index 6fdec05..fd7e5b9 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -451,7 +451,7 @@ done: herr_t H5D__layout_oh_create(H5F_t *file, 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 */ unsigned layout_mesg_flags; /* Flags for inserting layout message */ hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ @@ -501,7 +501,7 @@ H5D__layout_oh_create(H5F_t *file, H5O_t *oh, H5D_t *dset, hid_t dapl_id) /* 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; size_t name_offset; diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 9107a3a..17ae0e5 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -251,7 +251,7 @@ typedef struct H5D_filtered_collective_io_info_t { int orig_owner; int new_owner; int num_writers; - void * buf; + void *buf; UT_hash_handle hh; } H5D_filtered_collective_io_info_t; @@ -285,7 +285,7 @@ static herr_t H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_in H5D_chunk_map_t *fm); static herr_t H5D__multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, int mpi_rank, int mpi_size); -static herr_t H5D__multi_chunk_filtered_collective_io(H5D_io_info_t * io_info, +static herr_t H5D__multi_chunk_filtered_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, int mpi_rank, int mpi_size); static herr_t H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, @@ -303,9 +303,9 @@ static herr_t H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm, haddr_t chunk_addr[], int mpi_rank, int mpi_size); static herr_t H5D__mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, int *sum_chunkf); -static herr_t H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t * io_info, - const H5D_type_info_t * type_info, - const H5D_chunk_map_t * fm, +static herr_t H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, + const H5D_type_info_t *type_info, + const H5D_chunk_map_t *fm, H5D_filtered_collective_io_info_t **chunk_list, size_t *num_entries, int mpi_rank); static herr_t H5D__mpio_redistribute_shared_chunks(H5D_filtered_collective_io_info_t *chunk_list, @@ -314,54 +314,54 @@ static herr_t H5D__mpio_redistribute_shared_chunks(H5D_filtered_collective_io_in int mpi_rank, int mpi_size, size_t **rank_chunks_assigned_map); static herr_t H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chunk_list, - size_t * num_chunks_assigned_map, + size_t *num_chunks_assigned_map, hbool_t all_ranks_involved, - const H5D_io_info_t * io_info, + const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, int mpi_rank, int mpi_size); static herr_t H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk_list, size_t *chunk_list_num_entries, H5D_io_info_t *io_info, const H5D_type_info_t *type_info, int mpi_rank, int mpi_size, H5D_filtered_collective_io_info_t **chunk_hash_table, - unsigned char *** chunk_msg_bufs, - int * chunk_msg_bufs_len); + unsigned char ***chunk_msg_bufs, + int *chunk_msg_bufs_len); static herr_t H5D__mpio_collective_filtered_chunk_common_io(H5D_filtered_collective_io_info_t *chunk_list, size_t chunk_list_num_entries, - const H5D_io_info_t * io_info, + const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, int mpi_size); static herr_t H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chunk_list, size_t chunk_list_num_entries, - const H5D_io_info_t * io_info, + const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, int mpi_rank, int mpi_size); static herr_t H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *chunk_list, size_t chunk_list_num_entries, H5D_filtered_collective_io_info_t *chunk_hash_table, - unsigned char ** chunk_msg_bufs, + unsigned char **chunk_msg_bufs, int chunk_msg_bufs_len, const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, int mpi_rank, int mpi_size); static herr_t H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t *chunk_list, size_t chunk_list_num_entries, - size_t * num_chunks_assigned_map, - H5D_io_info_t * io_info, + size_t *num_chunks_assigned_map, + H5D_io_info_t *io_info, H5D_chk_idx_info_t *idx_info, int mpi_rank, int mpi_size); static herr_t H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t *chunk_list, size_t chunk_list_num_entries, - size_t * num_chunks_assigned_map, - H5D_io_info_t * io_info, + size_t *num_chunks_assigned_map, + H5D_io_info_t *io_info, H5D_chk_idx_info_t *idx_info, int mpi_rank, int mpi_size); static herr_t H5D__mpio_get_chunk_redistribute_info_types(MPI_Datatype *contig_type, - hbool_t * contig_type_derived, + hbool_t *contig_type_derived, MPI_Datatype *resized_type, - hbool_t * resized_type_derived); + hbool_t *resized_type_derived); static herr_t H5D__mpio_get_chunk_alloc_info_types(MPI_Datatype *contig_type, hbool_t *contig_type_derived, MPI_Datatype *resized_type, hbool_t *resized_type_derived); static herr_t H5D__mpio_get_chunk_insert_info_types(MPI_Datatype *contig_type, hbool_t *contig_type_derived, MPI_Datatype *resized_type, - hbool_t * resized_type_derived); + hbool_t *resized_type_derived); static herr_t H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_list, size_t num_entries, H5D_io_op_type_t op_type, MPI_Datatype *new_mem_type, hbool_t *mem_type_derived, @@ -423,7 +423,7 @@ static hbool_t H5D_mpio_debug_inited = FALSE; static const char *const trace_in_pre = "-> "; static const char *const trace_out_pre = "<- "; static int debug_indent = 0; -static FILE * debug_stream = NULL; +static FILE *debug_stream = NULL; /* Determine if this rank should output debugging info */ #define H5D_MPIO_DEBUG_THIS_RANK(rank) \ @@ -780,7 +780,7 @@ H5D__mpio_get_no_coll_cause_strings(char *local_cause, size_t local_cause_len, c nbits = 8 * sizeof(local_no_coll_cause); for (int bit_pos = 0; bit_pos < nbits; bit_pos++) { H5D_mpio_no_collective_cause_t cur_cause; - const char * cause_str; + const char *cause_str; size_t buf_space_left; cur_cause = (H5D_mpio_no_collective_cause_t)(1 << bit_pos); @@ -1090,7 +1090,7 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf H5FD_mpio_chunk_opt_t chunk_opt_mode; #ifdef H5Dmpio_DEBUG hbool_t log_file_flag = FALSE; - FILE * debug_log_file = NULL; + FILE *debug_log_file = NULL; #endif #ifdef H5_HAVE_INSTRUMENTED_LIBRARY htri_t temp_not_link_io = FALSE; @@ -1206,7 +1206,7 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf else /* Perform unfiltered link chunk collective IO */ if (H5D__link_chunk_collective_io(io_info, type_info, fm, sum_chunk, mpi_rank, mpi_size) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish linked chunk MPI-IO") + HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish linked chunk MPI-IO") break; case H5D_MULTI_CHUNK_IO: /* direct request to do multi-chunk IO */ @@ -1220,7 +1220,7 @@ H5D__chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf else /* Perform unfiltered multi chunk collective IO */ if (H5D__multi_chunk_collective_io(io_info, type_info, fm, mpi_rank, mpi_size) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish optimized multiple chunk MPI-IO") + HGOTO_ERROR(H5E_IO, H5E_CANTGET, FAIL, "couldn't finish optimized multiple chunk MPI-IO") break; } /* end switch */ @@ -1326,16 +1326,16 @@ 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; - 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 = + 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 */ - int * chunk_mpi_file_counts = NULL; /* Count of MPI file datatype for each chunk */ - int * chunk_mpi_mem_counts = NULL; /* Count of MPI memory datatype for each chunk */ + int *chunk_mpi_file_counts = NULL; /* Count of MPI file datatype for each chunk */ + int *chunk_mpi_mem_counts = NULL; /* Count of MPI memory datatype for each chunk */ int mpi_code; /* MPI return code */ herr_t ret_value = SUCCEED; @@ -1364,8 +1364,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); @@ -1685,13 +1685,13 @@ H5D__link_chunk_filtered_collective_io(H5D_io_info_t *io_info, const H5D_type_in { H5D_filtered_collective_io_info_t *chunk_list = NULL; /* The list of chunks being read/written */ H5D_filtered_collective_io_info_t *chunk_hash_table = NULL; - unsigned char ** chunk_msg_bufs = NULL; + unsigned char **chunk_msg_bufs = NULL; H5D_storage_t ctg_store; /* Chunk storage information as contiguous dataset */ MPI_Datatype mem_type = MPI_BYTE; MPI_Datatype file_type = MPI_BYTE; hbool_t mem_type_is_derived = FALSE; hbool_t file_type_is_derived = FALSE; - size_t * rank_chunks_assigned_map = NULL; + size_t *rank_chunks_assigned_map = NULL; size_t chunk_list_num_entries; size_t i; int chunk_msg_bufs_len = 0; @@ -1886,8 +1886,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_collective_opt_t last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO; /* Last parallel transfer with independent IO or collective IO with this mode @@ -1941,8 +1941,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 H5Dmpio_DEBUG H5D_MPIO_DEBUG_VA(mpi_rank, "mpi_rank = %d, chunk index = %zu", mpi_rank, u); @@ -2135,7 +2135,7 @@ H5D__multi_chunk_filtered_collective_io(H5D_io_info_t *io_info, const H5D_type_i { H5D_filtered_collective_io_info_t *chunk_list = NULL; /* The list of chunks being read/written */ H5D_filtered_collective_io_info_t *chunk_hash_table = NULL; - unsigned char ** chunk_msg_bufs = NULL; + unsigned char **chunk_msg_bufs = NULL; H5D_io_info_t ctg_io_info; /* Contiguous I/O info object */ H5D_storage_t ctg_store; /* Chunk storage information as contiguous dataset */ MPI_Datatype mem_type = MPI_BYTE; @@ -2733,7 +2733,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, int mpi_rank, int mpi_size) { - 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 */ @@ -2919,12 +2919,12 @@ H5D__obtain_mpio_mode(H5D_io_info_t *io_info, H5D_chunk_map_t *fm, uint8_t assig { size_t 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; - H5D_chunk_info_t * chunk_info; + 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; H5P_coll_md_read_flag_t md_reads_file_flag; hbool_t md_reads_context_flag; hbool_t restore_md_reads_state = FALSE; @@ -3099,7 +3099,7 @@ done: */ static herr_t H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, - const H5D_chunk_map_t * fm, + const H5D_chunk_map_t *fm, H5D_filtered_collective_io_info_t **chunk_list, size_t *num_entries, int mpi_rank) { @@ -3126,7 +3126,7 @@ H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, const /* Each rank builds a local list of the chunks they have selected */ if ((num_chunks_selected = H5SL_count(fm->sel_chunks))) { H5D_chunk_info_t *chunk_info; - H5SL_node_t * chunk_node; + H5SL_node_t *chunk_node; hsize_t select_npoints; hbool_t need_sort = FALSE; @@ -3458,7 +3458,7 @@ done: static herr_t H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chunk_list, size_t *num_chunks_assigned_map, hbool_t all_ranks_involved, - const H5D_io_info_t * io_info, + const H5D_io_info_t *io_info, const H5D_chunk_map_t H5_ATTR_NDEBUG_UNUSED *fm, int mpi_rank, int mpi_size) { @@ -3468,10 +3468,10 @@ H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chun hbool_t packed_type_derived = FALSE; size_t i; size_t coll_chunk_list_num_entries = 0; - void * coll_chunk_list = NULL; - int * counts_disps_array = NULL; - int * counts_ptr = NULL; - int * displacements_ptr = NULL; + void *coll_chunk_list = NULL; + int *counts_disps_array = NULL; + int *counts_ptr = NULL; + int *displacements_ptr = NULL; int num_chunks_int; int mpi_code; herr_t ret_value = SUCCEED; @@ -3796,11 +3796,11 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk { #if H5_CHECK_MPI_VERSION(3, 0) H5D_filtered_collective_io_info_t *chunk_table = NULL; - H5S_sel_iter_t * mem_iter = NULL; - unsigned char ** msg_send_bufs = NULL; - unsigned char ** msg_recv_bufs = NULL; - MPI_Request * send_requests = NULL; - MPI_Request * recv_requests = NULL; + H5S_sel_iter_t *mem_iter = NULL; + unsigned char **msg_send_bufs = NULL; + unsigned char **msg_recv_bufs = NULL; + MPI_Request *send_requests = NULL; + MPI_Request *recv_requests = NULL; MPI_Request ibarrier = MPI_REQUEST_NULL; hbool_t mem_iter_init = FALSE; hbool_t ibarrier_posted = FALSE; @@ -3892,7 +3892,7 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk } else { H5D_chunk_info_t *chunk_info = chunk_entry->chunk_info; - unsigned char * mod_data_p = NULL; + unsigned char *mod_data_p = NULL; hsize_t iter_nelmts; size_t mod_data_size = 0; size_t space_size = 0; @@ -4338,7 +4338,7 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun const H5D_type_info_t *type_info, int mpi_rank, int mpi_size) { H5D_fill_buf_info_t fb_info; - H5D_chunk_info_t * chunk_info = NULL; + H5D_chunk_info_t *chunk_info = NULL; H5D_io_info_t coll_io_info; H5Z_EDC_t err_detect; /* Error detection info */ H5Z_cb_t filter_cb; /* I/O filter callback function */ @@ -4348,8 +4348,8 @@ H5D__mpio_collective_filtered_chunk_read(H5D_filtered_collective_io_info_t *chun hbool_t fb_info_init = FALSE; hbool_t index_empty = FALSE; size_t i; - H5S_t * fill_space = NULL; - void * base_read_buf = NULL; + H5S_t *fill_space = NULL; + void *base_read_buf = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -4558,8 +4558,8 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch int H5_ATTR_NDEBUG_UNUSED mpi_rank, int mpi_size) { H5D_fill_buf_info_t fb_info; - H5D_chunk_info_t * chunk_info = NULL; - H5S_sel_iter_t * sel_iter = NULL; /* Dataspace selection iterator for H5D__scatter_mem */ + H5D_chunk_info_t *chunk_info = NULL; + H5S_sel_iter_t *sel_iter = NULL; /* Dataspace selection iterator for H5D__scatter_mem */ H5D_io_info_t coll_io_info; H5Z_EDC_t err_detect; /* Error detection info */ H5Z_cb_t filter_cb; /* I/O filter callback function */ @@ -4570,9 +4570,9 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch hbool_t sel_iter_init = FALSE; hbool_t index_empty = FALSE; size_t i; - H5S_t * dataspace = NULL; - H5S_t * fill_space = NULL; - void * base_read_buf = NULL; + H5S_t *dataspace = NULL; + H5S_t *fill_space = NULL; + void *base_read_buf = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -4777,7 +4777,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch /* Now process all received chunk message buffers */ for (i = 0; i < (size_t)chunk_msg_bufs_len; i++) { H5D_filtered_collective_io_info_t *chunk_entry = NULL; - const unsigned char * msg_ptr = chunk_msg_bufs[i]; + const unsigned char *msg_ptr = chunk_msg_bufs[i]; hsize_t chunk_idx; if (msg_ptr) { @@ -4909,10 +4909,10 @@ H5D__mpio_collective_filtered_chunk_reallocate(H5D_filtered_collective_io_info_t size_t collective_num_entries = 0; size_t num_local_chunks_processed = 0; size_t i; - void * gathered_array = NULL; - int * counts_disps_array = NULL; - int * counts_ptr = NULL; - int * displacements_ptr = NULL; + void *gathered_array = NULL; + int *counts_disps_array = NULL; + int *counts_ptr = NULL; + int *displacements_ptr = NULL; int mpi_code; herr_t ret_value = SUCCEED; @@ -5099,10 +5099,10 @@ H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t * hsize_t scaled_coords[H5O_LAYOUT_NDIMS]; size_t collective_num_entries = 0; size_t i; - void * gathered_array = NULL; - int * counts_disps_array = NULL; - int * counts_ptr = NULL; - int * displacements_ptr = NULL; + void *gathered_array = NULL; + int *counts_disps_array = NULL; + int *counts_ptr = NULL; + int *displacements_ptr = NULL; int mpi_code; herr_t ret_value = SUCCEED; @@ -5710,7 +5710,7 @@ H5D__mpio_collective_filtered_io_type(H5D_filtered_collective_io_info_t *chunk_l { MPI_Aint *io_buf_array = NULL; /* Relative displacements of filtered chunk data buffers */ MPI_Aint *file_offset_array = NULL; /* Chunk offsets in the file */ - int * length_array = NULL; /* Filtered Chunk lengths */ + int *length_array = NULL; /* Filtered Chunk lengths */ int mpi_code; herr_t ret_value = SUCCEED; diff --git a/src/H5Dnone.c b/src/H5Dnone.c index 5ce2e47..e157d6e 100644 --- a/src/H5Dnone.c +++ b/src/H5Dnone.c @@ -301,7 +301,7 @@ done: */ static herr_t H5D__none_idx_remove(const H5D_chk_idx_info_t H5_ATTR_UNUSED *idx_info, - H5D_chunk_common_ud_t H5_ATTR_UNUSED *udata) + H5D_chunk_common_ud_t H5_ATTR_UNUSED *udata) { FUNC_ENTER_PACKAGE_NOERR @@ -363,7 +363,7 @@ done: */ static herr_t H5D__none_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_info_src, - const H5D_chk_idx_info_t * idx_info_dst) + const H5D_chk_idx_info_t *idx_info_dst) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Doh.c b/src/H5Doh.c index 37ecc9c..ae88bb3 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -41,11 +41,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(const H5O_t *loc); -static void * H5O__dset_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); -static void * H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); +static void *H5O__dset_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); +static void *H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); static H5O_loc_t *H5O__dset_get_oloc(hid_t obj_id); static herr_t H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info); static herr_t H5O__dset_flush(void *_obj_ptr); @@ -211,7 +211,7 @@ H5O__dset_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type) { H5D_t *dset = NULL; /* Dataset opened */ hid_t dapl_id; /* dapl to use to open this dataset */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -273,8 +273,8 @@ static void * H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc) { 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_PACKAGE @@ -321,7 +321,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_PACKAGE @@ -438,7 +438,7 @@ done: static herr_t H5O__dset_flush(void *_obj_ptr) { - H5D_t * dset = (H5D_t *)_obj_ptr; /* Pointer to dataset object */ + H5D_t *dset = (H5D_t *)_obj_ptr; /* Pointer to dataset object */ 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 3df9dde..0b98ce7 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -92,7 +92,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 */ @@ -105,9 +105,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; @@ -193,7 +193,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; @@ -218,13 +218,13 @@ typedef struct H5D_io_info_t { MPI_Comm comm; /* MPI communicator for file */ hbool_t using_mpi_vfd; /* Whether the file is using an MPI-based VFD */ #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; hbool_t use_select_io; /* Whether to use selection I/O */ 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; @@ -235,9 +235,9 @@ 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 */ - const H5O_pline_t * pline; /* I/O pipeline info */ - H5O_layout_chunk_t * layout; /* Chunk layout description */ + H5F_t *f; /* File pointer for operation */ + 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; @@ -265,9 +265,9 @@ typedef struct H5D_chunk_rec_t { * to which the index points. */ typedef struct H5D_chunk_common_ud_t { - 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 * scaled; /* Scaled coordinates for a chunk */ + const hsize_t *scaled; /* Scaled coordinates for a chunk */ } H5D_chunk_common_ud_t; /* B-tree callback info for various operations */ @@ -335,9 +335,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 scaled[H5O_LAYOUT_NDIMS]; /* Scaled 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 */ hbool_t 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 */ hbool_t mspace_shared; /* Indicate that the memory space for a chunk is shared and shouldn't be freed */ } H5D_chunk_info_t; @@ -346,11 +346,11 @@ typedef struct H5D_chunk_map_t { H5O_layout_t *layout; /* Dataset layout information*/ hsize_t nelmts; /* Number of elements selected in file & memory dataspaces */ - H5S_t * file_space; /* Pointer to the file dataspace */ + H5S_t *file_space; /* Pointer to the file dataspace */ unsigned f_ndims; /* Number of dimensions for file dataspace */ - H5S_t * mem_space; /* Pointer to the memory dataspace */ - H5S_t * mchunk_tmpl; /* Dataspace template for new memory chunks */ + 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 */ @@ -358,7 +358,7 @@ typedef struct H5D_chunk_map_t { 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 */ @@ -388,7 +388,7 @@ typedef struct H5D_chunk_cached_t { /* List of files held open during refresh operations */ typedef struct H5D_virtual_held_file_t { - H5F_t * file; /* Pointer to file held open */ + H5F_t *file; /* Pointer to file held open */ struct H5D_virtual_held_file_t *next; /* Pointer to next node in list */ } H5D_virtual_held_file_t; @@ -413,9 +413,9 @@ typedef struct H5D_rdcc_t { 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 */ /* Cached information about scaled dataspace dimensions */ hsize_t scaled_dims[H5S_MAX_RANK]; /* The scaled dim sizes */ @@ -442,8 +442,8 @@ struct H5D_shared_t { size_t fo_count; /* Reference count */ hbool_t closing; /* Flag to indicate dataset is closing */ 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 */ hid_t dcpl_id; /* Dataset creation property id */ hid_t dapl_id; /* Dataset access property id */ H5D_dcpl_cache_t dcpl_cache; /* Cached DCPL values */ @@ -467,8 +467,8 @@ struct H5D_shared_t { } cache; H5D_append_flush_t append_flush; /* Append flush property information */ - char * extfile_prefix; /* expanded external file prefix */ - char * vds_prefix; /* expanded vds prefix */ + char *extfile_prefix; /* expanded external file prefix */ + char *vds_prefix; /* expanded vds prefix */ }; struct H5D_t { @@ -496,21 +496,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 */ @@ -549,10 +549,10 @@ H5_DLLVAR const unsigned H5O_layout_ver_bounds[H5F_LIBVER_NBOUNDS]; /* Package Private Prototypes */ /******************************/ -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); -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); -H5_DLL H5D_t * H5D__open_name(const H5G_loc_t *loc, const char *name, hid_t dapl_id); +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); +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); +H5_DLL H5D_t *H5D__open_name(const H5G_loc_t *loc, const char *name, hid_t dapl_id); H5_DLL hid_t H5D__get_space(const H5D_t *dset); H5_DLL hid_t H5D__get_type(const H5D_t *dset); H5_DLL herr_t H5D__get_space_status(const H5D_t *dset, H5D_space_status_t *allocation); @@ -641,10 +641,10 @@ H5_DLL herr_t H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_ov const hsize_t old_dim[]); H5_DLL herr_t H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old_chunk, H5F_block_t *new_chunk, hbool_t *need_insert, const hsize_t *scaled); -H5_DLL void * H5D__chunk_mem_alloc(size_t size, void *pline); +H5_DLL void *H5D__chunk_mem_alloc(size_t size, void *pline); H5_DLL void H5D__chunk_mem_free(void *chk, void *pline); -H5_DLL void * H5D__chunk_mem_xfree(void *chk, const void *pline); -H5_DLL void * H5D__chunk_mem_realloc(void *chk, size_t size, const H5O_pline_t *pline); +H5_DLL void *H5D__chunk_mem_xfree(void *chk, const void *pline); +H5_DLL void *H5D__chunk_mem_realloc(void *chk, size_t size, const H5O_pline_t *pline); H5_DLL herr_t H5D__chunk_update_old_edge_chunks(H5D_t *dset, hsize_t old_dim[]); H5_DLL hbool_t H5D__chunk_is_partial_edge_chunk(unsigned dset_ndims, const uint32_t *chunk_dims, const hsize_t *chunk_scaled, const hsize_t *dset_dims); diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 515c739..a80bbb6 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -138,8 +138,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; /* Structure for dataset append flush property (H5Pset_append_flush) */ @@ -147,7 +147,7 @@ typedef struct H5D_append_flush_t { unsigned ndims; /* The # of dimensions for "boundary" */ hsize_t boundary[H5S_MAX_RANK]; /* The dimension sizes for determining boundary */ H5D_append_cb_t func; /* The callback function */ - void * udata; /* User data */ + void *udata; /* User data */ } H5D_append_flush_t; /*****************************/ @@ -158,12 +158,12 @@ typedef struct H5D_append_flush_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); -H5_DLL herr_t H5D_close(H5D_t *dataset); -H5_DLL herr_t H5D_mult_refresh_close(hid_t dset_id); -H5_DLL herr_t H5D_mult_refresh_reopen(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); +H5_DLL herr_t H5D_close(H5D_t *dataset); +H5_DLL herr_t H5D_mult_refresh_close(hid_t dset_id); +H5_DLL herr_t H5D_mult_refresh_reopen(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 herr_t H5D_flush_all(H5F_t *f); H5_DLL hid_t H5D_get_create_plist(const H5D_t *dset); @@ -178,7 +178,7 @@ H5_DLL herr_t H5D_virtual_check_mapping_pre(const H5S_t *vspace, const H5S_t *sr H5_DLL herr_t H5D_virtual_check_mapping_post(const H5O_storage_virtual_ent_t *ent); H5_DLL herr_t H5D_virtual_check_min_dims(const H5D_t *dset); H5_DLL herr_t H5D_virtual_update_min_dims(H5O_layout_t *layout, size_t idx); -H5_DLL herr_t H5D_virtual_parse_source_name(const char * source_name, +H5_DLL herr_t H5D_virtual_parse_source_name(const char *source_name, H5O_storage_virtual_name_seg_t **parsed_name, size_t *static_strlen, size_t *nsubs); H5_DLL herr_t H5D_virtual_free_parsed_name(H5O_storage_virtual_name_seg_t *name_seg); diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index a5b0b53..45c7bff 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -84,11 +84,11 @@ static herr_t H5D__scatter_file(const H5D_io_info_t *_io_info, H5S_sel_iter_t *iter, size_t nelmts, const void *_buf) { H5D_io_info_t tmp_io_info; /* Temporary I/O info object */ - 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 = 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 */ @@ -181,11 +181,11 @@ static size_t H5D__gather_file(const H5D_io_info_t *_io_info, H5S_sel_iter_t *iter, size_t nelmts, void *_buf /*out*/) { H5D_io_info_t tmp_io_info; /* Temporary I/O info object */ - 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 = 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 */ @@ -273,10 +273,10 @@ done: herr_t H5D__scatter_mem(const void *_tscat_buf, H5S_sel_iter_t *iter, size_t nelmts, 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 = NULL; /* Pointer to sequence offsets */ - size_t * len = NULL; /* Pointer to sequence lengths */ + hsize_t *off = NULL; /* Pointer to sequence offsets */ + 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 */ @@ -359,9 +359,9 @@ size_t H5D__gather_mem(const void *_buf, H5S_sel_iter_t *iter, size_t nelmts, 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; - hsize_t * off = NULL; /* Pointer to sequence offsets */ - size_t * len = NULL; /* Pointer to sequence lengths */ + uint8_t *tgath_buf = (uint8_t *)_tgath_buf; + hsize_t *off = NULL; /* Pointer to sequence offsets */ + 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 */ @@ -439,7 +439,7 @@ herr_t H5D__scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts, H5S_t *file_space, H5S_t *mem_space) { - 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 = NULL; /* Memory selection iteration info*/ hbool_t mem_iter_init = FALSE; /* Memory selection iteration info has been initialized */ H5S_sel_iter_t *bkg_iter = NULL; /* Background iteration info*/ @@ -579,7 +579,7 @@ herr_t H5D__scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts, H5S_t *file_space, H5S_t *mem_space) { - 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 = NULL; /* Memory selection iteration info*/ hbool_t mem_iter_init = FALSE; /* Memory selection iteration info has been initialized */ H5S_sel_iter_t *bkg_iter = NULL; /* Background iteration info*/ @@ -745,7 +745,7 @@ H5D__compound_opt_read(size_t nelmts, H5S_sel_iter_t *iter, const H5D_type_info_ uint8_t *ubuf = (uint8_t *)user_buf; /* Cast for pointer arithmetic */ uint8_t *xdbuf; /* Pointer into dataset buffer */ hsize_t *off = NULL; /* Pointer to sequence offsets */ - size_t * len = NULL; /* Pointer to sequence lengths */ + size_t *len = NULL; /* Pointer to sequence lengths */ size_t src_stride, dst_stride, copy_size; size_t dxpl_vec_size; /* Vector length from API context's DXPL */ size_t vec_size; /* Vector length */ diff --git a/src/H5Dselect.c b/src/H5Dselect.c index ef33ea7..b16dd5a 100644 --- a/src/H5Dselect.c +++ b/src/H5Dselect.c @@ -84,10 +84,10 @@ H5D__select_io(const H5D_io_info_t *io_info, size_t elmt_size, size_t nelmts, H5 hbool_t mem_iter_init = FALSE; /* Memory selection iteration info has been initialized */ H5S_sel_iter_t *file_iter = NULL; /* File selection iteration info */ hbool_t file_iter_init = FALSE; /* File selection iteration info has been initialized */ - hsize_t * mem_off = NULL; /* Pointer to sequence offsets in memory */ - hsize_t * file_off = NULL; /* Pointer to sequence offsets in the file */ - size_t * mem_len = NULL; /* Pointer to sequence lengths in memory */ - size_t * file_len = NULL; /* Pointer to sequence lengths in the file */ + hsize_t *mem_off = NULL; /* Pointer to sequence offsets in memory */ + hsize_t *file_off = NULL; /* Pointer to sequence offsets in the file */ + size_t *mem_len = NULL; /* Pointer to sequence lengths in memory */ + 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 */ @@ -281,10 +281,10 @@ H5D_select_io_mem(void *dst_buf, H5S_t *dst_space, const void *src_buf, H5S_t *s H5S_sel_iter_t *src_sel_iter = NULL; /* Source dataspace iteration info */ hbool_t dst_sel_iter_init = FALSE; /* Destination dataspace selection iterator initialized? */ hbool_t src_sel_iter_init = FALSE; /* Source dataspace selection iterator initialized? */ - hsize_t * dst_off = NULL; /* Pointer to sequence offsets in destination buffer */ - hsize_t * src_off = NULL; /* Pointer to sequence offsets in source buffer */ - size_t * dst_len = NULL; /* Pointer to sequence lengths in destination buffer */ - size_t * src_len = NULL; /* Pointer to sequence lengths in source buffer */ + hsize_t *dst_off = NULL; /* Pointer to sequence offsets in destination buffer */ + hsize_t *src_off = NULL; /* Pointer to sequence offsets in source buffer */ + size_t *dst_len = NULL; /* Pointer to sequence lengths in destination buffer */ + size_t *src_len = NULL; /* Pointer to sequence lengths in source buffer */ size_t curr_dst_seq; /* Current destination buffer sequence to operate on */ size_t curr_src_seq; /* Current source buffer sequence to operate on */ size_t dst_nseq; /* Number of sequences generated for destination buffer */ diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c index 32da25e..8c4748e 100644 --- a/src/H5Dsingle.c +++ b/src/H5Dsingle.c @@ -422,7 +422,7 @@ H5D__single_idx_delete(const H5D_chk_idx_info_t *idx_info) */ static herr_t H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_info_src, - const H5D_chk_idx_info_t * idx_info_dst) + const H5D_chk_idx_info_t *idx_info_dst) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index 0326180..5fe2227 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -92,13 +92,13 @@ static herr_t H5D__virtual_flush(H5D_t *dset); /* Other functions */ static herr_t H5D__virtual_open_source_dset(const H5D_t *vdset, H5O_storage_virtual_ent_t *virtual_ent, H5O_storage_virtual_srcdset_t *source_dset); -static herr_t H5D__virtual_reset_source_dset(H5O_storage_virtual_ent_t * virtual_ent, +static herr_t H5D__virtual_reset_source_dset(H5O_storage_virtual_ent_t *virtual_ent, H5O_storage_virtual_srcdset_t *source_dset); static herr_t H5D__virtual_str_append(const char *src, size_t src_len, char **p, char **buf, size_t *buf_size); static herr_t H5D__virtual_copy_parsed_name(H5O_storage_virtual_name_seg_t **dst, - H5O_storage_virtual_name_seg_t * src); -static herr_t H5D__virtual_build_source_name(char * source_name, + H5O_storage_virtual_name_seg_t *src); +static herr_t H5D__virtual_build_source_name(char *source_name, const H5O_storage_virtual_name_seg_t *parsed_name, size_t static_strlen, size_t nsubs, hsize_t blockno, char **built_name); @@ -239,7 +239,7 @@ H5D_virtual_check_mapping_post(const H5O_storage_virtual_ent_t *ent) { hsize_t nelmts_vs; /* Number of elements in virtual selection */ hsize_t nelmts_ss; /* Number of elements in source selection */ - H5S_t * tmp_space = NULL; /* Temporary dataspace */ + H5S_t *tmp_space = NULL; /* Temporary dataspace */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -282,9 +282,9 @@ H5D_virtual_check_mapping_post(const H5O_storage_virtual_ent_t *ent) else /* Make sure there are no printf substitutions */ if ((ent->psfn_nsubs > 0) || (ent->psdn_nsubs > 0)) - HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, - "printf specifier(s) in source name(s) without an unlimited virtual selection and " - "limited source selection") + HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, + "printf specifier(s) in source name(s) without an unlimited virtual selection and " + "limited source selection") done: /* Free temporary space */ @@ -313,7 +313,7 @@ done: herr_t H5D_virtual_update_min_dims(H5O_layout_t *layout, size_t idx) { - H5O_storage_virtual_t * virt = &layout->storage.u.virt; + H5O_storage_virtual_t *virt = &layout->storage.u.virt; H5O_storage_virtual_ent_t *ent = &virt->list[idx]; H5S_sel_type sel_type; int rank; @@ -421,9 +421,9 @@ herr_t H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout) { H5O_storage_virtual_t *virt = &layout->storage.u.virt; - uint8_t * heap_block = NULL; /* Block to add to heap */ - size_t * str_size = NULL; /* Array for VDS entry string lengths */ - uint8_t * heap_block_p; /* Pointer into the heap block, while encoding */ + uint8_t *heap_block = NULL; /* Block to add to heap */ + size_t *str_size = NULL; /* Array for VDS entry string lengths */ + uint8_t *heap_block_p; /* Pointer into the heap block, while encoding */ size_t block_size; /* Total size of block needed */ hsize_t tmp_nentries; /* Temp. variable for # of VDS entries */ uint32_t chksum; /* Checksum for heap data */ @@ -557,10 +557,10 @@ herr_t H5D__virtual_copy_layout(H5O_layout_t *layout) { H5O_storage_virtual_ent_t *orig_list = NULL; - H5O_storage_virtual_t * virt = &layout->storage.u.virt; + H5O_storage_virtual_t *virt = &layout->storage.u.virt; hid_t orig_source_fapl; hid_t orig_source_dapl; - H5P_genplist_t * plist; + H5P_genplist_t *plist; size_t i; herr_t ret_value = SUCCEED; @@ -891,7 +891,7 @@ static herr_t H5D__virtual_open_source_dset(const H5D_t *vdset, H5O_storage_virtual_ent_t *virtual_ent, H5O_storage_virtual_srcdset_t *source_dset) { - H5F_t * src_file = NULL; /* Source file */ + H5F_t *src_file = NULL; /* Source file */ hbool_t src_file_open = FALSE; /* Whether we have opened and need to close src_file */ herr_t ret_value = SUCCEED; /* Return value */ @@ -982,7 +982,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5D__virtual_reset_source_dset(H5O_storage_virtual_ent_t * virtual_ent, +H5D__virtual_reset_source_dset(H5O_storage_virtual_ent_t *virtual_ent, H5O_storage_virtual_srcdset_t *source_dset) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1095,7 +1095,7 @@ H5D__virtual_str_append(const char *src, size_t src_len, char **p, char **buf, s /* Extend buffer if necessary */ if ((p_offset + src_len + (size_t)1) > *buf_size) { - char * tmp_buf; + char *tmp_buf; size_t tmp_buf_size; /* Calculate new size of buffer */ @@ -1140,14 +1140,14 @@ herr_t H5D_virtual_parse_source_name(const char *source_name, H5O_storage_virtual_name_seg_t **parsed_name, size_t *static_strlen, size_t *nsubs) { - H5O_storage_virtual_name_seg_t * tmp_parsed_name = NULL; + H5O_storage_virtual_name_seg_t *tmp_parsed_name = NULL; H5O_storage_virtual_name_seg_t **tmp_parsed_name_p = &tmp_parsed_name; size_t tmp_static_strlen; size_t tmp_strlen; size_t tmp_nsubs = 0; - const char * p; - const char * pct; - char * name_seg_p = NULL; + const char *p; + const char *pct; + char *name_seg_p = NULL; size_t name_seg_size = 0; herr_t ret_value = SUCCEED; /* Return value */ @@ -1256,8 +1256,8 @@ done: static herr_t H5D__virtual_copy_parsed_name(H5O_storage_virtual_name_seg_t **dst, H5O_storage_virtual_name_seg_t *src) { - H5O_storage_virtual_name_seg_t * tmp_dst = NULL; - H5O_storage_virtual_name_seg_t * p_src = src; + H5O_storage_virtual_name_seg_t *tmp_dst = NULL; + H5O_storage_virtual_name_seg_t *p_src = src; H5O_storage_virtual_name_seg_t **p_dst = &tmp_dst; herr_t ret_value = SUCCEED; @@ -1343,7 +1343,7 @@ static herr_t H5D__virtual_build_source_name(char *source_name, const H5O_storage_virtual_name_seg_t *parsed_name, size_t static_strlen, size_t nsubs, hsize_t blockno, char **built_name) { - char * tmp_name = NULL; /* Name buffer */ + char *tmp_name = NULL; /* Name buffer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1361,7 +1361,7 @@ H5D__virtual_build_source_name(char *source_name, const H5O_storage_virtual_name } /* end if */ else { const H5O_storage_virtual_name_seg_t *name_seg = parsed_name; - char * p; + char *p; hsize_t blockno_down = blockno; size_t blockno_len = 1; size_t name_len; @@ -2185,7 +2185,7 @@ herr_t H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) { H5O_storage_virtual_t *storage; /* Convenience pointer */ - H5P_genplist_t * dapl; /* Data access property list object pointer */ + H5P_genplist_t *dapl; /* Data access property list object pointer */ hssize_t old_offset[H5O_LAYOUT_NDIMS]; /* Old selection offset (unused) */ size_t i; /* Local index variables */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2247,7 +2247,7 @@ H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) /* Retrieve VDS file FAPL to layout */ if (storage->source_fapl <= 0) { - H5P_genplist_t * source_fapl = NULL; /* Source file FAPL */ + H5P_genplist_t *source_fapl = NULL; /* Source file FAPL */ H5F_close_degree_t close_degree = H5F_CLOSE_WEAK; /* Close degree for source files */ if ((storage->source_fapl = H5F_get_access_plist(f, FALSE)) < 0) @@ -2263,7 +2263,7 @@ H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) } /* end if */ #ifndef NDEBUG else { - H5P_genplist_t * source_fapl = NULL; /* Source file FAPL */ + H5P_genplist_t *source_fapl = NULL; /* Source file FAPL */ H5F_close_degree_t close_degree; /* Close degree for source files */ /* Get property list pointer */ @@ -2674,10 +2674,10 @@ H5D__virtual_post_io(H5O_storage_virtual_t *storage) else /* Close projected memory space */ if (storage->list[i].source_dset.projected_mem_space) { - if (H5S_close(storage->list[i].source_dset.projected_mem_space) < 0) - HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "can't close temporary space") - storage->list[i].source_dset.projected_mem_space = NULL; - } /* end if */ + if (H5S_close(storage->list[i].source_dset.projected_mem_space) < 0) + HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "can't close temporary space") + storage->list[i].source_dset.projected_mem_space = NULL; + } /* end if */ /* Note the lack of a done: label. This is because there are no HGOTO_ERROR * calls. If one is added, a done: label must also be added */ @@ -2762,7 +2762,7 @@ H5D__virtual_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsiz { H5O_storage_virtual_t *storage; /* Convenient pointer into layout struct */ hsize_t tot_nelmts; /* Total number of elements mapped to mem_space */ - H5S_t * fill_space = NULL; /* Space to fill with fill value */ + H5S_t *fill_space = NULL; /* Space to fill with fill value */ size_t i, j; /* Local index variables */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2803,7 +2803,7 @@ H5D__virtual_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsiz else /* Read from source dataset */ if (H5D__virtual_read_one(io_info, type_info, file_space, &storage->list[i].source_dset) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read source dataset") + HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "unable to read source dataset") } /* end for */ /* Fill unmapped part of buffer with fill value */ @@ -3000,7 +3000,7 @@ H5D__virtual_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsi else /* Write to source dataset */ if (H5D__virtual_write_one(io_info, type_info, file_space, &storage->list[i].source_dset) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write to source dataset") + HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write to source dataset") } /* end for */ done: @@ -3072,7 +3072,7 @@ done: herr_t H5D__virtual_hold_source_dset_files(const H5D_t *dset, H5D_virtual_held_file_t **head) { - H5O_storage_virtual_t * storage; /* Convenient pointer into layout struct */ + H5O_storage_virtual_t *storage; /* Convenient pointer into layout struct */ H5D_virtual_held_file_t *tmp; /* Temporary held file node */ size_t i; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3221,9 +3221,9 @@ H5D__virtual_refresh_source_dsets(H5D_t *dset) else /* Check if source dataset is open */ if (storage->list[i].source_dset.dset) - /* Refresh source dataset */ - if (H5D__virtual_refresh_source_dset(&storage->list[i].source_dset.dset) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to refresh source dataset") + /* Refresh source dataset */ + if (H5D__virtual_refresh_source_dset(&storage->list[i].source_dset.dset) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to refresh source dataset") done: FUNC_LEAVE_NOAPI(ret_value) @@ -81,7 +81,7 @@ static ssize_t H5E__get_class_name(const H5E_cls_t *cls, char *name, size_t s 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, void **request); 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, void **request); static ssize_t H5E__get_num(const H5E_t *err_stack); @@ -926,10 +926,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_PACKAGE @@ -1046,7 +1046,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 */ @@ -1178,7 +1178,7 @@ H5E__close_stack(H5E_t *estack, void H5_ATTR_UNUSED **request) 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! :-) */ @@ -1307,8 +1307,8 @@ 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 */ - char * tmp = NULL; /* Buffer to place formatted description in */ + H5E_t *estack; /* Pointer to error stack to modify */ + 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 */ @@ -1484,7 +1484,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 */ @@ -1534,7 +1534,7 @@ done: herr_t H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func /*out*/, void **client_data /*out*/) { - 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 */ @@ -1597,7 +1597,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 */ @@ -1764,7 +1764,7 @@ H5E__append_stack(H5E_t *dst_stack, const H5E_t *src_stack) /* Copy the errors from the source stack to the destination stack */ for (u = 0; u < src_stack->nused; u++) { const H5E_error2_t *src_error; /* Pointers to source error on stack */ - H5E_error2_t * dst_error; /* Pointers to destination error on stack */ + H5E_error2_t *dst_error; /* Pointers to destination error on stack */ /* Get pointers into the current error stack location */ src_error = &(src_stack->slot[u]); @@ -116,9 +116,9 @@ H5FL_BLK_DEFINE(ea_native_elmt); static H5EA_t * H5EA__new(H5F_t *f, haddr_t ea_addr, hbool_t from_open, void *ctx_udata) { - H5EA_t * ea = NULL; /* Pointer to new extensible array */ + H5EA_t *ea = NULL; /* Pointer to new extensible array */ H5EA_hdr_t *hdr = NULL; /* The extensible array header information */ - H5EA_t * ret_value = NULL; + H5EA_t *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -328,10 +328,10 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t uint8_t **thing_elmt_buf, hsize_t *thing_elmt_idx, H5EA__unprotect_func_t *thing_unprot_func) { - H5EA_hdr_t * hdr = ea->hdr; /* Header for EA */ - H5EA_iblock_t * iblock = NULL; /* Pointer to index block for EA */ - H5EA_sblock_t * sblock = NULL; /* Pointer to super block for EA */ - H5EA_dblock_t * dblock = NULL; /* Pointer to data block for EA */ + H5EA_hdr_t *hdr = ea->hdr; /* Header for EA */ + H5EA_iblock_t *iblock = NULL; /* Pointer to index block for EA */ + H5EA_sblock_t *sblock = NULL; /* Pointer to super block for EA */ + H5EA_dblock_t *dblock = NULL; /* Pointer to data block for EA */ H5EA_dblk_page_t *dblk_page = NULL; /* Pointer to data block page for EA */ unsigned iblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting index block */ unsigned sblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting super block */ @@ -669,7 +669,7 @@ herr_t H5EA_set(const H5EA_t *ea, hsize_t idx, const void *elmt) { H5EA_hdr_t *hdr = ea->hdr; /* Header for EA */ - void * thing = NULL; /* Pointer to the array metadata containing the array index we are interested in */ + void *thing = NULL; /* Pointer to the array metadata containing the array index we are interested in */ uint8_t *thing_elmt_buf; /* Pointer to the element buffer for the array metadata */ hsize_t thing_elmt_idx; /* Index of the element in the element buffer for the array metadata */ H5EA__unprotect_func_t thing_unprot_func; /* Function pointer for unprotecting the array metadata */ diff --git a/src/H5EAcache.c b/src/H5EAcache.c index 86610f9..68e927f 100644 --- a/src/H5EAcache.c +++ b/src/H5EAcache.c @@ -68,7 +68,7 @@ /* Metadata cache (H5AC) callbacks */ static herr_t H5EA__cache_hdr_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5EA__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5EA__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5EA__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5EA__cache_hdr_image_len(const void *thing, size_t *image_len); static herr_t H5EA__cache_hdr_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5EA__cache_hdr_notify(H5AC_notify_action_t action, void *thing); @@ -76,7 +76,7 @@ static herr_t H5EA__cache_hdr_free_icr(void *thing); static herr_t H5EA__cache_iblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5EA__cache_iblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5EA__cache_iblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5EA__cache_iblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5EA__cache_iblock_image_len(const void *thing, size_t *image_len); static herr_t H5EA__cache_iblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5EA__cache_iblock_notify(H5AC_notify_action_t action, void *thing); @@ -84,7 +84,7 @@ static herr_t H5EA__cache_iblock_free_icr(void *thing); static herr_t H5EA__cache_sblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5EA__cache_sblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5EA__cache_sblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5EA__cache_sblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5EA__cache_sblock_image_len(const void *thing, size_t *image_len); static herr_t H5EA__cache_sblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5EA__cache_sblock_notify(H5AC_notify_action_t action, void *thing); @@ -92,7 +92,7 @@ static herr_t H5EA__cache_sblock_free_icr(void *thing); static herr_t H5EA__cache_dblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5EA__cache_dblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5EA__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5EA__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5EA__cache_dblock_image_len(const void *thing, size_t *image_len); static herr_t H5EA__cache_dblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5EA__cache_dblock_notify(H5AC_notify_action_t action, void *thing); @@ -101,7 +101,7 @@ static herr_t H5EA__cache_dblock_fsf_size(const void *thing, hsize_t *fsf_size); static herr_t H5EA__cache_dblk_page_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5EA__cache_dblk_page_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5EA__cache_dblk_page_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5EA__cache_dblk_page_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5EA__cache_dblk_page_image_len(const void *thing, size_t *image_len); static herr_t H5EA__cache_dblk_page_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5EA__cache_dblk_page_notify(H5AC_notify_action_t action, void *thing); @@ -291,11 +291,11 @@ static void * H5EA__cache_hdr_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { H5EA_cls_id_t id; /* ID of extensible array class, as found in file */ - H5EA_hdr_t * hdr = NULL; /* Extensible array info */ + H5EA_hdr_t *hdr = NULL; /* Extensible array info */ H5EA_hdr_cache_ud_t *udata = (H5EA_hdr_cache_ud_t *)_udata; - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -446,7 +446,7 @@ static herr_t H5EA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5EA_hdr_t *hdr = (H5EA_hdr_t *)_thing; /* Pointer to the extensible array header */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ FUNC_ENTER_PACKAGE_NOERR @@ -627,7 +627,7 @@ done: static herr_t H5EA__cache_iblock_get_initial_load_size(void *_udata, size_t *image_len) { - H5EA_hdr_t * hdr = (H5EA_hdr_t *)_udata; /* User data for callback */ + H5EA_hdr_t *hdr = (H5EA_hdr_t *)_udata; /* User data for callback */ H5EA_iblock_t iblock; /* Fake index block for computing size */ FUNC_ENTER_PACKAGE_NOERR @@ -701,12 +701,12 @@ static void * H5EA__cache_iblock_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { H5EA_iblock_t *iblock = NULL; /* Index block info */ - H5EA_hdr_t * hdr = (H5EA_hdr_t *)_udata; /* User data for callback */ + H5EA_hdr_t *hdr = (H5EA_hdr_t *)_udata; /* User data for callback */ const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ haddr_t arr_addr; /* Address of array header in the file */ size_t u; /* Local index variable */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -837,7 +837,7 @@ static herr_t H5EA__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5EA_iblock_t *iblock = (H5EA_iblock_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; @@ -1120,13 +1120,13 @@ H5EA__cache_sblock_verify_chksum(const void *_image, size_t len, void H5_ATTR_UN static void * H5EA__cache_sblock_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5EA_sblock_t * sblock = NULL; /* Super block info */ + H5EA_sblock_t *sblock = NULL; /* Super block info */ H5EA_sblock_cache_ud_t *udata = (H5EA_sblock_cache_ud_t *)_udata; /* User data */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ haddr_t arr_addr; /* Address of array header in the file */ size_t u; /* Local index variable */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1254,7 +1254,7 @@ static herr_t H5EA__cache_sblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5EA_sblock_t *sblock = (H5EA_sblock_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ size_t u; /* Local index variable */ @@ -1547,12 +1547,12 @@ static void * H5EA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5EA_dblock_t * dblock = NULL; /* Data block info */ + H5EA_dblock_t *dblock = NULL; /* Data block info */ H5EA_dblock_cache_ud_t *udata = (H5EA_dblock_cache_ud_t *)_udata; /* User data */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ haddr_t arr_addr; /* Address of array header in the file */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1683,7 +1683,7 @@ static herr_t H5EA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5EA_dblock_t *dblock = (H5EA_dblock_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; @@ -1991,12 +1991,12 @@ H5EA__cache_dblk_page_verify_chksum(const void *_image, size_t len, void H5_ATTR static void * H5EA__cache_dblk_page_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5EA_dblk_page_t * dblk_page = NULL; /* Data block page info */ + H5EA_dblk_page_t *dblk_page = NULL; /* Data block page info */ H5EA_dblk_page_cache_ud_t *udata = (H5EA_dblk_page_cache_ud_t *)_udata; /* User data for loading data block page */ const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -2095,7 +2095,7 @@ H5EA__cache_dblk_page_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *_ima void *_thing) { H5EA_dblk_page_t *dblk_page = (H5EA_dblk_page_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c index b377422..c3489dc 100644 --- a/src/H5EAdbg.c +++ b/src/H5EAdbg.c @@ -85,7 +85,7 @@ H5EA__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co { /* Local variables */ H5EA_hdr_t *hdr = NULL; /* Shared extensible array header */ - void * dbg_ctx = NULL; /* Extensible array debugging context */ + void *dbg_ctx = NULL; /* Extensible array debugging context */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -166,9 +166,9 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde const H5EA_class_t *cls, haddr_t hdr_addr, haddr_t obj_addr) { /* Local variables */ - H5EA_hdr_t * hdr = NULL; /* Shared extensible array header */ + H5EA_hdr_t *hdr = NULL; /* Shared extensible array header */ H5EA_iblock_t *iblock = NULL; /* Extensible array index block */ - void * dbg_ctx = NULL; /* Extensible array context */ + void *dbg_ctx = NULL; /* Extensible array context */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -286,9 +286,9 @@ H5EA__sblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t hdr_addr, unsigned sblk_idx, haddr_t obj_addr) { /* Local variables */ - H5EA_hdr_t * hdr = NULL; /* Shared extensible array header */ + H5EA_hdr_t *hdr = NULL; /* Shared extensible array header */ H5EA_sblock_t *sblock = NULL; /* Extensible array super block */ - void * dbg_ctx = NULL; /* Extensible array context */ + void *dbg_ctx = NULL; /* Extensible array context */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -375,9 +375,9 @@ H5EA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t hdr_addr, size_t dblk_nelmts, haddr_t obj_addr) { /* Local variables */ - H5EA_hdr_t * hdr = NULL; /* Shared extensible array header */ + H5EA_hdr_t *hdr = NULL; /* Shared extensible array header */ H5EA_dblock_t *dblock = NULL; /* Extensible array data block */ - void * dbg_ctx = NULL; /* Extensible array context */ + void *dbg_ctx = NULL; /* Extensible array context */ size_t u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5EAdblkpage.c b/src/H5EAdblkpage.c index c0a92f0..8d09341 100644 --- a/src/H5EAdblkpage.c +++ b/src/H5EAdblkpage.c @@ -209,9 +209,9 @@ done: H5EA_dblk_page_t * H5EA__dblk_page_protect(H5EA_hdr_t *hdr, H5EA_sblock_t *parent, haddr_t dblk_page_addr, unsigned flags) { - H5EA_dblk_page_t * dblk_page = NULL; /* Extensible array data block page */ + H5EA_dblk_page_t *dblk_page = NULL; /* Extensible array data block page */ H5EA_dblk_page_cache_ud_t udata; /* Information needed for loading data block page */ - H5EA_dblk_page_t * ret_value = NULL; + H5EA_dblk_page_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5EAdblock.c b/src/H5EAdblock.c index f17aae3..8de3b5c 100644 --- a/src/H5EAdblock.c +++ b/src/H5EAdblock.c @@ -286,9 +286,9 @@ H5EA__dblock_sblk_idx(const H5EA_hdr_t *hdr, hsize_t idx) H5EA_dblock_t * H5EA__dblock_protect(H5EA_hdr_t *hdr, void *parent, haddr_t dblk_addr, size_t dblk_nelmts, unsigned flags) { - H5EA_dblock_t * dblock; /* Extensible array data block */ + H5EA_dblock_t *dblock; /* Extensible array data block */ H5EA_dblock_cache_ud_t udata; /* Information needed for loading data block */ - H5EA_dblock_t * ret_value = NULL; + H5EA_dblock_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c index 2c68949..daf4d6e 100644 --- a/src/H5EAhdr.c +++ b/src/H5EAhdr.c @@ -241,9 +241,9 @@ done: void * H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts) { - void * elmts = NULL; /* Element buffer allocated */ + void *elmts = NULL; /* Element buffer allocated */ unsigned idx; /* Index of element buffer factory in header */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -641,9 +641,9 @@ done: H5EA_hdr_t * H5EA__hdr_protect(H5F_t *f, haddr_t ea_addr, void *ctx_udata, unsigned flags) { - H5EA_hdr_t * hdr; /* Extensible array header */ + H5EA_hdr_t *hdr; /* Extensible array header */ H5EA_hdr_cache_ud_t udata; /* User data for cache callbacks */ - H5EA_hdr_t * ret_value = NULL; + H5EA_hdr_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5EApkg.h b/src/H5EApkg.h index 2212ccb..c3cc937 100644 --- a/src/H5EApkg.h +++ b/src/H5EApkg.h @@ -187,7 +187,7 @@ typedef struct H5EA_hdr_t { size_t rc; /* Reference count of heap's components using heap header */ haddr_t addr; /* Address of header in file */ size_t size; /* Size of header in file */ - H5F_t * f; /* Pointer to file for extensible array */ + H5F_t *f; /* Pointer to file for extensible array */ size_t file_rc; /* Reference count of files using array header */ hbool_t pending_delete; /* Array is pending deletion */ size_t sizeof_addr; /* Size of file addresses */ @@ -207,7 +207,7 @@ typedef struct H5EA_hdr_t { /* SWMR / Flush dependency information (not stored) */ hbool_t swmr_write; /* Flag indicating the file is opened with SWMR-write access */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all array entries */ - void * parent; /* Pointer to 'top' proxy flush dependency + void *parent; /* Pointer to 'top' proxy flush dependency * parent, if it exists, otherwise NULL. * If the extensible array is being used * to index a chunked dataset and the @@ -233,7 +233,7 @@ typedef struct H5EA_iblock_t { H5AC_info_t cache_info; /* Extensible array information (stored) */ - void * elmts; /* Buffer for elements stored in index block */ + void *elmts; /* Buffer for elements stored in index block */ haddr_t *dblk_addrs; /* Buffer for addresses of data blocks in index block */ haddr_t *sblk_addrs; /* Buffer for addresses of super blocks in index block */ @@ -269,7 +269,7 @@ typedef struct H5EA_sblock_t { /* SWMR / Flush dependency information (not stored) */ hbool_t has_hdr_depend; /* Whether this object has a flush dependency on the header */ H5AC_proxy_entry_t *top_proxy; /* "Top" proxy cache entry for all array entries */ - H5EA_iblock_t * parent; /* Parent object for super block (index block) */ + H5EA_iblock_t *parent; /* Parent object for super block (index block) */ /* Computed/cached values (not stored) */ unsigned idx; /* Super block index within the extensible array */ @@ -287,7 +287,7 @@ typedef struct H5EA_dblock_t { /* Extensible array information (stored) */ hsize_t block_off; /* Offset of the block within the array's address space */ - void * elmts; /* Buffer for elements stored in data block */ + void *elmts; /* Buffer for elements stored in data block */ /* Internal array information (not stored) */ H5EA_hdr_t *hdr; /* Shared array header info */ @@ -297,7 +297,7 @@ typedef struct H5EA_dblock_t { /* SWMR / Flush dependency information (not stored) */ hbool_t has_hdr_depend; /* Whether this object has a flush dependency on the header */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all array entries */ - void * parent; /* Parent object for data block (index or super block) */ + void *parent; /* Parent object for data block (index or super block) */ /* Computed/cached values (not stored) */ size_t nelmts; /* Number of elements in block */ @@ -320,7 +320,7 @@ typedef struct H5EA_dbk_page_t { /* SWMR / Flush dependency information (not stored) */ hbool_t has_hdr_depend; /* Whether this object has a flush dependency on the header */ H5AC_proxy_entry_t *top_proxy; /* "Top" proxy cache entry for all array entries */ - H5EA_sblock_t * parent; /* Parent object for data block page (super block) */ + H5EA_sblock_t *parent; /* Parent object for data block page (super block) */ /* Computed/cached values (not stored) */ /* <none> */ @@ -329,21 +329,21 @@ typedef struct H5EA_dbk_page_t { /* Extensible array */ struct H5EA_t { H5EA_hdr_t *hdr; /* Pointer to internal extensible array header info */ - H5F_t * f; /* Pointer to file for extensible array */ + H5F_t *f; /* Pointer to file for extensible array */ }; /* Metadata cache callback user data types */ /* Info needed for loading header */ typedef struct H5EA_hdr_cache_ud_t { - H5F_t * f; /* Pointer to file for extensible array */ + H5F_t *f; /* Pointer to file for extensible array */ haddr_t addr; /* Address of header on disk */ - void * ctx_udata; /* User context for class */ + void *ctx_udata; /* User context for class */ } H5EA_hdr_cache_ud_t; /* Info needed for loading super block */ typedef struct H5EA_sblock_cache_ud_t { - H5EA_hdr_t * hdr; /* Shared extensible array information */ + H5EA_hdr_t *hdr; /* Shared extensible array information */ H5EA_iblock_t *parent; /* Pointer to parent object for super block (index block) */ unsigned sblk_idx; /* Index of super block */ haddr_t sblk_addr; /* Address of super block */ @@ -352,14 +352,14 @@ typedef struct H5EA_sblock_cache_ud_t { /* Info needed for loading data block */ typedef struct H5EA_dblock_cache_ud_t { H5EA_hdr_t *hdr; /* Shared extensible array information */ - void * parent; /* Pointer to parent object for data block (index or super block) */ + void *parent; /* Pointer to parent object for data block (index or super block) */ size_t nelmts; /* Number of elements in data block */ haddr_t dblk_addr; /* Address of data block */ } H5EA_dblock_cache_ud_t; /* Info needed for loading data block page */ typedef struct H5EA_dblk_page_cache_ud_t { - H5EA_hdr_t * hdr; /* Shared extensible array information */ + H5EA_hdr_t *hdr; /* Shared extensible array information */ H5EA_sblock_t *parent; /* Pointer to parent object for data block page (super block) */ haddr_t dblk_page_addr; /* Address of data block page */ } H5EA_dblk_page_cache_ud_t; @@ -393,7 +393,7 @@ H5_DLL herr_t H5EA__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t H5_DLL H5EA_hdr_t *H5EA__hdr_alloc(H5F_t *f); H5_DLL herr_t H5EA__hdr_init(H5EA_hdr_t *hdr, void *ctx_udata); H5_DLL haddr_t H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata); -H5_DLL void * H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts); +H5_DLL void *H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts); H5_DLL herr_t H5EA__hdr_free_elmts(H5EA_hdr_t *hdr, size_t nelmts, void *elmts); H5_DLL herr_t H5EA__hdr_incr(H5EA_hdr_t *hdr); H5_DLL herr_t H5EA__hdr_decr(H5EA_hdr_t *hdr); diff --git a/src/H5EAprivate.h b/src/H5EAprivate.h index 9481559f..c9c3f8b 100644 --- a/src/H5EAprivate.h +++ b/src/H5EAprivate.h @@ -55,13 +55,13 @@ typedef enum H5EA_cls_id_t { */ typedef struct H5EA_class_t { H5EA_cls_id_t id; /* ID of Extensible Array class, as found in file */ - const char * name; /* Name of class (for debugging) */ + const char *name; /* Name of class (for debugging) */ size_t nat_elmt_size; /* Size of native (memory) element */ /* Extensible array client callback methods */ void *(*crt_context)(void *udata); /* Create context for other callbacks */ herr_t (*dst_context)(void *ctx); /* Destroy context */ - herr_t (*fill)(void * nat_blk, + herr_t (*fill)(void *nat_blk, size_t nelmts); /* Fill array of elements with encoded form of "missing element" value */ herr_t (*encode)(void *raw, const void *elmt, size_t nelmts, void *ctx); /* Encode elements from native form to disk storage form */ diff --git a/src/H5EAsblock.c b/src/H5EAsblock.c index 30cb220..152e32a 100644 --- a/src/H5EAsblock.c +++ b/src/H5EAsblock.c @@ -274,9 +274,9 @@ H5EA_sblock_t * H5EA__sblock_protect(H5EA_hdr_t *hdr, H5EA_iblock_t *parent, haddr_t sblk_addr, unsigned sblk_idx, unsigned flags) { - H5EA_sblock_t * sblock = NULL; /* Pointer to super block */ + H5EA_sblock_t *sblock = NULL; /* Pointer to super block */ H5EA_sblock_cache_ud_t udata; /* Information needed for loading super block */ - H5EA_sblock_t * ret_value = NULL; + H5EA_sblock_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5EAtest.c b/src/H5EAtest.c index d07d9d9..f3bfa05 100644 --- a/src/H5EAtest.c +++ b/src/H5EAtest.c @@ -64,13 +64,13 @@ typedef struct H5EA__test_ctx_t { /********************/ /* Extensible array class callbacks */ -static void * H5EA__test_crt_context(void *udata); +static void *H5EA__test_crt_context(void *udata); static herr_t H5EA__test_dst_context(void *ctx); static herr_t H5EA__test_fill(void *nat_blk, size_t nelmts); static herr_t H5EA__test_encode(void *raw, const void *elmt, size_t nelmts, void *ctx); static herr_t H5EA__test_decode(const void *raw, void *elmt, size_t nelmts, void *ctx); static herr_t H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); -static void * H5EA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_addr); +static void *H5EA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_addr); static herr_t H5EA__test_dst_dbg_context(void *_ctx); /*********************/ @@ -123,8 +123,8 @@ static void * H5EA__test_crt_context(void *_udata) { H5EA__test_ctx_t *ctx; /* Context for callbacks */ - H5EA__ctx_cb_t * udata = (H5EA__ctx_cb_t *)_udata; /* User data for context */ - void * ret_value = NULL; + H5EA__ctx_cb_t *udata = (H5EA__ctx_cb_t *)_udata; /* User data for context */ + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -219,7 +219,7 @@ static herr_t H5EA__test_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx) { H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */ - const uint64_t * elmt = (const uint64_t *)_elmt; /* Convenience pointer to native elements */ + const uint64_t *elmt = (const uint64_t *)_elmt; /* Convenience pointer to native elements */ herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -271,7 +271,7 @@ H5EA__test_decode(const void *_raw, void *_elmt, size_t nelmts, void H5_ATTR_NDE #ifndef NDEBUG H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */ #endif /* NDEBUG */ - uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */ + uint64_t *elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */ const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ FUNC_ENTER_PACKAGE_NOERR @@ -345,7 +345,7 @@ static void * H5EA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_addr) { H5EA__ctx_cb_t *ctx; /* Context for callbacks */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5ESevent.c b/src/H5ESevent.c index aafc785..abd7fbf 100644 --- a/src/H5ESevent.c +++ b/src/H5ESevent.c @@ -86,9 +86,9 @@ H5FL_DEFINE_STATIC(H5ES_event_t); H5ES_event_t * H5ES__event_new(H5VL_t *connector, void *token) { - H5ES_event_t * ev = NULL; /* New event */ + H5ES_event_t *ev = NULL; /* New event */ H5VL_object_t *request = NULL; /* Async request token VOL object */ - H5ES_event_t * ret_value = NULL; /* Return value */ + H5ES_event_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5ESint.c b/src/H5ESint.c index 970085d..f820850 100644 --- a/src/H5ESint.c +++ b/src/H5ESint.c @@ -60,22 +60,22 @@ typedef struct H5ES_get_requests_ctx_t { /* Callback context for wait operations */ typedef struct H5ES_wait_ctx_t { - H5ES_t * es; /* Event set being operated on */ + H5ES_t *es; /* Event set being operated on */ uint64_t timeout; /* Timeout for wait operation (in ns) */ - size_t * num_in_progress; /* Count of # of operations that have not completed */ + size_t *num_in_progress; /* Count of # of operations that have not completed */ hbool_t *op_failed; /* Flag to indicate an operation failed */ } H5ES_wait_ctx_t; /* Callback context for cancel operations */ typedef struct H5ES_cancel_ctx_t { - H5ES_t * es; /* Event set being operated on */ - size_t * num_not_canceled; /* Count of # of operations were not canceled */ + H5ES_t *es; /* Event set being operated on */ + size_t *num_not_canceled; /* Count of # of operations were not canceled */ hbool_t *op_failed; /* Flag to indicate an operation failed */ } H5ES_cancel_ctx_t; /* Callback context for get error info (gei) operations */ typedef struct H5ES_gei_ctx_t { - H5ES_t * es; /* Event set being operated on */ + H5ES_t *es; /* Event set being operated on */ size_t num_err_info; /* # of elements in err_info[] array */ size_t curr_err; /* Index of current error in array */ H5ES_err_info_t *curr_err_info; /* Pointer to current element in err_info[] array */ @@ -332,7 +332,7 @@ done: herr_t H5ES_insert(hid_t es_id, H5VL_t *connector, void *token, const char *caller, const char *caller_args, ...) { - H5ES_t * es = NULL; /* Event set for the operation */ + H5ES_t *es = NULL; /* Event set for the operation */ const char *app_file; /* Application source file name */ const char *app_func; /* Application source function name */ unsigned app_line; /* Application source line number */ @@ -652,7 +652,7 @@ done: static int H5ES__wait_cb(H5ES_event_t *ev, void *_ctx) { - H5ES_wait_ctx_t * ctx = (H5ES_wait_ctx_t *)_ctx; /* Callback context */ + H5ES_wait_ctx_t *ctx = (H5ES_wait_ctx_t *)_ctx; /* Callback context */ H5VL_request_status_t ev_status = H5VL_REQUEST_STATUS_SUCCEED; /* Status from event's operation */ uint64_t start_time = 0, elapsed_time = 0; /* Start and elapsed times for waiting on an operation */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -773,7 +773,7 @@ done: static int H5ES__cancel_cb(H5ES_event_t *ev, void *_ctx) { - H5ES_cancel_ctx_t * ctx = (H5ES_cancel_ctx_t *)_ctx; /* Callback context */ + H5ES_cancel_ctx_t *ctx = (H5ES_cancel_ctx_t *)_ctx; /* Callback context */ H5VL_request_status_t ev_status = H5VL_REQUEST_STATUS_SUCCEED; /* Status from event's operation */ int ret_value = H5_ITER_CONT; /* Return value */ @@ -882,7 +882,7 @@ static int H5ES__get_err_info_cb(H5ES_event_t *ev, void *_ctx) { H5VL_request_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - H5ES_gei_ctx_t * ctx = (H5ES_gei_ctx_t *)_ctx; /* Callback context */ + H5ES_gei_ctx_t *ctx = (H5ES_gei_ctx_t *)_ctx; /* Callback context */ int ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5ESpkg.h b/src/H5ESpkg.h index 6ee50fa..68e16c1 100644 --- a/src/H5ESpkg.h +++ b/src/H5ESpkg.h @@ -40,7 +40,7 @@ /* Typedef for event nodes */ typedef struct H5ES_event_t { - H5VL_object_t * request; /* Request token for event */ + H5VL_object_t *request; /* Request token for event */ struct H5ES_event_t *prev, *next; /* Previous and next event nodes */ H5ES_op_info_t op_info; /* Useful info about operation */ @@ -56,9 +56,9 @@ typedef struct H5ES_event_list_t { struct H5ES_t { uint64_t op_counter; /* Count of operations inserted into this set */ H5ES_event_insert_func_t ins_func; /* Callback to invoke for operation inserts */ - void * ins_ctx; /* Context for callback to invoke for operation inserts */ + void *ins_ctx; /* Context for callback to invoke for operation inserts */ H5ES_event_complete_func_t comp_func; /* Callback to invoke for operation completions */ - void * comp_ctx; /* Context for callback to invoke for operation inserts */ + void *comp_ctx; /* Context for callback to invoke for operation inserts */ /* Active events */ H5ES_event_list_t active; /* List of active events in set */ diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h index c8d1c7b..3aeb872 100644 --- a/src/H5ESpublic.h +++ b/src/H5ESpublic.h @@ -52,7 +52,7 @@ typedef enum H5ES_status_t { typedef struct H5ES_op_info_t { /* API call info */ const char *api_name; /* Name of HDF5 API routine called */ - char * api_args; /* "Argument string" for arguments to HDF5 API routine called */ + char *api_args; /* "Argument string" for arguments to HDF5 API routine called */ /* Application info */ const char *app_file_name; /* Name of source file where the HDF5 API routine was called */ @@ -76,8 +76,8 @@ typedef struct H5ES_err_info_t { char *api_args; /**< "Argument string" for arguments to HDF5 API routine called */ /* Application info */ - char * app_file_name; /**< Name of source file where the HDF5 API routine was called */ - char * app_func_name; /**< Name of function where the HDF5 API routine was called */ + char *app_file_name; /**< Name of source file where the HDF5 API routine was called */ + char *app_func_name; /**< Name of function where the HDF5 API routine was called */ unsigned app_line_num; /**< Line # of source file where the HDF5 API routine was called */ /* Operation info */ diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index a5cc7aa..860279a 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -88,8 +88,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); @@ -140,8 +140,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); @@ -295,7 +295,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 */ @@ -336,7 +336,7 @@ done: herr_t H5Eget_auto1(H5E_auto1_t *func /*out*/, void **client_data /*out*/) { - 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 */ @@ -389,7 +389,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 b8b9238..6d8e576 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -47,7 +47,7 @@ /* Printing information */ typedef struct H5E_print_t { - FILE * stream; + FILE *stream; H5E_cls_t cls; } H5E_print_t; @@ -181,12 +181,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; @@ -304,12 +304,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; @@ -651,7 +651,7 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin hid_t min_id, const char *fmt, ...) { va_list ap; /* Varargs info */ - 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 b11ee9e..11481ee 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 9dfd1fc..0254c37 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -112,7 +112,7 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g; #define H5E_BEGIN_TRY \ { \ H5E_auto2_t saved_efunc; \ - void * H5E_saved_edata; \ + void *H5E_saved_edata; \ \ (void)H5Eget_auto2(H5E_DEFAULT, &saved_efunc, &H5E_saved_edata); \ (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL); @@ -112,7 +112,7 @@ H5FL_EXTERN(H5VL_object_t); hid_t H5Fget_create_plist(hid_t file_id) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -159,7 +159,7 @@ done: hid_t H5Fget_access_plist(hid_t file_id) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -238,7 +238,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types) * count the IDs in the file. */ if (file_id != (hid_t)H5F_OBJ_ALL) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ size_t count = 0; /* Object count */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -358,7 +358,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list / * get the IDs from the file. */ if (file_id != (hid_t)H5F_OBJ_ALL) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ size_t count = 0; /* Object count */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -432,7 +432,7 @@ done: herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl_id, void **file_handle /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -558,8 +558,8 @@ done: static hid_t H5F__create_api_common(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, void **token_ptr) { - void * new_file = NULL; /* File struct for new file */ - H5P_genplist_t * plist; /* Property list pointer */ + void *new_file = NULL; /* File struct for new file */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -688,8 +688,8 @@ H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, c unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* File object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -752,8 +752,8 @@ done: static hid_t H5F__open_api_common(const char *filename, unsigned flags, hid_t fapl_id, void **token_ptr) { - void * new_file = NULL; /* File struct for new file */ - H5P_genplist_t * plist; /* Property list pointer */ + void *new_file = NULL; /* File struct for new file */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -865,8 +865,8 @@ H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, con unsigned flags, hid_t fapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* File object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -927,7 +927,7 @@ done: static herr_t H5F__flush_api_common(hid_t object_id, H5F_scope_t scope, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5I_type_t obj_type; /* Type of object to use */ @@ -1001,8 +1001,8 @@ H5Fflush_async(const char *app_file, const char *app_func, unsigned app_line, hi H5F_scope_t scope, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1077,9 +1077,9 @@ herr_t H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - H5VL_t * connector = NULL; /* VOL connector */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + H5VL_t *connector = NULL; /* VOL connector */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1137,7 +1137,7 @@ done: herr_t H5Fdelete(const char *filename, hid_t fapl_id) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ H5VL_file_specific_args_t vol_cb_args; /* Arguments to VOL callback */ hbool_t is_accessible = FALSE; /* Whether file is accessible */ @@ -1204,10 +1204,10 @@ done: herr_t H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) { - H5VL_object_t * loc_vol_obj = NULL; /* Parent object */ - H5VL_object_t * child_vol_obj = NULL; /* Child object */ + H5VL_object_t *loc_vol_obj = NULL; /* Parent object */ + H5VL_object_t *child_vol_obj = NULL; /* Child object */ H5VL_group_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - void * grp = NULL; /* Root group opened */ + void *grp = NULL; /* Root group opened */ H5I_type_t loc_type; /* ID type of location */ int same_connector = 0; /* Whether parent and child files use the same connector */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1239,7 +1239,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) * 'loc_id', because the 'mount' operation is a group specific operation. */ if (H5I_FILE == loc_type) { - H5VL_object_t * vol_obj; /* Object for loc_id (file) */ + H5VL_object_t *vol_obj; /* Object for loc_id (file) */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ /* Get the location object */ @@ -1322,9 +1322,9 @@ done: herr_t H5Funmount(hid_t loc_id, const char *name) { - H5VL_object_t * loc_vol_obj = NULL; /* Parent object */ + H5VL_object_t *loc_vol_obj = NULL; /* Parent object */ H5VL_group_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - void * grp = NULL; /* Root group opened */ + void *grp = NULL; /* Root group opened */ H5I_type_t loc_type; /* ID type of location */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1349,7 +1349,7 @@ H5Funmount(hid_t loc_id, const char *name) * 'loc_id', because the 'mount' operation is a group specific operation. */ if (H5I_FILE == loc_type) { - H5VL_object_t * vol_obj; /* Object for loc_id (file) */ + H5VL_object_t *vol_obj; /* Object for loc_id (file) */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ /* Get the location object */ @@ -1413,9 +1413,9 @@ done: static hid_t H5F__reopen_api_common(hid_t file_id, void **token_ptr) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_file_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - void * reopen_file = NULL; /* Pointer to the re-opened file object */ + void *reopen_file = NULL; /* Pointer to the re-opened file object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_PACKAGE @@ -1501,8 +1501,8 @@ hid_t H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -1571,7 +1571,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags /*out*/) /* If no intent flags were passed in, exit quietly */ if (intent_flags) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ /* Get the internal file structure */ @@ -1611,7 +1611,7 @@ H5Fget_fileno(hid_t file_id, unsigned long *fnumber /*out*/) /* If no fnumber pointer was passed in, exit quietly */ if (fnumber) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ /* Get the internal file structure */ @@ -1643,7 +1643,7 @@ done: hssize_t H5Fget_freespace(hid_t file_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ hsize_t file_freespace = 0; /* Size of freespace in the file */ @@ -1686,7 +1686,7 @@ done: herr_t H5Fget_filesize(hid_t file_id, hsize_t *size /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1753,7 +1753,7 @@ done: ssize_t H5Fget_file_image(hid_t file_id, void *buf /*out*/, size_t buf_len) { - H5VL_object_t * vol_obj; /* File object for file ID */ + H5VL_object_t *vol_obj; /* File object for file ID */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ size_t image_len = 0; /* Size of image buffer */ @@ -1801,7 +1801,7 @@ done: herr_t H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config /*out*/) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1844,7 +1844,7 @@ done: herr_t H5Fset_mdc_config(hid_t file_id, const H5AC_cache_config_t *config_ptr) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1884,7 +1884,7 @@ done: herr_t H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate /*out*/) { - H5VL_object_t * vol_obj; + H5VL_object_t *vol_obj; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1928,7 +1928,7 @@ herr_t H5Fget_mdc_size(hid_t file_id, size_t *max_size /*out*/, size_t *min_clean_size /*out*/, size_t *cur_size /*out*/, int *cur_num_entries /*out*/) { - H5VL_object_t * vol_obj; + H5VL_object_t *vol_obj; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ uint32_t index_len = 0; /* Size of cache index */ @@ -1980,7 +1980,7 @@ done: herr_t H5Freset_mdc_hit_rate_stats(hid_t file_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2025,7 +2025,7 @@ done: ssize_t H5Fget_name(hid_t obj_id, char *name /*out*/, size_t size) { - H5VL_object_t * vol_obj; /* File for file_id */ + H5VL_object_t *vol_obj; /* File for file_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5I_type_t type; size_t file_name_len = 0; /* Length of file name */ @@ -2078,7 +2078,7 @@ done: herr_t H5Fget_info2(hid_t obj_id, H5F_info2_t *finfo /*out*/) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ H5I_type_t type; @@ -2128,7 +2128,7 @@ done: herr_t H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t *info /*out*/) { - H5VL_object_t * vol_obj = NULL; /* File object for file ID */ + H5VL_object_t *vol_obj = NULL; /* File object for file ID */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2172,7 +2172,7 @@ done: ssize_t H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects, H5F_sect_info_t *sect_info /*out*/) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ size_t sect_count = 0; /* Number of sections */ @@ -2220,7 +2220,7 @@ done: herr_t H5Fclear_elink_file_cache(hid_t file_id) { - H5VL_object_t * vol_obj; /* File */ + H5VL_object_t *vol_obj; /* File */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2280,7 +2280,7 @@ done: herr_t H5Fstart_swmr_write(hid_t file_id) { - H5VL_object_t * vol_obj = NULL; /* File info */ + H5VL_object_t *vol_obj = NULL; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2320,7 +2320,7 @@ done: herr_t H5Fstart_mdc_logging(hid_t file_id) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2357,7 +2357,7 @@ done: herr_t H5Fstop_mdc_logging(hid_t file_id) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2394,7 +2394,7 @@ done: herr_t H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled /*out*/, hbool_t *is_currently_logging /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2435,7 +2435,7 @@ done: herr_t H5Fset_libver_bounds(hid_t file_id, H5F_libver_t low, H5F_libver_t high) { - H5VL_object_t * vol_obj; /* File as VOL object */ + H5VL_object_t *vol_obj; /* File as VOL object */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2479,7 +2479,7 @@ done: herr_t H5Fformat_convert(hid_t file_id) { - H5VL_object_t * vol_obj = NULL; /* File */ + H5VL_object_t *vol_obj = NULL; /* File */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2518,7 +2518,7 @@ done: herr_t H5Freset_page_buffering_stats(hid_t file_id) { - H5VL_object_t * vol_obj; /* File to reset stats on */ + H5VL_object_t *vol_obj; /* File to reset stats on */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2555,7 +2555,7 @@ H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2] /*out*/, unsigne unsigned misses[2] /*out*/, unsigned evictions[2] /*out*/, unsigned bypasses[2] /*out*/) { - H5VL_object_t * vol_obj; /* File object */ + H5VL_object_t *vol_obj; /* File object */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2602,7 +2602,7 @@ done: herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr /*out*/, hsize_t *image_len /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2683,7 +2683,7 @@ done: herr_t H5Fincrement_filesize(hid_t file_id, hsize_t increment) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2721,7 +2721,7 @@ done: herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2761,7 +2761,7 @@ done: herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -105,9 +105,9 @@ H5FL_BLK_DEFINE(fa_native_elmt); static H5FA_t * H5FA__new(H5F_t *f, haddr_t fa_addr, hbool_t from_open, void *ctx_udata) { - H5FA_t * fa = NULL; /* Pointer to new fixed array */ + H5FA_t *fa = NULL; /* Pointer to new fixed array */ H5FA_hdr_t *hdr = NULL; /* The fixed array header information */ - H5FA_t * ret_value = NULL; + H5FA_t *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -313,8 +313,8 @@ H5FA_get_addr(const H5FA_t *fa, haddr_t *addr) herr_t H5FA_set(const H5FA_t *fa, hsize_t idx, const void *elmt) { - H5FA_hdr_t * hdr = fa->hdr; /* Header for fixed array */ - H5FA_dblock_t * dblock = NULL; /* Pointer to fixed array Data block */ + H5FA_hdr_t *hdr = fa->hdr; /* Header for fixed array */ + H5FA_dblock_t *dblock = NULL; /* Pointer to fixed array Data block */ H5FA_dblk_page_t *dblk_page = NULL; /* Pointer to fixed array Data block page */ unsigned dblock_cache_flags = H5AC__NO_FLAGS_SET; /* Flags to unprotecting fixed array Data block */ unsigned dblk_page_cache_flags = @@ -428,8 +428,8 @@ done: herr_t H5FA_get(const H5FA_t *fa, hsize_t idx, void *elmt) { - H5FA_hdr_t * hdr = fa->hdr; /* Header for FA */ - H5FA_dblock_t * dblock = NULL; /* Pointer to data block for FA */ + H5FA_hdr_t *hdr = fa->hdr; /* Header for FA */ + H5FA_dblock_t *dblock = NULL; /* Pointer to data block for FA */ H5FA_dblk_page_t *dblk_page = NULL; /* Pointer to data block page for FA */ herr_t ret_value = SUCCEED; diff --git a/src/H5FAcache.c b/src/H5FAcache.c index 2889626..24c546a 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -66,7 +66,7 @@ /* Metadata cache (H5AC) callbacks */ static herr_t H5FA__cache_hdr_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5FA__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5FA__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5FA__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5FA__cache_hdr_image_len(const void *thing, size_t *image_len); static herr_t H5FA__cache_hdr_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5FA__cache_hdr_notify(H5AC_notify_action_t action, void *thing); @@ -74,7 +74,7 @@ static herr_t H5FA__cache_hdr_free_icr(void *thing); static herr_t H5FA__cache_dblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5FA__cache_dblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5FA__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5FA__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5FA__cache_dblock_image_len(const void *thing, size_t *image_len); static herr_t H5FA__cache_dblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5FA__cache_dblock_notify(H5AC_notify_action_t action, void *thing); @@ -83,7 +83,7 @@ static herr_t H5FA__cache_dblock_fsf_size(const void *thing, hsize_t *fsf_size); static herr_t H5FA__cache_dblk_page_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5FA__cache_dblk_page_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5FA__cache_dblk_page_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5FA__cache_dblk_page_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5FA__cache_dblk_page_image_len(const void *thing, size_t *image_len); static herr_t H5FA__cache_dblk_page_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5FA__cache_dblk_page_notify(H5AC_notify_action_t action, void *thing); @@ -238,11 +238,11 @@ H5FA__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len hbool_t H5_ATTR_UNUSED *dirty) { H5FA_cls_id_t id; /* ID of fixed array class, as found in file */ - H5FA_hdr_t * hdr = NULL; /* Fixed array info */ + H5FA_hdr_t *hdr = NULL; /* Fixed array info */ H5FA_hdr_cache_ud_t *udata = (H5FA_hdr_cache_ud_t *)_udata; - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -378,7 +378,7 @@ static herr_t H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5FA_hdr_t *hdr = (H5FA_hdr_t *)_thing; /* Pointer to the fixed array header */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ FUNC_ENTER_PACKAGE_NOERR @@ -639,12 +639,12 @@ static void * H5FA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5FA_dblock_t * dblock = NULL; /* Data block info */ + H5FA_dblock_t *dblock = NULL; /* Data block info */ H5FA_dblock_cache_ud_t *udata = (H5FA_dblock_cache_ud_t *)_udata; /* User data for loading data block */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ haddr_t arr_addr; /* Address of array header in the file */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -771,7 +771,7 @@ static herr_t H5FA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5FA_dblock_t *dblock = (H5FA_dblock_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; @@ -1064,12 +1064,12 @@ H5FA__cache_dblk_page_verify_chksum(const void *_image, size_t len, void H5_ATTR static void * H5FA__cache_dblk_page_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5FA_dblk_page_t * dblk_page = NULL; /* Data block page info */ + H5FA_dblk_page_t *dblk_page = NULL; /* Data block page info */ H5FA_dblk_page_cache_ud_t *udata = (H5FA_dblk_page_cache_ud_t *)_udata; /* User data for loading data block page */ const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ - void * ret_value = NULL; + void *ret_value = NULL; /* Sanity check */ FUNC_ENTER_PACKAGE @@ -1169,7 +1169,7 @@ H5FA__cache_dblk_page_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *_ima void *_thing) { H5FA_dblk_page_t *dblk_page = (H5FA_dblk_page_t *)_thing; /* Pointer to the object to serialize */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; diff --git a/src/H5FAdbg.c b/src/H5FAdbg.c index a69c078..9588787 100644 --- a/src/H5FAdbg.c +++ b/src/H5FAdbg.c @@ -85,7 +85,7 @@ H5FA__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co { /* Local variables */ H5FA_hdr_t *hdr = NULL; /* Shared fixed array header */ - void * dbg_ctx = NULL; /* Fixed array debugging context */ + void *dbg_ctx = NULL; /* Fixed array debugging context */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -155,9 +155,9 @@ H5FA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, haddr_t hdr_addr, haddr_t obj_addr) { /* Local variables */ - H5FA_hdr_t * hdr = NULL; /* Shared fixed array header */ + H5FA_hdr_t *hdr = NULL; /* Shared fixed array header */ H5FA_dblock_t *dblock = NULL; /* Fixed array data block */ - void * dbg_ctx = NULL; /* Fixed array context */ + void *dbg_ctx = NULL; /* Fixed array context */ size_t u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5FAdblkpage.c b/src/H5FAdblkpage.c index f6a5aef..e9482d7 100644 --- a/src/H5FAdblkpage.c +++ b/src/H5FAdblkpage.c @@ -216,9 +216,9 @@ done: H5FA_dblk_page_t * H5FA__dblk_page_protect(H5FA_hdr_t *hdr, haddr_t dblk_page_addr, size_t dblk_page_nelmts, unsigned flags) { - H5FA_dblk_page_t * dblk_page = NULL; /* Fixed array data block page */ + H5FA_dblk_page_t *dblk_page = NULL; /* Fixed array data block page */ H5FA_dblk_page_cache_ud_t udata; /* Information needed for loading data block page */ - H5FA_dblk_page_t * ret_value = NULL; + H5FA_dblk_page_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5FAdblock.c b/src/H5FAdblock.c index 1ccc97d..dabd513 100644 --- a/src/H5FAdblock.c +++ b/src/H5FAdblock.c @@ -265,9 +265,9 @@ done: H5FA_dblock_t * H5FA__dblock_protect(H5FA_hdr_t *hdr, haddr_t dblk_addr, unsigned flags) { - H5FA_dblock_t * dblock = NULL; /* Fixed array data block */ + H5FA_dblock_t *dblock = NULL; /* Fixed array data block */ H5FA_dblock_cache_ud_t udata; /* Information needed for loading data block */ - H5FA_dblock_t * ret_value = NULL; + H5FA_dblock_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c index aeb3fb1..e1b3983 100644 --- a/src/H5FAhdr.c +++ b/src/H5FAhdr.c @@ -427,9 +427,9 @@ done: H5FA_hdr_t * H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags) { - H5FA_hdr_t * hdr; /* Fixed array header */ + H5FA_hdr_t *hdr; /* Fixed array header */ H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */ - H5FA_hdr_t * ret_value = NULL; + H5FA_hdr_t *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5FApkg.h b/src/H5FApkg.h index 15f6445..e66af8f 100644 --- a/src/H5FApkg.h +++ b/src/H5FApkg.h @@ -129,7 +129,7 @@ typedef struct H5FA_hdr_t { size_t rc; /* Reference count of the header */ haddr_t addr; /* Address of header in file */ size_t size; /* Size of header in file */ - H5F_t * f; /* Pointer to file for fixed array */ + H5F_t *f; /* Pointer to file for fixed array */ size_t file_rc; /* Reference count of files using array header */ hbool_t pending_delete; /* Array is pending deletion */ size_t sizeof_addr; /* Size of file addresses */ @@ -141,7 +141,7 @@ typedef struct H5FA_hdr_t { /* SWMR / Flush dependency information (not stored) */ hbool_t swmr_write; /* Flag indicating the file is opened with SWMR-write access */ H5AC_proxy_entry_t *top_proxy; /* 'Top' proxy cache entry for all array entries */ - void * parent; /* Pointer to 'top' proxy flush dependency + void *parent; /* Pointer to 'top' proxy flush dependency * parent, if it exists, otherwise NULL. * If the fixed array is being used * to index a chunked dataset and the @@ -168,7 +168,7 @@ typedef struct H5FA_dblock_t { /* Fixed array information (stored) */ uint8_t *dblk_page_init; /* Bitmap of whether a data block page is initialized */ - void * elmts; /* Buffer for elements stored in data block */ + void *elmts; /* Buffer for elements stored in data block */ /* Internal array information (not stored) */ H5FA_hdr_t *hdr; /* Shared array header info */ @@ -211,16 +211,16 @@ typedef struct H5FA_dbk_page_t { /* Fixed array */ struct H5FA_t { H5FA_hdr_t *hdr; /* Pointer to internal fixed array header info */ - H5F_t * f; /* Pointer to file for fixed array */ + H5F_t *f; /* Pointer to file for fixed array */ }; /* Metadata cache callback user data types */ /* Info needed for loading header */ typedef struct H5FA_hdr_cache_ud_t { - H5F_t * f; /* Pointer to file for fixed array */ + H5F_t *f; /* Pointer to file for fixed array */ haddr_t addr; /* Address of header on disk */ - void * ctx_udata; /* User context for class */ + void *ctx_udata; /* User context for class */ } H5FA_hdr_cache_ud_t; /* Info needed for loading data block */ @@ -258,7 +258,7 @@ H5_DLL herr_t H5FA__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t H5_DLL H5FA_hdr_t *H5FA__hdr_alloc(H5F_t *f); H5_DLL herr_t H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata); H5_DLL haddr_t H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata); -H5_DLL void * H5FA__hdr_alloc_elmts(H5FA_hdr_t *hdr, size_t nelmts); +H5_DLL void *H5FA__hdr_alloc_elmts(H5FA_hdr_t *hdr, size_t nelmts); H5_DLL herr_t H5FA__hdr_free_elmts(H5FA_hdr_t *hdr, size_t nelmts, void *elmts); H5_DLL herr_t H5FA__hdr_incr(H5FA_hdr_t *hdr); H5_DLL herr_t H5FA__hdr_decr(H5FA_hdr_t *hdr); @@ -280,7 +280,7 @@ H5_DLL herr_t H5FA__dblock_delete(H5FA_hdr_t *hdr, haddr_t dblk_addr); H5_DLL herr_t H5FA__dblock_dest(H5FA_dblock_t *dblock); /* Data block page routines */ -H5_DLL herr_t H5FA__dblk_page_create(H5FA_hdr_t *hdr, haddr_t addr, size_t nelmts); +H5_DLL herr_t H5FA__dblk_page_create(H5FA_hdr_t *hdr, haddr_t addr, size_t nelmts); H5_DLL H5FA_dblk_page_t *H5FA__dblk_page_alloc(H5FA_hdr_t *hdr, size_t nelmts); H5_DLL H5FA_dblk_page_t *H5FA__dblk_page_protect(H5FA_hdr_t *hdr, haddr_t dblk_page_addr, size_t dblk_page_nelmts, unsigned flags); diff --git a/src/H5FAprivate.h b/src/H5FAprivate.h index 745c129..835b06f 100644 --- a/src/H5FAprivate.h +++ b/src/H5FAprivate.h @@ -53,13 +53,13 @@ typedef enum H5FA_cls_id_t { */ typedef struct H5FA_class_t { H5FA_cls_id_t id; /* ID of Fixed Array class, as found in file */ - const char * name; /* Name of class (for debugging) */ + const char *name; /* Name of class (for debugging) */ size_t nat_elmt_size; /* Size of native (memory) element */ /* Fixed array client callback methods */ void *(*crt_context)(void *udata); /* Create context for other callbacks */ herr_t (*dst_context)(void *ctx); /* Destroy context */ - herr_t (*fill)(void * nat_blk, + herr_t (*fill)(void *nat_blk, size_t nelmts); /* Fill array of elements with encoded form of "missing element" value */ herr_t (*encode)(void *raw, const void *elmt, size_t nelmts, void *ctx); /* Encode elements from native form to disk storage form */ diff --git a/src/H5FAtest.c b/src/H5FAtest.c index 87d1db0..9165bef 100644 --- a/src/H5FAtest.c +++ b/src/H5FAtest.c @@ -61,13 +61,13 @@ typedef struct H5FA__test_ctx_t { /********************/ /* Fixed array class callbacks */ -static void * H5FA__test_crt_context(void *udata); +static void *H5FA__test_crt_context(void *udata); static herr_t H5FA__test_dst_context(void *ctx); static herr_t H5FA__test_fill(void *nat_blk, size_t nelmts); static herr_t H5FA__test_encode(void *raw, const void *elmt, size_t nelmts, void *ctx); static herr_t H5FA__test_decode(const void *raw, void *elmt, size_t nelmts, void *ctx); static herr_t H5FA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); -static void * H5FA__test_crt_dbg_context(H5F_t *f, haddr_t obj_addr); +static void *H5FA__test_crt_dbg_context(H5F_t *f, haddr_t obj_addr); /*********************/ /* Package Variables */ @@ -116,7 +116,7 @@ static void * H5FA__test_crt_context(void H5_ATTR_UNUSED *udata) { H5FA__test_ctx_t *ctx; /* Context for callbacks */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -252,7 +252,7 @@ H5FA__test_decode(const void *_raw, void *_elmt, size_t nelmts, void H5_ATTR_UNU #ifndef NDEBUG H5FA__test_ctx_t *ctx = (H5FA__test_ctx_t *)_ctx; /* Callback context to destroy */ #endif - uint64_t * elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */ + uint64_t *elmt = (uint64_t *)_elmt; /* Convenience pointer to native elements */ const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */ FUNC_ENTER_PACKAGE_NOERR @@ -327,7 +327,7 @@ static void * H5FA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_addr) { H5FA__test_ctx_t *ctx; /* Context for callbacks */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -259,7 +259,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 */ @@ -721,13 +721,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 */ H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ - 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 20bb5f2..dd47e39 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -51,7 +51,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 */ @@ -91,7 +91,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 */ @@ -131,7 +131,7 @@ static herr_t H5FD__core_add_dirty_region(H5FD_core_t *file, haddr_t start, had 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 herr_t H5FD__core_term(void); -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); @@ -525,7 +525,7 @@ H5FD__core_term(void) herr_t H5Pset_core_write_tracking(hid_t plist_id, hbool_t is_enabled, size_t page_size) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5FD_core_fapl_t fa; /* Core VFD info */ const H5FD_core_fapl_t *old_fa; /* Old core VFD info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -576,7 +576,7 @@ done: herr_t H5Pget_core_write_tracking(hid_t plist_id, hbool_t *is_enabled /*out*/, size_t *page_size /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_core_fapl_t *fa; /* Core VFD info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -618,7 +618,7 @@ done: herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5FD_core_fapl_t fa; /* Core VFD info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -659,7 +659,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; /* Core VFD info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -698,9 +698,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; /* Core VFD info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -738,16 +738,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_PACKAGE @@ -1739,7 +1739,7 @@ static herr_t H5FD__core_delete(const char *filename, hid_t fapl_id) { const H5FD_core_fapl_t *fa = NULL; - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5FDdevelop.h b/src/H5FDdevelop.h index 50eae1f..db29c87 100644 --- a/src/H5FDdevelop.h +++ b/src/H5FDdevelop.h @@ -165,7 +165,7 @@ typedef struct H5FD_t H5FD_t; typedef struct H5FD_class_t { unsigned version; /**< File driver class struct version # */ H5FD_class_value_t value; - const char * name; + const char *name; haddr_t maxaddr; H5F_close_degree_t fc_degree; herr_t (*terminate)(void); @@ -252,11 +252,11 @@ typedef hid_t (*H5FD_init_t)(void); extern "C" { #endif -H5_DLL hid_t H5FDperform_init(H5FD_init_t op); -H5_DLL hid_t H5FDregister(const H5FD_class_t *cls); -H5_DLL htri_t H5FDis_driver_registered_by_name(const char *driver_name); -H5_DLL htri_t H5FDis_driver_registered_by_value(H5FD_class_value_t driver_value); -H5_DLL herr_t H5FDunregister(hid_t driver_id); +H5_DLL hid_t H5FDperform_init(H5FD_init_t op); +H5_DLL hid_t H5FDregister(const H5FD_class_t *cls); +H5_DLL htri_t H5FDis_driver_registered_by_name(const char *driver_name); +H5_DLL htri_t H5FDis_driver_registered_by_value(H5FD_class_value_t driver_value); +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/H5FDdirect.c b/src/H5FDdirect.c index a7ffe1b..99bf974 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -122,8 +122,8 @@ typedef struct H5FD_direct_t { static herr_t H5FD__direct_term(void); static herr_t H5FD__direct_populate_config(size_t boundary, size_t block_size, size_t cbuf_size, H5FD_direct_fapl_t *fa_out); -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); @@ -271,7 +271,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; @@ -309,7 +309,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 */ @@ -401,7 +401,7 @@ static void * H5FD__direct_fapl_get(H5FD_t *_file) { H5FD_direct_t *file = (H5FD_direct_t *)_file; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -429,7 +429,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_calloc(sizeof(H5FD_direct_fapl_t)); + H5FD_direct_fapl_t *new_fa = H5MM_calloc(sizeof(H5FD_direct_fapl_t)); FUNC_ENTER_PACKAGE_NOERR @@ -462,7 +462,7 @@ H5FD__direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad { int o_flags; int fd = (-1); - H5FD_direct_t * file = NULL; + H5FD_direct_t *file = NULL; const H5FD_direct_fapl_t *fa; H5FD_direct_fapl_t default_fa; #ifdef H5_HAVE_WIN32_API @@ -471,8 +471,8 @@ H5FD__direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad #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_PACKAGE @@ -873,7 +873,7 @@ H5FD__direct_read(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, *p2; + void *copy_buf = NULL, *p2; size_t _boundary; size_t _fbsize; size_t _cbsize; @@ -1053,8 +1053,8 @@ H5FD__direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_ 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 3107c8f..617f68b 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -63,7 +63,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 */ @@ -82,12 +82,12 @@ typedef struct H5FD_family_fapl_t { /* Private routines */ static herr_t H5FD__family_get_default_config(H5FD_family_fapl_t *fa_out); -static char * H5FD__family_get_default_printf_filename(const char *old_filename); +static char *H5FD__family_get_default_printf_filename(const char *old_filename); /* Callback prototypes */ static herr_t H5FD__family_term(void); -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*/); @@ -221,9 +221,9 @@ H5FD__family_get_default_printf_filename(const char *old_filename) const char *suffix = "-%06d"; size_t old_filename_len = 0; size_t new_filename_len = 0; - char * file_extension = NULL; - char * tmp_buffer = NULL; - char * ret_value = NULL; + char *file_extension = NULL; + char *tmp_buffer = NULL; + char *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -346,7 +346,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, H5I_INVALID_HID}; - 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); @@ -393,7 +393,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 */ @@ -436,10 +436,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_PACKAGE @@ -480,9 +480,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_PACKAGE @@ -694,11 +694,11 @@ static H5FD_t * H5FD__family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { H5FD_family_t *file = NULL; - char * memb_name = NULL, *temp = NULL; + char *memb_name = NULL, *temp = NULL; hsize_t eof = HADDR_UNDEF; hbool_t default_config = FALSE; unsigned t_flags = flags & ~H5F_ACC_CREAT; - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -726,7 +726,7 @@ H5FD__family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad default_config = TRUE; } /* end if */ else { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ const H5FD_family_fapl_t *fa; H5FD_family_fapl_t default_fa; @@ -1041,7 +1041,7 @@ H5FD__family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa) { H5FD_family_t *file = (H5FD_family_t *)_file; haddr_t addr = abs_eoa; - char * memb_name = NULL; + char *memb_name = NULL; unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1176,7 +1176,7 @@ H5FD__family_get_eof(const H5FD_t *_file, H5FD_mem_t type) 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; @@ -1221,8 +1221,8 @@ 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; @@ -1286,13 +1286,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_PACKAGE @@ -1488,14 +1488,14 @@ done: static herr_t H5FD__family_delete(const char *filename, hid_t fapl_id) { - H5P_genplist_t * plist; + H5P_genplist_t *plist; const H5FD_family_fapl_t *fa; H5FD_family_fapl_t default_fa = {0, H5I_INVALID_HID}; hbool_t default_config = FALSE; hid_t memb_fapl_id = H5I_INVALID_HID; unsigned current_member; - char * member_name = NULL; - char * temp = NULL; + char *member_name = NULL; + char *temp = NULL; herr_t delete_error = FAIL; herr_t ret_value = SUCCEED; diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 53c63f7..d81e8a5 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -236,7 +236,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]; @@ -258,8 +258,8 @@ typedef struct H5FD_hdfs_t { /* Prototypes */ static herr_t H5FD__hdfs_term(void); -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); @@ -416,8 +416,8 @@ H5FD__hdfs_handle_open(const char *path, const char *namenode_name, const int32_ 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_PACKAGE @@ -632,7 +632,7 @@ herr_t H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_dst /*out*/) { const H5FD_hdfs_fapl_t *fa_src = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -680,9 +680,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_PACKAGE @@ -720,8 +720,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_PACKAGE @@ -846,9 +846,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_PACKAGE @@ -967,7 +967,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; @@ -1242,8 +1242,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_PACKAGE_NOERR diff --git a/src/H5FDint.c b/src/H5FDint.c index 0a8b28c..d8c6203 100644 --- a/src/H5FDint.c +++ b/src/H5FDint.c @@ -756,14 +756,14 @@ H5FD__read_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uin hbool_t extend_bufs = FALSE; uint32_t i; size_t element_size; - void * buf; + void *buf; hbool_t use_vector = FALSE; haddr_t addrs_local[H5FD_LOCAL_VECTOR_LEN]; - haddr_t * addrs = addrs_local; + haddr_t *addrs = addrs_local; size_t sizes_local[H5FD_LOCAL_VECTOR_LEN]; - size_t * sizes = sizes_local; - void * vec_bufs_local[H5FD_LOCAL_VECTOR_LEN]; - void ** vec_bufs = vec_bufs_local; + size_t *sizes = sizes_local; + void *vec_bufs_local[H5FD_LOCAL_VECTOR_LEN]; + void **vec_bufs = vec_bufs_local; hsize_t file_off[H5FD_SEQ_LIST_LEN]; size_t file_len[H5FD_SEQ_LIST_LEN]; hsize_t mem_off[H5FD_SEQ_LIST_LEN]; @@ -959,7 +959,7 @@ H5FD__read_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uin /* Issue scalar read call */ if ((file->cls->read)(file, type, dxpl_id, offsets[i] + file_off[file_seq_i], io_len, (void *)((uint8_t *)buf + mem_off[mem_seq_i])) < 0) - HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "driver read request failed") + HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "driver read request failed") /* Update file sequence */ if (io_len == file_len[file_seq_i]) @@ -1077,9 +1077,9 @@ H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_s { hbool_t offsets_cooked = FALSE; hid_t mem_space_ids_local[H5FD_LOCAL_SEL_ARR_LEN]; - hid_t * mem_space_ids = mem_space_ids_local; + hid_t *mem_space_ids = mem_space_ids_local; hid_t file_space_ids_local[H5FD_LOCAL_SEL_ARR_LEN]; - hid_t * file_space_ids = file_space_ids_local; + hid_t *file_space_ids = file_space_ids_local; uint32_t num_spaces = 0; hid_t dxpl_id = H5I_INVALID_HID; /* DXPL for operation */ uint32_t i; @@ -1186,7 +1186,7 @@ H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_s */ if (H5FD__read_selection_translate(file, type, dxpl_id, count, mem_spaces, file_spaces, offsets, element_sizes, bufs) < 0) - HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "translation to vector or scalar read failed") + HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "translation to vector or scalar read failed") done: /* undo the base addr offset to the offsets array if necessary */ @@ -1241,10 +1241,10 @@ H5FD_read_selection_id(H5FD_t *file, H5FD_mem_t type, uint32_t count, hid_t mem_ void *bufs[] /* out */) { hbool_t offsets_cooked = FALSE; - H5S_t * mem_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; - H5S_t ** mem_spaces = mem_spaces_local; - H5S_t * file_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; - H5S_t ** file_spaces = file_spaces_local; + H5S_t *mem_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; + H5S_t **mem_spaces = mem_spaces_local; + H5S_t *file_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; + H5S_t **file_spaces = file_spaces_local; hid_t dxpl_id = H5I_INVALID_HID; /* DXPL for operation */ uint32_t i; herr_t ret_value = SUCCEED; /* Return value */ @@ -1399,14 +1399,14 @@ H5FD__write_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, ui hbool_t extend_bufs = FALSE; uint32_t i; size_t element_size; - const void * buf; + const void *buf; hbool_t use_vector = FALSE; haddr_t addrs_local[H5FD_LOCAL_VECTOR_LEN]; - haddr_t * addrs = addrs_local; + haddr_t *addrs = addrs_local; size_t sizes_local[H5FD_LOCAL_VECTOR_LEN]; - size_t * sizes = sizes_local; - const void * vec_bufs_local[H5FD_LOCAL_VECTOR_LEN]; - const void ** vec_bufs = vec_bufs_local; + size_t *sizes = sizes_local; + const void *vec_bufs_local[H5FD_LOCAL_VECTOR_LEN]; + const void **vec_bufs = vec_bufs_local; hsize_t file_off[H5FD_SEQ_LIST_LEN]; size_t file_len[H5FD_SEQ_LIST_LEN]; hsize_t mem_off[H5FD_SEQ_LIST_LEN]; @@ -1602,7 +1602,7 @@ H5FD__write_selection_translate(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, ui /* Issue scalar write call */ if ((file->cls->write)(file, type, dxpl_id, offsets[i] + file_off[file_seq_i], io_len, (const void *)((const uint8_t *)buf + mem_off[mem_seq_i])) < 0) - HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "driver write request failed") + HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "driver write request failed") /* Update file sequence */ if (io_len == file_len[file_seq_i]) @@ -1718,9 +1718,9 @@ H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_ { hbool_t offsets_cooked = FALSE; hid_t mem_space_ids_local[H5FD_LOCAL_SEL_ARR_LEN]; - hid_t * mem_space_ids = mem_space_ids_local; + hid_t *mem_space_ids = mem_space_ids_local; hid_t file_space_ids_local[H5FD_LOCAL_SEL_ARR_LEN]; - hid_t * file_space_ids = file_space_ids_local; + hid_t *file_space_ids = file_space_ids_local; uint32_t num_spaces = 0; hid_t dxpl_id = H5I_INVALID_HID; /* DXPL for operation */ uint32_t i; @@ -1821,7 +1821,7 @@ H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_ */ if (H5FD__write_selection_translate(file, type, dxpl_id, count, mem_spaces, file_spaces, offsets, element_sizes, bufs) < 0) - HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "translation to vector or scalar write failed") + HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "translation to vector or scalar write failed") done: /* undo the base addr offset to the offsets array if necessary */ @@ -1873,10 +1873,10 @@ H5FD_write_selection_id(H5FD_t *file, H5FD_mem_t type, uint32_t count, hid_t mem hid_t file_space_ids[], haddr_t offsets[], size_t element_sizes[], const void *bufs[]) { hbool_t offsets_cooked = FALSE; - H5S_t * mem_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; - H5S_t ** mem_spaces = mem_spaces_local; - H5S_t * file_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; - H5S_t ** file_spaces = file_spaces_local; + H5S_t *mem_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; + H5S_t **mem_spaces = mem_spaces_local; + H5S_t *file_spaces_local[H5FD_LOCAL_SEL_ARR_LEN]; + H5S_t **file_spaces = file_spaces_local; hid_t dxpl_id = H5I_INVALID_HID; /* DXPL for operation */ uint32_t i; herr_t ret_value = SUCCEED; /* Return value */ @@ -2388,9 +2388,9 @@ done: herr_t H5FD_delete(const char *filename, hid_t fapl_id) { - H5FD_class_t * driver; /* VFD for file */ + H5FD_class_t *driver; /* VFD for file */ H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -2483,7 +2483,7 @@ static int H5FD__get_driver_cb(void *obj, hid_t id, void *_op_data) { H5FD_get_driver_ud_t *op_data = (H5FD_get_driver_ud_t *)_op_data; /* User data for callback */ - H5FD_class_t * cls = (H5FD_class_t *)obj; + H5FD_class_t *cls = (H5FD_class_t *)obj; int ret_value = H5_ITER_CONT; /* Callback return value */ FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5FDlog.c b/src/H5FDlog.c index aa5db77..dc9eb4d 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -44,7 +44,7 @@ static htri_t ignore_disabled_file_locks_s = FAIL; /* 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; @@ -118,9 +118,9 @@ typedef struct H5FD_log_t { hbool_t fam_to_single; /* 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 */ @@ -130,7 +130,7 @@ typedef struct H5FD_log_t { double total_seek_time; /* Total time spent in seek operations */ double total_truncate_time; /* Total time spent in truncate 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; @@ -157,8 +157,8 @@ typedef struct H5FD_log_t { /* Prototypes */ static herr_t H5FD__log_term(void); -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); @@ -362,7 +362,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_PACKAGE_NOERR @@ -389,8 +389,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_PACKAGE @@ -467,8 +467,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 */ H5FD_log_fapl_t default_fa = H5FD_log_default_config_g; int fd = -1; /* File descriptor */ @@ -479,7 +479,7 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) H5_timer_t open_timer; /* Timer for open() call */ H5_timer_t stat_timer; /* Timer for stat() call */ h5_stat_t sb; - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1169,7 +1169,7 @@ static herr_t H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size, void *buf /*out*/) { - H5FD_log_t * file = (H5FD_log_t *)_file; + H5FD_log_t *file = (H5FD_log_t *)_file; size_t orig_size = size; /* Save the original size for later */ haddr_t orig_addr = addr; H5_timer_t read_timer; /* Timer for read operation */ @@ -1383,7 +1383,7 @@ static herr_t H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size, const void *buf) { - H5FD_log_t * file = (H5FD_log_t *)_file; + H5FD_log_t *file = (H5FD_log_t *)_file; size_t orig_size = size; /* Save the original size for later */ haddr_t orig_addr = addr; H5_timer_t write_timer; /* Timer for write operation */ diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c index 4cd0c4d..b973479 100644 --- a/src/H5FDmirror.c +++ b/src/H5FDmirror.c @@ -140,8 +140,8 @@ typedef struct H5FD_mirror_t { /* Prototypes */ static herr_t H5FD__mirror_term(void); -static void * H5FD__mirror_fapl_get(H5FD_t *_file); -static void * H5FD__mirror_fapl_copy(const void *_old_fa); +static void *H5FD__mirror_fapl_get(H5FD_t *_file); +static void *H5FD__mirror_fapl_copy(const void *_old_fa); static herr_t H5FD__mirror_fapl_free(void *_fa); static haddr_t H5FD__mirror_get_eoa(const H5FD_t *_file, H5FD_mem_t type); static herr_t H5FD__mirror_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); @@ -1106,7 +1106,7 @@ H5FD_mirror_xmit_is_xmit(const H5FD_mirror_xmit_t *xmit) static herr_t H5FD__mirror_verify_reply(H5FD_mirror_t *file) { - unsigned char * xmit_buf = NULL; + unsigned char *xmit_buf = NULL; struct H5FD_mirror_xmit_reply_t reply; ssize_t read_ret = 0; herr_t ret_value = SUCCEED; @@ -1162,9 +1162,9 @@ done: static void * H5FD__mirror_fapl_get(H5FD_t *_file) { - H5FD_mirror_t * file = (H5FD_mirror_t *)_file; + H5FD_mirror_t *file = (H5FD_mirror_t *)_file; H5FD_mirror_fapl_t *fa = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1199,8 +1199,8 @@ static void * H5FD__mirror_fapl_copy(const void *_old_fa) { const H5FD_mirror_fapl_t *old_fa = (const H5FD_mirror_fapl_t *)_old_fa; - H5FD_mirror_fapl_t * new_fa = NULL; - void * ret_value = NULL; + H5FD_mirror_fapl_t *new_fa = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1261,7 +1261,7 @@ herr_t H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_dst /*out*/) { const H5FD_mirror_fapl_t *fa_src = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -1346,11 +1346,11 @@ H5FD__mirror_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad int live_socket = -1; struct sockaddr_in target_addr; socklen_t addr_size; - unsigned char * xmit_buf = NULL; + unsigned char *xmit_buf = NULL; H5FD_mirror_fapl_t fa; - H5FD_mirror_t * file = NULL; + H5FD_mirror_t *file = NULL; H5FD_mirror_xmit_open_t *open_xmit = NULL; - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1609,8 +1609,8 @@ static herr_t H5FD__mirror_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) { H5FD_mirror_xmit_eoa_t xmit_eoa; - unsigned char * xmit_buf = NULL; - H5FD_mirror_t * file = (H5FD_mirror_t *)_file; + unsigned char *xmit_buf = NULL; + H5FD_mirror_t *file = (H5FD_mirror_t *)_file; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1718,8 +1718,8 @@ H5FD__mirror_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, const void *buf) { H5FD_mirror_xmit_write_t xmit_write; - unsigned char * xmit_buf = NULL; - H5FD_mirror_t * file = (H5FD_mirror_t *)_file; + unsigned char *xmit_buf = NULL; + H5FD_mirror_t *file = (H5FD_mirror_t *)_file; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1829,8 +1829,8 @@ static herr_t H5FD__mirror_lock(H5FD_t *_file, hbool_t rw) { H5FD_mirror_xmit_lock_t xmit_lock; - unsigned char * xmit_buf = NULL; - H5FD_mirror_t * file = (H5FD_mirror_t *)_file; + unsigned char *xmit_buf = NULL; + H5FD_mirror_t *file = (H5FD_mirror_t *)_file; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c index 80f2ead..74aedef 100644 --- a/src/H5FDmpi.c +++ b/src/H5FDmpi.c @@ -59,7 +59,7 @@ H5FD_mpi_get_rank(H5FD_t *file) const H5FD_class_t *cls; uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG; int rank = -1; - void * rank_ptr = (void *)(&rank); + void *rank_ptr = (void *)(&rank); int ret_value; FUNC_ENTER_NOAPI(FAIL) @@ -111,7 +111,7 @@ H5FD_mpi_get_size(H5FD_t *file) const H5FD_class_t *cls; uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG; int size = 0; - void * size_ptr = (void *)(&size); + void *size_ptr = (void *)(&size); int ret_value; FUNC_ENTER_NOAPI(FAIL) @@ -164,7 +164,7 @@ H5FD_mpi_get_comm(H5FD_t *file) const H5FD_class_t *cls; uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG; MPI_Comm comm = MPI_COMM_NULL; - void * comm_ptr = (void *)(&comm); + void *comm_ptr = (void *)(&comm); MPI_Comm ret_value; FUNC_ENTER_NOAPI(MPI_COMM_NULL) @@ -271,7 +271,7 @@ H5FD_mpi_get_file_sync_required(H5FD_t *file, hbool_t *file_sync_required) { const H5FD_class_t *cls; uint64_t flags = H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG; - void * file_sync_required_ptr = (void *)(&file_sync_required); + void *file_sync_required_ptr = (void *)(&file_sync_required); herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 5ada6f9..31593e3 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -261,7 +261,7 @@ hid_t H5FD_mpio_init(void) { static int H5FD_mpio_Debug_inited = 0; - char * env = NULL; + char *env = NULL; hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_NOAPI(H5I_INVALID_HID) @@ -836,7 +836,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; /* VFD File struct for new file */ + H5FD_mpio_t *file = NULL; /* VFD File struct for new file */ H5P_genplist_t *plist; /* Property list pointer */ MPI_Comm comm = MPI_COMM_NULL; /* MPI Communicator, from plist */ MPI_Info info = MPI_INFO_NULL; /* MPI Info, from plist */ @@ -1386,7 +1386,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU /* Perform collective read operation */ if (MPI_SUCCESS != (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat))) - HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code) + HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code) } /* end if */ else { #ifdef H5FDmpio_DEBUG @@ -1765,13 +1765,13 @@ H5FD__mpio_vector_build_types(uint32_t count, H5FD_mem_t types[], haddr_t addrs[ hsize_t bigio_count; /* Transition point to create derived type */ hbool_t fixed_size = FALSE; size_t size; - H5FD_mem_t * s_types = NULL; - int * mpi_block_lengths = NULL; + H5FD_mem_t *s_types = NULL; + int *mpi_block_lengths = NULL; MPI_Aint mpi_bufs_base_Aint; - MPI_Aint * mpi_bufs = NULL; - MPI_Aint * mpi_displacements = NULL; + MPI_Aint *mpi_bufs = NULL; + MPI_Aint *mpi_displacements = NULL; MPI_Datatype *sub_types = NULL; - uint8_t * sub_types_created = NULL; + uint8_t *sub_types_created = NULL; int i; int j; int mpi_code; /* MPI return code */ @@ -2119,13 +2119,13 @@ static herr_t H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], void *bufs[]) { - H5FD_mpio_t * file = (H5FD_mpio_t *)_file; + H5FD_mpio_t *file = (H5FD_mpio_t *)_file; hbool_t vector_was_sorted = TRUE; - haddr_t * s_addrs = NULL; - size_t * s_sizes = NULL; - void ** s_bufs = NULL; + haddr_t *s_addrs = NULL; + size_t *s_sizes = NULL; + void **s_bufs = NULL; char unused = 0; /* Unused, except for non-NULL pointer value */ - void * mpi_bufs_base = NULL; + void *mpi_bufs_base = NULL; MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */ hbool_t buf_type_created = FALSE; MPI_Datatype file_type = MPI_BYTE; /* MPI description of the selection in file */ @@ -2522,13 +2522,13 @@ static herr_t H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t count, H5FD_mem_t types[], haddr_t addrs[], size_t sizes[], const void *bufs[]) { - H5FD_mpio_t * file = (H5FD_mpio_t *)_file; + H5FD_mpio_t *file = (H5FD_mpio_t *)_file; hbool_t vector_was_sorted = TRUE; - haddr_t * s_addrs = NULL; - size_t * s_sizes = NULL; - const void ** s_bufs = NULL; + haddr_t *s_addrs = NULL; + size_t *s_sizes = NULL; + const void **s_bufs = NULL; char unused = 0; /* Unused, except for non-NULL pointer value */ - const void * mpi_bufs_base = NULL; + const void *mpi_bufs_base = NULL; MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */ hbool_t buf_type_created = FALSE; MPI_Datatype file_type = MPI_BYTE; /* MPI description of the selection in file */ diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index d5bbb52..5f161aa 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -104,7 +104,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; @@ -119,14 +119,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 */ @@ -148,8 +148,8 @@ static herr_t H5FD_multi_term(void); 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); @@ -420,7 +420,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_multi_fapl_t default_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*/ @@ -488,7 +488,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char static char meta_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store metadata member name */ static char - raw_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store raw data member name */ + raw_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store raw data member name */ const char *_memb_name[H5FD_MEM_NTYPES]; H5FD_mem_t _memb_map[H5FD_MEM_NTYPES]; hid_t _memb_fapl[H5FD_MEM_NTYPES]; @@ -616,7 +616,7 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c H5FD_mem_t mt, mmt; H5FD_mem_t _memb_map[H5FD_MEM_NTYPES]; hid_t _memb_fapl[H5FD_MEM_NTYPES]; - const char * _memb_name_ptrs[H5FD_MEM_NTYPES]; + const char *_memb_name_ptrs[H5FD_MEM_NTYPES]; haddr_t _memb_addr[H5FD_MEM_NTYPES]; herr_t ret_value = 0; @@ -764,9 +764,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; @@ -845,17 +845,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 */ @@ -1019,9 +1019,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 *)calloc(1, sizeof(H5FD_multi_fapl_t)); + H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)calloc(1, 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); @@ -1116,11 +1116,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); @@ -1231,7 +1231,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 */ @@ -1393,7 +1393,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; - 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); @@ -1494,7 +1494,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 */ @@ -1560,7 +1560,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type) { const H5FD_multi_t *file = (const H5FD_multi_t *)_file; haddr_t eof = 0; - 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); @@ -1649,7 +1649,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type) 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 */ @@ -1683,7 +1683,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 */ @@ -1864,7 +1864,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, 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_flush"; /* Function Name for error reporting */ @@ -1937,7 +1937,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t 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 */ @@ -1980,7 +1980,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing) static herr_t H5FD_multi_lock(H5FD_t *_file, hbool_t rw) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; int nerrors = 0; H5FD_mem_t out_mt = H5FD_MEM_DEFAULT; static const char *func = "H5FD_multi_unlock"; /* Function Name for error reporting */ @@ -2041,7 +2041,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw) static herr_t H5FD_multi_unlock(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_unlock"; /* Function Name for error reporting */ @@ -2182,7 +2182,7 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id) int nchars; const H5FD_multi_fapl_t *fa; H5FD_multi_fapl_t default_fa; - static const char * func = "H5FD_multi_delete"; /* Function Name for error reporting */ + static const char *func = "H5FD_multi_delete"; /* Function Name for error reporting */ /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -2253,7 +2253,7 @@ H5_MULTI_GCC_DIAG_ON("format-nonliteral") static herr_t H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *input, void **output) { - H5FD_multi_t * file = (H5FD_multi_t *)_file; + H5FD_multi_t *file = (H5FD_multi_t *)_file; static const char *func = "H5FD_multi_ctl"; /* Function Name for error reporting */ herr_t ret_value = 0; diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 9f0c15f..080b418 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -61,7 +61,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; @@ -110,21 +110,21 @@ struct H5S_t; struct H5F_t; union H5PL_key_t; -H5_DLL int H5FD_term_interface(void); -H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, haddr_t *sig_addr); +H5_DLL int H5FD_term_interface(void); +H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, 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_load(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_free_driver_info(hid_t driver_id, const void *driver_info); H5_DLL hid_t H5FD_register(const void *cls, size_t size, hbool_t app_ref); H5_DLL hid_t H5FD_register_driver_by_name(const char *name, hbool_t app_ref); H5_DLL hid_t H5FD_register_driver_by_value(H5FD_class_value_t value, hbool_t app_ref); H5_DLL htri_t H5FD_is_driver_registered_by_name(const char *driver_name, hid_t *registered_id); -H5_DLL htri_t H5FD_is_driver_registered_by_value(H5FD_class_value_t driver_value, hid_t *registered_id); -H5_DLL hid_t H5FD_get_driver_id_by_name(const char *name, hbool_t is_api); -H5_DLL hid_t H5FD_get_driver_id_by_value(H5FD_class_value_t value, hbool_t is_api); +H5_DLL htri_t H5FD_is_driver_registered_by_value(H5FD_class_value_t driver_value, hid_t *registered_id); +H5_DLL hid_t H5FD_get_driver_id_by_name(const char *name, hbool_t is_api); +H5_DLL hid_t H5FD_get_driver_id_by_value(H5FD_class_value_t value, hbool_t is_api); 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); diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 26863e0..eb3d4cf 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -376,7 +376,7 @@ typedef struct { */ //! <!-- [H5FD_ctl_memcpy_args_t_snip] --> typedef struct H5FD_ctl_memcpy_args_t { - void * dstbuf; /**< Destination buffer */ + void *dstbuf; /**< Destination buffer */ hsize_t dst_off; /**< Offset within destination buffer */ const void *srcbuf; /**< Source buffer */ hsize_t src_off; /**< Offset within source buffer */ diff --git a/src/H5FDros3.c b/src/H5FDros3.c index b1bb559..156da68 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]; @@ -217,8 +217,8 @@ typedef struct H5FD_ros3_t { /* Prototypes */ static herr_t H5FD__ros3_term(void); -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 H5FD_t *H5FD__ros3_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD__ros3_close(H5FD_t *_file); @@ -462,7 +462,7 @@ herr_t H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_dst /*out*/) { const H5FD_ros3_fapl_t *fa_src = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -511,9 +511,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_PACKAGE @@ -553,8 +553,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_PACKAGE @@ -687,13 +687,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_PACKAGE @@ -836,7 +836,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; @@ -1143,8 +1143,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 747aa25..1bf0a2f 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; @@ -1555,7 +1555,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() */ @@ -1933,7 +1933,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_PACKAGE @@ -2050,7 +2050,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; @@ -2196,8 +2196,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; @@ -2559,7 +2559,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 c4dc100..944ade6 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -309,7 +309,7 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr #endif h5_stat_t sb; H5P_genplist_t *plist; /* Property list pointer */ - H5FD_t * ret_value = NULL; /* Return value */ + H5FD_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c index 48de4e6..faf5d29 100644 --- a/src/H5FDsplitter.c +++ b/src/H5FDsplitter.c @@ -46,9 +46,9 @@ typedef struct H5FD_splitter_t { H5FD_t pub; /* public stuff, must be first */ unsigned version; /* version of the H5FD_splitter_vfd_config_t structure used */ H5FD_splitter_fapl_t fa; /* driver-specific file access properties */ - H5FD_t * rw_file; /* pointer of R/W channel */ - H5FD_t * wo_file; /* pointer of W/O channel */ - FILE * logfp; /* Log file pointer */ + H5FD_t *rw_file; /* pointer of R/W channel */ + H5FD_t *wo_file; /* pointer of W/O channel */ + FILE *logfp; /* Log file pointer */ } H5FD_splitter_t; /* @@ -105,14 +105,14 @@ static int H5FD__copy_plist(hid_t fapl_id, hid_t *id_out_ptr); /* Prototypes */ static herr_t H5FD__splitter_term(void); static herr_t H5FD__splitter_populate_config(H5FD_splitter_vfd_config_t *vfd_config, - H5FD_splitter_fapl_t * fapl_out); + H5FD_splitter_fapl_t *fapl_out); static herr_t H5FD__splitter_get_default_wo_path(char *new_path, size_t new_path_len, const char *base_filename); static hsize_t H5FD__splitter_sb_size(H5FD_t *_file); static herr_t H5FD__splitter_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/); static herr_t H5FD__splitter_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf); -static void * H5FD__splitter_fapl_get(H5FD_t *_file); -static void * H5FD__splitter_fapl_copy(const void *_old_fa); +static void *H5FD__splitter_fapl_get(H5FD_t *_file); +static void *H5FD__splitter_fapl_copy(const void *_old_fa); static herr_t H5FD__splitter_fapl_free(void *_fapl); static H5FD_t *H5FD__splitter_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD__splitter_close(H5FD_t *_file); @@ -283,7 +283,7 @@ herr_t H5Pset_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *vfd_config) { H5FD_splitter_fapl_t *info = NULL; - H5P_genplist_t * plist_ptr = NULL; + H5P_genplist_t *plist_ptr = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -330,8 +330,8 @@ herr_t H5Pget_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *config /*out*/) { const H5FD_splitter_fapl_t *fapl_ptr = NULL; - H5FD_splitter_fapl_t * default_fapl = NULL; - H5P_genplist_t * plist_ptr = NULL; + H5FD_splitter_fapl_t *default_fapl = NULL; + H5P_genplist_t *plist_ptr = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -428,9 +428,9 @@ H5FD__splitter_populate_config(H5FD_splitter_vfd_config_t *vfd_config, H5FD_spli * determining attribute. */ if (H5P_DEFAULT != vfd_config->wo_fapl_id) { - H5FD_class_t * wo_driver = NULL; + H5FD_class_t *wo_driver = NULL; H5FD_driver_prop_t wo_driver_prop; - H5P_genplist_t * wo_plist_ptr = NULL; + H5P_genplist_t *wo_plist_ptr = NULL; unsigned long wo_driver_flags = 0; wo_plist_ptr = (H5P_genplist_t *)H5I_object(vfd_config->wo_fapl_id); @@ -518,7 +518,7 @@ H5FD__splitter_get_default_wo_path(char *new_path, size_t new_path_len, const ch { const char *suffix = "_wo"; size_t old_filename_len = 0; - char * file_extension = NULL; + char *file_extension = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -645,7 +645,7 @@ H5FD__splitter_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr const void *buf) { H5FD_splitter_t *file = (H5FD_splitter_t *)_file; - H5P_genplist_t * plist_ptr = NULL; + H5P_genplist_t *plist_ptr = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -682,7 +682,7 @@ static void * H5FD__splitter_fapl_get(H5FD_t *_file) { H5FD_splitter_t *file = (H5FD_splitter_t *)_file; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE_NOERR @@ -706,8 +706,8 @@ static void * H5FD__splitter_fapl_copy(const void *_old_fa) { const H5FD_splitter_fapl_t *old_fa_ptr = (const H5FD_splitter_fapl_t *)_old_fa; - H5FD_splitter_fapl_t * new_fa_ptr = NULL; - void * ret_value = NULL; + H5FD_splitter_fapl_t *new_fa_ptr = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -786,11 +786,11 @@ done: static H5FD_t * H5FD__splitter_open(const char *name, unsigned flags, hid_t splitter_fapl_id, haddr_t maxaddr) { - H5FD_splitter_t * file_ptr = NULL; /* Splitter VFD info */ + H5FD_splitter_t *file_ptr = NULL; /* Splitter VFD info */ const H5FD_splitter_fapl_t *fapl_ptr = NULL; /* Driver-specific property list */ - H5FD_splitter_fapl_t * default_fapl = NULL; - H5P_genplist_t * plist_ptr = NULL; - H5FD_t * ret_value = NULL; + H5FD_splitter_fapl_t *default_fapl = NULL; + H5P_genplist_t *plist_ptr = NULL; + H5FD_t *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -1493,8 +1493,8 @@ static herr_t H5FD__splitter_delete(const char *filename, hid_t fapl_id) { const H5FD_splitter_fapl_t *fapl_ptr = NULL; - H5FD_splitter_fapl_t * default_fapl = NULL; - H5P_genplist_t * plist; + H5FD_splitter_fapl_t *default_fapl = NULL; + H5P_genplist_t *plist; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1572,7 +1572,7 @@ H5FD__splitter_log_error(const H5FD_splitter_t *file, const char *atfunc, const if (file->logfp != NULL) { size_t size; - char * s; + char *s; size = HDstrlen(atfunc) + HDstrlen(msg) + 3; /* ':', ' ', '\n' */ s = (char *)H5MM_malloc(sizeof(char) * (size + 1)); diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index c5aa006..19f7f41 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -79,7 +79,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 */ @@ -341,9 +341,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; @@ -498,7 +498,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 */ @@ -767,7 +767,7 @@ H5FD_stdio_get_eof(const H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type) static herr_t H5FD_stdio_get_handle(H5FD_t *_file, hid_t /*UNUSED*/ 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 */ @@ -805,7 +805,7 @@ static herr_t H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl_id, haddr_t addr, size_t size, void /*OUT*/ *buf) { - 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 */ @@ -908,7 +908,7 @@ static herr_t H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ 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 */ @@ -995,7 +995,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp static herr_t H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ 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_flush"; /* Function Name for error reporting */ /* Quiet the compiler */ @@ -1039,7 +1039,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t closing) static herr_t H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t /*UNUSED*/ 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 */ @@ -1130,7 +1130,7 @@ static herr_t H5FD_stdio_lock(H5FD_t *_file, hbool_t rw) { #ifdef H5_HAVE_FLOCK - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; /* VFD file struct */ + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */ int lock_flags; /* file locking flags */ static const char *func = "H5FD_stdio_lock"; /* Function Name for error reporting */ @@ -1181,7 +1181,7 @@ static herr_t H5FD_stdio_unlock(H5FD_t *_file) { #ifdef H5_HAVE_FLOCK - H5FD_stdio_t * file = (H5FD_stdio_t *)_file; /* VFD file struct */ + H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */ static const char *func = "H5FD_stdio_unlock"; /* Function Name for error reporting */ /* Clear the error stack */ diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c index 8017cc0..2eb7970 100644 --- a/src/H5FDsubfiling/H5FDioc.c +++ b/src/H5FDsubfiling/H5FDioc.c @@ -129,8 +129,8 @@ static herr_t H5FD__ioc_term(void); static hsize_t H5FD__ioc_sb_size(H5FD_t *_file); static herr_t H5FD__ioc_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/); static herr_t H5FD__ioc_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf); -static void * H5FD__ioc_fapl_get(H5FD_t *_file); -static void * H5FD__ioc_fapl_copy(const void *_old_fa); +static void *H5FD__ioc_fapl_get(H5FD_t *_file); +static void *H5FD__ioc_fapl_copy(const void *_old_fa); static herr_t H5FD__ioc_fapl_free(void *_fapl); static H5FD_t *H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD__ioc_close(H5FD_t *_file); @@ -349,7 +349,7 @@ herr_t H5Pset_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *vfd_config) { H5FD_ioc_config_t *ioc_conf = NULL; - H5P_genplist_t * plist_ptr = NULL; + H5P_genplist_t *plist_ptr = NULL; herr_t ret_value = SUCCEED; H5FD_IOC_LOG_CALL(__func__); @@ -401,7 +401,7 @@ herr_t H5Pget_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *config_out) { const H5FD_ioc_config_t *config_ptr = NULL; - H5P_genplist_t * plist_ptr = NULL; + H5P_genplist_t *plist_ptr = NULL; hbool_t use_default_config = FALSE; herr_t ret_value = SUCCEED; @@ -626,7 +626,7 @@ static void * H5FD__ioc_fapl_get(H5FD_t *_file) { H5FD_ioc_t *file = (H5FD_ioc_t *)_file; - void * ret_value = NULL; + void *ret_value = NULL; H5FD_IOC_LOG_CALL(__func__); @@ -682,8 +682,8 @@ static void * H5FD__ioc_fapl_copy(const void *_old_fa) { const H5FD_ioc_config_t *old_fa_ptr = (const H5FD_ioc_config_t *)_old_fa; - H5FD_ioc_config_t * new_fa_ptr = NULL; - void * ret_value = NULL; + H5FD_ioc_config_t *new_fa_ptr = NULL; + void *ret_value = NULL; H5FD_IOC_LOG_CALL(__func__); @@ -752,15 +752,15 @@ done: static H5FD_t * H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_ioc_t * file_ptr = NULL; /* Ioc VFD info */ + H5FD_ioc_t *file_ptr = NULL; /* Ioc VFD info */ const H5FD_ioc_config_t *config_ptr = NULL; /* Driver-specific property list */ H5FD_ioc_config_t default_config; - H5FD_class_t * driver = NULL; /* VFD for file */ - H5P_genplist_t * plist_ptr = NULL; + H5FD_class_t *driver = NULL; /* VFD for file */ + H5P_genplist_t *plist_ptr = NULL; H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ int mpi_inited = 0; int mpi_code; /* MPI return code */ - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; H5FD_IOC_LOG_CALL(__func__); @@ -884,7 +884,7 @@ H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) file_ptr->ioc_file = H5FD_open(file_ptr->file_path, flags, config_ptr->ioc_fapl_id, HADDR_UNDEF); if (file_ptr->ioc_file) { h5_stat_t sb; - void * file_handle = NULL; + void *file_handle = NULL; if (file_ptr->mpi_rank == 0) { if (H5FDget_vfd_handle(file_ptr->ioc_file, config_ptr->ioc_fapl_id, &file_handle) < 0) @@ -1286,7 +1286,7 @@ done: static haddr_t H5FD__ioc_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type) { - const H5FD_ioc_t * file = (const H5FD_ioc_t *)_file; + const H5FD_ioc_t *file = (const H5FD_ioc_t *)_file; haddr_t ret_value = HADDR_UNDEF; /* Return value */ subfiling_context_t *sf_context = NULL; @@ -1628,9 +1628,9 @@ H5FD__ioc_write_vector_internal(H5FD_t *_file, uint32_t count, H5FD_mem_t types[ size_t sizes[], const void *bufs[] /* in */) { subfiling_context_t *sf_context = NULL; - MPI_Request * active_reqs = NULL; - H5FD_ioc_t * file_ptr = (H5FD_ioc_t *)_file; - io_req_t ** sf_async_reqs = NULL; + MPI_Request *active_reqs = NULL; + H5FD_ioc_t *file_ptr = (H5FD_ioc_t *)_file; + io_req_t **sf_async_reqs = NULL; int64_t sf_context_id = -1; herr_t ret_value = SUCCEED; struct __mpi_req { @@ -1732,9 +1732,9 @@ H5FD__ioc_read_vector_internal(H5FD_t *_file, uint32_t count, haddr_t addrs[], s void *bufs[] /* out */) { subfiling_context_t *sf_context = NULL; - MPI_Request * active_reqs = NULL; - H5FD_ioc_t * file_ptr = (H5FD_ioc_t *)_file; - io_req_t ** sf_async_reqs = NULL; + MPI_Request *active_reqs = NULL; + H5FD_ioc_t *file_ptr = (H5FD_ioc_t *)_file; + io_req_t **sf_async_reqs = NULL; int64_t sf_context_id = -1; herr_t ret_value = SUCCEED; struct __mpi_req { diff --git a/src/H5FDsubfiling/H5FDioc_int.c b/src/H5FDsubfiling/H5FDioc_int.c index c1ce669..71afef4 100644 --- a/src/H5FDsubfiling/H5FDioc_int.c +++ b/src/H5FDsubfiling/H5FDioc_int.c @@ -51,7 +51,7 @@ cast_to_void(const void *data) { union { const void *const_ptr_to_data; - void * ptr_to_data; + void *ptr_to_data; } eliminate_const_warning; eliminate_const_warning.const_ptr_to_data = data; return eliminate_const_warning.ptr_to_data; @@ -95,11 +95,11 @@ ioc__write_independent_async(int64_t context_id, int n_io_concentrators, int64_t { subfiling_context_t *sf_context = NULL; MPI_Request ack_request = MPI_REQUEST_NULL; - io_req_t * sf_io_request = NULL; + io_req_t *sf_io_request = NULL; int64_t ioc_start; int64_t ioc_offset; int64_t msg[3] = {0}; - int * io_concentrators = NULL; + int *io_concentrators = NULL; int data_tag = 0; int mpi_code; herr_t ret_value = SUCCEED; @@ -245,11 +245,11 @@ ioc__read_independent_async(int64_t context_id, int n_io_concentrators, int64_t void *data, io_req_t **io_req) { subfiling_context_t *sf_context = NULL; - io_req_t * sf_io_request = NULL; + io_req_t *sf_io_request = NULL; int64_t ioc_start; int64_t ioc_offset; int64_t msg[3] = {0}; - int * io_concentrators = NULL; + int *io_concentrators = NULL; int mpi_code; herr_t ret_value = SUCCEED; diff --git a/src/H5FDsubfiling/H5FDioc_priv.h b/src/H5FDsubfiling/H5FDioc_priv.h index 07eb124..7ad7acc 100644 --- a/src/H5FDsubfiling/H5FDioc_priv.h +++ b/src/H5FDsubfiling/H5FDioc_priv.h @@ -400,7 +400,7 @@ typedef struct _client_io_args { int64_t context_id; /* The context id provided for the read or write */ int64_t offset; /* The file offset for the IO operation */ int64_t elements; /* How many bytes */ - void * data; /* A pointer to the (contiguous) data segment */ + void *data; /* A pointer to the (contiguous) data segment */ MPI_Request io_req; /* An MPI request to allow the code to loop while */ /* making progress on multiple IOs */ } io_args_t; diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c index 0d620b5..2d50503 100644 --- a/src/H5FDsubfiling/H5FDioc_threads.c +++ b/src/H5FDsubfiling/H5FDioc_threads.c @@ -117,9 +117,9 @@ int initialize_ioc_threads(void *_sf_context) { subfiling_context_t *sf_context = _sf_context; - ioc_data_t * ioc_data = NULL; + ioc_data_t *ioc_data = NULL; unsigned thread_pool_count = HG_TEST_NUM_THREADS_DEFAULT; - char * env_value; + char *env_value; int ret_value = 0; #ifdef H5FD_IOC_COLLECT_STATS double t_start = 0.0, t_end = 0.0; @@ -218,7 +218,7 @@ int finalize_ioc_threads(void *_sf_context) { subfiling_context_t *sf_context = _sf_context; - ioc_data_t * ioc_data = NULL; + ioc_data_t *ioc_data = NULL; int ret_value = 0; HDassert(sf_context); @@ -273,7 +273,7 @@ static HG_THREAD_RETURN_TYPE ioc_thread_main(void *arg) { hg_thread_ret_t thread_ret = (hg_thread_ret_t)0; - ioc_data_t * ioc_data = (ioc_data_t *)arg; + ioc_data_t *ioc_data = (ioc_data_t *)arg; /* Pass along the ioc_data_t */ ioc_main(ioc_data); @@ -506,9 +506,9 @@ static HG_THREAD_RETURN_TYPE handle_work_request(void *arg) { ioc_io_queue_entry_t *q_entry_ptr = (ioc_io_queue_entry_t *)arg; - subfiling_context_t * sf_context = NULL; - sf_work_request_t * msg = &(q_entry_ptr->wk_req); - ioc_data_t * ioc_data = NULL; + subfiling_context_t *sf_context = NULL; + sf_work_request_t *msg = &(q_entry_ptr->wk_req); + ioc_data_t *ioc_data = NULL; int64_t file_context_id = msg->header[2]; int op_ret; hg_thread_ret_t ret_value = 0; @@ -1000,7 +1000,7 @@ ioc_file_write_data(int fd, int64_t file_offset, void *data_buffer, int64_t data { ssize_t bytes_remaining = (ssize_t)data_size; ssize_t bytes_written = 0; - char * this_data = (char *)data_buffer; + char *this_data = (char *)data_buffer; int ret_value = 0; #ifndef H5FD_IOC_DEBUG @@ -1047,7 +1047,7 @@ ioc_file_read_data(int fd, int64_t file_offset, void *data_buffer, int64_t data_ useconds_t delay = 100; ssize_t bytes_remaining = (ssize_t)data_size; ssize_t bytes_read = 0; - char * this_buffer = (char *)data_buffer; + char *this_buffer = (char *)data_buffer; int retries = MIN_READ_RETRIES; int ret_value = 0; diff --git a/src/H5FDsubfiling/H5FDsubfile_int.c b/src/H5FDsubfiling/H5FDsubfile_int.c index 577762a..af14db3 100644 --- a/src/H5FDsubfiling/H5FDsubfile_int.c +++ b/src/H5FDsubfiling/H5FDsubfile_int.c @@ -204,9 +204,9 @@ herr_t H5FD__subfiling__get_real_eof(hid_t context_id, int64_t *logical_eof_ptr) { subfiling_context_t *sf_context = NULL; - MPI_Request * recv_reqs = NULL; - int64_t * recv_msg = NULL; - int64_t * sf_eofs = NULL; /* dynamically allocated array for subfile EOFs */ + MPI_Request *recv_reqs = NULL; + int64_t *recv_msg = NULL; + int64_t *sf_eofs = NULL; /* dynamically allocated array for subfile EOFs */ int64_t msg[3] = {0, 0, 0}; int64_t logical_eof = 0; int64_t sf_logical_eof; diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 32ac6a8..2b436fe 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -189,8 +189,8 @@ typedef struct H5FD_subfiling_t { /* Prototypes */ static herr_t H5FD__subfiling_term(void); -static void * H5FD__subfiling_fapl_get(H5FD_t *_file); -static void * H5FD__subfiling_fapl_copy(const void *_old_fa); +static void *H5FD__subfiling_fapl_get(H5FD_t *_file); +static void *H5FD__subfiling_fapl_copy(const void *_old_fa); static herr_t H5FD__subfiling_fapl_free(void *_fa); static H5FD_t *H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr); static herr_t H5FD__subfiling_close(H5FD_t *_file); @@ -460,7 +460,7 @@ herr_t H5Pset_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *vfd_config) { H5FD_subfiling_config_t *subfiling_conf = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; /*NO TRACE*/ @@ -514,7 +514,7 @@ herr_t H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out) { const H5FD_subfiling_config_t *config_ptr = NULL; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; hbool_t use_default_config = FALSE; herr_t ret_value = SUCCEED; @@ -557,7 +557,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi { MPI_Comm comm = MPI_COMM_NULL; MPI_Info info = MPI_INFO_NULL; - char * h5_require_ioc; + char *h5_require_ioc; herr_t ret_value = SUCCEED; HDassert(config_out); @@ -676,9 +676,9 @@ done: static void * H5FD__subfiling_fapl_get(H5FD_t *_file) { - H5FD_subfiling_t * file = (H5FD_subfiling_t *)_file; + H5FD_subfiling_t *file = (H5FD_subfiling_t *)_file; H5FD_subfiling_config_t *fa = NULL; - void * ret_value = NULL; + void *ret_value = NULL; fa = (H5FD_subfiling_config_t *)H5MM_calloc(sizeof(H5FD_subfiling_config_t)); @@ -762,8 +762,8 @@ static void * H5FD__subfiling_fapl_copy(const void *_old_fa) { const H5FD_subfiling_config_t *old_fa = (const H5FD_subfiling_config_t *)_old_fa; - H5FD_subfiling_config_t * new_fa = NULL; - void * ret_value = NULL; + H5FD_subfiling_config_t *new_fa = NULL; + void *ret_value = NULL; new_fa = (H5FD_subfiling_config_t *)H5MM_malloc(sizeof(H5FD_subfiling_config_t)); if (new_fa == NULL) { @@ -836,17 +836,17 @@ H5FD__subfiling_fapl_free(void *_fa) static H5FD_t * H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { - H5FD_subfiling_t * file_ptr = NULL; /* Subfiling VFD info */ + H5FD_subfiling_t *file_ptr = NULL; /* Subfiling VFD info */ const H5FD_subfiling_config_t *config_ptr = NULL; /* Driver-specific property list */ H5FD_subfiling_config_t default_config; - H5FD_class_t * driver = NULL; /* VFD for file */ - H5P_genplist_t * plist_ptr = NULL; + H5FD_class_t *driver = NULL; /* VFD for file */ + H5P_genplist_t *plist_ptr = NULL; H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ hbool_t bcasted_inode = FALSE; hbool_t bcasted_eof = FALSE; int64_t sf_eof = -1; int mpi_code; /* MPI return code */ - H5FD_t * ret_value = NULL; + H5FD_t *ret_value = NULL; /* Check arguments */ if (!name || !*name) @@ -961,7 +961,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma if (driver->value == H5_VFD_IOC) { h5_stat_t sb; uint64_t fid; - void * file_handle = NULL; + void *file_handle = NULL; if (file_ptr->mpi_rank == 0) { if (H5FDget_vfd_handle(file_ptr->sf_file, file_ptr->fa.ioc_fapl_id, &file_handle) < 0) @@ -1000,7 +1000,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma if (file_ptr->mpi_rank == 0) { if (file_ptr->sf_file) { h5_stat_t sb; - void * file_handle = NULL; + void *file_handle = NULL; if (H5FDget_vfd_handle(file_ptr->sf_file, file_ptr->fa.ioc_fapl_id, &file_handle) < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get file handle"); @@ -1419,14 +1419,14 @@ H5FD__subfiling_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr void *buf /*out*/) { subfiling_context_t *sf_context = NULL; - H5FD_subfiling_t * file_ptr = (H5FD_subfiling_t *)_file; - H5FD_mem_t * io_types = NULL; - haddr_t * io_addrs = NULL; - size_t * io_sizes = NULL; - void ** io_bufs = NULL; - int64_t * source_data_offset = NULL; - int64_t * sf_data_size = NULL; - int64_t * sf_offset = NULL; + H5FD_subfiling_t *file_ptr = (H5FD_subfiling_t *)_file; + H5FD_mem_t *io_types = NULL; + haddr_t *io_addrs = NULL; + size_t *io_sizes = NULL; + void **io_bufs = NULL; + int64_t *source_data_offset = NULL; + int64_t *sf_data_size = NULL; + int64_t *sf_offset = NULL; hbool_t rank0_bcast = FALSE; int ioc_total; herr_t ret_value = SUCCEED; @@ -1688,14 +1688,14 @@ H5FD__subfiling_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t add const void *buf /*in*/) { subfiling_context_t *sf_context = NULL; - H5FD_subfiling_t * file_ptr = (H5FD_subfiling_t *)_file; - const void ** io_bufs = NULL; - H5FD_mem_t * io_types = NULL; - haddr_t * io_addrs = NULL; - size_t * io_sizes = NULL; - int64_t * source_data_offset = NULL; - int64_t * sf_data_size = NULL; - int64_t * sf_offset = NULL; + H5FD_subfiling_t *file_ptr = (H5FD_subfiling_t *)_file; + const void **io_bufs = NULL; + H5FD_mem_t *io_types = NULL; + haddr_t *io_addrs = NULL; + size_t *io_sizes = NULL; + int64_t *source_data_offset = NULL; + int64_t *sf_data_size = NULL; + int64_t *sf_offset = NULL; int ioc_total; herr_t ret_value = SUCCEED; @@ -2421,7 +2421,7 @@ H5FD__subfiling_del(const char *name, hid_t fapl) { const H5FD_subfiling_config_t *subfiling_config = NULL; H5FD_subfiling_config_t default_config; - H5P_genplist_t * plist = NULL; + H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; if (NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS))) diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c index 980a1b3..25e80fb 100644 --- a/src/H5FDsubfiling/H5subfiling_common.c +++ b/src/H5FDsubfiling/H5subfiling_common.c @@ -50,7 +50,7 @@ char H5subfiling_mpi_error_str[MPI_MAX_ERROR_STRING]; int H5subfiling_mpi_error_str_len; static subfiling_context_t *sf_context_cache = NULL; -static sf_topology_t * sf_topology_cache = NULL; +static sf_topology_t *sf_topology_cache = NULL; static size_t sf_context_cache_limit = 16; static size_t sf_topology_cache_limit = 4; @@ -105,7 +105,7 @@ static int get_next_fid_map_index(void); static void clear_fid_map_entry(uint64_t sf_fid, int64_t sf_context_id); static int compare_hostid(const void *h1, const void *h2); static herr_t get_ioc_selection_criteria_from_env(ioc_selection_t *ioc_selection_type, - char ** ioc_sel_info_str); + char **ioc_sel_info_str); static int count_nodes(sf_topology_t *info, MPI_Comm comm); static herr_t gather_topology_info(sf_topology_t *info, MPI_Comm comm); static int identify_ioc_ranks(sf_topology_t *info, int node_count, int iocs_per_node); @@ -549,7 +549,7 @@ static inline void assign_ioc_ranks(sf_topology_t *app_topology, int ioc_count, int rank_multiple) { app_layout_t *app_layout = NULL; - int * io_concentrators = NULL; + int *io_concentrators = NULL; HDassert(app_topology); HDassert(app_topology->app_layout); @@ -667,7 +667,7 @@ H5_get_subfiling_object(int64_t object_id) /* Make more space in context cache if needed */ if ((size_t)obj_index == sf_context_cache_limit) { size_t old_num_entries; - void * tmp_realloc; + void *tmp_realloc; old_num_entries = sf_context_cache_limit; @@ -1095,7 +1095,7 @@ static herr_t init_subfiling(ioc_selection_t ioc_selection_type, MPI_Comm comm, int64_t *context_id_out) { subfiling_context_t *new_context = NULL; - sf_topology_t * app_topology = NULL; + sf_topology_t *app_topology = NULL; int64_t context_id = -1; int file_index = -1; herr_t ret_value = SUCCEED; @@ -1210,10 +1210,10 @@ static herr_t init_app_topology(ioc_selection_t ioc_selection_type, MPI_Comm comm, sf_topology_t **app_topology_out) { sf_topology_t *app_topology = NULL; - app_layout_t * app_layout = sf_app_layout; - char * env_value = NULL; - char * ioc_sel_str = NULL; - int * io_concentrators = NULL; + app_layout_t *app_layout = sf_app_layout; + char *env_value = NULL; + char *ioc_sel_str = NULL; + int *io_concentrators = NULL; long ioc_select_val = -1; long iocs_per_node = 1; int ioc_count = 0; @@ -1511,7 +1511,7 @@ done: static herr_t init_subfiling_context(subfiling_context_t *sf_context, sf_topology_t *app_topology, MPI_Comm file_comm) { - char * env_value = NULL; + char *env_value = NULL; int comm_rank; int mpi_code; herr_t ret_value = SUCCEED; @@ -1959,9 +1959,9 @@ ioc_open_file(sf_work_request_t *msg, int file_acc_flags) int64_t file_context_id; hbool_t mutex_locked = FALSE; mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; - char * filepath = NULL; - char * subfile_dir = NULL; - char * base = NULL; + char *filepath = NULL; + char *subfile_dir = NULL; + char *base = NULL; int fd = -1; herr_t ret_value = SUCCEED; @@ -2073,11 +2073,11 @@ static herr_t generate_subfile_name(subfiling_context_t *sf_context, int file_acc_flags, char *filename_out, size_t filename_out_len, char **filename_basename_out, char **subfile_dir_out) { - FILE * config_file = NULL; - char * config_buf = NULL; - char * subfile_dir = NULL; - char * prefix = NULL; - char * base = NULL; + FILE *config_file = NULL; + char *config_buf = NULL; + char *subfile_dir = NULL; + char *prefix = NULL; + char *base = NULL; int n_io_concentrators; int num_digits; herr_t ret_value = SUCCEED; @@ -2323,9 +2323,9 @@ create_config_file(subfiling_context_t *sf_context, const char *base_filename, c hbool_t truncate_if_exists) { hbool_t config_file_exists = FALSE; - FILE * config_file = NULL; - char * config_filename = NULL; - char * line_buf = NULL; + FILE *config_file = NULL; + char *config_filename = NULL; + char *line_buf = NULL; int ret = 0; herr_t ret_value = SUCCEED; @@ -2505,8 +2505,8 @@ open_config_file(subfiling_context_t *sf_context, const char *base_filename, con const char *mode, FILE **config_file_out) { hbool_t config_file_exists = FALSE; - FILE * config_file = NULL; - char * config_filename = NULL; + FILE *config_file = NULL; + char *config_filename = NULL; int ret = 0; herr_t ret_value = SUCCEED; diff --git a/src/H5FDsubfiling/H5subfiling_common.h b/src/H5FDsubfiling/H5subfiling_common.h index cfcbf4a..19c5c0c 100644 --- a/src/H5FDsubfiling/H5subfiling_common.h +++ b/src/H5FDsubfiling/H5subfiling_common.h @@ -156,7 +156,7 @@ typedef struct { typedef struct app_layout_t { long hostid; /* value returned by gethostid() */ layout_t *layout; /* Vector of {rank,hostid} values */ - int * node_ranks; /* ranks extracted from sorted layout */ + int *node_ranks; /* ranks extracted from sorted layout */ int node_count; /* Total nodes (different hostids) */ int node_index; /* My node: index into node_ranks */ int local_peers; /* How may local peers on my node */ @@ -166,12 +166,12 @@ typedef struct app_layout_t { /* This typedef defines things related to IOC selections */ typedef struct topology { - app_layout_t * app_layout; /* Pointer to our layout struct */ + app_layout_t *app_layout; /* Pointer to our layout struct */ bool rank_is_ioc; /* Indicates that we host an IOC */ int subfile_rank; /* Valid only if rank_is_ioc */ int n_io_concentrators; /* Number of IO concentrators */ - int * io_concentrators; /* Vector of ranks which are IOCs */ - int * subfile_fd; /* file descriptor (if IOC) */ + int *io_concentrators; /* Vector of ranks which are IOCs */ + int *subfile_fd; /* file descriptor (if IOC) */ ioc_selection_t selection_type; /* Cache our IOC selection criteria */ } sf_topology_t; @@ -194,10 +194,10 @@ typedef struct { int sf_group_size; /* IOC count (in sf_group_comm) */ int sf_group_rank; /* IOC rank (in sf_group_comm) */ int sf_intercomm_root; /* Not used: for IOC comms */ - char * subfile_prefix; /* If subfiles are node-local */ - char * sf_filename; /* A generated subfile name */ - char * h5_filename; /* The user supplied file name */ - void * ioc_data; /* Private data for underlying IOC */ + char *subfile_prefix; /* If subfiles are node-local */ + char *sf_filename; /* A generated subfile name */ + char *h5_filename; /* The user supplied file name */ + void *ioc_data; /* Private data for underlying IOC */ sf_topology_t *topology; /* pointer to our topology */ #ifdef H5_SUBFILING_DEBUG @@ -242,7 +242,7 @@ H5_DLL herr_t H5_open_subfiles(const char *base_filename, uint64_t h5_file_id, H5_DLL herr_t H5_close_subfiles(int64_t subfiling_context_id); H5_DLL int64_t H5_new_subfiling_object_id(sf_obj_type_t obj_type, int64_t index_val); -H5_DLL void * H5_get_subfiling_object(int64_t object_id); +H5_DLL void *H5_get_subfiling_object(int64_t object_id); H5_DLL int64_t H5_subfile_fid_to_context(uint64_t h5_fid); H5_DLL herr_t H5_free_subfiling_object(int64_t object_id); diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c index 7dd5104..2589795 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c +++ b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.c @@ -37,7 +37,7 @@ struct hg_dlog * hg_dlog_alloc(char *name, unsigned int lesize, int leloop) { struct hg_dlog_entry *le; - struct hg_dlog * d; + struct hg_dlog *d; le = malloc(sizeof(*le) * lesize); if (!le) @@ -249,7 +249,7 @@ hg_dlog_dump_file(struct hg_dlog *d, const char *base, int addpid, int trylock) { char buf[2048]; int pid; - FILE * fp = NULL; + FILE *fp = NULL; unsigned int left, idx; struct hg_dlog_dcount32 *dc32; struct hg_dlog_dcount64 *dc64; diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h index 0027fde..81182f5 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_dlog.h @@ -49,11 +49,11 @@ * hg_dlog_entry: an entry in the dlog */ struct hg_dlog_entry { - const char * file; /* file name */ + const char *file; /* file name */ unsigned int line; /* line number */ - const char * func; /* function name */ - const char * msg; /* entry message (optional) */ - const void * data; /* user data (optional) */ + const char *func; /* function name */ + const char *msg; /* entry message (optional) */ + const void *data; /* user data (optional) */ hg_time_t time; /* time added to log */ }; @@ -61,8 +61,8 @@ struct hg_dlog_entry { * hg_dlog_dcount32: 32-bit debug counter in the dlog */ struct hg_dlog_dcount32 { - const char * name; /* counter name (short) */ - const char * descr; /* description of counter */ + const char *name; /* counter name (short) */ + const char *descr; /* description of counter */ hg_atomic_int32_t c; /* the counter itself */ HG_LIST_ENTRY(hg_dlog_dcount32) l; /* linkage */ }; @@ -71,8 +71,8 @@ struct hg_dlog_dcount32 { * hg_dlog_dcount64: 64-bit debug counter in the dlog */ struct hg_dlog_dcount64 { - const char * name; /* counter name (short) */ - const char * descr; /* description of counter */ + const char *name; /* counter name (short) */ + const char *descr; /* description of counter */ hg_atomic_int64_t c; /* the counter itself */ HG_LIST_ENTRY(hg_dlog_dcount64) l; /* linkage */ }; diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_list.h b/src/H5FDsubfiling/mercury/src/util/mercury_list.h index 7b66c23..1de32c5 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_list.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_list.h @@ -59,7 +59,7 @@ #define HG_LIST_ENTRY(struct_entry_name) \ struct { \ - struct struct_entry_name * next; \ + struct struct_entry_name *next; \ struct struct_entry_name **prev; \ } diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_log.c b/src/H5FDsubfiling/mercury/src/util/mercury_log.c index def1abe..f77ba23 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_log.c +++ b/src/H5FDsubfiling/mercury/src/util/mercury_log.c @@ -303,7 +303,7 @@ const char * hg_log_get_subsys(void) { static char log_subsys[HG_LOG_SUBSYS_MAX * (HG_LOG_SUBSYS_NAME_MAX + 2)] = "\0"; - char * p = log_subsys; + char *p = log_subsys; int i = 0; while (hg_log_subsys_g[i][0] != '\0' && i < HG_LOG_SUBSYS_MAX) { @@ -324,7 +324,7 @@ void hg_log_set_subsys_level(const char *subsys, enum hg_log_level log_level) { const char *log_subsys = hg_log_get_subsys(); - char * new_subsys = NULL; + char *new_subsys = NULL; const char *new_subsys_ptr; if (strcmp(log_subsys, "") != 0) { @@ -451,7 +451,7 @@ hg_log_write(struct hg_log_outlet *hg_log_outlet, enum hg_log_level log_level, c unsigned int line, const char *func, const char *format, ...) { char buf[HG_LOG_BUF_MAX]; - FILE * stream = NULL; + FILE *stream = NULL; const char *level_name = NULL; #ifdef HG_UTIL_HAS_LOG_COLOR const char *color = hg_log_colors_g[log_level]; diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_log.h b/src/H5FDsubfiling/mercury/src/util/mercury_log.h index a550d97..8076272 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_log.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_log.h @@ -179,11 +179,11 @@ enum hg_log_state { HG_LOG_PASS, HG_LOG_OFF, HG_LOG_ON }; /* Log outlet */ struct hg_log_outlet { - const char * name; /* Name of outlet */ + const char *name; /* Name of outlet */ enum hg_log_state state; /* Init state of outlet */ enum hg_log_level level; /* Level of outlet */ struct hg_log_outlet *parent; /* Parent of outlet */ - struct hg_dlog * debug_log; /* Debug log to use */ + struct hg_dlog *debug_log; /* Debug log to use */ HG_QUEUE_ENTRY(hg_log_outlet) entry; /* List entry */ }; diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_queue.h b/src/H5FDsubfiling/mercury/src/util/mercury_queue.h index 07d977f..6cc65f7 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_queue.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_queue.h @@ -49,13 +49,13 @@ #define HG_QUEUE_HEAD_DECL(struct_head_name, struct_entry_name) \ struct struct_head_name { \ - struct struct_entry_name * head; \ + struct struct_entry_name *head; \ struct struct_entry_name **tail; \ } #define HG_QUEUE_HEAD(struct_entry_name) \ struct { \ - struct struct_entry_name * head; \ + struct struct_entry_name *head; \ struct struct_entry_name **tail; \ } diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread.h b/src/H5FDsubfiling/mercury/src/util/mercury_thread.h index 185d997..d199bc7 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_thread.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread.h @@ -25,7 +25,7 @@ typedef DWORD_PTR hg_cpu_set_t; #include <pthread.h> typedef pthread_t hg_thread_t; typedef void *(*hg_thread_func_t)(void *); -typedef void * hg_thread_ret_t; +typedef void *hg_thread_ret_t; #define HG_THREAD_RETURN_TYPE hg_thread_ret_t typedef pthread_key_t hg_thread_key_t; #ifdef __APPLE__ diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c index 76248d1..cbb7563 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c +++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.c @@ -21,7 +21,7 @@ struct hg_thread_pool_private { struct hg_thread_pool pool; unsigned int thread_count; - hg_thread_t * threads; + hg_thread_t *threads; }; /********************/ @@ -42,7 +42,7 @@ static HG_THREAD_RETURN_TYPE hg_thread_pool_worker(void *args) { hg_thread_ret_t ret = 0; - hg_thread_pool_t * pool = (hg_thread_pool_t *)args; + hg_thread_pool_t *pool = (hg_thread_pool_t *)args; struct hg_thread_work *work; while (1) { diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h index b399f66..e3b9f4d 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_thread_pool.h @@ -27,7 +27,7 @@ struct hg_thread_pool { struct hg_thread_work { hg_thread_func_t func; - void * args; + void *args; HG_QUEUE_ENTRY(hg_thread_work) entry; /* Internal */ }; @@ -54,7 +54,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; @@ -69,7 +69,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; @@ -84,7 +84,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; @@ -99,7 +99,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 */ }; @@ -127,7 +127,7 @@ static H5FL_track_t *H5FL_out_head_g = NULL; #endif /* H5FL_TRACK */ /* Forward declarations of local static functions */ -static void * H5FL__malloc(size_t mem_size); +static void *H5FL__malloc(size_t mem_size); static herr_t H5FL__reg_init(H5FL_reg_head_t *head); static herr_t H5FL__reg_gc(void); static herr_t H5FL__reg_gc_list(H5FL_reg_head_t *head); @@ -848,7 +848,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) @@ -989,7 +989,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 */ @@ -1421,7 +1421,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 */ @@ -1529,7 +1529,7 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem H5FL_TRACK_PARAMS) { 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) @@ -2036,8 +2036,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) diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index 7595075..72e5f93 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -69,9 +69,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 */ @@ -101,7 +101,7 @@ typedef struct H5FL_reg_head_t { hbool_t 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; @@ -162,7 +162,7 @@ typedef struct H5FL_blk_node_t { size_t size; /* Size of the blocks in the list */ unsigned allocated; /* Number of blocks of this size allocated */ unsigned onlist; /* Number of blocks on free 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; @@ -173,7 +173,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; @@ -246,7 +246,7 @@ typedef struct H5FL_arr_head_t { hbool_t 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 */ @@ -368,7 +368,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; @@ -399,10 +399,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_ATTR_MALLOC; -H5_DLL void * H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS) H5_ATTR_MALLOC; -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_ATTR_MALLOC; +H5_DLL void *H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS) H5_ATTR_MALLOC; +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 */ @@ -424,9 +424,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_ATTR_MALLOC; -H5_DLL void * H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS) H5_ATTR_MALLOC; -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_ATTR_MALLOC; +H5_DLL void *H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS) H5_ATTR_MALLOC; +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 7b51266..e20f54d 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, haddr_t addr); H5_DLL herr_t H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted); @@ -175,9 +175,9 @@ H5FS_t * H5FS_open(H5F_t *f, haddr_t fs_addr, uint16_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 @@ -243,7 +243,7 @@ done: herr_t H5FS_delete(H5F_t *f, 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 */ @@ -1072,7 +1072,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_PACKAGE_NOERR diff --git a/src/H5FScache.c b/src/H5FScache.c index 9b4b51e..d931c65 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -56,7 +56,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 ** image; /* Pointer to address of buffer pointer to serialize with */ + uint8_t **image; /* 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; @@ -75,7 +75,7 @@ static herr_t H5FS__sinfo_serialize_node_cb(void *_item, void H5_ATTR_UNUSED *ke /* Metadata cache callbacks */ static herr_t H5FS__cache_hdr_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5FS__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5FS__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5FS__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5FS__cache_hdr_image_len(const void *thing, size_t *image_len); static herr_t H5FS__cache_hdr_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); @@ -85,7 +85,7 @@ static herr_t H5FS__cache_hdr_free_icr(void *thing); static herr_t H5FS__cache_sinfo_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5FS__cache_sinfo_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5FS__cache_sinfo_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5FS__cache_sinfo_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5FS__cache_sinfo_image_len(const void *thing, size_t *image_len); static herr_t H5FS__cache_sinfo_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); @@ -226,12 +226,12 @@ static void * H5FS__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - 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 */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ unsigned nclasses; /* Number of section classes */ - H5FS_t * ret_value = NULL; /* Return value */ + H5FS_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -386,7 +386,7 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t H5_AT haddr_t H5_ATTR_NDEBUG_UNUSED *new_addr, size_t H5_ATTR_NDEBUG_UNUSED *new_len, unsigned *flags) { - H5FS_t * fspace = (H5FS_t *)_thing; /* Pointer to the object */ + H5FS_t *fspace = (H5FS_t *)_thing; /* Pointer to the object */ H5AC_ring_t orig_ring = H5AC_RING_INV; /* Original ring value */ herr_t ret_value = SUCCEED; /* Return value */ @@ -683,7 +683,7 @@ done: static herr_t H5FS__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { - H5FS_t * fspace = (H5FS_t *)_thing; /* Pointer to the object */ + H5FS_t *fspace = (H5FS_t *)_thing; /* Pointer to the object */ uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; /* Return value */ @@ -887,7 +887,7 @@ done: static herr_t H5FS__cache_sinfo_get_initial_load_size(void *_udata, size_t *image_len) { - const H5FS_t * fspace; /* free space manager */ + const H5FS_t *fspace; /* free space manager */ H5FS_sinfo_cache_ud_t *udata = (H5FS_sinfo_cache_ud_t *)_udata; /* User data for callback */ FUNC_ENTER_PACKAGE_NOERR @@ -961,14 +961,14 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l hbool_t H5_ATTR_NDEBUG_UNUSED *dirty) { H5FS_sinfo_cache_ud_t *udata = (H5FS_sinfo_cache_ud_t *)_udata; /* User data for callback */ - H5FS_t * fspace; /* free space manager */ - H5FS_sinfo_t * sinfo = NULL; /* Free space section info */ + H5FS_t *fspace; /* free space manager */ + H5FS_sinfo_t *sinfo = NULL; /* Free space section info */ haddr_t fs_addr; /* Free space header address */ size_t old_sect_size; /* Old section size */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ - const uint8_t * chksum_image; /* Points to chksum location */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *chksum_image; /* Points to chksum location */ uint32_t stored_chksum; /* Stored metadata checksum */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1005,10 +1005,10 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l if (fspace->serial_sect_count > 0) { hsize_t old_tot_sect_count; /* Total section count from header */ hsize_t H5_ATTR_NDEBUG_UNUSED - old_serial_sect_count; /* Total serializable section count from header */ - hsize_t H5_ATTR_NDEBUG_UNUSED old_ghost_sect_count; /* Total ghost section count from header */ - hsize_t H5_ATTR_NDEBUG_UNUSED old_tot_space; /* Total space managed from header */ - unsigned sect_cnt_size; /* The size of the section size counts */ + old_serial_sect_count; /* Total serializable section count from header */ + hsize_t H5_ATTR_NDEBUG_UNUSED old_ghost_sect_count; /* Total ghost section count from header */ + hsize_t H5_ATTR_NDEBUG_UNUSED old_tot_space; /* Total space managed from header */ + unsigned sect_cnt_size; /* The size of the section size counts */ /* Compute the size of the section counts */ sect_cnt_size = H5VM_limit_enc_size((uint64_t)fspace->serial_sect_count); @@ -1159,7 +1159,7 @@ H5FS__cache_sinfo_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t H5_ haddr_t *new_addr, size_t H5_ATTR_NDEBUG_UNUSED *new_len, unsigned *flags) { H5FS_sinfo_t *sinfo = (H5FS_sinfo_t *)_thing; /* Pointer to the object */ - H5FS_t * fspace; /* Free space header */ + H5FS_t *fspace; /* Free space header */ haddr_t sinfo_addr; /* Address for section info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1240,10 +1240,10 @@ done: static herr_t H5FS__cache_sinfo_serialize(const H5F_t *f, void *_image, size_t len, void *_thing) { - H5FS_sinfo_t * sinfo = (H5FS_sinfo_t *)_thing; /* Pointer to the object */ + H5FS_sinfo_t *sinfo = (H5FS_sinfo_t *)_thing; /* Pointer to the object */ H5FS_iter_ud_t udata; /* User data for callbacks */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ - uint8_t * chksum_image = NULL; /* Points to chksum location */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *chksum_image = NULL; /* Points to chksum location */ uint32_t metadata_chksum; /* Computed metadata checksum value */ unsigned bin; /* Current bin we are on */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1427,8 +1427,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_PACKAGE @@ -1481,7 +1481,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 */ diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c index 3862b53..16e9541 100644 --- a/src/H5FSdbg.c +++ b/src/H5FSdbg.c @@ -82,7 +82,7 @@ herr_t H5FS_debug(H5F_t *f, 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 */ @@ -204,7 +204,7 @@ herr_t H5FS_sects_debug(H5F_t *f, 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 ba2cf03..d051fff 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 */ uint16_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 */ } H5FS_sinfo_cache_ud_t; @@ -139,7 +139,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 */ diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h index bb4f56a..130e1e5 100644 --- a/src/H5FSprivate.h +++ b/src/H5FSprivate.h @@ -100,7 +100,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 46aba93..9670719 100644 --- a/src/H5FSsection.c +++ b/src/H5FSsection.c @@ -47,9 +47,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; /********************/ @@ -774,7 +774,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 */ @@ -1163,7 +1163,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 */ @@ -1638,7 +1638,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; @@ -1845,7 +1845,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_PACKAGE @@ -1879,7 +1879,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 */ @@ -2210,7 +2210,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 = (H5FS_section_info_t *)H5SL_item(curr_sect_node); @@ -2317,7 +2317,7 @@ H5FS_sect_try_shrink_eoa(H5F_t *f, H5FS_t *fspace, void *op_data) /* 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/H5Faccum.c b/src/H5Faccum.c index cf3d359..aa89690 100644 --- a/src/H5Faccum.c +++ b/src/H5Faccum.c @@ -852,7 +852,7 @@ herr_t H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr, hsize_t size) { H5F_meta_accum_t *accum; /* Alias for file's metadata accumulator */ - H5FD_t * file; /* File driver pointer */ + H5FD_t *file; /* File driver pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c index 5157180..e6c1242 100644 --- a/src/H5Fdbg.c +++ b/src/H5Fdbg.c @@ -118,7 +118,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/H5Fdeprec.c b/src/H5Fdeprec.c index ff6b4a0..94fba65 100644 --- a/src/H5Fdeprec.c +++ b/src/H5Fdeprec.c @@ -89,7 +89,7 @@ herr_t H5Fget_info1(hid_t obj_id, H5F_info1_t *finfo /*out*/) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ H5I_type_t type; @@ -213,7 +213,7 @@ done: herr_t H5Fset_latest_format(hid_t file_id, hbool_t latest_format) { - H5VL_object_t * vol_obj; /* File as VOL object */ + H5VL_object_t *vol_obj; /* File as VOL object */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ H5F_libver_t low = H5F_LIBVER_LATEST; /* Low bound */ diff --git a/src/H5Fefc.c b/src/H5Fefc.c index 49996dd..6edb7a9 100644 --- a/src/H5Fefc.c +++ b/src/H5Fefc.c @@ -43,8 +43,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 */ @@ -52,14 +52,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_shared_t * tmp_next; /* Next file in temporary list used by H5F__efc_try_close() */ + H5F_shared_t *tmp_next; /* Next file in temporary list used by H5F__efc_try_close() */ }; /* Private prototypes */ @@ -140,12 +140,12 @@ done: H5F_t * H5F__efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) { - H5F_efc_t * efc = NULL; /* External file cache for parent file */ - H5F_efc_ent_t * ent = NULL; /* Entry for target file in efc */ + 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 */ - H5P_genplist_t * plist; /* Property list pointer for FAPL */ + H5P_genplist_t *plist; /* Property list pointer for FAPL */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - H5F_t * ret_value = NULL; /* Return value */ + H5F_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -268,7 +268,7 @@ H5F__efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hi 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))) @@ -353,7 +353,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 */ @@ -650,7 +650,7 @@ static void H5F__efc_try_close_tag1(H5F_shared_t *sf, H5F_shared_t **tail) { H5F_efc_ent_t *ent = NULL; /* EFC entry */ - H5F_shared_t * esf; /* Convenience pointer to ent->file->shared */ + H5F_shared_t *esf; /* Convenience pointer to ent->file->shared */ FUNC_ENTER_PACKAGE_NOERR @@ -723,7 +723,7 @@ static void H5F__efc_try_close_tag2(H5F_shared_t *sf, H5F_shared_t **tail) { H5F_efc_ent_t *ent = NULL; /* EFC entry */ - H5F_shared_t * esf; /* Convenience pointer to ent->file->shared */ + H5F_shared_t *esf; /* Convenience pointer to ent->file->shared */ FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Fint.c b/src/H5Fint.c index e6c2a6b..9929957 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -51,13 +51,13 @@ /* 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_shared_t *shared; /* Pointer to shared file to look inside */ - const H5F_t * file; /* Pointer to file to look inside */ + const H5F_t *file; /* Pointer to file to look inside */ } ptr; } file_info; size_t list_index; /* Current index in open ID array */ @@ -78,7 +78,7 @@ static herr_t H5F__get_objects(const H5F_t *f, unsigned types, size_t max_index, hbool_t app_ref, size_t *obj_id_count_ptr); static int H5F__get_objects_cb(void *obj_ptr, hid_t obj_id, void *key); static herr_t H5F__build_name(const char *prefix, const char *file_name, char **full_name /*out*/); -static char * H5F__getenv_prefix_name(char **env_prefix /*in,out*/); +static char *H5F__getenv_prefix_name(char **env_prefix /*in,out*/); static H5F_t *H5F__new(H5F_shared_t *shared, unsigned flags, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf); static herr_t H5F__check_if_using_file_locks(H5P_genplist_t *fapl, hbool_t *use_file_locking); static herr_t H5F__dest(H5F_t *f, hbool_t flush); @@ -270,7 +270,7 @@ static herr_t H5F__set_vol_conn(H5F_t *file) { H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - void * new_connector_info = NULL; /* Copy of connector info */ + void *new_connector_info = NULL; /* Copy of connector info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -326,8 +326,8 @@ done: hid_t 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 */ + H5P_genplist_t *new_plist; /* New property list */ + H5P_genplist_t *old_plist; /* Old property list */ H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ hbool_t driver_prop_copied = FALSE; /* Whether the driver property has been set up */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ @@ -808,9 +808,9 @@ H5F_prefix_open_file(H5F_t *primary_file, H5F_prefix_open_t prefix_type, const c const char *file_name, unsigned file_intent, hid_t fapl_id) { H5F_t *src_file = NULL; /* Source file */ - char * full_name = NULL; /* File name with prefix */ - char * actual_file_name = NULL; /* File's actual name */ - char * temp_file_name = NULL; /* Temporary pointer to file name */ + char *full_name = NULL; /* File name with prefix */ + char *actual_file_name = NULL; /* File's actual name */ + char *temp_file_name = NULL; /* Temporary pointer to file name */ size_t temp_file_name_len; /* Length of temporary file name */ H5F_t *ret_value = NULL; /* Return value */ @@ -1026,7 +1026,7 @@ done: htri_t H5F__is_hdf5(const char *name, hid_t fapl_id) { - H5FD_t * file = NULL; /* Low-level file struct */ + H5FD_t *file = NULL; /* Low-level file struct */ H5F_shared_t *shared = NULL; /* Shared part of file */ haddr_t sig_addr = HADDR_UNDEF; /* Address of hdf5 file signature */ htri_t ret_value = FAIL; /* Return value */ @@ -1742,12 +1742,12 @@ done: H5F_t * H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) { - H5F_t * file = NULL; /*the success return value */ - H5F_shared_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_shared_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 */ size_t page_buf_size; unsigned page_buf_min_meta_perc = 0; @@ -1758,7 +1758,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) hbool_t use_file_locking = TRUE; /* Using file locks? */ hbool_t ci_load = FALSE; /* whether MDC ci load requested */ hbool_t ci_write = FALSE; /* whether MDC CI write requested */ - H5F_t * ret_value = NULL; /*actual return value */ + H5F_t *ret_value = NULL; /*actual return value */ FUNC_ENTER_NOAPI(NULL) @@ -2685,7 +2685,7 @@ H5F__build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *n /* 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 */ hbool_t want_posix_fd; /* Flag for retrieving file descriptor from VFD */ @@ -3592,14 +3592,14 @@ H5F__start_swmr_write(H5F_t *f) hbool_t ci_write = FALSE; /* whether MDC CI write requested */ size_t grp_dset_count = 0; /* # of open objects: groups & datasets */ size_t nt_attr_count = 0; /* # of opened named datatypes + opened attributes */ - hid_t * obj_ids = NULL; /* List of ids */ - hid_t * obj_apl_ids = NULL; /* List of access property lists */ - H5G_loc_t * obj_glocs = NULL; /* Group location of the object */ - H5O_loc_t * obj_olocs = NULL; /* Object location */ + hid_t *obj_ids = NULL; /* List of ids */ + hid_t *obj_apl_ids = NULL; /* List of access property lists */ + H5G_loc_t *obj_glocs = NULL; /* Group location of the object */ + H5O_loc_t *obj_olocs = NULL; /* Object location */ H5G_name_t *obj_paths = NULL; /* Group hierarchy path */ size_t u; /* Local index variable */ hbool_t setup = FALSE; /* Boolean flag to indicate whether SWMR setting is enabled */ - H5VL_t * vol_connector = NULL; /* VOL connector for the file */ + H5VL_t *vol_connector = NULL; /* VOL connector for the file */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3687,7 +3687,7 @@ H5F__start_swmr_write(H5F_t *f) /* Gather information about opened objects (groups, datasets) in the file */ /* (For refresh later on) */ for (u = 0; u < grp_dset_count; u++) { - void * obj = NULL; /* VOL object */ + void *obj = NULL; /* VOL object */ H5I_type_t type; /* Type of object for the ID */ H5G_loc_t tmp_loc; @@ -3941,7 +3941,7 @@ done: hid_t H5F_get_file_id(H5VL_object_t *vol_obj, H5I_type_t obj_type, hbool_t app_ref) { - void * vol_obj_file = NULL; /* File object pointer */ + void *vol_obj_file = NULL; /* File object pointer */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ hid_t file_id = H5I_INVALID_HID; /* File ID for object */ diff --git a/src/H5Fmount.c b/src/H5Fmount.c index ae5970b..7992f7b 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -99,9 +99,9 @@ done: herr_t H5F_mount(const H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UNUSED plist_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 mount point to be opened */ @@ -262,9 +262,9 @@ done: herr_t H5F_unmount(const H5G_loc_t *loc, const char *name) { - 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 */ diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c index e83d69c..d4baf1f 100644 --- a/src/H5Fmpi.c +++ b/src/H5Fmpi.c @@ -241,7 +241,7 @@ done: herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -315,7 +315,7 @@ done: herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag /*out*/) { - H5VL_object_t * vol_obj; /* File info */ + H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_file_optional_args_t file_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -373,7 +373,7 @@ H5F_mpi_retrieve_comm(hid_t loc_id, hid_t acspl_id, MPI_Comm *mpi_comm) attached to the loc_id */ if (H5I_INVALID_HID != loc_id) { H5G_loc_t loc; - H5F_t * f = NULL; + H5F_t *f = NULL; /* Retrieve the file structure */ if (H5G_loc(loc_id, &loc) < 0) @@ -391,9 +391,9 @@ H5F_mpi_retrieve_comm(hid_t loc_id, hid_t acspl_id, MPI_Comm *mpi_comm) /* otherwise, this is from H5Fopen or H5Fcreate and has to be collective */ else { H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */ - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ unsigned long driver_feat_flags; - H5FD_class_t * driver_class = NULL; + H5FD_class_t *driver_class = NULL; if (NULL == (plist = H5P_object_verify(acspl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_FILE, H5E_BADTYPE, FAIL, "not a file access list") diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 9208815..575cc0b 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -160,7 +160,7 @@ typedef struct H5F_efc_t H5F_efc_t; /* Structure for passing 'user data' to superblock cache callbacks */ typedef struct H5F_superblock_cache_ud_t { /* IN: */ - H5F_t * f; /* Pointer to file */ + H5F_t *f; /* Pointer to file */ hbool_t ignore_drvrinfo; /* Indicate if the driver info should be ignored */ /* OUT: */ unsigned sym_leaf_k; /* Symbol table leaf node's 'K' value */ @@ -174,7 +174,7 @@ typedef struct H5F_superblock_cache_ud_t { /* Structure for passing 'user data' to driver info block cache callbacks */ typedef struct H5F_drvrinfo_cache_ud_t { - H5F_t * f; /* Pointer to file */ + H5F_t *f; /* Pointer to file */ haddr_t driver_addr; /* address of driver info block */ } H5F_drvrinfo_cache_ud_t; @@ -241,8 +241,8 @@ typedef struct H5F_super_t { * pointing to this struct. */ struct H5F_shared_t { - H5FD_t * lf; /* Lower level file handle for I/O */ - H5F_super_t * sblock; /* Pointer to (pinned) superblock for file */ + H5FD_t *lf; /* Lower level file handle for I/O */ + H5F_super_t *sblock; /* Pointer to (pinned) superblock for file */ H5O_drvinfo_t *drvinfo; /* Pointer to the (pinned) driver info * cache entry. This field is only defined * for older versions of the super block, @@ -272,8 +272,8 @@ struct H5F_shared_t { unsigned long feature_flags; /* VFL Driver feature Flags */ haddr_t maxaddr; /* Maximum address for file */ - H5PB_t * page_buf; /* The page buffer cache */ - H5AC_t * cache; /* The object cache */ + H5PB_t *page_buf; /* The page buffer 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 */ @@ -286,7 +286,7 @@ struct H5F_shared_t { hbool_t use_mdc_logging; /* Set when metadata logging is desired */ hbool_t start_mdc_log_on_access; /* set when mdc logging should */ /* begin on file access/create */ - char * mdc_log_location; /* location of mdc log */ + char *mdc_log_location; /* location of mdc log */ hid_t fcpl_id; /* File creation property list ID */ H5F_close_degree_t fc_degree; /* File close behavior degree */ hbool_t evict_on_close; /* If the file's objects should be evicted from the metadata cache on close */ @@ -302,16 +302,16 @@ struct H5F_shared_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 */ - H5UC_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 */ + H5UC_t *grp_btree_shared; /* Ref-counted group B-tree node info */ hbool_t use_file_locking; /* Whether or not to use file locking */ hbool_t closing; /* File is in the process of being closed */ /* Cached VOL connector ID & info */ hid_t vol_id; /* ID of VOL connector for the container */ const H5VL_class_t *vol_cls; /* Pointer to VOL connector class for the container */ - void * vol_info; /* Copy of VOL connector info for container */ + void *vol_info; /* Copy of VOL connector info for container */ /* File space allocation information */ H5F_fspace_strategy_t fs_strategy; /* File space handling strategy */ @@ -327,7 +327,7 @@ struct H5F_shared_t { H5F_fs_state_t fs_state[H5F_MEM_PAGE_NTYPES]; /* State of free space manager for each type */ haddr_t fs_addr[H5F_MEM_PAGE_NTYPES]; /* Address of free space manager info for each type */ - H5FS_t * fs_man[H5F_MEM_PAGE_NTYPES]; /* Free space manager for each file space type */ + H5FS_t *fs_man[H5F_MEM_PAGE_NTYPES]; /* Free space manager for each file space type */ hbool_t null_fsm_addr; /* Used by h5clear tool to tell the library */ /* to drop free-space to the floor */ haddr_t eoa_fsm_fsalloc; /* eoa after file space allocation */ @@ -372,15 +372,15 @@ struct H5F_shared_t { * to shared H5F_shared_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. */ - H5F_shared_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. */ + H5F_shared_t *shared; /* The shared file info */ H5VL_object_t *vol_obj; /* VOL object */ 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 */ hbool_t id_exists; /* Whether an ID for this struct exists */ hbool_t closing; /* File is in the process of being closed */ - struct H5F_t * parent; /* Parent file that this file is mounted to */ + struct H5F_t *parent; /* Parent file that this file is mounted to */ unsigned nmounts; /* Number of children mounted to this file */ }; @@ -444,7 +444,7 @@ H5_DLL herr_t H5F__accum_flush(H5F_shared_t *f_sh); H5_DLL herr_t H5F__accum_reset(H5F_shared_t *f_sh, hbool_t flush); /* Shared file list related routines */ -H5_DLL herr_t H5F__sfile_add(H5F_shared_t *shared); +H5_DLL herr_t H5F__sfile_add(H5F_shared_t *shared); H5_DLL H5F_shared_t *H5F__sfile_search(H5FD_t *lf); H5_DLL herr_t H5F__sfile_remove(H5F_shared_t *shared); @@ -456,7 +456,7 @@ H5_DLL herr_t H5F__set_mpi_atomicity(H5F_t *file, hbool_t flag); /* External file cache routines */ H5_DLL H5F_efc_t *H5F__efc_create(unsigned max_nfiles); -H5_DLL H5F_t * H5F__efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); +H5_DLL H5F_t *H5F__efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); H5_DLL unsigned H5F__efc_max_nfiles(H5F_efc_t *efc); H5_DLL herr_t H5F__efc_release(H5F_efc_t *efc); H5_DLL herr_t H5F__efc_destroy(H5F_efc_t *efc); diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 134c606..01fa950 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -771,7 +771,7 @@ typedef struct H5F_blk_aggr_t H5F_blk_aggr_t; /* Structure for object flush callback property (H5Pset_object_flush_cb)*/ typedef struct H5F_object_flush_t { H5F_flush_cb_t func; /* The callback function */ - void * udata; /* User data */ + void *udata; /* User data */ } H5F_object_flush_t; /* Concise info about a block of bytes in a file */ @@ -832,35 +832,35 @@ H5_DLL herr_t H5F_try_close(H5F_t *f, hbool_t *was_closed /*out*/); H5_DLL hid_t H5F_get_file_id(H5VL_object_t *vol_obj, H5I_type_t obj_type, hbool_t app_ref); /* Functions that retrieve values from the file struct */ -H5_DLL H5F_libver_t H5F_get_low_bound(const H5F_t *f); -H5_DLL H5F_libver_t H5F_get_high_bound(const H5F_t *f); -H5_DLL unsigned H5F_shared_get_intent(const H5F_shared_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_libver_t H5F_get_low_bound(const H5F_t *f); +H5_DLL H5F_libver_t H5F_get_high_bound(const H5F_t *f); +H5_DLL unsigned H5F_shared_get_intent(const H5F_shared_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_shared_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); H5_DLL unsigned H5F_incr_nopen_objs(H5F_t *f); H5_DLL unsigned H5F_decr_nopen_objs(H5F_t *f); H5_DLL hbool_t H5F_file_id_exists(const H5F_t *f); -H5_DLL H5F_t * H5F_get_parent(const H5F_t *f); -H5_DLL unsigned H5F_get_nmounts(const H5F_t *f); -H5_DLL unsigned H5F_get_read_attempts(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); -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 hsize_t H5F_get_pgend_meta_thres(const H5F_t *f); -H5_DLL hbool_t H5F_get_point_of_no_return(const H5F_t *f); -H5_DLL hbool_t H5F_get_null_fsm_addr(const H5F_t *f); -H5_DLL hbool_t H5F_get_min_dset_ohdr(const H5F_t *f); -H5_DLL herr_t H5F_set_min_dset_ohdr(H5F_t *f, hbool_t minimize); +H5_DLL H5F_t *H5F_get_parent(const H5F_t *f); +H5_DLL unsigned H5F_get_nmounts(const H5F_t *f); +H5_DLL unsigned H5F_get_read_attempts(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); +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 hsize_t H5F_get_pgend_meta_thres(const H5F_t *f); +H5_DLL hbool_t H5F_get_point_of_no_return(const H5F_t *f); +H5_DLL hbool_t H5F_get_null_fsm_addr(const H5F_t *f); +H5_DLL hbool_t H5F_get_min_dset_ohdr(const H5F_t *f); +H5_DLL herr_t H5F_set_min_dset_ohdr(H5F_t *f, hbool_t minimize); H5_DLL const H5VL_class_t *H5F_get_vol_cls(const H5F_t *f); -H5_DLL H5VL_object_t *H5F_get_vol_obj(const H5F_t *f); -H5_DLL hbool_t H5F_get_file_locking(const H5F_t *f); +H5_DLL H5VL_object_t *H5F_get_vol_obj(const H5F_t *f); +H5_DLL hbool_t H5F_get_file_locking(const H5F_t *f); /* Functions than retrieve values set/cached from the superblock/FCPL */ H5_DLL haddr_t H5F_get_base_addr(const H5F_t *f); @@ -885,7 +885,7 @@ H5_DLL size_t H5F_sieve_buf_size(const H5F_t *f); H5_DLL unsigned H5F_gc_ref(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 H5UC_t * H5F_grp_btree_shared(const H5F_t *f); +H5_DLL struct H5UC_t *H5F_grp_btree_shared(const H5F_t *f); H5_DLL herr_t H5F_set_grp_btree_shared(H5F_t *f, struct H5UC_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); @@ -896,7 +896,7 @@ H5_DLL H5P_coll_md_read_flag_t H5F_coll_md_read(const H5F_t *f); #endif /* H5_HAVE_PARALLEL */ H5_DLL hbool_t H5F_use_mdc_logging(const H5F_t *f); H5_DLL hbool_t H5F_start_mdc_log_on_access(const H5F_t *f); -H5_DLL char * H5F_mdc_log_location(const H5F_t *f); +H5_DLL char *H5F_mdc_log_location(const H5F_t *f); /* Functions that retrieve values from VFD layer */ H5_DLL hid_t H5F_get_driver_id(const H5F_t *f); diff --git a/src/H5Fsfile.c b/src/H5Fsfile.c index be45e78..6a565ca 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_shared_t * shared; /* Pointer to "shared" file struct */ + H5F_shared_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_shared_t * H5F__sfile_search(H5FD_t *lf) { H5F_sfile_node_t *curr; /* Current shared file node */ - H5F_shared_t * ret_value = NULL; /* Return value */ + H5F_shared_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 6a82a6e..824c770 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -318,10 +318,10 @@ herr_t H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read) { H5AC_ring_t orig_ring = H5AC_RING_INV; - H5F_super_t * sblock = NULL; /* Superblock structure */ + H5F_super_t *sblock = NULL; /* Superblock structure */ H5F_superblock_cache_ud_t udata; /* User data for cache callbacks */ - H5P_genplist_t * c_plist; /* File creation property list */ - H5FD_t * file; /* File driver pointer */ + H5P_genplist_t *c_plist; /* File creation property list */ + H5FD_t *file; /* File driver pointer */ unsigned sblock_flags = H5AC__NO_FLAGS_SET; /* flags used in superblock unprotect call */ haddr_t super_addr; /* Absolute address of superblock */ haddr_t eof; /* End of file address */ @@ -628,7 +628,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read) /* Decode the optional driver information block */ if (H5F_addr_defined(sblock->driver_addr)) { - H5O_drvinfo_t * drvinfo; /* Driver info */ + H5O_drvinfo_t *drvinfo; /* Driver info */ H5F_drvrinfo_cache_ud_t drvrinfo_udata; /* User data for metadata callbacks */ unsigned drvinfo_flags = H5AC__NO_FLAGS_SET; /* Flags used in driver info block unprotect call */ @@ -1494,7 +1494,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 daab7c7..ce39f19 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -63,7 +63,7 @@ static herr_t H5F__cache_superblock_get_initial_load_size(void *udata, size_t *i static herr_t H5F__cache_superblock_get_final_load_size(const void *image_ptr, size_t image_len, void *udata, size_t *actual_len); static htri_t H5F__cache_superblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5F__cache_superblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5F__cache_superblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5F__cache_superblock_image_len(const void *thing, size_t *image_len); static herr_t H5F__cache_superblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5F__cache_superblock_free_icr(void *thing); @@ -71,7 +71,7 @@ static herr_t H5F__cache_superblock_free_icr(void *thing); static herr_t H5F__cache_drvrinfo_get_initial_load_size(void *udata, size_t *image_len); static herr_t H5F__cache_drvrinfo_get_final_load_size(const void *image_ptr, size_t image_len, void *udata, size_t *actual_len); -static void * H5F__cache_drvrinfo_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5F__cache_drvrinfo_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5F__cache_drvrinfo_image_len(const void *thing, size_t *image_len); static herr_t H5F__cache_drvrinfo_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5F__cache_drvrinfo_free_icr(void *thing); @@ -326,7 +326,7 @@ static herr_t H5F__cache_superblock_get_final_load_size(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED image_len, void *_udata, size_t *actual_len) { - const uint8_t * image = _image; /* Pointer into raw data buffer */ + const uint8_t *image = _image; /* Pointer into raw data buffer */ H5F_superblock_cache_ud_t *udata = (H5F_superblock_cache_ud_t *)_udata; /* User data */ H5F_super_t sblock; /* Temporary file superblock */ htri_t ret_value = SUCCEED; /* Return value */ @@ -371,7 +371,7 @@ done: static htri_t H5F__cache_superblock_verify_chksum(const void *_image, size_t len, void *_udata) { - const uint8_t * image = _image; /* Pointer into raw data buffer */ + const uint8_t *image = _image; /* Pointer into raw data buffer */ H5F_superblock_cache_ud_t *udata = (H5F_superblock_cache_ud_t *)_udata; /* User data */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ @@ -413,10 +413,10 @@ static void * H5F__cache_superblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5F_super_t * sblock = NULL; /* File's superblock */ + H5F_super_t *sblock = NULL; /* File's superblock */ H5F_superblock_cache_ud_t *udata = (H5F_superblock_cache_ud_t *)_udata; /* User data */ - const uint8_t * image = _image; /* Pointer into raw data buffer */ - H5F_super_t * ret_value = NULL; /* Return value */ + const uint8_t *image = _image; /* Pointer into raw data buffer */ + H5F_super_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -636,7 +636,7 @@ static herr_t H5F__cache_superblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, void *_thing) { H5F_super_t *sblock = (H5F_super_t *)_thing; /* Pointer to the object */ - uint8_t * image = _image; /* Pointer into raw data buffer */ + uint8_t *image = _image; /* Pointer into raw data buffer */ haddr_t rel_eof; /* Relative EOF for file */ herr_t ret_value = SUCCEED; /* Return value */ @@ -836,7 +836,7 @@ static herr_t H5F__cache_drvrinfo_get_final_load_size(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED image_len, void *_udata, size_t *actual_len) { - const uint8_t * image = _image; /* Pointer into raw data buffer */ + const uint8_t *image = _image; /* Pointer into raw data buffer */ H5F_drvrinfo_cache_ud_t *udata = (H5F_drvrinfo_cache_ud_t *)_udata; /* User data */ H5O_drvinfo_t drvrinfo; /* Driver info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -878,11 +878,11 @@ static void * H5F__cache_drvrinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5O_drvinfo_t * drvinfo = NULL; /* Driver info */ + H5O_drvinfo_t *drvinfo = NULL; /* Driver info */ H5F_drvrinfo_cache_ud_t *udata = (H5F_drvrinfo_cache_ud_t *)_udata; /* User data */ - const uint8_t * image = _image; /* Pointer into raw data buffer */ + const uint8_t *image = _image; /* Pointer into raw data buffer */ char drv_name[9]; /* Name of driver */ - H5O_drvinfo_t * ret_value = NULL; /* Return value */ + H5O_drvinfo_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -969,8 +969,8 @@ static herr_t H5F__cache_drvrinfo_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { H5O_drvinfo_t *drvinfo = (H5O_drvinfo_t *)_thing; /* Pointer to the object */ - uint8_t * image = _image; /* Pointer into raw data buffer */ - uint8_t * dbuf; /* Pointer to beginning of driver info */ + uint8_t *image = _image; /* Pointer into raw data buffer */ + uint8_t *dbuf; /* Pointer to beginning of driver info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Ftest.c b/src/H5Ftest.c index e5a882a..3628879 100644 --- a/src/H5Ftest.c +++ b/src/H5Ftest.c @@ -88,7 +88,7 @@ herr_t H5F__get_sohm_mesg_count_test(hid_t file_id, unsigned type_id, size_t *mesg_count) { - H5F_t * file; /* File info */ + H5F_t *file; /* File info */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -132,7 +132,7 @@ done: herr_t H5F__check_cached_stab_test(hid_t file_id) { - H5F_t * file; /* File info */ + H5F_t *file; /* File info */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -145,8 +145,8 @@ static hid_t H5G__create_api_common(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * grp = NULL; /* Structure for new group */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *grp = NULL; /* Structure for new group */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -250,8 +250,8 @@ H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -317,8 +317,8 @@ done: hid_t H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) { - void * grp = NULL; /* Structure for new group */ - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + void *grp = NULL; /* Structure for new group */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -375,8 +375,8 @@ static hid_t H5G__open_api_common(hid_t loc_id, const char *name, hid_t gapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * grp = NULL; /* Group opened */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *grp = NULL; /* Group opened */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ @@ -456,8 +456,8 @@ H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t gapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -502,7 +502,7 @@ done: hid_t H5Gget_create_plist(hid_t group_id) { - H5VL_object_t * vol_obj; /* Object for loc_id */ + H5VL_object_t *vol_obj; /* Object for loc_id */ H5VL_group_get_args_t vol_cb_args; /* Arguments to VOL callback */ hid_t ret_value = H5I_INVALID_HID; @@ -542,7 +542,7 @@ static herr_t H5G__get_info_api_common(hid_t loc_id, H5G_info_t *group_info /*out*/, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_group_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -611,8 +611,8 @@ H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line, H5G_info_t *group_info /*out*/, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -652,7 +652,7 @@ static herr_t H5G__get_info_by_name_api_common(hid_t loc_id, const char *name, H5G_info_t *group_info /*out*/, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_group_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -719,8 +719,8 @@ H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned a const char *name, H5G_info_t *group_info /*out*/, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -761,7 +761,7 @@ H5G__get_info_by_idx_api_common(hid_t loc_id, const char *group_name, H5_index_t H5_iter_order_t order, hsize_t n, H5G_info_t *group_info /*out*/, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_group_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -831,8 +831,8 @@ H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned ap H5G_info_t *group_info /*out*/, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -905,9 +905,9 @@ herr_t H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t group_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - H5VL_t * connector = NULL; /* VOL connector */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + H5VL_t *connector = NULL; /* VOL connector */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -968,7 +968,7 @@ done: herr_t H5Gflush(hid_t group_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_group_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1010,7 +1010,7 @@ done: herr_t H5Grefresh(hid_t group_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_group_specific_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c index eac1d51..7dc268a 100644 --- a/src/H5Gbtree2.c +++ b/src/H5Gbtree2.c @@ -50,10 +50,10 @@ */ typedef struct H5G_fh_ud_cmp_t { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ - const char * name; /* Name of link to compare */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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 */ @@ -146,7 +146,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_PACKAGE @@ -188,7 +188,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_PACKAGE_NOERR @@ -217,7 +217,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 */ @@ -359,7 +359,7 @@ H5G__dense_btree2_name_debug(FILE *stream, int indent, int fwidth, const void *_ 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_PACKAGE_NOERR @@ -388,7 +388,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_PACKAGE_NOERR diff --git a/src/H5Gcache.c b/src/H5Gcache.c index 15fa764..2c640784 100644 --- a/src/H5Gcache.c +++ b/src/H5Gcache.c @@ -58,7 +58,7 @@ /* Metadata cache (H5AC) callbacks */ static herr_t H5G__cache_node_get_initial_load_size(void *udata, size_t *image_len); -static void * H5G__cache_node_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5G__cache_node_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5G__cache_node_image_len(const void *thing, size_t *image_len); static herr_t H5G__cache_node_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5G__cache_node_free_icr(void *thing); @@ -154,11 +154,11 @@ H5G__cache_node_get_initial_load_size(void *_udata, size_t *image_len) static void * H5G__cache_node_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5F_t * f = (H5F_t *)_udata; /* User data for callback */ - H5G_node_t * sym = NULL; /* Symbol table node created */ + H5F_t *f = (H5F_t *)_udata; /* User data for callback */ + H5G_node_t *sym = NULL; /* Symbol table node created */ const uint8_t *image = (const uint8_t *)_image; /* Pointer to image to deserialize */ const uint8_t *image_end = image + len - 1; /* Pointer to end of image buffer */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -257,7 +257,7 @@ static herr_t H5G__cache_node_serialize(const H5F_t *f, void *_image, size_t len, void *_thing) { H5G_node_t *sym = (H5G_node_t *)_thing; /* Pointer to object */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c index cc6113d..5346c01 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 */ H5RS_str_t *grp_full_path_r; /* Full path for group of link */ const char *name; /* Link name to search for */ } H5G_iter_rm_t; @@ -52,7 +52,7 @@ typedef struct { /* upward */ H5O_link_t *lnk; /* Link struct to fill in */ - hbool_t * found; /* Pointer to flag to indicate that the object was found */ + hbool_t *found; /* Pointer to flag to indicate that the object was found */ } H5G_iter_lkp_t; /* Private macros */ @@ -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_PACKAGE @@ -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_PACKAGE @@ -432,7 +432,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_PACKAGE diff --git a/src/H5Gdense.c b/src/H5Gdense.c index 31ae1f3..0df6ffa 100644 --- a/src/H5Gdense.c +++ b/src/H5Gdense.c @@ -80,14 +80,14 @@ 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 */ H5HF_t *fheap; /* Fractal heap handle */ hsize_t count; /* # of links examined */ /* 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 */ @@ -114,7 +114,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; @@ -124,7 +124,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 */ 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 */ hbool_t replace_names; /* Whether to replace the names of open objects */ @@ -136,8 +136,8 @@ typedef struct { */ typedef struct { /* downward */ - H5F_t * f; /* Pointer to file that fractal heap is in */ - H5HF_t * fheap; /* Fractal heap handle */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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 */ @@ -161,11 +161,11 @@ 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 */ 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 */ @@ -181,7 +181,7 @@ typedef struct { H5F_t *f; /* Pointer to file that fractal heap is in */ /* 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 */ @@ -194,7 +194,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 */ H5HF_t *fheap; /* Fractal heap handle */ /* upward */ @@ -250,9 +250,9 @@ H5G__dense_create(H5F_t *f, H5O_linfo_t *linfo, const H5O_pline_t *pline) { 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 */ @@ -353,13 +353,13 @@ herr_t H5G__dense_insert(H5F_t *f, 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 @@ -455,7 +455,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_PACKAGE @@ -490,8 +490,8 @@ herr_t H5G__dense_lookup(H5F_t *f, const H5O_linfo_t *linfo, const char *name, hbool_t *found, 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 */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -552,7 +552,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_PACKAGE @@ -590,7 +590,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 */ @@ -626,9 +626,9 @@ herr_t H5G__dense_lookup_by_idx(H5F_t *f, 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 */ @@ -867,7 +867,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_PACKAGE @@ -921,9 +921,9 @@ herr_t H5G__dense_iterate(H5F_t *f, const H5O_linfo_t *linfo, H5_index_t idx_type, 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 */ @@ -1035,7 +1035,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_PACKAGE @@ -1078,7 +1078,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 */ @@ -1117,9 +1117,9 @@ herr_t H5G__dense_get_name_by_idx(H5F_t *f, H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name, size_t name_size, size_t *name_len) { - 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 */ @@ -1232,8 +1232,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_PACKAGE @@ -1297,7 +1297,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 */ @@ -1337,9 +1337,9 @@ done: herr_t H5G__dense_remove(H5F_t *f, 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 @@ -1433,8 +1433,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_PACKAGE @@ -1539,9 +1539,9 @@ herr_t H5G__dense_remove_by_idx(H5F_t *f, 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 */ @@ -1660,7 +1660,7 @@ H5G__dense_delete(H5F_t *f, 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 e00a90b..43b6caf 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -59,7 +59,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 */ } H5G_trav_goi_t; /********************/ @@ -162,8 +162,8 @@ H5G_map_obj_type(H5O_type_t obj_type) hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) { - void * grp = NULL; /* New group created */ - H5VL_object_t * vol_obj; /* Object of loc_id */ + void *grp = NULL; /* New group created */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t tmp_gcpl = H5I_INVALID_HID; /* Temporary group creation property list */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -260,8 +260,8 @@ done: hid_t H5Gopen1(hid_t loc_id, const char *name) { - void * grp = NULL; /* Group opened */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *grp = NULL; /* Group opened */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -326,7 +326,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new /* Create link */ if (type == H5L_TYPE_HARD) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t new_loc_params; H5VL_object_t tmp_vol_obj; /* Temporary object */ @@ -357,7 +357,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if (type == H5L_TYPE_SOFT) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; /* Set up location struct */ @@ -415,8 +415,8 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_ /* Create the appropriate kind of link */ if (type == H5L_TYPE_HARD) { - H5VL_object_t * vol_obj1; /* Object of loc_id */ - H5VL_object_t * vol_obj2; /* Object of loc_id */ + H5VL_object_t *vol_obj1; /* Object of loc_id */ + H5VL_object_t *vol_obj2; /* Object of loc_id */ H5VL_loc_params_t new_loc_params; /* Set up new location struct */ @@ -445,7 +445,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if (type == H5L_TYPE_SOFT) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; /* Soft links only need one location, the new_loc_id, but it's possible that @@ -489,7 +489,7 @@ done: herr_t H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params1; H5VL_loc_params_t loc_params2; herr_t ret_value = SUCCEED; /* Return value */ @@ -533,9 +533,9 @@ done: herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name) { - H5VL_object_t * vol_obj1 = NULL; /* Object of src_id */ + H5VL_object_t *vol_obj1 = NULL; /* Object of src_id */ H5VL_loc_params_t loc_params1; - H5VL_object_t * vol_obj2 = NULL; /* Object of dst_id */ + H5VL_object_t *vol_obj2 = NULL; /* Object of dst_id */ H5VL_loc_params_t loc_params2; herr_t ret_value = SUCCEED; /* Return value */ @@ -586,7 +586,7 @@ done: herr_t H5Gunlink(hid_t loc_id, const char *name) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -633,7 +633,7 @@ done: herr_t H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf /*out*/) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -692,7 +692,7 @@ done: herr_t H5Gset_comment(hid_t loc_id, const char *name, const char *comment) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -758,7 +758,7 @@ done: int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf /*out*/) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -833,7 +833,7 @@ done: herr_t H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op, void *op_data) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_group_optional_args_t grp_opt_args; /* Arguments for optional operation */ hsize_t last_obj = 0; /* Pointer to index value */ @@ -898,7 +898,7 @@ done: herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_group_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5I_type_t id_type; /* Type of ID */ H5G_info_t grp_info; /* Group information */ @@ -951,7 +951,7 @@ done: herr_t H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *statbuf /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_group_optional_args_t grp_opt_args; /* Arguments for optional operation */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1174,7 +1174,7 @@ done: ssize_t H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name /*out*/, size_t size) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; size_t name_len = 0; /* Length of object name */ @@ -1235,7 +1235,7 @@ done: H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5O_info2_t oinfo; /* Object info (contains object type) */ diff --git a/src/H5Gent.c b/src/H5Gent.c index 2e06092..811e010 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -421,7 +421,7 @@ H5G__ent_convert(H5F_t *f, H5HL_t *heap, const char *name, const H5O_link_t *lnk 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 34711dd..d3b6ccf 100644 --- a/src/H5Gint.c +++ b/src/H5Gint.c @@ -56,23 +56,23 @@ typedef struct { /* User data for application-style iteration over links in a group */ typedef struct { hid_t gid; /* The group ID for the application callback */ - H5O_loc_t * link_loc; /* The object location for the link */ + H5O_loc_t *link_loc; /* The object location for the link */ 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 */ 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_iterate2_t op; /* Application callback */ - void * op_data; /* Application's op data */ + void *op_data; /* Application's op data */ } H5G_iter_visit_ud_t; /********************/ @@ -250,7 +250,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 @@ -302,9 +302,9 @@ done: H5G_t * H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info) { - 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 @@ -373,13 +373,13 @@ done: H5G_t * H5G__open_name(const H5G_loc_t *loc, const char *name) { - 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 @@ -436,9 +436,9 @@ done: H5G_t * H5G_open(const H5G_loc_t *loc) { - 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) @@ -629,7 +629,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 (i.e. fo_count == 1 now), then attempt to @@ -891,7 +891,7 @@ H5G_iterate(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type, H5_iter hsize_t *last_lnk, const H5G_link_iterate_t *lnk_op, void *op_data) { 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 */ @@ -1063,7 +1063,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 */ @@ -1152,7 +1152,7 @@ H5G_visit(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type, H5_iter_o 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 start_loc; /* Location of starting group */ unsigned rc; /* Reference count of object */ herr_t ret_value = FAIL; /* Return value */ diff --git a/src/H5Gloc.c b/src/H5Gloc.c index fb94685..0d85bc1 100644 --- a/src/H5Gloc.c +++ b/src/H5Gloc.c @@ -93,7 +93,7 @@ typedef struct { /* User data for getting an object's comment in a group */ typedef struct { /* downward */ - char * comment; /* Object comment buffer */ + char *comment; /* Object comment buffer */ size_t bufsize; /* Size of object comment buffer */ /* upward */ @@ -255,7 +255,7 @@ done: herr_t H5G_loc(hid_t loc_id, H5G_loc_t *loc) { - void * obj = NULL; /* VOL object */ + void *obj = NULL; /* VOL object */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Gname.c b/src/H5Gname.c index 2ea1912..7f1d6c0 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -54,10 +54,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 */ @@ -144,10 +144,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 @@ -685,9 +685,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 */ diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 9f6d7e0..0e66107 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -70,7 +70,7 @@ typedef struct H5G_node_key_t { /********************/ /* B-tree callbacks */ -static H5UC_t * H5G__node_get_shared(const H5F_t *f, const void *_udata); +static H5UC_t *H5G__node_get_shared(const H5F_t *f, const void *_udata); static herr_t H5G__node_create(H5F_t *f, 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_PACKAGE_NOERR @@ -297,7 +297,7 @@ H5G__node_create(H5F_t *f, H5B_ins_t H5_ATTR_UNUSED op, void *_lt_key, void H5_A { 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_PACKAGE @@ -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_PACKAGE @@ -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_PACKAGE @@ -475,10 +475,10 @@ static herr_t H5G__node_found(H5F_t *f, haddr_t addr, const void H5_ATTR_UNUSED *_lt_key, hbool_t *found, 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; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -569,13 +569,13 @@ H5G__node_insert(H5F_t *f, haddr_t addr, void H5_ATTR_UNUSED *_lt_key, hbool_t H { 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; @@ -730,8 +730,8 @@ H5G__node_remove(H5F_t *f, haddr_t addr, void H5_ATTR_NDEBUG_UNUSED *_lt_key /*i void *_rt_key /*in,out*/, hbool_t *rt_key_changed /*out*/) { 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; @@ -926,8 +926,8 @@ H5G__node_iterate(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, 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; @@ -1004,7 +1004,7 @@ int H5G__node_sumup(H5F_t *f, 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; @@ -1049,7 +1049,7 @@ H5G__node_by_idx(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, 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 @@ -1183,9 +1183,9 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const { 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; @@ -1209,7 +1209,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const 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; /* Temporary 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 */ @@ -1220,7 +1220,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, const haddr_t obj_addr; /* Address of 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 */ H5MM_memcpy(&tmp_src_ent, src_ent, sizeof(H5G_entry_t)); @@ -1341,7 +1341,7 @@ H5G__node_build_table(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr 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; @@ -1364,7 +1364,7 @@ H5G__node_build_table(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr /* 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 */ @@ -1446,7 +1446,7 @@ herr_t H5G_node_debug(H5F_t *f, 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 cc92f2c..a6b6808 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -52,7 +52,7 @@ * link storage */ typedef struct { - H5F_t * f; /* Pointer to file for insertion */ + H5F_t *f; /* Pointer to file for insertion */ haddr_t oh_addr; /* Address of the object header */ H5O_linfo_t *linfo; /* Pointer to link info */ } H5G_obj_oh_it_ud1_t; @@ -353,7 +353,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 */ @@ -692,7 +692,7 @@ done: herr_t H5G__obj_info(const H5O_loc_t *oloc, H5G_info_t *grp_info) { - 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 */ @@ -866,7 +866,7 @@ H5G__obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo) /* 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 */ @@ -971,7 +971,7 @@ H5G_obj_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *n else /* Remove object from the link messages */ if (H5G__compact_remove(oloc, grp_full_path_r, name) < 0) - HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object") + HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object") } /* end if */ else { /* Using the old format for groups */ @@ -1110,7 +1110,7 @@ H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, hbool_t *found, H5O else /* Get the object's info from the symbol table */ if (H5G__stab_lookup(grp_oloc, name, found, lnk) < 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_TAG(ret_value) diff --git a/src/H5Goh.c b/src/H5Goh.c index fcc62de..1a2504a 100644 --- a/src/H5Goh.c +++ b/src/H5Goh.c @@ -40,11 +40,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(const H5O_t *loc); -static void * H5O__group_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); -static void * H5O__group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); +static void *H5O__group_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); +static void *H5O__group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); static H5O_loc_t *H5O__group_get_oloc(hid_t obj_id); static herr_t H5O__group_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info); @@ -198,7 +198,7 @@ static void * H5O__group_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type) { H5G_t *grp = NULL; /* Group opened */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -237,8 +237,8 @@ static void * H5O__group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc) { 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_PACKAGE @@ -284,7 +284,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_PACKAGE diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 6939d2f..75c7c89 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -156,7 +156,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; /* @@ -168,7 +168,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; /* @@ -178,7 +178,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 */ @@ -192,7 +192,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; @@ -203,10 +203,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 */ @@ -214,11 +214,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 */ @@ -263,13 +263,13 @@ 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 */ - H5HF_t * fheap; /* Fractal heap handle */ - const char * name; /* Name of link to compare */ + H5F_t *f; /* Pointer to file that fractal heap is in */ + 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 d8cd6e8..87cb8c6 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -146,7 +146,7 @@ struct H5O_link_t; */ typedef struct H5G_loc_t { 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 */ @@ -191,14 +191,14 @@ typedef struct H5G_entry_t H5G_entry_t; */ H5_DLL herr_t H5G_init(void); 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); -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); +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,16 +254,16 @@ 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); -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 herr_t H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, size_t *name_len, - hbool_t *cached); -H5_DLL herr_t H5G_get_name_by_addr(H5F_t *f, const struct H5O_loc_t *loc, char *name, size_t size, - size_t *name_len); +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); +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 herr_t H5G_get_name(const H5G_loc_t *loc, char *name /*out*/, size_t size, size_t *name_len, + hbool_t *cached); +H5_DLL herr_t H5G_get_name_by_addr(H5F_t *f, const struct H5O_loc_t *loc, char *name, size_t size, + size_t *name_len); 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 fb8c4d4..a91b670 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 */ /* upward */ H5G_obj_t type; /*member type to be returned */ @@ -76,7 +76,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 */ @@ -245,7 +245,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) { - 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 */ @@ -334,7 +334,7 @@ done: herr_t H5G__stab_remove(const H5O_loc_t *loc, 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 */ @@ -385,7 +385,7 @@ herr_t H5G__stab_remove_by_idx(const H5O_loc_t *grp_oloc, 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 */ @@ -445,7 +445,7 @@ done: herr_t H5G__stab_delete(H5F_t *f, 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 */ @@ -501,7 +501,7 @@ herr_t H5G__stab_iterate(const H5O_loc_t *oloc, 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 */ @@ -678,7 +678,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_PACKAGE @@ -716,7 +716,7 @@ herr_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n, char *name, size_t name_size, size_t *name_len) { - 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 */ @@ -835,7 +835,7 @@ done: herr_t H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, hbool_t *found, H5O_link_t *lnk) { - 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 */ @@ -898,7 +898,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_PACKAGE @@ -935,7 +935,7 @@ done: 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) { - 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 */ @@ -1017,7 +1017,7 @@ herr_t H5G__stab_valid(H5O_loc_t *grp_oloc, 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 4d7dfa4..bc1f784 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -86,7 +86,7 @@ htri_t H5G__is_empty_test(hid_t gid) { - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ htri_t msg_exists = FALSE; /* Indicate that a header message is present */ htri_t linfo_exists = FALSE; /* Indicate that the 'link info' message is present */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ @@ -206,7 +206,7 @@ done: htri_t H5G__has_links_test(hid_t gid, unsigned *nmsgs) { - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ htri_t msg_exists = 0; /* Indicate that a header message is present */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ htri_t ret_value = TRUE; /* Return value */ @@ -272,7 +272,7 @@ done: htri_t H5G__has_stab_test(hid_t gid) { - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ htri_t msg_exists = 0; /* Indicate that a header message is present */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ htri_t ret_value = TRUE; /* Return value */ @@ -330,7 +330,7 @@ done: htri_t H5G__is_new_dense_test(hid_t gid) { - H5G_t * grp = NULL; /* Pointer to group */ + H5G_t *grp = NULL; /* Pointer to group */ htri_t msg_exists = 0; /* Indicate that a header message is present */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ htri_t ret_value = TRUE; /* Return value */ @@ -406,10 +406,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -497,7 +497,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -553,7 +553,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 */ const H5G_name_t *obj_path; /* Pointer to group hier. path for obj */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -659,7 +659,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 */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE_TAG(grp_oloc->addr) @@ -715,7 +715,7 @@ H5G__verify_cached_stabs_test_cb(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, h { 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; @@ -806,7 +806,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 f03794e..87b3c4b 100644 --- a/src/H5Gtraverse.c +++ b/src/H5Gtraverse.c @@ -159,7 +159,7 @@ 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 cur_grp = (-1); herr_t ret_value = SUCCEED; /* Return value */ @@ -470,8 +470,8 @@ H5G__traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, H5G 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 */ @@ -593,7 +593,7 @@ H5G__traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, H5G /* 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) { @@ -142,10 +142,10 @@ H5HF__op_write(const void *obj, size_t obj_len, void *op_data) H5HF_t * H5HF_create(H5F_t *f, 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) @@ -208,9 +208,9 @@ done: H5HF_t * H5HF_open(H5F_t *f, 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 8f33f45..9f54681 100644 --- a/src/H5HFbtree2.c +++ b/src/H5HFbtree2.c @@ -61,7 +61,7 @@ typedef struct H5HF_huge_bt2_ctx_t { /* v2 B-tree driver callbacks */ /* Common 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); /* Callbacks for indirect objects */ @@ -188,9 +188,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_PACKAGE @@ -365,7 +365,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_PACKAGE_NOERR @@ -397,7 +397,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_PACKAGE_NOERR @@ -563,7 +563,7 @@ H5HF__huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2, int *res 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_PACKAGE_NOERR @@ -597,7 +597,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_PACKAGE_NOERR @@ -752,7 +752,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_PACKAGE_NOERR @@ -783,7 +783,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_PACKAGE_NOERR @@ -959,7 +959,7 @@ H5HF__huge_bt2_filt_dir_compare(const void *_rec1, const void *_rec2, int *resul 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_PACKAGE_NOERR @@ -992,7 +992,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_PACKAGE_NOERR diff --git a/src/H5HFcache.c b/src/H5HFcache.c index f5a03f5..a6a26d2 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -71,7 +71,7 @@ static herr_t H5HF__cache_hdr_get_initial_load_size(void *udata, size_t *image_l static herr_t H5HF__cache_hdr_get_final_load_size(const void *image_ptr, size_t image_len, void *udata, size_t *actual_len); static htri_t H5HF__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5HF__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HF__cache_hdr_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HF__cache_hdr_image_len(const void *thing, size_t *image_len); static herr_t H5HF__cache_hdr_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); @@ -80,7 +80,7 @@ static herr_t H5HF__cache_hdr_free_icr(void *thing); static herr_t H5HF__cache_iblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5HF__cache_iblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5HF__cache_iblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HF__cache_iblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HF__cache_iblock_image_len(const void *thing, size_t *image_len); static herr_t H5HF__cache_iblock_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); @@ -90,7 +90,7 @@ static herr_t H5HF__cache_iblock_free_icr(void *thing); static herr_t H5HF__cache_dblock_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5HF__cache_dblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5HF__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HF__cache_dblock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HF__cache_dblock_image_len(const void *thing, size_t *image_len); static herr_t H5HF__cache_dblock_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); @@ -385,7 +385,7 @@ H5HF__cache_hdr_get_final_load_size(const void *_image, size_t H5_ATTR_NDEBUG_UN size_t *actual_len) { H5HF_hdr_t hdr; /* Temporary fractal heap header */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into into supplied image */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into into supplied image */ H5HF_hdr_cache_ud_t *udata = (H5HF_hdr_cache_ud_t *)_udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ @@ -466,12 +466,12 @@ H5HF__cache_hdr_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNUSE static void * H5HF__cache_hdr_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - 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; /* User data for callback */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into into supplied image */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into into supplied image */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint8_t heap_flags; /* Status flags for heap */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -726,7 +726,7 @@ static herr_t H5HF__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { H5HF_hdr_t *hdr = (H5HF_hdr_t *)_thing; /* Fractal heap info */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint8_t heap_flags; /* Status flags for heap */ uint32_t metadata_chksum; /* Computed metadata checksum value */ herr_t ret_value = SUCCEED; /* Return value */ @@ -954,14 +954,14 @@ static void * H5HF__cache_iblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - 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 */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + H5HF_indirect_t *iblock = NULL; /* Indirect block info */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ haddr_t heap_addr; /* Address of heap header in the file */ uint32_t stored_chksum; /* Stored metadata checksum value */ unsigned u; /* Local index variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1181,7 +1181,7 @@ static herr_t H5HF__cache_iblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t H5_ATTR_UNUSED len, haddr_t *new_addr, size_t H5_ATTR_UNUSED *new_len, unsigned *flags) { - H5HF_hdr_t * hdr; /* Shared fractal heap information */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ H5HF_indirect_t *iblock = (H5HF_indirect_t *)_thing; /* Indirect block info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1302,9 +1302,9 @@ done: static herr_t H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { - H5HF_hdr_t * hdr; /* Shared fractal heap information */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ H5HF_indirect_t *iblock = (H5HF_indirect_t *)_thing; /* Indirect block info */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ #ifndef NDEBUG unsigned nchildren = 0; /* Track # of children */ size_t max_child = 0; /* Track max. child entry used */ @@ -1562,8 +1562,8 @@ static herr_t H5HF__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len) { const H5HF_dblock_cache_ud_t *udata = (const H5HF_dblock_cache_ud_t *)_udata; /* User data for callback */ - const H5HF_parent_t * par_info; /* Pointer to parent information */ - const H5HF_hdr_t * hdr; /* Shared fractal heap information */ + const H5HF_parent_t *par_info; /* Pointer to parent information */ + const H5HF_hdr_t *hdr; /* Shared fractal heap information */ FUNC_ENTER_PACKAGE_NOERR @@ -1609,15 +1609,15 @@ H5HF__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len) static htri_t H5HF__cache_dblock_verify_chksum(const void *_image, size_t len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5HF_dblock_cache_ud_t *udata = (H5HF_dblock_cache_ud_t *)_udata; /* User data for callback */ - void * read_buf = NULL; /* Pointer to buffer to read in */ - H5HF_hdr_t * hdr; /* Shared fractal heap information */ - H5HF_parent_t * par_info; /* Pointer to parent information */ + void *read_buf = NULL; /* Pointer to buffer to read in */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ + H5HF_parent_t *par_info; /* Pointer to parent information */ uint32_t stored_chksum; /* Stored metadata checksum value */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t chk_size; /* The size for validating checksum */ - uint8_t * chk_p; /* Pointer to the area for validating checksum */ + uint8_t *chk_p; /* Pointer to the area for validating checksum */ htri_t ret_value = TRUE; /* Return value */ FUNC_ENTER_PACKAGE @@ -1740,14 +1740,14 @@ done: static void * H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5HF_hdr_t * hdr; /* Shared fractal heap information */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ H5HF_dblock_cache_ud_t *udata = (H5HF_dblock_cache_ud_t *)_udata; /* User data for callback */ - H5HF_parent_t * par_info; /* Pointer to parent information */ - H5HF_direct_t * dblock = NULL; /* Direct block info */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ - void * read_buf = NULL; /* Pointer to buffer to decompress */ + H5HF_parent_t *par_info; /* Pointer to parent information */ + H5HF_direct_t *dblock = NULL; /* Direct block info */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + void *read_buf = NULL; /* Pointer to buffer to decompress */ haddr_t heap_addr; /* Address of heap header in the file */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1922,7 +1922,7 @@ static herr_t H5HF__cache_dblock_image_len(const void *_thing, size_t *image_len) { const H5HF_direct_t *dblock = (const H5HF_direct_t *)_thing; /* Direct block info */ - const H5HF_hdr_t * hdr; /* Shared fractal heap information */ + const H5HF_hdr_t *hdr; /* Shared fractal heap information */ size_t size; FUNC_ENTER_PACKAGE_NOERR @@ -2057,13 +2057,13 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t le hbool_t at_tmp_addr; /* Flag to indicate direct block is */ /* at temporary address */ haddr_t dblock_addr; - H5HF_hdr_t * hdr; /* Shared fractal heap information */ - H5HF_direct_t * dblock = (H5HF_direct_t *)_thing; /* Direct block info */ + H5HF_hdr_t *hdr; /* Shared fractal heap information */ + H5HF_direct_t *dblock = (H5HF_direct_t *)_thing; /* Direct block info */ H5HF_indirect_t *par_iblock; /* Parent indirect block */ unsigned par_entry = 0; /* Entry in parent indirect block */ - 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 * image; /* Pointer into raw data buffer */ + uint8_t *image; /* Pointer into raw data buffer */ unsigned dblock_flags = 0; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 41c9468..af8c264 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; /* Indentation 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; /* Indentation amount */ int fwidth; /* Field width mount */ } H5HF_debug_iter_ud2_t; @@ -373,7 +373,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 */ @@ -456,11 +456,11 @@ herr_t H5HF_dblock_debug(H5F_t *f, 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) @@ -690,7 +690,7 @@ herr_t H5HF_iblock_debug(H5F_t *f, 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 */ @@ -746,7 +746,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 749b973..69e745a 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -86,7 +86,7 @@ H5HF__man_dblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned 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 */ @@ -431,9 +431,9 @@ H5HF_direct_t * H5HF__man_dblock_protect(H5HF_hdr_t *hdr, haddr_t dblock_addr, size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry, unsigned flags) { - 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 info for deserializing direct block */ - H5HF_direct_t * ret_value = NULL; /* Return value */ + H5HF_direct_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index cc315cd..fa03c32 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -515,8 +515,8 @@ H5HF_hdr_t * H5HF__hdr_protect(H5F_t *f, haddr_t addr, unsigned flags) { 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_PACKAGE diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c index 824cfc9..cfa7330 100644 --- a/src/H5HFhuge.c +++ b/src/H5HFhuge.c @@ -291,7 +291,7 @@ H5HF__huge_insert(H5HF_hdr_t *hdr, size_t obj_size, void *obj, void *_id) { 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 */ @@ -411,7 +411,7 @@ H5HF__huge_insert(H5HF_hdr_t *hdr, size_t obj_size, void *obj, void *_id) 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 */ @@ -664,7 +664,7 @@ done: static herr_t H5HF__huge_op_real(H5HF_hdr_t *hdr, 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 94538f7..afbfb14 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -803,7 +803,7 @@ done: static herr_t H5HF__man_iblock_root_revert(H5HF_indirect_t *root_iblock) { - 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 */ @@ -893,7 +893,7 @@ done: herr_t H5HF__man_iblock_alloc_row(H5HF_hdr_t *hdr, 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 */ @@ -1349,7 +1349,7 @@ done: herr_t H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry) { - H5HF_hdr_t * hdr; /* Fractal heap header */ + H5HF_hdr_t *hdr; /* Fractal heap header */ H5HF_indirect_t *del_iblock = NULL; /* Pointer to protected indirect block, when deleting */ unsigned row; /* Row for entry */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5HFman.c b/src/H5HFman.c index 90cbb57..b1b4f60 100644 --- a/src/H5HFman.c +++ b/src/H5HFman.c @@ -97,10 +97,10 @@ herr_t H5HF__man_insert(H5HF_hdr_t *hdr, 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 */ @@ -552,7 +552,7 @@ herr_t H5HF__man_remove(H5HF_hdr_t *hdr, 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 8d189e8..81b4063 100644 --- a/src/H5HFpkg.h +++ b/src/H5HFpkg.h @@ -230,7 +230,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; @@ -339,16 +339,16 @@ 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 */ unsigned 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 @@ -381,9 +381,9 @@ 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 */ + H5HF_hdr_t *hdr; /* Shared heap header info */ struct H5HF_indirect_t *parent; /* Shared parent indirect block info */ - void * fd_parent; /* Saved copy of the parent pointer -- this */ + void *fd_parent; /* Saved copy of the parent pointer -- this */ /* necessary as the parent field is sometimes */ /* nulled out before the eviction notify call */ /* is made from the metadata cache. Since */ @@ -404,7 +404,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 */ }; @@ -414,9 +414,9 @@ 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 */ - void * fd_parent; /* Saved copy of the parent pointer -- this */ + void *fd_parent; /* Saved copy of the parent pointer -- this */ /* necessary as the parent field is sometimes */ /* nulled out before the eviction notify call */ /* is made from the metadata cache. Since */ @@ -459,12 +459,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; @@ -517,15 +517,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 @@ -751,7 +751,7 @@ H5_DLL herr_t H5HF__sect_single_dblock_info(H5HF_hdr_t *hdr, const haddr_t *dblock_addr, size_t *dblock_size); H5_DLL herr_t H5HF__sect_single_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, size_t amt); H5_DLL herr_t H5HF__sect_row_revive(H5HF_hdr_t *hdr, H5HF_free_section_t *sect); -H5_DLL herr_t H5HF__sect_row_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned *entry_p); +H5_DLL herr_t H5HF__sect_row_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned *entry_p); H5_DLL H5HF_indirect_t *H5HF__sect_row_get_iblock(H5HF_free_section_t *sect); H5_DLL herr_t H5HF__sect_indirect_add(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, unsigned start_entry, unsigned nentries); diff --git a/src/H5HFsection.c b/src/H5HFsection.c index 2472149..de68e3d 100644 --- a/src/H5HFsection.c +++ b/src/H5HFsection.c @@ -131,7 +131,7 @@ static herr_t H5HF__sect_indirect_reduce_row(H5HF_hdr_t *hdr, H5HF static herr_t H5HF__sect_indirect_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned child_entry); static herr_t H5HF__sect_indirect_first(H5HF_hdr_t *hdr, 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, H5HF_free_section_t *sect1, @@ -783,8 +783,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 */ /* Sanity check */ HDassert(sect); @@ -910,9 +910,9 @@ static herr_t H5HF__sect_single_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void *_udata) { 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_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 */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -967,8 +967,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_PACKAGE_NOERR @@ -1021,9 +1021,9 @@ static herr_t H5HF__sect_single_shrink(H5FS_section_info_t **_sect, void *_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_direct_t * dblock; /* Pointer to direct block for 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_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 */ @@ -1086,7 +1086,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_PACKAGE @@ -1135,7 +1135,7 @@ H5HF__sect_single_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls, const H5 /* Check if this section is not in a direct block that is the root direct block */ /* (not enough information to check on a single section in a root direct block) */ if (sect->u.single.parent != NULL) { - H5HF_indirect_t * iblock; /* Indirect block that section's direct block resides in */ + H5HF_indirect_t *iblock; /* Indirect block that section's direct block resides in */ haddr_t dblock_addr; /* Direct block address */ size_t dblock_size; /* Direct block size */ unsigned dblock_status = 0; /* Direct block's status in the metadata cache */ @@ -1441,7 +1441,7 @@ H5HF__sect_row_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect) else /* Change row section to be the "first row" */ if (H5HF__space_sect_change_class(hdr, sect, H5HF_FSPACE_SECT_FIRST_ROW) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row") + HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1625,7 +1625,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 */ @@ -1669,7 +1669,7 @@ static H5FS_section_info_t * H5HF__sect_row_deserialize(const H5FS_section_class_t *cls, 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_PACKAGE @@ -1712,7 +1712,7 @@ H5HF__sect_row_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_i { 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_PACKAGE_NOERR @@ -1766,9 +1766,9 @@ static herr_t H5HF__sect_row_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void *_udata) { 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_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 */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1793,7 +1793,7 @@ H5HF__sect_row_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, else /* Merge rows' underlying indirect sections together */ if (H5HF__sect_indirect_merge_row(hdr, (*sect1), sect2) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTMERGE, FAIL, "can't merge underlying indirect sections") + HGOTO_ERROR(H5E_HEAP, H5E_CANTMERGE, FAIL, "can't merge underlying indirect sections") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1821,8 +1821,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_PACKAGE_NOERR @@ -1857,9 +1857,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 */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1967,8 +1967,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 H5_ATTR_NDEBUG_UNUSED indir_idx; /* Index of row in underlying indirect section's row array */ @@ -2447,7 +2447,7 @@ H5HF__sect_indirect_init_rows(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, hbool_ else /* Add new row section to free space manager for the heap */ if (H5HF__space_add(hdr, row_sect, space_flags) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add row section to free space") + HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add row section to free space") /* Increment reference count for underlying indirect section */ sect->u.indirect.rc++; @@ -2463,7 +2463,7 @@ H5HF__sect_indirect_init_rows(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, hbool_ 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 */ @@ -3206,7 +3206,7 @@ H5HF__sect_indirect_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned /* (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 */ @@ -3672,7 +3672,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 */ hsize_t par_block_off; /* Offset of parent's block */ unsigned par_row, par_col; /* Row & column in parent indirect section */ @@ -4059,7 +4059,7 @@ H5HF__sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect HDassert(tmp_child_sect->u.indirect.parent == sect); if (u > 0) { const H5HF_free_section_t H5_ATTR_NDEBUG_UNUSED - * tmp_child_sect2; /* Pointer to child indirect section */ + *tmp_child_sect2; /* Pointer to child indirect section */ tmp_child_sect2 = sect->u.indirect.indir_ents[u - 1]; HDassert(H5F_addr_lt(tmp_child_sect2->sect_info.addr, tmp_child_sect->sect_info.addr)); diff --git a/src/H5HFspace.c b/src/H5HFspace.c index d166cf5..c007e1e 100644 --- a/src/H5HFspace.c +++ b/src/H5HFspace.c @@ -320,7 +320,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_PACKAGE diff --git a/src/H5HFstat.c b/src/H5HFstat.c index 5e5d06a..542d12b 100644 --- a/src/H5HFstat.c +++ b/src/H5HFstat.c @@ -116,7 +116,7 @@ herr_t H5HF_size(const H5HF_t *fh, 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 */ @@ -124,7 +124,7 @@ static haddr_t H5HG__create(H5F_t *f, 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 */ @@ -407,8 +407,8 @@ H5HG_extend(H5F_t *f, 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 */ @@ -581,9 +581,9 @@ H5HG_read(H5F_t *f, H5HG_t *hobj, void *object /*out*/, size_t *buf_size) { 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 = NULL; /* 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 = NULL; /* Return value */ FUNC_ENTER_NOAPI_TAG(H5AC__GLOBALHEAP_TAG, NULL) @@ -748,7 +748,7 @@ herr_t H5HG_remove(H5F_t *f, 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 0eaa698..ddcf8a1 100644 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -58,7 +58,7 @@ static herr_t H5HG__cache_heap_get_initial_load_size(void *udata, size_t *image_len); static herr_t H5HG__cache_heap_get_final_load_size(const void *_image, size_t image_len, void *udata, size_t *actual_len); -static void * H5HG__cache_heap_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HG__cache_heap_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HG__cache_heap_image_len(const void *thing, size_t *image_len); static herr_t H5HG__cache_heap_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5HG__cache_heap_free_icr(void *thing); @@ -231,12 +231,12 @@ done: static void * H5HG__cache_heap_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5F_t * f = (H5F_t *)_udata; /* File pointer -- obtained from user data */ + H5F_t *f = (H5F_t *)_udata; /* File pointer -- obtained from user data */ H5HG_heap_t *heap = NULL; /* New global heap */ - uint8_t * image; /* Pointer to image to decode */ + uint8_t *image; /* Pointer to image to decode */ size_t max_idx = 0; /* Maximum heap object index seen */ size_t nalloc; /* Number of objects allocated */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c index 51a74ec..4ae9025 100644 --- a/src/H5HGdbg.c +++ b/src/H5HGdbg.c @@ -78,7 +78,7 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth) 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 5c0fbe8..dcac6ef 100644 --- a/src/H5HGpkg.h +++ b/src/H5HGpkg.h @@ -127,13 +127,13 @@ struct H5HG_heap_t { /* have been used at some time and the */ /* correct new index should be searched for */ struct H5F_shared_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, haddr_t addr, unsigned flags); #endif /* H5HGpkg_H */ diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h index 5deae88..28d0058 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -54,7 +54,7 @@ typedef struct H5HG_heap_t H5HG_heap_t; /* Main global heap routines */ H5_DLL herr_t H5HG_insert(H5F_t *f, size_t size, const void *obj, H5HG_t *hobj /*out*/); -H5_DLL void * H5HG_read(H5F_t *f, H5HG_t *hobj, void *object, size_t *buf_size /*out*/); +H5_DLL void *H5HG_read(H5F_t *f, H5HG_t *hobj, void *object, size_t *buf_size /*out*/); H5_DLL int H5HG_link(H5F_t *f, const H5HG_t *hobj, int adjust); H5_DLL herr_t H5HG_get_obj_size(H5F_t *f, H5HG_t *hobj, size_t *obj_size); H5_DLL herr_t H5HG_remove(H5F_t *f, H5HG_t *hobj); @@ -98,7 +98,7 @@ H5FL_BLK_DEFINE(lheap_chunk); herr_t H5HL_create(H5F_t *f, 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 = 0; /* Total heap size on disk */ herr_t ret_value = SUCCEED; @@ -305,12 +305,12 @@ H5HL_t * H5HL_protect(H5F_t *f, haddr_t addr, unsigned flags) { 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 = NULL; /* Heap data structure */ + H5HL_prfx_t *prfx = NULL; /* Local heap prefix */ + H5HL_dblk_t *dblk = NULL; /* Local heap data block */ + H5HL_t *heap = NULL; /* 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 = NULL; + H5HL_t *ret_value = NULL; FUNC_ENTER_NOAPI(NULL) @@ -894,10 +894,10 @@ done: herr_t H5HL_delete(H5F_t *f, haddr_t addr) { - H5HL_t * heap = NULL; /* Local heap to delete */ + H5HL_t *heap = NULL; /* 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; @@ -959,8 +959,8 @@ herr_t H5HL_get_size(H5F_t *f, 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; FUNC_ENTER_NOAPI(FAIL) @@ -1011,8 +1011,8 @@ herr_t H5HL_heapsize(H5F_t *f, 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; FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5HLcache.c b/src/H5HLcache.c index c625088..4d78d0c 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -68,14 +68,14 @@ static herr_t H5HL__cache_prefix_get_initial_load_size(void *udata, size_t *image_len); static herr_t H5HL__cache_prefix_get_final_load_size(const void *_image, size_t image_len, void *udata, size_t *actual_len); -static void * H5HL__cache_prefix_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HL__cache_prefix_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HL__cache_prefix_image_len(const void *thing, size_t *image_len); static herr_t H5HL__cache_prefix_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5HL__cache_prefix_free_icr(void *thing); /* Local heap data block */ static herr_t H5HL__cache_datablock_get_initial_load_size(void *udata, size_t *image_len); -static void * H5HL__cache_datablock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5HL__cache_datablock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5HL__cache_datablock_image_len(const void *thing, size_t *image_len); static herr_t H5HL__cache_datablock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5HL__cache_datablock_notify(H5C_notify_action_t action, void *_thing); @@ -348,7 +348,7 @@ static herr_t H5HL__cache_prefix_get_final_load_size(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED image_len, void *_udata, size_t *actual_len) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5HL_cache_prfx_ud_t *udata = (H5HL_cache_prfx_ud_t *)_udata; /* User data for callback */ H5HL_t heap; /* Local heap */ herr_t ret_value = SUCCEED; /* Return value */ @@ -400,11 +400,11 @@ static void * H5HL__cache_prefix_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5HL_t * heap = NULL; /* Local heap */ - H5HL_prfx_t * prfx = NULL; /* Heap prefix deserialized */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into decoding buffer */ + H5HL_t *heap = NULL; /* Local heap */ + H5HL_prfx_t *prfx = NULL; /* Heap prefix deserialized */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into decoding buffer */ H5HL_cache_prfx_ud_t *udata = (H5HL_cache_prfx_ud_t *)_udata; /* User data for callback */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -539,8 +539,8 @@ H5HL__cache_prefix_serialize(const H5_ATTR_NDEBUG_UNUSED H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { H5HL_prfx_t *prfx = (H5HL_prfx_t *)_thing; /* Pointer to local heap prefix to query */ - H5HL_t * heap; /* Pointer to the local heap */ - uint8_t * image = (uint8_t *)_image; /* Pointer into image buffer */ + H5HL_t *heap; /* Pointer to the local heap */ + uint8_t *image = (uint8_t *)_image; /* Pointer into image buffer */ size_t buf_size; /* expected size of the image buffer */ FUNC_ENTER_PACKAGE_NOERR @@ -708,8 +708,8 @@ static void * H5HL__cache_datablock_deserialize(const void *image, size_t len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { H5HL_dblk_t *dblk = NULL; /* Local heap data block deserialized */ - H5HL_t * heap = (H5HL_t *)_udata; /* User data for callback */ - void * ret_value = NULL; /* Return value */ + H5HL_t *heap = (H5HL_t *)_udata; /* User data for callback */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -803,7 +803,7 @@ static herr_t H5HL__cache_datablock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { - H5HL_t * heap; /* Pointer to the local heap */ + H5HL_t *heap; /* Pointer to the local heap */ H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c index 305014b..e75f361 100644 --- a/src/H5HLdbg.c +++ b/src/H5HLdbg.c @@ -47,10 +47,10 @@ herr_t H5HL_debug(H5F_t *f, 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 5ee9aee..6228f24 100644 --- a/src/H5HLpkg.h +++ b/src/H5HLpkg.h @@ -100,7 +100,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 02e07eb..f990563 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -53,12 +53,12 @@ typedef struct H5HL_t H5HL_t; /* * Library prototypes */ -H5_DLL herr_t H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr /*out*/); -H5_DLL herr_t H5HL_delete(H5F_t *f, haddr_t addr); -H5_DLL herr_t H5HL_get_size(H5F_t *f, haddr_t addr, size_t *size); -H5_DLL herr_t H5HL_heapsize(H5F_t *f, haddr_t addr, hsize_t *heap_size); -H5_DLL herr_t H5HL_insert(H5F_t *f, H5HL_t *heap, size_t size, const void *buf, size_t *offset); -H5_DLL void * H5HL_offset_into(const H5HL_t *heap, size_t offset); +H5_DLL herr_t H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr /*out*/); +H5_DLL herr_t H5HL_delete(H5F_t *f, haddr_t addr); +H5_DLL herr_t H5HL_get_size(H5F_t *f, haddr_t addr, size_t *size); +H5_DLL herr_t H5HL_heapsize(H5F_t *f, haddr_t addr, hsize_t *heap_size); +H5_DLL herr_t H5HL_insert(H5F_t *f, H5HL_t *heap, size_t size, const void *buf, size_t *offset); +H5_DLL void *H5HL_offset_into(const H5HL_t *heap, size_t offset); H5_DLL H5HL_t *H5HL_protect(H5F_t *f, haddr_t addr, unsigned flags); H5_DLL herr_t H5HL_remove(H5F_t *f, H5HL_t *heap, size_t offset, size_t size); H5_DLL herr_t H5HL_unprotect(H5HL_t *heap); @@ -41,13 +41,13 @@ 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; typedef struct { H5I_iterate_func_t op; /* Application's callback routine */ - void * op_data; /* Application's user data */ + void *op_data; /* Application's user data */ } H5I_iterate_pub_ud_t; /********************/ @@ -746,7 +746,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 = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) H5TRACE3("*x", "ItIS*x", type, func, key); @@ -925,7 +925,7 @@ done: ssize_t H5Iget_name(hid_t id, char *name /*out*/, size_t size) { - H5VL_object_t * vol_obj = NULL; /* Object stored in ID */ + H5VL_object_t *vol_obj = NULL; /* Object stored in ID */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; size_t obj_name_len = 0; /* Length of object's name */ diff --git a/src/H5Idbg.c b/src/H5Idbg.c index 3eb6518..aa244a7 100644 --- a/src/H5Idbg.c +++ b/src/H5Idbg.c @@ -75,10 +75,10 @@ static int H5I__id_dump_cb(void *_item, void *_key, void *_udata); static int H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5I_id_info_t * info = (H5I_id_info_t *)_item; /* Pointer to the ID node */ + H5I_id_info_t *info = (H5I_id_info_t *)_item; /* Pointer to the ID node */ H5I_type_t type = *(H5I_type_t *)_udata; /* User data */ const H5G_name_t *path = NULL; /* Path to file object */ - void * object = NULL; /* Pointer to VOL connector object */ + void *object = NULL; /* Pointer to VOL connector object */ FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Iint.c b/src/H5Iint.c index e382efc..5675374 100644 --- a/src/H5Iint.c +++ b/src/H5Iint.c @@ -53,7 +53,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_type_t obj_type; /* Type of object we are iterating over */ } H5I_iterate_ud_t; @@ -73,9 +73,9 @@ typedef struct { /* Local Prototypes */ /********************/ -static void * H5I__unwrap(void *object, H5I_type_t type); +static void *H5I__unwrap(void *object, H5I_type_t type); static herr_t H5I__mark_node(void *_id, void *key, void *udata); -static void * H5I__remove_common(H5I_type_info_t *type_info, hid_t id); +static void *H5I__remove_common(H5I_type_info_t *type_info, hid_t id); static int H5I__dec_ref(hid_t id, void **request); static int H5I__dec_app_ref(hid_t id, void **request); static int H5I__dec_app_ref_always_close(hid_t id, void **request); @@ -300,8 +300,8 @@ herr_t H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref) { H5I_clear_type_ud_t udata; /* udata struct for callback */ - H5I_id_info_t * item = NULL; - H5I_id_info_t * tmp = NULL; + H5I_id_info_t *item = NULL; + H5I_id_info_t *tmp = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -366,7 +366,7 @@ done: static herr_t H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata) { - H5I_id_info_t * info = (H5I_id_info_t *)_info; /* Current ID info being worked with */ + H5I_id_info_t *info = (H5I_id_info_t *)_info; /* Current ID info being worked with */ H5I_clear_type_ud_t *udata = (H5I_clear_type_ud_t *)_udata; /* udata struct */ hbool_t mark = FALSE; @@ -520,7 +520,7 @@ H5I__register(H5I_type_t type, const void *object, hbool_t app_ref, H5I_future_r H5I_future_discard_func_t discard_cb) { H5I_type_info_t *type_info = NULL; /* Pointer to the type */ - H5I_id_info_t * info = NULL; /* Pointer to the new ID information */ + H5I_id_info_t *info = NULL; /* Pointer to the new ID information */ hid_t new_id = H5I_INVALID_HID; /* New ID */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -615,7 +615,7 @@ herr_t H5I_register_using_existing_id(H5I_type_t type, void *object, hbool_t app_ref, hid_t existing_id) { H5I_type_info_t *type_info = NULL; /* Pointer to the type */ - H5I_id_info_t * info = NULL; /* Pointer to the new ID information */ + H5I_id_info_t *info = NULL; /* Pointer to the new ID information */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -687,7 +687,7 @@ void * H5I_subst(hid_t id, const void *new_object) { H5I_id_info_t *info = NULL; /* Pointer to the ID's info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -723,7 +723,7 @@ void * H5I_object(hid_t id) { H5I_id_info_t *info = NULL; /* Pointer to the ID info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOERR @@ -757,7 +757,7 @@ void * H5I_object_verify(hid_t id, H5I_type_t type) { H5I_id_info_t *info = NULL; /* Pointer to the ID info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOERR @@ -906,7 +906,7 @@ static void * H5I__remove_common(H5I_type_info_t *type_info, hid_t id) { H5I_id_info_t *info = NULL; /* Pointer to the current ID */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -960,7 +960,7 @@ H5I_remove(hid_t id) { H5I_type_info_t *type_info = NULL; /* Pointer to the ID type */ H5I_type_t type = H5I_BADID; /* ID's type */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1502,7 +1502,7 @@ done: static int H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5I_id_info_t * info = (H5I_id_info_t *)_item; /* Pointer to the ID info */ + H5I_id_info_t *info = (H5I_id_info_t *)_item; /* Pointer to the ID info */ H5I_iterate_ud_t *udata = (H5I_iterate_ud_t *)_udata; /* User data for callback */ int ret_value = H5_ITER_CONT; /* Callback return value */ @@ -1513,7 +1513,7 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) */ if ((!udata->app_ref) || (info->app_count > 0)) { H5I_type_t type = udata->obj_type; - void * object; + void *object; herr_t cb_ret_val; /* The stored object pointer might be an H5VL_object_t, in which @@ -1577,8 +1577,8 @@ H5I_iterate(H5I_type_t type, H5I_search_func_t func, void *udata, hbool_t app_re /* Only iterate through ID list if it is initialized and there are IDs in type */ if (type_info && type_info->init_count > 0 && type_info->id_count > 0) { H5I_iterate_ud_t iter_udata; /* User data for iteration callback */ - H5I_id_info_t * item = NULL; - H5I_id_info_t * tmp = NULL; + H5I_id_info_t *item = NULL; + H5I_id_info_t *tmp = NULL; /* Set up iterator user data */ iter_udata.user_func = func; @@ -1620,8 +1620,8 @@ H5I__find_id(hid_t id) { H5I_type_t type; /* ID's type */ H5I_type_info_t *type_info = NULL; /* Pointer to the type */ - H5I_id_info_t * id_info = NULL; /* ID's info */ - H5I_id_info_t * ret_value = NULL; /* Return value */ + H5I_id_info_t *id_info = NULL; /* ID's info */ + H5I_id_info_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -1698,10 +1698,10 @@ done: static int H5I__find_id_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata) { - H5I_id_info_t * info = (H5I_id_info_t *)_item; /* Pointer to the ID info */ + H5I_id_info_t *info = (H5I_id_info_t *)_item; /* Pointer to the ID info */ H5I_get_id_ud_t *udata = (H5I_get_id_ud_t *)_udata; /* Pointer to user data */ H5I_type_t type = udata->obj_type; - const void * object = NULL; + const void *object = NULL; int ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -1754,8 +1754,8 @@ H5I_find_id(const void *object, H5I_type_t type, hid_t *id) /* Only iterate through ID list if it is initialized and there are IDs in type */ if (type_info->init_count > 0 && type_info->id_count > 0) { H5I_get_id_ud_t udata; /* User data */ - H5I_id_info_t * item = NULL; - H5I_id_info_t * tmp = NULL; + H5I_id_info_t *item = NULL; + H5I_id_info_t *tmp = NULL; /* Set up iterator user data */ udata.object = object; diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h index 34e6174..e368ef4 100644 --- a/src/H5Ipkg.h +++ b/src/H5Ipkg.h @@ -81,8 +81,8 @@ typedef struct H5I_type_info_t { unsigned init_count; /* # of times this type has been initialized */ uint64_t id_count; /* Current number of IDs held */ uint64_t nextid; /* ID to use for the next object */ - H5I_id_info_t * last_id_info; /* Info for most recent ID looked up */ - H5I_id_info_t * hash_table; /* Hash table pointer for this ID type */ + H5I_id_info_t *last_id_info; /* Info for most recent ID looked up */ + H5I_id_info_t *hash_table; /* Hash table pointer for this ID type */ } H5I_type_info_t; /*****************************/ @@ -105,12 +105,12 @@ H5_DLLVAR int H5I_next_type_g; /* Package Private Prototypes */ /******************************/ -H5_DLL hid_t H5I__register(H5I_type_t type, const void *object, hbool_t app_ref, - H5I_future_realize_func_t realize_cb, H5I_future_discard_func_t discard_cb); -H5_DLL int H5I__destroy_type(H5I_type_t type); -H5_DLL void *H5I__remove_verify(hid_t id, H5I_type_t type); -H5_DLL int H5I__inc_type_ref(H5I_type_t type); -H5_DLL int H5I__get_type_ref(H5I_type_t type); +H5_DLL hid_t H5I__register(H5I_type_t type, const void *object, hbool_t app_ref, + H5I_future_realize_func_t realize_cb, H5I_future_discard_func_t discard_cb); +H5_DLL int H5I__destroy_type(H5I_type_t type); +H5_DLL void *H5I__remove_verify(hid_t id, H5I_type_t type); +H5_DLL int H5I__inc_type_ref(H5I_type_t type); +H5_DLL int H5I__get_type_ref(H5I_type_t type); H5_DLL H5I_id_info_t *H5I__find_id(hid_t id); /* Testing functions */ diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index 831ff76..3eaa3de 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -88,10 +88,10 @@ H5_DLL herr_t H5I_find_id(const void *object, H5I_type_t type, hid_t *id /*o */ /* Functions that manipulate objects */ -H5_DLL void * H5I_object(hid_t id); -H5_DLL void * H5I_object_verify(hid_t id, H5I_type_t type); -H5_DLL void * H5I_remove(hid_t id); -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 type); +H5_DLL void *H5I_remove(hid_t id); +H5_DLL void *H5I_subst(hid_t id, const void *new_object); H5_DLL htri_t H5I_is_file_object(hid_t id); /* ID registration functions */ @@ -94,8 +94,8 @@ herr_t H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t lcpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj1 = NULL; /* Object of src_id */ - H5VL_object_t * vol_obj2 = NULL; /* Object of dst_id */ + H5VL_object_t *vol_obj1 = NULL; /* Object of src_id */ + H5VL_object_t *vol_obj2 = NULL; /* Object of dst_id */ H5VL_loc_params_t loc_params1; H5VL_loc_params_t loc_params2; H5VL_object_t tmp_vol_obj; /* Temporary object */ @@ -199,9 +199,9 @@ herr_t H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t lcpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj1 = NULL; /* Object of src_id */ + H5VL_object_t *vol_obj1 = NULL; /* Object of src_id */ H5VL_loc_params_t loc_params1; - H5VL_object_t * vol_obj2 = NULL; /* Object of dst_id */ + H5VL_object_t *vol_obj2 = NULL; /* Object of dst_id */ H5VL_loc_params_t loc_params2; H5VL_object_t tmp_vol_obj; /* Temporary object */ herr_t ret_value = SUCCEED; /* Return value */ @@ -299,7 +299,7 @@ static herr_t H5L__create_soft_api_common(const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_link_create_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -396,8 +396,8 @@ H5Lcreate_soft_async(const char *app_file, const char *app_func, unsigned app_li hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -438,10 +438,10 @@ static herr_t H5L__create_hard_api_common(hid_t cur_loc_id, const char *cur_name, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * curr_vol_obj = NULL; /* Object of cur_loc_id */ - H5VL_object_t * link_vol_obj = NULL; /* Object of link_loc_id */ + H5VL_object_t *curr_vol_obj = NULL; /* Object of cur_loc_id */ + H5VL_object_t *link_vol_obj = NULL; /* Object of link_loc_id */ H5VL_object_t tmp_vol_obj; /* Temporary object */ - H5VL_object_t * tmp_vol_obj_ptr = &tmp_vol_obj; /* Ptr to temporary object */ + H5VL_object_t *tmp_vol_obj_ptr = &tmp_vol_obj; /* Ptr to temporary object */ H5VL_object_t **tmp_vol_obj_ptr_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj_ptr); /* Ptr to ptr to temporary object */ H5VL_link_create_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -590,8 +590,8 @@ H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_li { H5VL_object_t vol_obj; /* Object for loc_id */ H5VL_object_t *vol_obj_ptr = &vol_obj; /* Pointer to object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -643,15 +643,15 @@ herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_create_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ - 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) @@ -749,7 +749,7 @@ herr_t H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, const void *udata, size_t udata_size, hid_t lcpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_create_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -813,7 +813,7 @@ static herr_t H5L__delete_api_common(hid_t loc_id, const char *name, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -887,8 +887,8 @@ H5Ldelete_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -929,7 +929,7 @@ H5L__delete_by_idx_api_common(hid_t loc_id, const char *group_name, H5_index_t i H5_iter_order_t order, hsize_t n, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1013,8 +1013,8 @@ H5Ldelete_by_idx_async(const char *app_file, const char *app_func, unsigned app_ hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1064,7 +1064,7 @@ done: herr_t H5Lget_val(hid_t loc_id, const char *name, void *buf /*out*/, size_t size, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1125,7 +1125,7 @@ herr_t H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, void *buf /*out*/, size_t size, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1184,7 +1184,7 @@ static herr_t H5L__exists_api_common(hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1260,8 +1260,8 @@ H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, h hbool_t *exists, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1303,7 +1303,7 @@ done: herr_t H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1359,7 +1359,7 @@ herr_t H5Lget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5L_info2_t *linfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1560,7 +1560,7 @@ ssize_t H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ size_t link_name_len = 0; /* Length of the link name string */ @@ -1624,7 +1624,7 @@ static herr_t H5L__iterate_api_common(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1724,8 +1724,8 @@ H5Literate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1779,7 +1779,7 @@ herr_t H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value; /* Return value */ @@ -1862,7 +1862,7 @@ done: herr_t H5Lvisit2(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5I_type_t id_type; /* Type of ID */ @@ -1940,7 +1940,7 @@ herr_t H5Lvisit_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value; /* Return value */ diff --git a/src/H5Ldeprec.c b/src/H5Ldeprec.c index 896861a..4c107b1 100644 --- a/src/H5Ldeprec.c +++ b/src/H5Ldeprec.c @@ -51,7 +51,7 @@ /* Shim data for using native H5Literate/visit callbacks with the VOL */ typedef struct H5L_shim_data_t { H5L_iterate1_t real_op; - void * real_op_data; + void *real_op_data; } H5L_shim_data_t; /********************/ @@ -141,7 +141,7 @@ herr_t H5Literate1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate1_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5I_type_t id_type; /* Type of ID */ @@ -228,7 +228,7 @@ herr_t H5Literate_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate1_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5L_shim_data_t shim_data; @@ -311,7 +311,7 @@ done: herr_t H5Lget_info1(hid_t loc_id, const char *name, H5L_info1_t *linfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5L_info2_t linfo2; /* New-style link info */ @@ -399,7 +399,7 @@ herr_t H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5L_info1_t *linfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_link_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5L_info2_t linfo2; /* New-style link info */ @@ -507,7 +507,7 @@ done: herr_t H5Lvisit1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate1_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5I_type_t id_type; /* Type of ID */ @@ -600,7 +600,7 @@ herr_t H5Lvisit_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate1_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_link_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; H5L_shim_data_t shim_data; diff --git a/src/H5Ldevelop.h b/src/H5Ldevelop.h index 96b2ec3..04eb0ff 100644 --- a/src/H5Ldevelop.h +++ b/src/H5Ldevelop.h @@ -83,7 +83,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 */ @@ -300,7 +300,7 @@ typedef hid_t (*H5L_traverse_0_func_t)(const char *link_name, hid_t cur_group, c 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/H5Lexternal.c b/src/H5Lexternal.c index b120ef8..82c4512 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -101,25 +101,25 @@ 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, hid_t H5_ATTR_UNUSED dxpl_id) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ 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 */ - 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 */ + 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 = H5I_INVALID_HID; /* File access property list for external link's file */ - void * ext_obj = NULL; /* External link's object */ + void *ext_obj = NULL; /* External link's object */ hid_t ext_obj_id = H5I_INVALID_HID; /* ID for external link's object */ H5I_type_t opened_type; /* ID type of 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 */ - H5P_genplist_t * fa_plist; /* File access property list pointer */ + 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 */ - char * elink_prefix = NULL; /* Pointer to elink prefix */ + char *elink_prefix = NULL; /* Pointer to elink prefix */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Lint.c b/src/H5Lint.c index 12de22f..9deb3a4 100644 --- a/src/H5Lint.c +++ b/src/H5Lint.c @@ -87,22 +87,22 @@ typedef struct { size_t size; /* Size of name buffer */ /* Out */ - char * name; /* Buffer to return name to user */ + char *name; /* Buffer to return name to user */ size_t name_len; /* Length of full name */ } H5L_trav_gnbi_t; /* 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 */ - H5G_name_t * path; /* Path to object being linked */ + H5F_t *file; /* Pointer to the file */ + H5P_genplist_t *lc_plist; /* Link creation property list */ + 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 */ + const char *dst_name; /* Destination name for moving object */ H5T_cset_t cset; /* Char set for new name */ const H5G_loc_t *dst_loc; /* Destination location for moving object */ unsigned dst_target_flags; /* Target flags for destination object */ @@ -112,7 +112,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 */ } H5L_trav_mv2_t; @@ -129,7 +129,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; /********************/ @@ -537,7 +537,7 @@ H5L__link_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t H5_AT 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 */ @@ -703,7 +703,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) { - 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 */ @@ -783,8 +783,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) { - 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*/ @@ -854,7 +854,7 @@ done: herr_t H5L__create_soft(const char *target_path, const H5G_loc_t *link_loc, const char *link_name, hid_t lcpl_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 */ @@ -1232,7 +1232,7 @@ done: herr_t H5L__delete(const H5G_loc_t *loc, const char *name) { - 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_PACKAGE @@ -1356,7 +1356,7 @@ H5L__move_dest_cb(H5G_loc_t *grp_loc /*in*/, const char *name, const H5O_link_t 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; @@ -1470,7 +1470,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 */ @@ -1704,7 +1704,7 @@ H5L__exists_inter_cb(H5G_loc_t H5_ATTR_UNUSED *grp_loc /*in*/, const char H5_ATT /* Check for more components to the path */ if (udata->sep) { H5G_traverse_t cb_func; /* Callback function for tranversal */ - char * next; /* Pointer to next component name */ + char *next; /* Pointer to next component name */ /* Look for another separator */ next = udata->sep; @@ -1755,8 +1755,8 @@ H5L_exists_tolerant(const H5G_loc_t *loc, const char *name, hbool_t *exists) { H5L_trav_le_t udata; /* User data for traversal */ H5G_traverse_t cb_func; /* Callback function for tranversal */ - char * name_copy = NULL; /* Duplicate of name */ - char * name_trav; /* Name to traverse */ + char *name_copy = NULL; /* Duplicate of name */ + char *name_trav; /* Name to traverse */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h index 98e3051..8256a19 100644 --- a/src/H5Lprivate.h +++ b/src/H5Lprivate.h @@ -55,7 +55,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; /*****************************/ @@ -78,9 +78,9 @@ H5_DLL herr_t H5L_iterate(H5G_loc_t *loc, const char *group_name, H5_index_t idx hsize_t *idx_p, H5L_iterate2_t op, void *op_data); /* 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_is_registered(H5L_type_t id, hbool_t *is_registered); +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_is_registered(H5L_type_t id, hbool_t *is_registered); H5_DLL const H5L_class_t *H5L_find_class(H5L_type_t id); #endif /* H5Lprivate_H */ @@ -206,8 +206,8 @@ static hid_t H5M__create_api_common(hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * map = NULL; /* New map's info */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *map = NULL; /* New map's info */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -323,8 +323,8 @@ H5Mcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -382,8 +382,8 @@ done: hid_t H5Mcreate_anon(hid_t loc_id, hid_t key_type_id, hid_t val_type_id, hid_t mcpl_id, hid_t mapl_id) { - void * map = NULL; /* map object from VOL connector */ - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + void *map = NULL; /* map object from VOL connector */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -458,8 +458,8 @@ static hid_t H5M__open_api_common(hid_t loc_id, const char *name, hid_t mapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * map = NULL; /* map object from VOL connector */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *map = NULL; /* map object from VOL connector */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -554,8 +554,8 @@ H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t mapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -629,10 +629,10 @@ done: herr_t H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, hid_t es_id) { - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ H5VL_object_t *vol_obj = NULL; /* VOL object of dset_id */ - H5VL_t * connector = NULL; /* VOL connector */ + H5VL_t *connector = NULL; /* VOL connector */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -694,7 +694,7 @@ done: hid_t H5Mget_key_type(hid_t map_id) { - H5VL_object_t * vol_obj; /* Map structure */ + H5VL_object_t *vol_obj; /* Map structure */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -739,7 +739,7 @@ done: hid_t H5Mget_val_type(hid_t map_id) { - H5VL_object_t * vol_obj; /* Map structure */ + H5VL_object_t *vol_obj; /* Map structure */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -784,7 +784,7 @@ done: hid_t H5Mget_create_plist(hid_t map_id) { - H5VL_object_t * vol_obj; /* Map structure */ + H5VL_object_t *vol_obj; /* Map structure */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -832,7 +832,7 @@ done: hid_t H5Mget_access_plist(hid_t map_id) { - H5VL_object_t * vol_obj; /* Map structure */ + H5VL_object_t *vol_obj; /* Map structure */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -876,7 +876,7 @@ done: herr_t H5Mget_count(hid_t map_id, hsize_t *count /*out*/, hid_t dxpl_id) { - H5VL_object_t * vol_obj; /* Map structure */ + H5VL_object_t *vol_obj; /* Map structure */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ herr_t ret_value = SUCCEED; /* Return value */ @@ -928,7 +928,7 @@ static herr_t H5M__put_api_common(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1021,8 +1021,8 @@ H5Mput_async(const char *app_file, const char *app_func, unsigned app_line, hid_ hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1063,7 +1063,7 @@ static herr_t H5M__get_api_common(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1159,8 +1159,8 @@ H5Mget_async(const char *app_file, const char *app_func, unsigned app_line, hid_ hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1204,7 +1204,7 @@ done: herr_t H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists, hid_t dxpl_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1282,7 +1282,7 @@ done: herr_t H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, void *op_data, hid_t dxpl_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1367,7 +1367,7 @@ herr_t H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, void *op_data, hid_t dxpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1441,7 +1441,7 @@ done: herr_t H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id) { - H5VL_object_t * vol_obj = NULL; + H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_map_args_t map_args; /* Arguments for map operations */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1450,7 +1450,7 @@ done: htri_t H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size) { - H5MF_free_section_t * node = NULL; /* Free space section pointer */ + H5MF_free_section_t *node = NULL; /* Free space section pointer */ H5MF_sect_ud_t udata; /* User data for callback */ const H5FS_section_class_t *sect_cls; /* Section class */ H5AC_ring_t orig_ring = H5AC_RING_INV; /* Original ring value */ @@ -2133,8 +2133,9 @@ H5MF__close_shrink_eoa(H5F_t *f) curr_ring = needed_ring; } /* end if */ - udata.alloc_type = (H5FD_mem_t)( - (H5FD_mem_t)ptype < H5FD_MEM_NTYPES ? ptype : ((ptype % H5FD_MEM_NTYPES) + 1)); + udata.alloc_type = + (H5FD_mem_t)((H5FD_mem_t)ptype < H5FD_MEM_NTYPES ? ptype + : ((ptype % H5FD_MEM_NTYPES) + 1)); if ((status = H5FS_sect_try_shrink_eoa(f, f->shared->fs_man[ptype], &udata)) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't check for shrinking eoa") @@ -3095,10 +3096,10 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled) H5F_mem_page_t sm_fssinfo_fs_type; /* small fs sinfo fsm */ H5F_mem_page_t lg_fshdr_fs_type = H5F_MEM_PAGE_DEFAULT; /* large fs hdr fsm */ H5F_mem_page_t lg_fssinfo_fs_type = H5F_MEM_PAGE_DEFAULT; /* large fs sinfo fsm */ - H5FS_t * sm_hdr_fspace = NULL; /* ptr to sm FSM hdr alloc FSM */ - H5FS_t * sm_sinfo_fspace = NULL; /* ptr to sm FSM sinfo alloc FSM */ - H5FS_t * lg_hdr_fspace = NULL; /* ptr to lg FSM hdr alloc FSM */ - H5FS_t * lg_sinfo_fspace = NULL; /* ptr to lg FSM sinfo alloc FSM */ + H5FS_t *sm_hdr_fspace = NULL; /* ptr to sm FSM hdr alloc FSM */ + H5FS_t *sm_sinfo_fspace = NULL; /* ptr to sm FSM sinfo alloc FSM */ + H5FS_t *lg_hdr_fspace = NULL; /* ptr to lg FSM hdr alloc FSM */ + H5FS_t *lg_sinfo_fspace = NULL; /* ptr to lg FSM sinfo alloc FSM */ haddr_t eoa_fsm_fsalloc; /* eoa after file space allocation */ /* for self referential FSMs */ hbool_t continue_alloc_fsm = FALSE; /* Continue allocating addr and sect_addr for FSMs */ diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c index 4bd3ec5..2184302 100644 --- a/src/H5MFdbg.c +++ b/src/H5MFdbg.c @@ -49,7 +49,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; /* Indentation amount */ int fwidth; /* Field width amount */ } H5MF_debug_iter_ud_t; @@ -91,7 +91,7 @@ static herr_t H5MF__sects_debug_cb(H5FS_section_info_t *_sect, void *_udata); 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 f34c73e..5119316 100644 --- a/src/H5MFpkg.h +++ b/src/H5MFpkg.h @@ -144,21 +144,21 @@ 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 */ H5FD_mem_t alloc_type; /* Type of memory being allocated */ hbool_t allow_sect_absorb; /* Whether sections are allowed to absorb a block aggregator */ hbool_t allow_eoa_shrink_only; /* Whether shrinking eoa is allowed only for the section */ /* 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; /* Information about the current free-space manager to use */ typedef struct H5MF_fs_t { H5F_fs_state_t *fs_state; - haddr_t * fs_addr; - H5FS_t ** fs_man; + haddr_t *fs_addr; + H5FS_t **fs_man; hsize_t align_thres; /* Threshold for alignment */ hsize_t alignment; /* Alignment */ } H5MF_fs_t; diff --git a/src/H5MFsection.c b/src/H5MFsection.c index 43586af..d9fc355 100644 --- a/src/H5MFsection.c +++ b/src/H5MFsection.c @@ -408,7 +408,7 @@ H5MF__sect_simple_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect void H5_ATTR_UNUSED *_udata) { H5MF_free_section_t **sect1 = (H5MF_free_section_t **)_sect1; /* File free section */ - H5MF_free_section_t * sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ + H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -448,7 +448,7 @@ static 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 */ @@ -554,7 +554,7 @@ static 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_PACKAGE @@ -620,7 +620,7 @@ static herr_t H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata) { H5MF_free_section_t **sect = (H5MF_free_section_t **)_sect; /* Fractal heap 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 sect_end; hsize_t rem, prem; herr_t ret_value = SUCCEED; /* Return value */ @@ -685,7 +685,7 @@ H5MF__sect_small_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section { const H5MF_free_section_t *sect1 = (const H5MF_free_section_t *)_sect1; /* File free section */ const H5MF_free_section_t *sect2 = (const H5MF_free_section_t *)_sect2; /* 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 */ htri_t ret_value = FALSE; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -731,8 +731,8 @@ static herr_t H5MF__sect_small_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void *_udata) { H5MF_free_section_t **sect1 = (H5MF_free_section_t **)_sect1; /* File free section */ - H5MF_free_section_t * sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ - H5MF_sect_ud_t * udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ + H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ + H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -833,7 +833,7 @@ static herr_t H5MF__sect_large_merge(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata) { H5MF_free_section_t **sect1 = (H5MF_free_section_t **)_sect1; /* File free section */ - H5MF_free_section_t * sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ + H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2; /* File free section */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -872,7 +872,7 @@ static htri_t H5MF__sect_large_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 = FALSE; /* Return value */ @@ -926,7 +926,7 @@ static herr_t H5MF__sect_large_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 */ hsize_t frag_size = 0; /* Fragment size */ herr_t ret_value = SUCCEED; /* Return value */ @@ -53,7 +53,7 @@ struct H5MM_block_t; /* Forward declaration for typedef */ typedef struct H5MM_block_t { unsigned char - sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */ + sig[H5MM_SIG_SIZE]; /* Signature for the block, to indicate it was allocated with H5MM* interface */ struct H5MM_block_t *next; /* Pointer to next block in the list of allocated blocks */ struct H5MM_block_t *prev; /* Pointer to previous block in the list of allocated blocks */ union { diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h index 28d0a3b..f05a3da 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -39,14 +39,14 @@ /* * Library prototypes... */ -H5_DLL void * H5MM_malloc(size_t size) H5_ATTR_MALLOC; -H5_DLL void * H5MM_calloc(size_t size) H5_ATTR_MALLOC; -H5_DLL void * H5MM_realloc(void *mem, size_t size); -H5_DLL char * H5MM_xstrdup(const char *s); -H5_DLL char * H5MM_strdup(const char *s); -H5_DLL void * H5MM_xfree(void *mem); -H5_DLL void * H5MM_xfree_const(const void *mem); -H5_DLL void * H5MM_memcpy(void *dest, const void *src, size_t n); +H5_DLL void *H5MM_malloc(size_t size) H5_ATTR_MALLOC; +H5_DLL void *H5MM_calloc(size_t size) H5_ATTR_MALLOC; +H5_DLL void *H5MM_realloc(void *mem, size_t size); +H5_DLL char *H5MM_xstrdup(const char *s); +H5_DLL char *H5MM_strdup(const char *s); +H5_DLL void *H5MM_xfree(void *mem); +H5_DLL void *H5MM_xfree_const(const void *mem); +H5_DLL void *H5MM_memcpy(void *dest, const void *src, size_t n); H5_DLL herr_t H5MM_get_alloc_stats(H5_alloc_stats_t *stats); #if defined H5_MEMORY_ALLOC_SANITY_CHECK H5_DLL void H5MM_sanity_check_all(void); diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 3f94edb..0d6b1b2 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -74,21 +74,21 @@ typedef union H5VL_map_args_t { /* H5VL_MAP_CREATE */ struct { H5VL_loc_params_t loc_params; /* Location parameters for object */ - const char * name; /* Name of new map object */ + const char *name; /* Name of new map object */ hid_t lcpl_id; /* Link creation property list for map */ hid_t key_type_id; /* Datatype for map keys */ hid_t val_type_id; /* Datatype for map values */ hid_t mcpl_id; /* Map creation property list */ hid_t mapl_id; /* Map access property list */ - void * map; /* Pointer to newly created map object (OUT) */ + void *map; /* Pointer to newly created map object (OUT) */ } create; /* H5VL_MAP_OPEN */ struct { H5VL_loc_params_t loc_params; /* Location parameters for object */ - const char * name; /* Name of new map object */ + const char *name; /* Name of new map object */ hid_t mapl_id; /* Map access property list */ - void * map; /* Pointer to newly created map object (OUT) */ + void *map; /* Pointer to newly created map object (OUT) */ } open; /* H5VL_MAP_GET_VAL */ @@ -96,7 +96,7 @@ typedef union H5VL_map_args_t { hid_t key_mem_type_id; /* Memory datatype for key */ const void *key; /* Pointer to key */ hid_t value_mem_type_id; /* Memory datatype for value */ - void * value; /* Buffer for value (OUT) */ + void *value; /* Buffer for value (OUT) */ } get_val; /* H5VL_MAP_EXISTS */ @@ -159,14 +159,14 @@ typedef union H5VL_map_args_t { hsize_t idx; /* Start/end iteration index (IN/OUT) */ hid_t key_mem_type_id; /* Memory datatype for key */ H5M_iterate_t op; /* Iteration callback routine */ - void * op_data; /* Pointer to callback context */ + void *op_data; /* Pointer to callback context */ } iterate; /* H5VL_MAP_DELETE */ struct { H5VL_loc_params_t loc_params; /* Location parameters for object */ hid_t key_mem_type_id; /* Memory datatype for key */ - const void * key; /* Pointer to key */ + const void *key; /* Pointer to key */ } del; } args; } specific; @@ -98,11 +98,11 @@ static hid_t H5O__open_api_common(hid_t loc_id, const char *name, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5I_type_t opened_type; - void * opened_obj = NULL; + void *opened_obj = NULL; H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; @@ -182,8 +182,8 @@ H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -226,11 +226,11 @@ static hid_t H5O__open_by_idx_api_common(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5I_type_t opened_type; - void * opened_obj = NULL; + void *opened_obj = NULL; H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; @@ -313,8 +313,8 @@ H5Oopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -361,10 +361,10 @@ done: hid_t H5Oopen_by_token(hid_t loc_id, H5O_token_t token) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ H5VL_loc_params_t loc_params; /* Location parameters */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -414,13 +414,13 @@ H5O__copy_api_common(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, c hid_t ocpypl_id, hid_t lcpl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { /* dst_id */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params2; /* src_id */ - H5VL_object_t * vol_obj1 = NULL; /* object of src_id */ + H5VL_object_t *vol_obj1 = NULL; /* object of src_id */ H5VL_loc_params_t loc_params1; herr_t ret_value = SUCCEED; /* Return value */ @@ -573,8 +573,8 @@ H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -614,7 +614,7 @@ done: static herr_t H5O__flush_api_common(hid_t obj_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -681,8 +681,8 @@ herr_t H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -720,7 +720,7 @@ done: static herr_t H5O__refresh_api_common(hid_t oid, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -787,8 +787,8 @@ herr_t H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, hid_t oid, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -838,8 +838,8 @@ done: herr_t H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id) { - H5VL_object_t * vol_obj1 = NULL; /* object of obj_id */ - H5VL_object_t * vol_obj2 = NULL; /* object of new_loc_id */ + H5VL_object_t *vol_obj1 = NULL; /* object of obj_id */ + H5VL_object_t *vol_obj2 = NULL; /* object of new_loc_id */ H5VL_object_t tmp_vol_obj; /* Temporary object */ H5VL_link_create_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t new_loc_params; @@ -941,7 +941,7 @@ done: herr_t H5Oincr_refcount(hid_t object_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; @@ -996,7 +996,7 @@ done: herr_t H5Odecr_refcount(hid_t object_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1044,7 +1044,7 @@ done: htri_t H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ hbool_t obj_exists = FALSE; /* Whether object exists */ @@ -1104,7 +1104,7 @@ done: herr_t H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo /*out*/, unsigned fields) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -1153,7 +1153,7 @@ static herr_t H5O__get_info_by_name_api_common(hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1230,8 +1230,8 @@ H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned a hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1276,7 +1276,7 @@ herr_t H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -1341,7 +1341,7 @@ done: herr_t H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo /*out*/, unsigned fields) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1395,7 +1395,7 @@ herr_t H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_native_info_t *oinfo /*out*/, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1461,7 +1461,7 @@ herr_t H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_native_info_t *oinfo /*out*/, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1534,7 +1534,7 @@ done: herr_t H5Oset_comment(hid_t obj_id, const char *comment) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1589,7 +1589,7 @@ done: herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1649,7 +1649,7 @@ done: ssize_t H5Oget_comment(hid_t obj_id, char *comment /*out*/, size_t bufsize) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1705,7 +1705,7 @@ done: ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment /*out*/, size_t bufsize, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; @@ -1791,7 +1791,7 @@ herr_t H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value; /* Return value */ @@ -1873,7 +1873,7 @@ herr_t H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ herr_t ret_value; /* Return value */ @@ -2026,9 +2026,9 @@ herr_t H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - H5VL_t * connector = NULL; /* VOL connector */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + H5VL_t *connector = NULL; /* VOL connector */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -2114,7 +2114,7 @@ done: herr_t H5Odisable_mdc_flushes(hid_t object_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2187,7 +2187,7 @@ done: herr_t H5Oenable_mdc_flushes(hid_t object_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2265,7 +2265,7 @@ done: herr_t H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; /* Location parameters */ diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index 39e6313..7b1598c 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -32,16 +32,16 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O__ainfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__ainfo_decode(H5F_t *f, 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, 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); 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, H5O_copy_t *cpy_info); @@ -99,9 +99,9 @@ static void * H5O__ainfo_decode(H5F_t *f, 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_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_PACKAGE @@ -225,8 +225,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_PACKAGE @@ -396,7 +396,7 @@ H5O__ainfo_copy_file(H5F_t H5_ATTR_NDEBUG_UNUSED *file_src, void *mesg_src, H5F_ { 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_PACKAGE diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 3bbf8e1..1fbcbeb 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -326,7 +326,7 @@ H5O__alloc_null(H5F_t *f, H5O_t *oh, size_t null_idx, const H5O_msg_class_t *new { 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_PACKAGE @@ -496,7 +496,7 @@ H5O__alloc_extend_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno, size_t size, size 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 */ @@ -868,12 +868,12 @@ herr_t H5O__alloc_chunk(H5F_t *f, H5O_t *oh, size_t size, size_t found_null, const H5O_msg_alloc_info_t *found_msg, size_t *new_idx) { - 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 idx; /* Message number */ - uint8_t * p = NULL; /* Pointer into new chunk image */ - H5O_cont_t * cont = NULL; /*native continuation message */ + uint8_t *p = NULL; /* Pointer into new chunk image */ + H5O_cont_t *cont = NULL; /*native continuation message */ unsigned chunkno; /* Chunk allocated */ haddr_t new_chunk_addr; /* Address of new chunk in file */ unsigned u; /* Local index variable */ @@ -1219,16 +1219,16 @@ H5O__alloc_find_best_null(const H5O_t *oh, size_t size, size_t *mesg_idx) else /* If we've got more than one exact fit, choose the one in the earliest chunk */ if (oh->mesg[idx].chunkno < oh->mesg[found_null].chunkno) { - found_null = (ssize_t)idx; + found_null = (ssize_t)idx; - /* If we found an exact fit in object header chunk #0, we can get out */ - /* (Could extend this to look for earliest message in - * chunk #0 - QAK, 2016/10/21) - */ - if (0 == oh->mesg[idx].chunkno) - break; - } /* end if */ - } /* end if */ + /* If we found an exact fit in object header chunk #0, we can get out */ + /* (Could extend this to look for earliest message in + * chunk #0 - QAK, 2016/10/21) + */ + if (0 == oh->mesg[idx].chunkno) + break; + } /* end if */ + } /* end if */ /* Look for null message that's larger than needed */ else if (oh->mesg[idx].raw_size > size) { /* Keep first one found */ @@ -1426,7 +1426,7 @@ static htri_t H5O__move_cont(H5F_t *f, 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 */ @@ -2367,10 +2367,10 @@ done: static herr_t H5O__alloc_shrink_chunk(H5F_t *f, 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 */ @@ -2407,7 +2407,7 @@ H5O__alloc_shrink_chunk(H5F_t *f, 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 2c8d537..9e6f7e7 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -31,7 +31,7 @@ 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); static herr_t H5O__attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, H5O_copy_t *cpy_info); @@ -120,14 +120,14 @@ static void * H5O__attr_decode(H5F_t *f, 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 */ size_t dt_size; /* Datatype size */ hssize_t sds_size; /* Signed Dataspace size */ hsize_t ds_size; /* Dataspace size */ unsigned flags = 0; /* Attribute flags */ - H5A_t * ret_value = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -789,7 +789,7 @@ static herr_t H5O__attr_debug(H5F_t *f, 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 05d60a4..175c860 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 */ H5O_ainfo_t *ainfo; /* Attribute info struct */ } H5O_iter_cvt_t; @@ -75,7 +75,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 */ const char *old_name; /* Old name of attribute */ const char *new_name; /* New name of attribute */ @@ -86,7 +86,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 */ const char *name; /* Name of attribute to open */ /* up */ @@ -159,7 +159,7 @@ H5O__attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned H5_ATTR_U 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_PACKAGE @@ -203,7 +203,7 @@ done: herr_t H5O__attr_create(const H5O_loc_t *loc, 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 */ @@ -323,7 +323,7 @@ H5O__attr_create(const H5O_loc_t *loc, H5A_t *attr) else /* Append new message to object header */ if (H5O__msg_append_real(loc->file, oh, H5O_MSG_ATTR, 0, 0, attr) < 0) - HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header") + HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header") /* Increment reference count for shared attribute object for the * object handle created by the caller function H5A__create. The count @@ -443,12 +443,12 @@ done: H5A_t * H5O__attr_open_by_name(const H5O_loc_t *loc, const char *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 */ - 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 = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_TAG(loc->addr) @@ -576,10 +576,10 @@ 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) { 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 = NULL; /* Return value */ + H5A_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -647,7 +647,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 */ @@ -798,7 +798,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 */ @@ -879,7 +879,7 @@ done: herr_t H5O__attr_write(const H5O_loc_t *loc, 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 */ @@ -1000,7 +1000,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 */ @@ -1124,7 +1124,7 @@ done: herr_t H5O__attr_rename(const H5O_loc_t *loc, 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 */ @@ -1211,7 +1211,7 @@ herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, 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) { - 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 = FAIL; /* Return value */ @@ -1506,7 +1506,7 @@ done: herr_t H5O__attr_remove(const H5O_loc_t *loc, const char *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 */ htri_t ainfo_exists = FALSE; /* Whether the attribute info exists in the file */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1587,7 +1587,7 @@ done: 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) { - 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 */ @@ -1768,7 +1768,7 @@ H5O__attr_exists_cb(H5O_t H5_ATTR_UNUSED *oh, H5O_mesg_t *mesg /*in,out*/, unsig herr_t H5O__attr_exists(const H5O_loc_t *loc, const char *name, hbool_t *attr_exists) { - 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 */ diff --git a/src/H5Obogus.c b/src/H5Obogus.c index e311cd5..8ef1abc 100644 --- a/src/H5Obogus.c +++ b/src/H5Obogus.c @@ -36,7 +36,7 @@ #ifdef H5O_ENABLE_BOGUS /* PRIVATE PROTOTYPES */ -static void * H5O__bogus_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__bogus_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O__bogus_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static size_t H5O__bogus_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -110,7 +110,7 @@ H5O__bogus_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUS unsigned H5_ATTR_UNUSED *ioflags, 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_PACKAGE diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c index d6a6e6d..d219e78 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__btreek_decode(H5F_t *f, 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, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -78,7 +78,7 @@ H5O__btreek_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsig unsigned H5_ATTR_UNUSED *ioflags, 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_PACKAGE @@ -158,8 +158,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_PACKAGE diff --git a/src/H5Ocache.c b/src/H5Ocache.c index e63dc66..5088a46 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -60,7 +60,7 @@ static herr_t H5O__cache_get_initial_load_size(void *udata, size_t *image_len); static herr_t H5O__cache_get_final_load_size(const void *image_ptr, size_t image_len, void *udata, size_t *actual_len); static htri_t H5O__cache_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5O__cache_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5O__cache_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5O__cache_image_len(const void *thing, size_t *image_len); static herr_t H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5O__cache_notify(H5AC_notify_action_t action, void *_thing); @@ -68,7 +68,7 @@ static herr_t H5O__cache_free_icr(void *thing); static herr_t H5O__cache_chk_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5O__cache_chk_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5O__cache_chk_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5O__cache_chk_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5O__cache_chk_image_len(const void *thing, size_t *image_len); static herr_t H5O__cache_chk_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5O__cache_chk_notify(H5AC_notify_action_t action, void *_thing); @@ -229,7 +229,7 @@ done: static htri_t H5O__cache_verify_chksum(const void *_image, size_t len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5O_cache_ud_t *udata = (H5O_cache_ud_t *)_udata; /* User data for callback */ htri_t ret_value = TRUE; /* Return value */ @@ -289,9 +289,9 @@ H5O__cache_verify_chksum(const void *_image, size_t len, void *_udata) static void * H5O__cache_deserialize(const void *image, size_t len, void *_udata, hbool_t *dirty) { - 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 */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -403,7 +403,7 @@ H5O__cache_image_len(const void *_thing, size_t *image_len) static herr_t H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing) { - H5O_t * oh = (H5O_t *)_thing; /* Object header to encode */ + H5O_t *oh = (H5O_t *)_thing; /* Object header to encode */ uint8_t *chunk_image; /* Pointer to object header prefix buffer */ herr_t ret_value = SUCCEED; /* Return value */ @@ -696,7 +696,7 @@ H5O__cache_chk_get_initial_load_size(void *_udata, size_t *image_len) static htri_t H5O__cache_chk_verify_chksum(const void *_image, size_t len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5O_chk_cache_ud_t *udata = (H5O_chk_cache_ud_t *)_udata; /* User data for callback */ htri_t ret_value = TRUE; /* Return value */ @@ -738,9 +738,9 @@ H5O__cache_chk_verify_chksum(const void *_image, size_t len, void *_udata) static void * H5O__cache_chk_deserialize(const void *image, size_t len, void *_udata, hbool_t *dirty) { - 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 */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1107,7 +1107,7 @@ static herr_t H5O__prefix_deserialize(const uint8_t *_image, H5O_cache_ud_t *udata) { const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ - H5O_t * oh = NULL; /* Object header read in */ + H5O_t *oh = NULL; /* Object header read in */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1279,7 +1279,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t H5O_common_cache_ud_t *udata, hbool_t *dirty) { const uint8_t *chunk_image; /* 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 */ unsigned merged_null_msgs = 0; /* Number of null messages merged together */ unsigned chunkno; /* Current chunk's index */ #ifndef NDEBUG diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c index ed4471d..84ee3c3 100644 --- a/src/H5Ocache_image.c +++ b/src/H5Ocache_image.c @@ -40,7 +40,7 @@ static void *H5O__mdci_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O__mdci_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O__mdci_copy(const void *_mesg, void *_dest); +static void *H5O__mdci_copy(const void *_mesg, void *_dest); static size_t H5O__mdci_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O__mdci_free(void *mesg); static herr_t H5O__mdci_delete(H5F_t *f, H5O_t *open_oh, void *_mesg); @@ -95,7 +95,7 @@ H5O__mdci_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_mdci_t *mesg; /* Native message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -173,8 +173,8 @@ static void * H5O__mdci_copy(const void *_mesg, void *_dest) { const H5O_mdci_t *mesg = (const H5O_mdci_t *)_mesg; - H5O_mdci_t * dest = (H5O_mdci_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_mdci_t *dest = (H5O_mdci_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Ocont.c b/src/H5Ocont.c index a8420b2..16797c2 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -88,7 +88,7 @@ H5O__cont_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_cont_t *cont = NULL; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 2d0222c..c12d305 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) */ } H5O_copy_search_comm_dt_ud_t; @@ -202,11 +202,11 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 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 */ @@ -214,11 +214,11 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 H5O_mesg_t *mesg_dst; /* Message in destination 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; @@ -264,7 +264,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 /* 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, 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 */ @@ -937,7 +937,7 @@ static herr_t H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t ocpypl_id, hid_t lcpl_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 */ @@ -1036,7 +1036,7 @@ H5O__copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name, hid_ 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 */ @@ -1095,7 +1095,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_PACKAGE_NOERR @@ -1169,10 +1169,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 */ @@ -1250,10 +1250,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_PACKAGE @@ -1431,7 +1431,7 @@ H5O__copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*i 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 */ @@ -1496,10 +1496,10 @@ H5O__copy_search_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst /*i 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) @@ -1598,7 +1598,7 @@ static herr_t H5O__copy_insert_comm_dt(H5F_t *file_src, H5O_t *oh_src, H5O_loc_t *oloc_dst, 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_PACKAGE diff --git a/src/H5Ocopy_ref.c b/src/H5Ocopy_ref.c index 5fc27d1..3ac0781 100644 --- a/src/H5Ocopy_ref.c +++ b/src/H5Ocopy_ref.c @@ -153,8 +153,8 @@ static herr_t H5O__copy_expand_ref_object1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t *dst_oloc, H5G_loc_t *dst_root_loc, void *buf_dst, size_t ref_count, H5O_copy_t *cpy_info) { - const hobj_ref_t * src_ref = (const hobj_ref_t *)buf_src; - hobj_ref_t * dst_ref = (hobj_ref_t *)buf_dst; + const hobj_ref_t *src_ref = (const hobj_ref_t *)buf_src; + hobj_ref_t *dst_ref = (hobj_ref_t *)buf_dst; const unsigned char zeros[H5R_OBJ_REF_BUF_SIZE] = {0}; size_t buf_size = H5R_OBJ_REF_BUF_SIZE; size_t i; /* Local index variable */ @@ -166,7 +166,7 @@ H5O__copy_expand_ref_object1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t /* Making equivalent references in the destination file */ for (i = 0; i < ref_count; i++) { const unsigned char *src_buf = (const unsigned char *)&src_ref[i]; - unsigned char * dst_buf = (unsigned char *)&dst_ref[i]; + unsigned char *dst_buf = (unsigned char *)&dst_ref[i]; H5O_token_t tmp_token = {0}; /* If data is not initialized, copy zeros and skip */ @@ -215,7 +215,7 @@ H5O__copy_expand_ref_region1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t H5G_loc_t *dst_root_loc, void *buf_dst, size_t ref_count, H5O_copy_t *cpy_info) { const hdset_reg_ref_t *src_ref = (const hdset_reg_ref_t *)buf_src; - hdset_reg_ref_t * dst_ref = (hdset_reg_ref_t *)buf_dst; + hdset_reg_ref_t *dst_ref = (hdset_reg_ref_t *)buf_dst; const unsigned char zeros[H5R_DSET_REG_REF_BUF_SIZE] = {0}; size_t buf_size = H5R_DSET_REG_REF_BUF_SIZE; size_t i; /* Local index variable */ @@ -226,11 +226,11 @@ H5O__copy_expand_ref_region1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t /* Making equivalent references in the destination file */ for (i = 0; i < ref_count; i++) { const unsigned char *src_buf = (const unsigned char *)&src_ref[i]; - unsigned char * dst_buf = (unsigned char *)&dst_ref[i]; - unsigned char * data = NULL; + unsigned char *dst_buf = (unsigned char *)&dst_ref[i]; + unsigned char *data = NULL; size_t data_size; - const uint8_t * p; - uint8_t * q; + const uint8_t *p; + uint8_t *q; /* If data is not initialized, copy zeros and skip */ if (0 == HDmemcmp(src_buf, zeros, buf_size)) @@ -288,18 +288,18 @@ H5O__copy_expand_ref_object2(H5O_loc_t *src_oloc, hid_t tid_src, const H5T_t *dt size_t nbytes_src, H5O_loc_t *dst_oloc, H5G_loc_t *dst_root_loc, void *buf_dst, size_t ref_count, H5O_copy_t *cpy_info) { - H5T_t * dt_mem = NULL; /* Memory datatype */ - H5T_t * dt_dst = NULL; /* Destination datatype */ + H5T_t *dt_mem = NULL; /* Memory datatype */ + H5T_t *dt_dst = NULL; /* Destination datatype */ hid_t tid_mem = H5I_INVALID_HID; /* Datatype ID for memory datatype */ hid_t tid_dst = H5I_INVALID_HID; /* Datatype ID for memory datatype */ - 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 */ size_t i; /* Local index variable */ hbool_t reg_tid_src = (tid_src == H5I_INVALID_HID); hid_t dst_loc_id = H5I_INVALID_HID; - void * conv_buf = NULL; /* Buffer for converting data */ + void *conv_buf = NULL; /* Buffer for converting data */ size_t conv_buf_size = 0; /* Buffer size */ - void * reclaim_buf = NULL; /* Buffer for reclaiming data */ - H5S_t * buf_space = NULL; /* Dataspace describing buffer */ + void *reclaim_buf = NULL; /* Buffer for reclaiming data */ + H5S_t *buf_space = NULL; /* Dataspace describing buffer */ hsize_t buf_dim[1] = {ref_count}; /* Dimension for buffer */ size_t token_size = H5F_SIZEOF_ADDR(src_oloc->file); const unsigned char zeros[H5R_REF_BUF_SIZE] = {0}; @@ -354,7 +354,7 @@ H5O__copy_expand_ref_object2(H5O_loc_t *src_oloc, hid_t tid_src, const H5T_t *dt /* Making equivalent references in the destination file */ for (i = 0; i < ref_count; i++) { - H5R_ref_t * ref_ptr = (H5R_ref_t *)conv_buf; + H5R_ref_t *ref_ptr = (H5R_ref_t *)conv_buf; H5R_ref_priv_t *ref = (H5R_ref_priv_t *)&ref_ptr[i]; /* Check for null reference - only expand reference if it is not null */ diff --git a/src/H5Odbg.c b/src/H5Odbg.c index 2826bcd..2435463 100644 --- a/src/H5Odbg.c +++ b/src/H5Odbg.c @@ -155,7 +155,7 @@ H5O__assert(const H5O_t *oh) if (H5O_NULL_ID == curr_msg->type->id) free_space += curr_tot_size; else if (H5O_CONT_ID == curr_msg->type->id) { - H5O_cont_t * cont = (H5O_cont_t *)curr_msg->native; + H5O_cont_t *cont = (H5O_cont_t *)curr_msg->native; hbool_t H5_ATTR_NDEBUG_UNUSED found_chunk = FALSE; /* Found a chunk that matches */ HDassert(cont); @@ -512,7 +512,7 @@ done: herr_t H5O_debug(H5F_t *f, 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/H5Odeprec.c b/src/H5Odeprec.c index 585eaf0..e920aea 100644 --- a/src/H5Odeprec.c +++ b/src/H5Odeprec.c @@ -52,7 +52,7 @@ typedef struct H5O_visit1_adapter_t { H5O_iterate1_t real_op; /* Application callback to invoke */ unsigned fields; /* Original fields passed to H5Ovisit */ - void * real_op_data; /* Application op_data */ + void *real_op_data; /* Application op_data */ } H5O_visit1_adapter_t; /********************/ @@ -161,7 +161,7 @@ H5O__iterate1_adapter(hid_t obj_id, const char *name, const H5O_info2_t *oinfo2, /* Check for retrieving native information */ nat_fields = shim_data->fields & (H5O_INFO_HDR | H5O_INFO_META_SIZE); if (nat_fields) { - H5VL_object_t * vol_obj; /* Object of obj_id */ + H5VL_object_t *vol_obj; /* Object of obj_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_native_object_optional_args_t obj_opt_args; /* Arguments for optional operation */ H5VL_loc_params_t loc_params; /* Location parameters for VOL callback */ @@ -344,10 +344,10 @@ done: hid_t H5Oopen_by_addr(hid_t loc_id, haddr_t addr) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ hbool_t is_native_vol_obj; @@ -408,7 +408,7 @@ done: herr_t H5Oget_info1(hid_t loc_id, H5O_info1_t *oinfo /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -448,7 +448,7 @@ done: herr_t H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info1_t *oinfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -503,7 +503,7 @@ herr_t H5Oget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info1_t *oinfo /*out*/, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -561,7 +561,7 @@ done: herr_t H5Oget_info2(hid_t loc_id, H5O_info1_t *oinfo /*out*/, unsigned fields) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; hbool_t is_native_vol_obj; herr_t ret_value = SUCCEED; /* Return value */ @@ -617,7 +617,7 @@ herr_t H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info1_t *oinfo /*out*/, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; hbool_t is_native_vol_obj; herr_t ret_value = SUCCEED; /* Return value */ @@ -685,7 +685,7 @@ herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_info1_t *oinfo /*out*/, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_loc_params_t loc_params; hbool_t is_native_vol_obj; herr_t ret_value = SUCCEED; /* Return value */ @@ -772,7 +772,7 @@ done: herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1_t op, void *op_data) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5O_visit1_adapter_t shim_data; /* Adapter for passing app callback & user data */ @@ -855,7 +855,7 @@ herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1_t op, void *op_data, hid_t lapl_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5O_visit1_adapter_t shim_data; /* Adapter for passing app callback & user data */ @@ -951,7 +951,7 @@ herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1_t op, void *op_data, unsigned fields) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5O_visit1_adapter_t shim_data; /* Adapter for passing app callback & user data */ @@ -1048,7 +1048,7 @@ herr_t H5Ovisit_by_name2(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1_t op, void *op_data, unsigned fields, hid_t lapl_id) { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_object_specific_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ H5O_visit1_adapter_t shim_data; /* Adapter for passing app callback & user data */ diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c index 1c343f0..ffa1cee 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__drvinfo_decode(H5F_t *f, 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, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -80,7 +80,7 @@ H5O__drvinfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, 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_PACKAGE @@ -175,8 +175,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_PACKAGE diff --git a/src/H5Odtype.c b/src/H5Odtype.c index e11836d..6a13f52 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -27,9 +27,9 @@ /* PRIVATE PROTOTYPES */ static herr_t H5O__dtype_encode(H5F_t *f, uint8_t *p, const void *mesg); -static void * H5O__dtype_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__dtype_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); -static void * H5O__dtype_copy(const void *_mesg, void *_dest); +static void *H5O__dtype_copy(const void *_mesg, void *_dest); static size_t H5O__dtype_size(const H5F_t *f, const void *_mesg); static herr_t H5O__dtype_reset(void *_mesg); static herr_t H5O__dtype_free(void *_mesg); @@ -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); static herr_t H5O__dtype_shared_post_copy_upd(const H5O_loc_t *src_oloc, const void *mesg_src, @@ -277,8 +277,8 @@ H5O__dtype_decode_helper(unsigned *ioflags /*in,out*/, const uint8_t **pp, H5T_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); @@ -1122,7 +1122,7 @@ H5O__dtype_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsign unsigned *ioflags /*in,out*/, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5T_t *dt = NULL; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1203,8 +1203,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 = NULL; /* Return value */ + H5T_t *dst; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1531,7 +1531,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 *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 */ @@ -1588,7 +1588,7 @@ H5O__dtype_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const H5O_msg_class_t *mesg H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata) { H5T_t *dst_mesg; /* Destination datatype */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1669,7 +1669,7 @@ static herr_t H5O__dtype_debug(H5F_t *f, 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 204460a..15c0bf2 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, +static void *H5O__efl_decode(H5F_t *f, 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); static herr_t H5O__efl_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -86,12 +86,12 @@ static void * H5O__efl_decode(H5F_t *f, 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_PACKAGE @@ -251,10 +251,10 @@ 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 */ hbool_t slot_allocated = FALSE; /* Flag to indicate that dynamic allocation has begun */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -435,9 +435,9 @@ H5O__efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_d { 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_PACKAGE_TAG(H5AC__COPIED_TAG) diff --git a/src/H5Ofill.c b/src/H5Ofill.c index a9be74b..b62281e 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__fill_old_decode(H5F_t *f, 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__fill_new_decode(H5F_t *f, 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_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, @@ -196,9 +196,9 @@ H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, 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_PACKAGE @@ -315,11 +315,11 @@ static void * H5O__fill_old_decode(H5F_t *f, H5O_t *open_oh, 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 */ htri_t exists = FALSE; - H5T_t * dt = NULL; + H5T_t *dt = 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_PACKAGE @@ -528,8 +528,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 = NULL; /* Return value */ + H5O_fill_t *dst = (H5O_fill_t *)_dst; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -976,7 +976,7 @@ herr_t H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed) { 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/H5Oflush.c b/src/H5Oflush.c index 401d2d0..0ea9c40 100644 --- a/src/H5Oflush.c +++ b/src/H5Oflush.c @@ -69,7 +69,7 @@ static herr_t H5O__refresh_metadata_close(H5O_loc_t *oloc, H5G_loc_t *obj_loc, h herr_t H5O_flush(H5O_loc_t *oloc, hid_t obj_id) { - void * obj_ptr; /* Pointer to object */ + void *obj_ptr; /* Pointer to object */ const H5O_obj_class_t *obj_class; /* Class of object */ herr_t ret_value = SUCCEED; /* Return value */ @@ -201,7 +201,7 @@ H5O_refresh_metadata(H5O_loc_t *oloc, hid_t oid) { H5VL_object_t *vol_obj = NULL; /* VOL object associated with the ID */ hbool_t objs_incr = FALSE; /* Whether the object count in the file was incremented */ - H5F_t * file = NULL; + H5F_t *file = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -212,7 +212,7 @@ H5O_refresh_metadata(H5O_loc_t *oloc, hid_t oid) H5O_loc_t obj_oloc; H5G_name_t obj_path; H5O_shared_t cached_H5O_shared; - H5VL_t * connector = NULL; + H5VL_t *connector = NULL; /* Hold a copy of the object's file pointer, since closing the object will * invalidate the file pointer in the oloc. @@ -295,7 +295,7 @@ done: static herr_t H5O__refresh_metadata_close(H5O_loc_t *oloc, H5G_loc_t *obj_loc, hid_t oid) { - H5F_t * file; /* Local copy of the object's file pointer */ + H5F_t *file; /* Local copy of the object's file pointer */ haddr_t tag = 0; /* Tag for object */ hbool_t corked = FALSE; /* Whether object's metadata is corked */ herr_t ret_value = SUCCEED; /* Return value */ @@ -366,7 +366,7 @@ herr_t H5O_refresh_metadata_reopen(hid_t oid, hid_t apl_id, H5G_loc_t *obj_loc, H5VL_t *vol_connector, hbool_t start_swmr) { - void * object = NULL; /* Object for this operation */ + void *object = NULL; /* Object for this operation */ H5I_type_t type; /* Type of object for the ID */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c index 853b5d8..a60222c 100644 --- a/src/H5Ofsinfo.c +++ b/src/H5Ofsinfo.c @@ -31,10 +31,10 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O__fsinfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__fsinfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O__fsinfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void * H5O__fsinfo_copy(const void *_mesg, void *_dest); +static void *H5O__fsinfo_copy(const void *_mesg, void *_dest); static size_t H5O__fsinfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O__fsinfo_free(void *mesg); static herr_t H5O__fsinfo_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -93,11 +93,11 @@ static void * H5O__fsinfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_fsinfo_t * fsinfo = NULL; /* File space info message */ + H5O_fsinfo_t *fsinfo = NULL; /* File space info message */ H5F_mem_page_t ptype; /* Memory type for iteration */ unsigned vers; /* message version */ const uint8_t *p_end = p + p_size; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -257,8 +257,8 @@ static void * H5O__fsinfo_copy(const void *_mesg, void *_dest) { const H5O_fsinfo_t *fsinfo = (const H5O_fsinfo_t *)_mesg; - H5O_fsinfo_t * dest = (H5O_fsinfo_t *)_dest; - void * ret_value = NULL; /* Return value */ + H5O_fsinfo_t *dest = (H5O_fsinfo_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c index 066bd4b..ef0c434 100644 --- a/src/H5Oginfo.c +++ b/src/H5Oginfo.c @@ -30,10 +30,10 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O__ginfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__ginfo_decode(H5F_t *f, 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, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -92,9 +92,9 @@ static void * H5O__ginfo_decode(H5F_t H5_ATTR_UNUSED *f, 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_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_PACKAGE @@ -214,8 +214,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_PACKAGE diff --git a/src/H5Oint.c b/src/H5Oint.c index 70661ad..0d04e2e 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -55,10 +55,10 @@ /* 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 */ - H5SL_t * visited; /* Skip list for tracking visited nodes */ + H5G_loc_t *start_loc; /* Location of starting group */ + H5SL_t *visited; /* Skip list for tracking visited nodes */ H5O_iterate2_t op; /* Application callback */ - void * op_data; /* Application's op data */ + void *op_data; /* Application's op data */ unsigned fields; /* Selection of object info */ } H5O_iter_visit_ud_t; @@ -312,9 +312,9 @@ H5O_t * H5O_create_ohdr(H5F_t *f, hid_t ocpl_id) { H5P_genplist_t *oc_plist; - H5O_t * oh = NULL; /* Object header in Freelist */ + H5O_t *oh = NULL; /* Object header in Freelist */ uint8_t oh_flags; /* Initial status flags */ - H5O_t * ret_value = NULL; + H5O_t *ret_value = NULL; FUNC_ENTER_NOAPI(NULL) @@ -603,7 +603,7 @@ H5O_open_name(const H5G_loc_t *loc, const char *name, H5I_type_t *opened_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 'name' found */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -654,7 +654,7 @@ H5O__open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type, H5 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 'name' found */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -703,7 +703,7 @@ H5O__open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type) 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 */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -743,7 +743,7 @@ void * H5O_open_by_loc(const H5G_loc_t *obj_loc, H5I_type_t *opened_type) { const H5O_obj_class_t *obj_class; /* Class of object for location */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -958,7 +958,7 @@ done: int H5O_link(const H5O_loc_t *loc, int adjust) { - H5O_t * oh = NULL; + H5O_t *oh = NULL; hbool_t deleted = FALSE; /* Whether the object was deleted */ int ret_value = -1; /* Return value */ @@ -1005,11 +1005,11 @@ done: H5O_t * H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks) { - 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 = NULL; /* Return value */ + H5O_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_TAG(loc->addr, NULL) @@ -1422,7 +1422,7 @@ done: herr_t H5O_touch(const H5O_loc_t *loc, hbool_t force) { - 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 */ @@ -1536,7 +1536,7 @@ done: herr_t H5O_delete(H5F_t *f, 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 */ hbool_t corked; @@ -1712,7 +1712,7 @@ H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type) const H5O_obj_class_t * H5O__obj_class(const H5O_loc_t *loc) { - H5O_t * oh = NULL; /* Object header for location */ + H5O_t *oh = NULL; /* Object header for location */ const H5O_obj_class_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_TAG(loc->addr) @@ -2096,7 +2096,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 */ @@ -2177,7 +2177,7 @@ herr_t H5O_get_info(const H5O_loc_t *loc, H5O_info2_t *oinfo, unsigned fields) { 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_TAG(loc->addr, FAIL) @@ -2286,7 +2286,7 @@ herr_t H5O_get_native_info(const H5O_loc_t *loc, H5O_native_info_t *oinfo, unsigned fields) { 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_TAG(loc->addr, FAIL) @@ -2445,7 +2445,7 @@ void * H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc) { size_t u; /* Local index variable */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2758,7 +2758,7 @@ H5O__visit(H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5_iter_or H5O_loc_t obj_oloc; /* Opened object object location */ hbool_t loc_found = FALSE; /* Entry at 'name' found */ H5O_info2_t oinfo; /* Object info struct */ - void * obj = NULL; /* Object */ + void *obj = NULL; /* Object */ H5I_type_t opened_type; /* ID type of object */ hid_t obj_id = H5I_INVALID_HID; /* ID of object */ herr_t ret_value = FAIL; /* Return value */ diff --git a/src/H5Olayout.c b/src/H5Olayout.c index eb3890a..206b2b8 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -32,17 +32,17 @@ /* Local macros */ /* PRIVATE PROTOTYPES */ -static void * H5O__layout_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__layout_decode(H5F_t *f, 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, H5O_t *open_oh, void *_mesg); static herr_t H5O__layout_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__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); static herr_t H5O__layout_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -92,11 +92,11 @@ static void * H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5O_layout_t * mesg = NULL; - uint8_t * heap_block = NULL; + H5O_layout_t *mesg = NULL; + uint8_t *heap_block = 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_PACKAGE @@ -754,8 +754,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_PACKAGE @@ -1039,10 +1039,10 @@ H5O__layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, H5O_copy_t *cpy_info, void *_udata) { 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 */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c index a821bae..5624517 100644 --- a/src/H5Olinfo.c +++ b/src/H5Olinfo.c @@ -34,10 +34,10 @@ #include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void * H5O__linfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__linfo_decode(H5F_t *f, 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, H5O_t *open_oh, void *_mesg); @@ -83,9 +83,9 @@ 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_copy_t * cpy_info; /* Information for copy operation */ + H5O_loc_t *dst_oloc; /* Destination object location */ + H5O_linfo_t *dst_linfo; /* Destination object's link info message */ + 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 */ @@ -108,9 +108,9 @@ static void * H5O__linfo_decode(H5F_t *f, 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_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 = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -235,8 +235,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 = NULL; /* Return value */ + H5O_linfo_t *dest = (H5O_linfo_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -367,10 +367,10 @@ H5O__linfo_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t *fi hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t *cpy_info, void *_udata) { - 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 = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE_TAG(H5AC__COPIED_TAG) @@ -485,7 +485,7 @@ H5O__linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_l void *mesg_dst, unsigned H5_ATTR_UNUSED *mesg_flags, 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_PACKAGE diff --git a/src/H5Olink.c b/src/H5Olink.c index acc7ee2..ea1a1c0 100644 --- a/src/H5Olink.c +++ b/src/H5Olink.c @@ -39,13 +39,13 @@ static void *H5O__link_decode(H5F_t *f, 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); 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, H5O_copy_t *cpy_info); @@ -114,11 +114,11 @@ static void * H5O__link_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, 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 = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -414,8 +414,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 = NULL; /* Return value */ + H5O_link_t *dest = (H5O_link_t *)_dest; + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -719,7 +719,7 @@ H5O__link_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *native_src, H5F_t H5_A H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *udata) { H5O_link_t *link_src = (H5O_link_t *)native_src; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -758,7 +758,7 @@ H5O__link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_lo unsigned H5_ATTR_UNUSED *mesg_flags, 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_PACKAGE diff --git a/src/H5Omessage.c b/src/H5Omessage.c index 8179853..48b04ee 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -50,11 +50,11 @@ /* 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 */ 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; @@ -237,7 +237,7 @@ done: herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg) { - 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 */ @@ -437,7 +437,7 @@ void * H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg) { H5O_t *oh = NULL; /* Object header to use */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_TAG(loc->addr, NULL) @@ -489,7 +489,7 @@ H5O_msg_read_oh(H5F_t *f, 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 @@ -616,7 +616,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 @@ -709,7 +709,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) @@ -745,7 +745,7 @@ done: int H5O_msg_count(const H5O_loc_t *loc, unsigned type_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 */ @@ -918,7 +918,7 @@ done: herr_t H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj_link) { - 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 = FAIL; /* Return value */ @@ -968,7 +968,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) { - 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 = FAIL; /* Return value */ @@ -1151,7 +1151,7 @@ done: herr_t H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id, const H5O_mesg_operator_t *op, void *op_data) { - 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 = FAIL; /* Return value */ @@ -1336,7 +1336,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 = 0; /* Return value */ @@ -1731,7 +1731,7 @@ H5O_msg_decode(H5F_t *f, H5O_t *open_oh, unsigned type_id, size_t buf_size, cons { 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) @@ -1878,7 +1878,7 @@ H5O__copy_mesg(H5F_t *f, H5O_t *oh, size_t idx, const H5O_msg_class_t *type, con 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 */ @@ -2170,9 +2170,9 @@ done: herr_t H5O_msg_get_flags(const H5O_loc_t *loc, unsigned type_id, uint8_t *flags) { - 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 a0bd2ab..8b82f61 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -25,15 +25,15 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Opkg.h" /* Object headers */ -static void * H5O__mtime_new_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__mtime_new_decode(H5F_t *f, 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); -static void * H5O__mtime_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__mtime_decode(H5F_t *f, 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_free(void *_mesg); static herr_t H5O__mtime_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -116,9 +116,9 @@ H5O__mtime_new_decode(H5F_t H5_ATTR_UNUSED *f, 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) { - 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_PACKAGE @@ -170,10 +170,10 @@ static void * H5O__mtime_decode(H5F_t H5_ATTR_UNUSED *f, 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) { - 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_PACKAGE @@ -266,7 +266,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_PACKAGE_NOERR @@ -302,8 +302,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_PACKAGE @@ -422,7 +422,7 @@ static herr_t H5O__mtime_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int indent, int fwidth) { const time_t *mesg = (const time_t *)_mesg; - struct tm * tm; + struct tm *tm; char buf[128]; FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Oname.c b/src/H5Oname.c index ec9ba12..b12634e 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -33,7 +33,7 @@ static void *H5O__name_decode(H5F_t *f, 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, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -82,7 +82,7 @@ H5O__name_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigne unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_name_t *mesg; - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -157,8 +157,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_PACKAGE diff --git a/src/H5Opkg.h b/src/H5Opkg.h index 1fe918d..a81da00 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -238,8 +238,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 */ }; @@ -258,7 +258,7 @@ typedef struct H5O_chunk_t { haddr_t addr; /*chunk file address */ size_t size; /*chunk size */ size_t gap; /*space at end of chunk too small for null message */ - uint8_t * image; /*image of file */ + uint8_t *image; /*image of file */ struct H5O_chunk_proxy_t *chunk_proxy; /* Pointer to a chunk's proxy when chunk protected */ } H5O_chunk_t; @@ -340,7 +340,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 */ @@ -352,7 +352,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 */ unsigned file_intent; /* Read/write intent for file */ unsigned merged_null_msgs; /* Number of null messages merged together */ H5O_cont_msgs_t *cont_msg_info; /* Pointer to continuation messages to work on */ @@ -364,7 +364,7 @@ typedef struct H5O_cache_ud_t { hbool_t made_attempt; /* Whether the deserialize routine was already attempted */ unsigned v1_pfx_nmesgs; /* Number of messages from v1 prefix header */ size_t chunk0_size; /* Size of serialized first chunk */ - H5O_t * oh; /* Partially deserialized object header, for later use */ + H5O_t *oh; /* Partially deserialized object header, for later use */ hbool_t free_oh; /* Whether to free the object header or not */ H5O_common_cache_ud_t common; /* Common object header cache callback info */ } H5O_cache_ud_t; @@ -374,8 +374,8 @@ typedef struct H5O_chunk_proxy_t { H5AC_info_t cache_info; /* Information for metadata cache functions, _must_ be */ /* first field in structure */ - H5F_t * f; /* Pointer to file for object header/chunk */ - H5O_t * oh; /* Object header for this chunk */ + H5F_t *f; /* Pointer to file for object header/chunk */ + H5O_t *oh; /* Object header for this chunk */ unsigned chunkno; /* Chunk number for this chunk */ /* Flush dependency parent information (not stored) @@ -395,7 +395,7 @@ typedef struct 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 */ @@ -573,7 +573,7 @@ H5_DLL herr_t H5O__flush_msgs(H5F_t *f, H5O_t *oh); H5_DLL herr_t H5O__delete_mesg(H5F_t *f, H5O_t *open_oh, H5O_mesg_t *mesg); /* Object header chunk routines */ -H5_DLL herr_t H5O__chunk_add(H5F_t *f, H5O_t *oh, unsigned idx, unsigned cont_chunkno); +H5_DLL herr_t H5O__chunk_add(H5F_t *f, H5O_t *oh, unsigned idx, unsigned cont_chunkno); H5_DLL H5O_chunk_proxy_t *H5O__chunk_protect(H5F_t *f, H5O_t *oh, unsigned idx); H5_DLL herr_t H5O__chunk_unprotect(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t chk_dirtied); H5_DLL herr_t H5O__chunk_update_idx(H5F_t *f, H5O_t *oh, unsigned idx); @@ -599,7 +599,7 @@ H5_DLL herr_t H5O__condense_header(H5F_t *f, H5O_t *oh); H5_DLL herr_t H5O__release_mesg(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg, hbool_t adj_link); /* Shared object operators */ -H5_DLL void * H5O__shared_decode(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const uint8_t *buf, +H5_DLL void *H5O__shared_decode(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const uint8_t *buf, const H5O_msg_class_t *type); H5_DLL herr_t H5O__shared_encode(const H5F_t *f, uint8_t *buf /*out*/, const H5O_shared_t *sh_mesg); H5_DLL size_t H5O__shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg); diff --git a/src/H5Opline.c b/src/H5Opline.c index 5618dce..0f14891 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -31,9 +31,9 @@ /* PRIVATE PROTOTYPES */ static herr_t H5O__pline_encode(H5F_t *f, uint8_t *p, const void *mesg); -static void * H5O__pline_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__pline_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); -static void * H5O__pline_copy(const void *_mesg, void *_dest); +static void *H5O__pline_copy(const void *_mesg, void *_dest); static size_t H5O__pline_size(const H5F_t *f, const void *_mesg); static herr_t H5O__pline_reset(void *_mesg); static herr_t H5O__pline_free(void *_mesg); @@ -115,12 +115,12 @@ static void * H5O__pline_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, 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_PACKAGE @@ -256,7 +256,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 */ @@ -358,9 +358,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_PACKAGE @@ -593,7 +593,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 *cpy_info, void *_udata) { - const H5O_pline_t * pline_src = (const H5O_pline_t *)mesg_src; /* Source pline */ + const H5O_pline_t *pline_src = (const H5O_pline_t *)mesg_src; /* Source pline */ 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 1051195..d5cf31c 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -158,7 +158,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. */ @@ -166,14 +166,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 */ @@ -188,8 +188,8 @@ 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 */ @@ -198,7 +198,7 @@ typedef struct H5O_copy_t { the destination file's high bound. The high bound is used to index into the corresponding message's array of versions for doing version bounds check. */ - void * shared_fo; /* The shared pointer for the src object */ + void *shared_fo; /* The shared pointer for the src 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 */ @@ -276,7 +276,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 */ @@ -334,9 +334,9 @@ 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 */ @@ -355,7 +355,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; @@ -364,7 +364,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 */ @@ -381,7 +381,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 */ HDoff_t offset; /*offset of data within file */ hsize_t size; /*size allocated within file */ } H5O_efl_entry_t; @@ -497,7 +497,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_virtual_srcdset_t { @@ -505,8 +505,8 @@ typedef struct H5O_storage_virtual_srcdset_t { struct H5S_t *virtual_select; /* Selection in the virtual dataset that is mapped to source selection */ /* Not stored */ - char * file_name; /* Source file name used for virtual dataset mapping */ - char * dset_name; /* Source dataset name used for virtual dataset mapping */ + char *file_name; /* Source file name used for virtual dataset mapping */ + char *dset_name; /* Source dataset name used for virtual dataset mapping */ struct H5S_t *clipped_source_select; /* Clipped version of source_select */ struct H5S_t *clipped_virtual_select; /* Clipped version of virtual_select */ struct H5D_t *dset; /* Source dataset */ @@ -517,7 +517,7 @@ typedef struct H5O_storage_virtual_srcdset_t { } H5O_storage_virtual_srcdset_t; typedef struct H5O_storage_virtual_name_seg_t { - char * name_segment; /* String for this name segment */ + char *name_segment; /* String for this name segment */ struct H5O_storage_virtual_name_seg_t *next; /* Next name segment */ } H5O_storage_virtual_name_seg_t; @@ -531,9 +531,9 @@ typedef enum H5O_virtual_space_status_t { typedef struct H5O_storage_virtual_ent_t { /* Stored */ H5O_storage_virtual_srcdset_t source_dset; /* Information about the source dataset */ - char * source_file_name; /* Original (unparsed) source file name */ - char * source_dset_name; /* Original (unparsed) source dataset name */ - struct H5S_t * source_select; /* Selection in the source dataset for mapping */ + char *source_file_name; /* Original (unparsed) source file name */ + char *source_dset_name; /* Original (unparsed) source dataset name */ + struct H5S_t *source_select; /* Selection in the source dataset for mapping */ /* Not stored */ H5O_storage_virtual_srcdset_t *sub_dset; /* Array of sub-source dataset info structs */ @@ -790,7 +790,7 @@ typedef struct H5O_drvinfo_t { H5AC_info_t cache_info; char name[9]; /* Driver name */ size_t len; /* Length of encoded buffer */ - uint8_t * buf; /* Buffer for encoded info */ + uint8_t *buf; /* Buffer for encoded info */ } H5O_drvinfo_t; /* @@ -892,8 +892,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 */ @@ -907,7 +907,7 @@ H5_DLL H5O_t *H5O_create_ohdr(H5F_t *f, hid_t ocpl_id); H5_DLL herr_t H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out); H5_DLL herr_t H5O_open(H5O_loc_t *loc); -H5_DLL void * H5O_open_by_loc(const H5G_loc_t *obj_loc, H5I_type_t *opened_type /*out*/); +H5_DLL void *H5O_open_by_loc(const H5G_loc_t *obj_loc, H5I_type_t *opened_type /*out*/); H5_DLL herr_t H5O_close(H5O_loc_t *loc, hbool_t *file_closed /*out*/); H5_DLL int H5O_link(const H5O_loc_t *loc, int adjust); H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks); @@ -926,9 +926,9 @@ H5_DLL herr_t H5O_get_info(const H5O_loc_t *oloc, H5O_info2_t *oinfo, unsigned H5_DLL herr_t H5O_get_native_info(const H5O_loc_t *oloc, H5O_native_info_t *oinfo, unsigned fields); H5_DLL herr_t H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type); H5_DLL herr_t H5O_get_create_plist(const H5O_loc_t *loc, struct H5P_genplist_t *oc_plist); -H5_DLL void * H5O_open_name(const H5G_loc_t *loc, const char *name, H5I_type_t *opened_type /*out*/); +H5_DLL void *H5O_open_name(const H5G_loc_t *loc, const char *name, H5I_type_t *opened_type /*out*/); H5_DLL herr_t H5O_get_nlinks(const H5O_loc_t *loc, hsize_t *nlinks); -H5_DLL void * H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc); +H5_DLL void *H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc); H5_DLL haddr_t H5O_get_oh_addr(const H5O_t *oh); H5_DLL uint8_t H5O_get_oh_flags(const H5O_t *oh); H5_DLL time_t H5O_get_oh_mtime(const H5O_t *oh); @@ -946,12 +946,12 @@ H5_DLL herr_t H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mes H5_DLL herr_t H5O_msg_write_oh(H5F_t *f, H5O_t *oh, unsigned type_id, unsigned mesg_flags, unsigned update_flags, void *mesg); H5_DLL herr_t H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg); -H5_DLL void * H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg); -H5_DLL void * H5O_msg_read_oh(H5F_t *f, H5O_t *oh, unsigned type_id, void *mesg); +H5_DLL void *H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg); +H5_DLL void *H5O_msg_read_oh(H5F_t *f, 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_free_real(const H5O_msg_class_t *type, 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_free_real(const H5O_msg_class_t *type, 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); H5_DLL htri_t H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id); H5_DLL htri_t H5O_msg_exists_oh(const H5O_t *oh, unsigned type_id); @@ -973,7 +973,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, H5O_t *open_oh, unsigned type_id, size_t buf_size, +H5_DLL void *H5O_msg_decode(H5F_t *f, 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, H5O_t *open_oh, unsigned type_id, void *mesg); H5_DLL herr_t H5O_msg_get_flags(const H5O_loc_t *loc, unsigned type_id, uint8_t *flags); @@ -998,12 +998,12 @@ H5_DLL herr_t H5O_debug_id(unsigned type_id, H5F_t *f, const void *mesg, FILE *s H5_DLL herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth); /* These functions operate on object locations */ -H5_DLL herr_t H5O_loc_reset(H5O_loc_t *loc); -H5_DLL herr_t H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth); -H5_DLL herr_t H5O_loc_copy_shallow(H5O_loc_t *dst, H5O_loc_t *src); -H5_DLL herr_t H5O_loc_copy_deep(H5O_loc_t *dst, const H5O_loc_t *src); -H5_DLL herr_t H5O_loc_hold_file(H5O_loc_t *loc); -H5_DLL herr_t H5O_loc_free(H5O_loc_t *loc); +H5_DLL herr_t H5O_loc_reset(H5O_loc_t *loc); +H5_DLL herr_t H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth); +H5_DLL herr_t H5O_loc_copy_shallow(H5O_loc_t *dst, H5O_loc_t *src); +H5_DLL herr_t H5O_loc_copy_deep(H5O_loc_t *dst, const H5O_loc_t *src); +H5_DLL herr_t H5O_loc_hold_file(H5O_loc_t *loc); +H5_DLL herr_t H5O_loc_free(H5O_loc_t *loc); H5_DLL H5O_loc_t *H5O_get_loc(hid_t id); /* EFL operators */ diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c index 0da849d..277c0f5 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__refcount_decode(H5F_t *f, 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, @@ -89,7 +89,7 @@ H5O__refcount_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_refcount_t *refcount = NULL; /* Reference count */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -170,8 +170,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_PACKAGE diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index e94b7c4..cacceb5 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__sdspace_decode(H5F_t *f, 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); @@ -108,11 +108,11 @@ static void * H5O__sdspace_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p) { - H5S_extent_t * sdim = NULL; /* New extent dimensionality structure */ + H5S_extent_t *sdim = NULL; /* New extent dimensionality structure */ unsigned flags, version; unsigned i; /* Local counting variable */ 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_PACKAGE @@ -298,8 +298,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_PACKAGE diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 249b32a..646ce62 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -67,7 +67,7 @@ /********************/ /* Local Prototypes */ /********************/ -static void * H5O__shared_read(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const H5O_shared_t *shared, +static void *H5O__shared_read(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const H5O_shared_t *shared, const H5O_msg_class_t *type); static herr_t H5O__shared_link_adj(H5F_t *f, H5O_t *open_oh, const H5O_msg_class_t *type, H5O_shared_t *shared, int adjust); @@ -106,7 +106,7 @@ H5O__shared_read(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const H5O_shared_t 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_PACKAGE @@ -176,7 +176,7 @@ H5O__shared_read(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const H5O_shared_t else /* The shared message is in another object header */ if (NULL == (ret_value = H5O_msg_read(&oloc, type->id, NULL))) - 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 */ @@ -265,7 +265,7 @@ H5O__shared_link_adj(H5F_t *f, H5O_t *open_oh, const H5O_msg_class_t *type, H5O_ else /* The shared message is in another object header */ if (H5O_link(&oloc, adjust) < 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); @@ -305,7 +305,7 @@ H5O__shared_decode(H5F_t *f, H5O_t *open_oh, unsigned *ioflags, const uint8_t *b { 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_PACKAGE @@ -671,7 +671,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, 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 c04eeb1..4b4dfab 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, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, +static void *H5O__shmesg_decode(H5F_t *f, 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, const void *_mesg, FILE *stream, int indent, int fwidth); @@ -75,7 +75,7 @@ H5O__shmesg_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_shmesg_table_t *mesg; /* Native message */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -149,8 +149,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_PACKAGE diff --git a/src/H5Ostab.c b/src/H5Ostab.c index 06480cf..30d7bd4 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -36,11 +36,11 @@ static void *H5O__stab_decode(H5F_t *f, 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, 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); 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, H5O_copy_t *cpy_info); @@ -93,7 +93,7 @@ H5O__stab_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSE unsigned H5_ATTR_UNUSED *ioflags, 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_PACKAGE @@ -168,8 +168,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_PACKAGE @@ -291,11 +291,11 @@ H5O__stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst, hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags, H5O_copy_t H5_ATTR_UNUSED *cpy_info, void *_udata) { - 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_PACKAGE @@ -354,7 +354,7 @@ H5O__stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_lo unsigned H5_ATTR_UNUSED *mesg_flags, 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 48bc77f..61d513e 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -86,9 +86,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ htri_t ret_value = FAIL; /* Return value */ @@ -155,11 +155,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ htri_t ret_value = FAIL; /* Return value */ @@ -258,10 +258,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -357,11 +357,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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ @@ -461,8 +461,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 */ @@ -522,7 +522,7 @@ done: herr_t H5O__expunge_chunks_test(const H5O_loc_t *loc) { - 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 */ @@ -628,8 +628,8 @@ done: herr_t H5O__msg_get_chunkno_test(hid_t oid, unsigned msg_type, unsigned *chunk_num) { - 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 */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ @@ -695,8 +695,8 @@ done: herr_t H5O__msg_move_to_new_chunk_test(hid_t oid, unsigned msg_type) { - 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 *curr_msg; /* Pointer to current message */ unsigned idx; /* Index of message */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ @@ -722,7 +722,7 @@ H5O__msg_move_to_new_chunk_test(hid_t oid, unsigned msg_type) if (curr_msg->type->id == msg_type) { H5O_msg_alloc_info_t found_msg; /* Information about message to move */ unsigned msg_chunkno = curr_msg->chunkno; /* Chunk that the message is in */ - uint8_t * end_chunk_data = + uint8_t *end_chunk_data = (oh->chunk[msg_chunkno].image + oh->chunk[msg_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[msg_chunkno].gap); /* End of message data in chunk */ uint8_t *end_msg = curr_msg->raw + curr_msg->raw_size; /* End of current message */ @@ -43,7 +43,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; /********************/ @@ -1015,7 +1015,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) @@ -1192,7 +1192,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) @@ -1519,7 +1519,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); @@ -426,7 +426,7 @@ static herr_t H5PB__dest_cb(void *item, void H5_ATTR_UNUSED *key, void *_op_data) { H5PB_entry_t *page_entry = (H5PB_entry_t *)item; /* Pointer to page entry node */ - H5PB_ud1_t * op_data = (H5PB_ud1_t *)_op_data; + H5PB_ud1_t *op_data = (H5PB_ud1_t *)_op_data; FUNC_ENTER_PACKAGE_NOERR @@ -470,7 +470,7 @@ H5PB_dest(H5F_shared_t *f_sh) /* flush and destroy the page buffer, if it exists */ if (f_sh->page_buf) { - H5PB_t * page_buf = f_sh->page_buf; + H5PB_t *page_buf = f_sh->page_buf; H5PB_ud1_t op_data; /* Iteration context */ if (H5PB_flush(f_sh) < 0) @@ -517,7 +517,7 @@ done: herr_t H5PB_add_new_page(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t page_addr) { - H5PB_t * page_buf; /* Page buffer to operate on */ + H5PB_t *page_buf; /* Page buffer to operate on */ H5PB_entry_t *page_entry = NULL; /* Pointer to the corresponding page entry */ herr_t ret_value = SUCCEED; /* Return value */ @@ -623,7 +623,7 @@ H5PB_update_entry(H5PB_t *page_buf, haddr_t addr, size_t size, const void *buf) herr_t H5PB_remove_entry(const H5F_shared_t *f_sh, haddr_t addr) { - H5PB_t * page_buf; /* Page buffer to operate on */ + H5PB_t *page_buf; /* Page buffer to operate on */ H5PB_entry_t *page_entry = NULL; /* Pointer to the page entry being searched */ herr_t ret_value = SUCCEED; /* Return value */ @@ -672,9 +672,9 @@ done: herr_t H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *buf /*out*/) { - H5PB_t * page_buf; /* Page buffering info for this file */ + H5PB_t *page_buf; /* Page buffering info for this file */ H5PB_entry_t *page_entry; /* Pointer to the corresponding page entry */ - H5FD_t * file; /* File driver pointer */ + H5FD_t *file; /* File driver pointer */ haddr_t first_page_addr, last_page_addr; /* Addresses of the first and last pages covered by I/O */ haddr_t offset; haddr_t search_addr; /* Address of current page */ @@ -874,7 +874,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void * } /* end if */ /* if not found */ else { - void * new_page_buf = NULL; + void *new_page_buf = NULL; size_t page_size = page_buf->page_size; haddr_t eoa; @@ -973,9 +973,9 @@ done: herr_t H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf) { - H5PB_t * page_buf; /* Page buffering info for this file */ + H5PB_t *page_buf; /* Page buffering info for this file */ H5PB_entry_t *page_entry; /* Pointer to the corresponding page entry */ - H5FD_t * file; /* File driver pointer */ + H5FD_t *file; /* File driver pointer */ haddr_t first_page_addr, last_page_addr; /* Addresses of the first and last pages covered by I/O */ haddr_t offset; haddr_t search_addr; /* Address of current page */ @@ -1180,7 +1180,7 @@ H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, const } /* end if */ /* If not found */ else { - void * new_page_buf; + void *new_page_buf; size_t page_size = page_buf->page_size; /* Make space for new entry */ diff --git a/src/H5PBpkg.h b/src/H5PBpkg.h index 2656588..b603f03 100644 --- a/src/H5PBpkg.h +++ b/src/H5PBpkg.h @@ -32,7 +32,7 @@ /****************************/ typedef struct H5PB_entry_t { - void * page_buf_ptr; /* Pointer to the buffer containing the data */ + void *page_buf_ptr; /* Pointer to the buffer containing the data */ haddr_t addr; /* Address of the page in the file */ H5F_mem_page_t type; /* Type of the page entry (H5F_MEM_PAGE_RAW/META) */ hbool_t is_dirty; /* Flag indicating whether the page has dirty data or not */ diff --git a/src/H5PLint.c b/src/H5PLint.c index fe9d3c1..9256e85 100644 --- a/src/H5PLint.c +++ b/src/H5PLint.c @@ -131,7 +131,7 @@ H5PL__set_plugin_control_mask(unsigned int mask) herr_t H5PL_init(void) { - char * env_var = NULL; + char *env_var = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) @@ -214,8 +214,8 @@ H5PL_load(H5PL_type_t type, const H5PL_key_t *key) { H5PL_search_params_t search_params; /* Plugin search parameters */ hbool_t found = FALSE; /* Whether the plugin was found */ - const void * plugin_info = NULL; /* Information from the plugin */ - const void * ret_value = NULL; + const void *plugin_info = NULL; /* Information from the plugin */ + const void *ret_value = NULL; FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5PLpath.c b/src/H5PLpath.c index 291d259..31960c7 100644 --- a/src/H5PLpath.c +++ b/src/H5PLpath.c @@ -102,7 +102,7 @@ static unsigned H5PL_path_capacity_g = H5PL_INITIAL_PATH_CAPACITY; static herr_t H5PL__insert_at(const char *path, unsigned int idx) { - char * path_copy = NULL; /* copy of path string (for storing) */ + char *path_copy = NULL; /* copy of path string (for storing) */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -183,7 +183,7 @@ H5PL__make_space_at(unsigned int idx) static herr_t H5PL__replace_at(const char *path, unsigned int idx) { - char * path_copy = NULL; /* copy of path string (for storing) */ + char *path_copy = NULL; /* copy of path string (for storing) */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -233,8 +233,8 @@ H5PL__create_path_table(void) char *paths = NULL; /* Delimited paths string. Either from the * environment variable or the default. */ - char * next_path = NULL; /* A path tokenized from the paths string */ - char * lasts = NULL; /* Context pointer for strtok_r() call */ + char *next_path = NULL; /* A path tokenized from the paths string */ + char *lasts = NULL; /* Context pointer for strtok_r() call */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -603,10 +603,10 @@ H5PL__path_table_iterate_process_path(const char *plugin_path, H5PL_iterate_type H5PL_iterate_t iter_op, void *op_data) { H5PL_type_t plugin_type; - const void * plugin_info = NULL; + const void *plugin_info = NULL; hbool_t plugin_loaded; - char * path = NULL; - DIR * dirp = NULL; /* Directory stream */ + char *path = NULL; + DIR *dirp = NULL; /* Directory stream */ struct dirent *dp = NULL; /* Directory entry */ herr_t ret_value = H5_ITER_CONT; @@ -695,9 +695,9 @@ H5PL__path_table_iterate_process_path(const char *plugin_path, H5PL_iterate_type WIN32_FIND_DATAA fdFile; HANDLE hFind = INVALID_HANDLE_VALUE; H5PL_type_t plugin_type; - const void * plugin_info = NULL; + const void *plugin_info = NULL; hbool_t plugin_loaded; - char * path = NULL; + char *path = NULL; char service[2048]; herr_t ret_value = H5_ITER_CONT; @@ -836,8 +836,8 @@ static herr_t H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *found, const char *dir, const void **plugin_info) { - char * path = NULL; - DIR * dirp = NULL; /* Directory stream */ + char *path = NULL; + DIR *dirp = NULL; /* Directory stream */ struct dirent *dp = NULL; /* Directory entry */ herr_t ret_value = SUCCEED; @@ -918,7 +918,7 @@ H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *fo { WIN32_FIND_DATAA fdFile; HANDLE hFind = INVALID_HANDLE_VALUE; - char * path = NULL; + char *path = NULL; char service[2048]; herr_t ret_value = SUCCEED; diff --git a/src/H5PLplugin_cache.c b/src/H5PLplugin_cache.c index 9a579f9..2f77e58 100644 --- a/src/H5PLplugin_cache.c +++ b/src/H5PLplugin_cache.c @@ -337,7 +337,7 @@ H5PL__find_plugin_in_cache(const H5PL_search_params_t *search_params, hbool_t *f */ if (matched) { H5PL_get_plugin_info_t get_plugin_info_function; - const void * info; + const void *info; /* Get the "get plugin info" function from the plugin. */ if (NULL == (get_plugin_info_function = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC( diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h index 83cc8a5..430f3d8 100644 --- a/src/H5PLprivate.h +++ b/src/H5PLprivate.h @@ -38,7 +38,7 @@ typedef struct H5PL_vol_key_t { H5VL_get_connector_kind_t kind; /* Kind of VOL lookup to do */ union { H5VL_class_value_t value; /* VOL connector value */ - const char * name; /* VOL connector name */ + const char *name; /* VOL connector name */ } u; } H5PL_vol_key_t; @@ -47,7 +47,7 @@ typedef struct H5PL_vfd_key_t { H5FD_get_driver_kind_t kind; /* Kind of VFD lookup to do */ union { H5FD_class_value_t value; /* VFD value */ - const char * name; /* VFD name */ + const char *name; /* VFD name */ } u; } H5PL_vfd_key_t; diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index ad47f20..82e1a9f 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -315,7 +315,7 @@ static herr_t H5P__dapl_vds_file_pref_enc(const void *value, void **_pp, size_t *size) { const char *vds_file_pref = *(const char *const *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; size_t len = 0; uint64_t enc_value; unsigned enc_size; @@ -364,7 +364,7 @@ H5P__dapl_vds_file_pref_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dapl_vds_file_pref_dec(const void **_pp, void *_value) { - char ** vds_file_pref = (char **)_value; + char **vds_file_pref = (char **)_value; const uint8_t **pp = (const uint8_t **)_pp; size_t len; uint64_t enc_value; /* Decoded property value */ @@ -555,7 +555,7 @@ static herr_t H5P__dapl_efile_pref_enc(const void *value, void **_pp, size_t *size) { const char *efile_pref = *(const char *const *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; size_t len = 0; uint64_t enc_value; unsigned enc_size; @@ -604,7 +604,7 @@ H5P__dapl_efile_pref_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dapl_efile_pref_dec(const void **_pp, void *_value) { - char ** efile_pref = (char **)_value; + char **efile_pref = (char **)_value; const uint8_t **pp = (const uint8_t **)_pp; size_t len; uint64_t enc_value; /* Decoded property value */ @@ -920,7 +920,7 @@ H5P__encode_chunk_cache_nslots(const void *value, void **_pp, size_t *size) static herr_t H5P__decode_chunk_cache_nslots(const void **_pp, void *_value) { - size_t * value = (size_t *)_value; /* Property value to return */ + size_t *value = (size_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; uint64_t enc_value; /* Decoded property value */ unsigned enc_size; /* Size of encoded property */ @@ -1020,7 +1020,7 @@ H5P__encode_chunk_cache_nbytes(const void *value, void **_pp, size_t *size) static herr_t H5P__decode_chunk_cache_nbytes(const void **_pp, void *_value) { - size_t * value = (size_t *)_value; /* Property value to return */ + size_t *value = (size_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; uint64_t enc_value; /* Decoded property value */ unsigned enc_size; /* Size of encoded property */ @@ -1139,7 +1139,7 @@ static herr_t H5P__dacc_vds_view_enc(const void *value, void **_pp, size_t *size) { const H5D_vds_view_t *view = (const H5D_vds_view_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -1287,7 +1287,7 @@ herr_t H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D_append_cb_t func, void *udata) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5D_append_flush_t info; /* Property for append flush parameters */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1349,7 +1349,7 @@ herr_t H5Pget_append_flush(hid_t plist_id, unsigned ndims, hsize_t boundary[], H5D_append_cb_t *func /*out*/, void **udata /*out*/) { - H5P_genplist_t * plist; /* property list pointer */ + H5P_genplist_t *plist; /* property list pointer */ H5D_append_flush_t info; unsigned u; /* local index variable */ herr_t ret_value = SUCCEED; /* return value */ @@ -1433,7 +1433,7 @@ ssize_t H5Pget_efile_prefix(hid_t plist_id, char *prefix /*out*/, 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 */ @@ -1523,7 +1523,7 @@ ssize_t H5Pget_virtual_prefix(hid_t plist_id, char *prefix /*out*/, 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 3561c65..fc9dd47 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -435,8 +435,8 @@ static herr_t H5P__dcrt_layout_enc(const void *value, void **_pp, size_t *size) { const H5O_layout_t *layout = (const H5O_layout_t *)value; /* Create local aliases for values */ - uint8_t ** pp = (uint8_t **)_pp; - uint8_t * tmp_p; + uint8_t **pp = (uint8_t **)_pp; + uint8_t *tmp_p; size_t tmp_size; size_t u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -572,7 +572,7 @@ H5P__dcrt_layout_dec(const void **_pp, void *value) const H5O_layout_t *layout; /* Storage layout */ H5O_layout_t tmp_layout; /* Temporary local layout structure */ H5D_layout_t type; /* Layout type */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1076,7 +1076,7 @@ H5P__dcrt_fill_value_enc(const void *value, void **_pp, size_t *size) const H5O_fill_t *fill = (const H5O_fill_t *)value; /* Create local aliases for values */ size_t dt_size = 0; /* Size of encoded datatype */ herr_t ret_value = SUCCEED; /* Return value */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; uint64_t enc_value; unsigned enc_size = 0; @@ -1167,7 +1167,7 @@ done: static herr_t H5P__dcrt_fill_value_dec(const void **_pp, void *_value) { - H5O_fill_t * fill = (H5O_fill_t *)_value; /* Fill value */ + H5O_fill_t *fill = (H5O_fill_t *)_value; /* Fill value */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -1478,7 +1478,7 @@ H5P__dcrt_ext_file_list_enc(const void *value, void **_pp, size_t *size) const H5O_efl_t *efl = (const H5O_efl_t *)value; /* Create local aliases for values */ size_t len = 0; /* String length of slot name */ size_t u; /* Local index variable */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; unsigned enc_size; uint64_t enc_value; @@ -1560,7 +1560,7 @@ H5P__dcrt_ext_file_list_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dcrt_ext_file_list_dec(const void **_pp, void *_value) { - H5O_efl_t * efl = (H5O_efl_t *)_value; /* External file list */ + H5O_efl_t *efl = (H5O_efl_t *)_value; /* External file list */ const uint8_t **pp = (const uint8_t **)_pp; size_t u, nused; unsigned enc_size; @@ -1894,7 +1894,7 @@ done: 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 */ @@ -2121,10 +2121,10 @@ herr_t H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name, const char *src_dset_name, hid_t src_space_id) { - H5P_genplist_t * plist = NULL; /* Property list pointer */ + H5P_genplist_t *plist = NULL; /* Property list pointer */ H5O_layout_t virtual_layout; /* Layout information for setting virtual info */ - H5S_t * vspace; /* Virtual dataset space selection */ - H5S_t * src_space; /* Source dataset space selection */ + H5S_t *vspace; /* Virtual dataset space selection */ + H5S_t *src_space; /* Source dataset space selection */ H5O_storage_virtual_ent_t *old_list = NULL; /* List pointer previously on property list */ H5O_storage_virtual_ent_t *ent = NULL; /* Convenience pointer to new VDS entry */ hbool_t retrieved_layout = FALSE; /* Whether the layout has been retrieved */ @@ -2341,7 +2341,7 @@ H5Pget_virtual_vspace(hid_t dcpl_id, size_t idx) { H5P_genplist_t *plist; /* Property list pointer */ H5O_layout_t layout; /* Layout information */ - H5S_t * space = NULL; /* Dataspace pointer */ + H5S_t *space = NULL; /* Dataspace pointer */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) @@ -2398,7 +2398,7 @@ H5Pget_virtual_srcspace(hid_t dcpl_id, size_t idx) { H5P_genplist_t *plist; /* Property list pointer */ H5O_layout_t layout; /* Layout information */ - H5S_t * space = NULL; /* Dataspace pointer */ + H5S_t *space = NULL; /* Dataspace pointer */ hid_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) @@ -3151,7 +3151,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 */ @@ -3224,8 +3224,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 */ @@ -3316,7 +3316,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 8e640de..dd1f632 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -246,7 +246,7 @@ static const size_t H5D_def_max_temp_buf_g = H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */ static const void *H5D_def_tconv_buf_g = H5D_XFER_TCONV_BUF_DEF; /* Default value for type conversion buffer */ -static const void * H5D_def_bkgr_buf_g = H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ +static const void *H5D_def_bkgr_buf_g = H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ static const H5T_bkg_t H5D_def_bkgr_buf_type_g = H5D_XFER_BKGR_BUF_TYPE_DEF; static const double H5D_def_btree_split_ratio_g[3] = H5D_XFER_BTREE_SPLIT_RATIO_DEF; /* Default value for B-tree node split ratios */ @@ -275,7 +275,7 @@ static const H5Z_EDC_t H5D_def_enable_edc_g = H5D_XFER_EDC_DEF; /* Default static const H5Z_cb_t H5D_def_filter_cb_g = H5D_XFER_FILTER_CB_DEF; /* Default value for filter callback */ static const H5T_conv_cb_t H5D_def_conv_cb_g = H5D_XFER_CONV_CB_DEF; /* Default value for datatype conversion callback */ -static const void * H5D_def_xfer_xform_g = H5D_XFER_XFORM_DEF; /* Default value for data transform */ +static const void *H5D_def_xfer_xform_g = H5D_XFER_XFORM_DEF; /* Default value for data transform */ static const H5S_t *H5D_def_dset_io_sel_g = H5D_XFER_DSET_IO_SEL_DEF; /* Default value for dataset I/O selection */ @@ -465,7 +465,7 @@ static herr_t H5P__dxfr_bkgr_buf_type_enc(const void *value, void **_pp, size_t *size) { const H5T_bkg_t *bkgr_buf_type = (const H5T_bkg_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -501,7 +501,7 @@ H5P__dxfr_bkgr_buf_type_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dxfr_bkgr_buf_type_dec(const void **_pp, void *_value) { - H5T_bkg_t * bkgr_buf_type = (H5T_bkg_t *)_value; /* Background buffer type */ + H5T_bkg_t *bkgr_buf_type = (H5T_bkg_t *)_value; /* Background buffer type */ const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -536,7 +536,7 @@ static herr_t H5P__dxfr_btree_split_ratio_enc(const void *value, void **_pp, size_t *size) { const double *btree_split_ratio = (const double *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -584,7 +584,7 @@ H5P__dxfr_btree_split_ratio_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dxfr_btree_split_ratio_dec(const void **_pp, void *_value) { - double * btree_split_ratio = (double *)_value; /* B-tree split ratio */ + double *btree_split_ratio = (double *)_value; /* B-tree split ratio */ unsigned enc_size; /* Size of encoded property */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -696,7 +696,7 @@ H5P__dxfr_xform_enc(const void *value, void **_pp, size_t *size) *(const H5Z_data_xform_t *const *)value; /* Create local alias for values */ const char *pexp = NULL; /* Pointer to transform expression */ size_t len = 0; /* Length of transform expression */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -766,7 +766,7 @@ H5P__dxfr_xform_dec(const void **_pp, void *_value) { H5Z_data_xform_t **data_xform_prop = (H5Z_data_xform_t **)_value; /* New data xform property */ size_t len; /* Length of encoded string */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; uint64_t enc_value; herr_t ret_value = SUCCEED; /* Return value */ @@ -962,7 +962,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 */ @@ -1026,10 +1026,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) @@ -1754,7 +1754,7 @@ static herr_t H5P__dxfr_io_xfer_mode_enc(const void *value, void **_pp, size_t *size) { const H5FD_mpio_xfer_t *xfer_mode = (const H5FD_mpio_xfer_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -1791,7 +1791,7 @@ static herr_t H5P__dxfr_io_xfer_mode_dec(const void **_pp, void *_value) { H5FD_mpio_xfer_t *xfer_mode = (H5FD_mpio_xfer_t *)_value; /* I/O transfer mode */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -1936,7 +1936,7 @@ static herr_t H5P__dxfr_mpio_chunk_opt_hard_dec(const void **_pp, void *_value) { H5FD_mpio_chunk_opt_t *chunk_opt = (H5FD_mpio_chunk_opt_t *)_value; /* MPI-I/O chunk optimization mode */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -2080,7 +2080,7 @@ static herr_t H5P__dxfr_edc_enc(const void *value, void **_pp, size_t *size) { const H5Z_EDC_t *check = (const H5Z_EDC_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -2116,7 +2116,7 @@ H5P__dxfr_edc_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__dxfr_edc_dec(const void **_pp, void *_value) { - H5Z_EDC_t * check = (H5Z_EDC_t *)_value; /* EDC property */ + H5Z_EDC_t *check = (H5Z_EDC_t *)_value; /* EDC property */ const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -2290,7 +2290,7 @@ H5Pset_dataset_io_hyperslab_selection(hid_t plist_id, unsigned rank, H5S_seloper const hsize_t stride[], const hsize_t count[], const hsize_t block[]) { H5P_genplist_t *plist = NULL; /* Property list pointer */ - H5S_t * space; /* Dataspace to hold selection */ + H5S_t *space; /* Dataspace to hold selection */ hbool_t space_created = FALSE; /* Whether a new dataspace has been created */ hbool_t reset_prop_on_error = FALSE; /* Whether to reset the property on failure */ herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c index b0a355f..d7ebac6 100644 --- a/src/H5Pencdec.c +++ b/src/H5Pencdec.c @@ -48,7 +48,7 @@ typedef struct { hbool_t encode; /* Whether the property list should be encoded */ size_t *enc_size_ptr; /* Pointer to size of encoded buffer */ - void ** pp; /* Pointer to encoding buffer pointer */ + void **pp; /* Pointer to encoding buffer pointer */ } H5P_enc_iter_ud_t; /********************/ @@ -376,7 +376,7 @@ herr_t H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop, void *buf, size_t *nalloc) { H5P_enc_iter_ud_t udata; /* User data for property iteration callback */ - uint8_t * p = (uint8_t *)buf; /* Temporary pointer to encoding buffer */ + uint8_t *p = (uint8_t *)buf; /* Temporary pointer to encoding buffer */ int idx; /* Index of property to start at */ size_t encode_size = 0; /* Size of buffer needed to encode properties */ hbool_t encode = TRUE; /* Whether the property list should be encoded */ @@ -442,7 +442,7 @@ done: herr_t H5P__decode_size_t(const void **_pp, void *_value) { - size_t * value = (size_t *)_value; /* Property value to return */ + size_t *value = (size_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; uint64_t enc_value; /* Decoded property value */ unsigned enc_size; /* Size of encoded property */ @@ -482,7 +482,7 @@ H5P__decode_size_t(const void **_pp, void *_value) herr_t H5P__decode_hsize_t(const void **_pp, void *_value) { - hsize_t * value = (hsize_t *)_value; /* Property value to return */ + hsize_t *value = (hsize_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; uint64_t enc_value; /* Decoded property value */ unsigned enc_size; /* Size of encoded property */ @@ -522,7 +522,7 @@ H5P__decode_hsize_t(const void **_pp, void *_value) herr_t H5P__decode_unsigned(const void **_pp, void *_value) { - unsigned * value = (unsigned *)_value; /* Property value to return */ + unsigned *value = (unsigned *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; /* Size of encoded property */ herr_t ret_value = SUCCEED; /* Return value */ @@ -561,7 +561,7 @@ done: herr_t H5P__decode_uint8_t(const void **_pp, void *_value) { - uint8_t * value = (uint8_t *)_value; /* Property value to return */ + uint8_t *value = (uint8_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -594,7 +594,7 @@ H5P__decode_uint8_t(const void **_pp, void *_value) herr_t H5P__decode_hbool_t(const void **_pp, void *_value) { - hbool_t * value = (hbool_t *)_value; /* Property value to return */ + hbool_t *value = (hbool_t *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -627,7 +627,7 @@ H5P__decode_hbool_t(const void **_pp, void *_value) herr_t H5P__decode_double(const void **_pp, void *_value) { - double * value = (double *)_value; /* Property value to return */ + double *value = (double *)_value; /* Property value to return */ const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; /* Size of encoded property */ herr_t ret_value = SUCCEED; /* Return value */ @@ -676,9 +676,9 @@ done: hid_t H5P__decode(const void *buf) { - H5P_genplist_t * plist; /* Property list to decode into */ - void * value_buf = NULL; /* Pointer to buffer to use when decoding values */ - const uint8_t * p = (const uint8_t *)buf; /* Current pointer into buffer */ + H5P_genplist_t *plist; /* Property list to decode into */ + void *value_buf = NULL; /* Pointer to buffer to use when decoding values */ + const uint8_t *p = (const uint8_t *)buf; /* Current pointer into buffer */ H5P_plist_type_t type; /* Type of encoded property list */ hid_t plist_id = -1; /* ID of new property list */ size_t value_buf_size = 0; /* Size of current value buffer */ @@ -713,7 +713,7 @@ H5P__decode(const void *buf) /* Loop over encoded properties, deserializing their values */ while (p) { H5P_genprop_t *prop; /* Pointer to property with same name */ - const char * name; /* Pointer to property list name */ + const char *name; /* Pointer to property list name */ /* Check for end of serialized list of properties */ if (0 == *p) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 8b126fe..c8c0736 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -507,7 +507,7 @@ static const hbool_t H5F_def_null_fsm_addr_g = static const hbool_t H5F_def_use_mdc_logging_g = H5F_ACS_USE_MDC_LOGGING_DEF; /* Default metadata cache logging flag */ -static const char * H5F_def_mdc_log_location_g = H5F_ACS_MDC_LOG_LOCATION_DEF; /* Default mdc log location */ +static const char *H5F_def_mdc_log_location_g = H5F_ACS_MDC_LOG_LOCATION_DEF; /* Default mdc log location */ static const hbool_t H5F_def_start_mdc_log_on_access_g = H5F_ACS_START_MDC_LOG_ON_ACCESS_DEF; /* Default mdc log start on access flag */ static const hbool_t H5F_def_evict_on_close_flag_g = @@ -860,9 +860,9 @@ H5P__facc_set_def_driver(void) /* Only parse VFL driver string if it's set */ if (driver_env_var && *driver_env_var) { H5FD_driver_prop_t driver_prop; - H5P_genplist_t * def_fapl; /* Default file access property list */ - H5P_genclass_t * def_fapclass; /* Default file access property class */ - const char * driver_config_env_var; + H5P_genplist_t *def_fapl; /* Default file access property list */ + H5P_genclass_t *def_fapclass; /* Default file access property class */ + const char *driver_config_env_var; htri_t driver_is_registered; /* Check to see if the driver is already registered */ @@ -1554,7 +1554,7 @@ const void * H5Pget_driver_info(hid_t plist_id) { H5P_genplist_t *plist = NULL; /* Property list pointer */ - const void * ret_value = NULL; /* Return value */ + const void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) H5TRACE1("*x", "i", plist_id); @@ -1628,7 +1628,7 @@ ssize_t H5Pget_driver_config_str(hid_t fapl_id, char *config_buf, size_t buf_size) { H5P_genplist_t *plist; /* Property list pointer */ - const char * config_str = NULL; + const char *config_str = NULL; ssize_t ret_value = -1; FUNC_ENTER_API((-1)) @@ -1697,7 +1697,7 @@ H5P__file_driver_copy(void *value) /* Copy driver info, if it exists */ if (info->driver_info) { H5FD_class_t *driver; /* Pointer to driver */ - void * new_pl; /* Copy of driver info */ + void *new_pl; /* Copy of driver info */ /* Retrieve the driver for the ID */ if (NULL == (driver = (H5FD_class_t *)H5I_object(info->driver_id))) @@ -3123,7 +3123,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 */ @@ -3220,7 +3220,7 @@ done: herr_t H5Pget_file_image(hid_t fapl_id, void **buf /*out*/, size_t *buf_len /*out*/) { - 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 */ @@ -3295,7 +3295,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 */ @@ -3371,7 +3371,7 @@ done: herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks /*out*/) { - 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 */ @@ -3659,7 +3659,7 @@ static herr_t H5P__facc_cache_image_config_dec(const void **_pp, void *_value) { H5AC_cache_image_config_t *config = (H5AC_cache_image_config_t *)_value; - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; herr_t ret_value = SUCCEED; /* Return value */ @@ -4247,7 +4247,7 @@ static herr_t H5P__facc_cache_config_dec(const void **_pp, void *_value) { H5AC_cache_config_t *config = (H5AC_cache_config_t *)_value; - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; uint64_t enc_value; herr_t ret_value = SUCCEED; /* Return value */ @@ -4419,7 +4419,7 @@ static herr_t H5P__facc_fclose_degree_dec(const void **_pp, void *_value) { H5F_close_degree_t *fclose_degree = (H5F_close_degree_t *)_value; /* File close degree */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -4453,7 +4453,7 @@ static herr_t H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size) { const H5FD_mem_t *type = (const H5FD_mem_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -4489,7 +4489,7 @@ H5P__facc_multi_type_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__facc_multi_type_dec(const void **_pp, void *_value) { - H5FD_mem_t * type = (H5FD_mem_t *)_value; /* File close degree */ + H5FD_mem_t *type = (H5FD_mem_t *)_value; /* File close degree */ const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -4523,7 +4523,7 @@ static herr_t H5P__facc_libver_type_enc(const void *value, void **_pp, size_t *size) { const H5F_libver_t *type = (const H5F_libver_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -4558,7 +4558,7 @@ H5P__facc_libver_type_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__facc_libver_type_dec(const void **_pp, void *_value) { - H5F_libver_t * type = (H5F_libver_t *)_value; + H5F_libver_t *type = (H5F_libver_t *)_value; const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -4672,7 +4672,7 @@ done: herr_t H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5F_object_flush_t flush_info; herr_t ret_value = SUCCEED; /* return value */ @@ -4715,7 +4715,7 @@ done: herr_t H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func /*out*/, void **udata /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5F_object_flush_t flush_info; herr_t ret_value = SUCCEED; /* return value */ @@ -4753,7 +4753,7 @@ herr_t H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location, hbool_t start_on_access) { H5P_genplist_t *plist; /* Property list pointer */ - char * new_location; /* Working location pointer */ + char *new_location; /* Working location pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -4799,7 +4799,7 @@ H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled /*out*/, char *locati size_t *location_size /*out*/, hbool_t *start_on_access /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ - char * location_ptr = NULL; /* Pointer to location string */ + char *location_ptr = NULL; /* Pointer to location string */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -4854,7 +4854,7 @@ static herr_t H5P__facc_mdc_log_location_enc(const void *value, void **_pp, size_t *size) { const char *log_location = *(const char *const *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; size_t len = 0; uint64_t enc_value; unsigned enc_size; @@ -4905,7 +4905,7 @@ H5P__facc_mdc_log_location_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__facc_mdc_log_location_dec(const void **_pp, void *_value) { - char ** log_location = (char **)_value; + char **log_location = (char **)_value; const uint8_t **pp = (const uint8_t **)_pp; size_t len; uint64_t enc_value; /* Decoded property value */ @@ -5238,7 +5238,7 @@ herr_t H5P__encode_coll_md_read_flag_t(const void *value, void **_pp, size_t *size) { const H5P_coll_md_read_flag_t *coll_md_read_flag = (const H5P_coll_md_read_flag_t *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -5275,7 +5275,7 @@ herr_t H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value) { H5P_coll_md_read_flag_t *coll_md_read_flag = (H5P_coll_md_read_flag_t *)_value; /* File close degree */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -5314,7 +5314,7 @@ H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value) herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5P_coll_md_read_flag_t coll_meta_read; /* Property value */ herr_t ret_value = SUCCEED; /* return value */ @@ -6200,7 +6200,7 @@ H5Pget_vol_info(hid_t plist_id, void **vol_info /*out*/) /* Get the current VOL info */ if (TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS)) { - void * new_connector_info = NULL; /* Copy of connector info */ + void *new_connector_info = NULL; /* Copy of connector info */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ /* Get the connector property */ @@ -6265,7 +6265,7 @@ H5Pget_vol_cap_flags(hid_t plist_id, unsigned *cap_flags) /* Get the 'cap_flags' from the connector */ if (cap_flags) { if (TRUE == H5P_isa_class(plist_id, H5P_FILE_ACCESS)) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ /* Get property list for ID */ @@ -6441,7 +6441,7 @@ H5P__facc_vol_cmp(const void *_info1, const void *_info2, size_t H5_ATTR_UNUSED const H5VL_connector_prop_t *info1 = (const H5VL_connector_prop_t *)_info1; /* Create local aliases for values */ const H5VL_connector_prop_t *info2 = (const H5VL_connector_prop_t *)_info2; - H5VL_class_t * cls1, *cls2; /* connector class for each property */ + H5VL_class_t *cls1, *cls2; /* connector class for each property */ int cmp_value = 0; /* Value from comparison */ herr_t H5_ATTR_NDEBUG_UNUSED status; /* Status from info comparison */ int ret_value = 0; /* Return value */ diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 118cf19..195fada 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -696,7 +696,7 @@ static herr_t H5P__fcrt_btree_rank_enc(const void *value, void **_pp, size_t *size) { const unsigned *btree_k = (const unsigned *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -741,7 +741,7 @@ H5P__fcrt_btree_rank_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__fcrt_btree_rank_dec(const void **_pp, void *_value) { - unsigned * btree_k = (unsigned *)_value; + unsigned *btree_k = (unsigned *)_value; const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; /* Size of encoded property */ unsigned u; /* Local index variable */ @@ -983,7 +983,7 @@ static herr_t H5P__fcrt_shmsg_index_types_enc(const void *value, void **_pp, size_t *size) { const unsigned *type_flags = (const unsigned *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -1029,7 +1029,7 @@ H5P__fcrt_shmsg_index_types_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__fcrt_shmsg_index_types_dec(const void **_pp, void *_value) { - unsigned * type_flags = (unsigned *)_value; + unsigned *type_flags = (unsigned *)_value; const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; /* Size of encoded property */ unsigned u; /* Local index variable */ @@ -1074,7 +1074,7 @@ static herr_t H5P__fcrt_shmsg_index_minsize_enc(const void *value, void **_pp, size_t *size) { const unsigned *minsizes = (const unsigned *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -1120,7 +1120,7 @@ H5P__fcrt_shmsg_index_minsize_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__fcrt_shmsg_index_minsize_dec(const void **_pp, void *_value) { - unsigned * minsizes = (unsigned *)_value; + unsigned *minsizes = (unsigned *)_value; const uint8_t **pp = (const uint8_t **)_pp; unsigned enc_size; /* Size of encoded property */ unsigned u; /* Local index variable */ @@ -1389,7 +1389,7 @@ static herr_t H5P__fcrt_fspace_strategy_dec(const void **_pp, void *_value) { H5F_fspace_strategy_t *strategy = (H5F_fspace_strategy_t *)_value; /* Free-space strategy */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index d7b8161..c4ecf20 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -530,7 +530,7 @@ static herr_t H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size) { const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)value; /* Create local aliases for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -565,7 +565,7 @@ H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__gcrt_group_info_dec(const void **_pp, void *_value) { - H5O_ginfo_t * ginfo = (H5O_ginfo_t *)_value; /* Group info settings */ + H5O_ginfo_t *ginfo = (H5O_ginfo_t *)_value; /* Group info settings */ const uint8_t **pp = (const uint8_t **)_pp; herr_t ret_value = SUCCEED; /* Return value */ @@ -615,7 +615,7 @@ static herr_t H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size) { const H5O_linfo_t *linfo = (const H5O_linfo_t *)value; /* Create local aliases for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -655,7 +655,7 @@ H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__gcrt_link_info_dec(const void **_pp, void *_value) { - H5O_linfo_t * linfo = (H5O_linfo_t *)_value; /* Link info settings */ + H5O_linfo_t *linfo = (H5O_linfo_t *)_value; /* Link info settings */ const uint8_t **pp = (const uint8_t **)_pp; unsigned crt_order_flags; unsigned enc_size; diff --git a/src/H5Pint.c b/src/H5Pint.c index da8ca1c..6a8d2e0 100644 --- a/src/H5Pint.c +++ b/src/H5Pint.c @@ -47,25 +47,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; @@ -101,19 +101,19 @@ static herr_t H5P__close_list_cb(void *space, void **request); /* General helper routines */ static H5P_genplist_t *H5P__create(H5P_genclass_t *pclass); -static H5P_genprop_t * H5P__create_prop(const char *name, size_t size, H5P_prop_within_t type, +static H5P_genprop_t *H5P__create_prop(const char *name, size_t size, H5P_prop_within_t type, const void *value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get, H5P_prp_encode_func_t prp_encode, H5P_prp_decode_func_t prp_decode, H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy, H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close); -static H5P_genprop_t * H5P__dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type); +static H5P_genprop_t *H5P__dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type); static herr_t H5P__free_prop(H5P_genprop_t *prop); static int H5P__cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2); static herr_t H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op, H5P_do_pclass_op_t pclass_op, void *udata); static int H5P__open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key); -static H5P_genprop_t * H5P__find_prop_pclass(H5P_genclass_t *pclass, const char *name); +static H5P_genprop_t *H5P__find_prop_pclass(H5P_genclass_t *pclass, const char *name); static herr_t H5P__free_prop_cb(void *item, void H5_ATTR_UNUSED *key, void *op_data); static herr_t H5P__free_del_name_cb(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *op_data); @@ -773,7 +773,7 @@ done: 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 */ @@ -842,7 +842,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_PACKAGE @@ -918,11 +918,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 */ @@ -1675,7 +1675,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 */ @@ -1830,8 +1830,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_PACKAGE @@ -2772,7 +2772,7 @@ H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op H5P_do_pclass_op_t pclass_op, void *udata) { 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_PACKAGE @@ -2899,7 +2899,7 @@ H5P__poke_pclass_cb(H5P_genplist_t *plist, const char H5_ATTR_NDEBUG_UNUSED *nam void *_udata) { H5P_prop_set_ud_t *udata = (H5P_prop_set_ud_t *)_udata; /* User data for callback */ - H5P_genprop_t * pcopy = NULL; /* Copy of property to insert into skip list */ + H5P_genprop_t *pcopy = NULL; /* Copy of property to insert into skip list */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3004,8 +3004,8 @@ static herr_t H5P__set_plist_cb(H5P_genplist_t *plist, const char *name, H5P_genprop_t *prop, void *_udata) { H5P_prop_set_ud_t *udata = (H5P_prop_set_ud_t *)_udata; /* User data for callback */ - void * tmp_value = NULL; /* Temporary value for property */ - const void * prp_value = NULL; /* Property value */ + void *tmp_value = NULL; /* Temporary value for property */ + const void *prp_value = NULL; /* Property value */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3080,9 +3080,9 @@ static herr_t H5P__set_pclass_cb(H5P_genplist_t *plist, const char *name, H5P_genprop_t *prop, void *_udata) { H5P_prop_set_ud_t *udata = (H5P_prop_set_ud_t *)_udata; /* User data for callback */ - H5P_genprop_t * pcopy = NULL; /* Copy of property to insert into skip list */ - void * tmp_value = NULL; /* Temporary value for property */ - const void * prp_value = NULL; /* Property value */ + H5P_genprop_t *pcopy = NULL; /* Copy of property to insert into skip list */ + void *tmp_value = NULL; /* Temporary value for property */ + const void *prp_value = NULL; /* Property value */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -4146,8 +4146,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 */ @@ -4199,8 +4199,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 */ @@ -4277,9 +4277,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 */ @@ -4358,7 +4358,7 @@ property list class. static int H5P__iterate_pclass_cb(void *_item, void H5_ATTR_NDEBUG_UNUSED *_key, void *_udata) { - H5P_genprop_t * item = (H5P_genprop_t *)_item; /* Pointer to the property */ + H5P_genprop_t *item = (H5P_genprop_t *)_item; /* Pointer to the property */ H5P_iter_pclass_ud_t *udata = (H5P_iter_pclass_ud_t *)_udata; /* Pointer to user data */ int ret_value = 0; /* Return value */ @@ -4585,7 +4585,7 @@ static herr_t H5P__get_cb(H5P_genplist_t *plist, const char *name, H5P_genprop_t *prop, void *_udata) { H5P_prop_get_ud_t *udata = (H5P_prop_get_ud_t *)_udata; /* User data for callback */ - void * tmp_value = NULL; /* Temporary value for property */ + void *tmp_value = NULL; /* Temporary value for property */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -4699,7 +4699,7 @@ done: static herr_t H5P__del_plist_cb(H5P_genplist_t *plist, const char *name, H5P_genprop_t *prop, void H5_ATTR_UNUSED *_udata) { - char * del_name = NULL; /* Pointer to deleted name */ + char *del_name = NULL; /* Pointer to deleted name */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -4767,8 +4767,8 @@ done: static herr_t H5P__del_pclass_cb(H5P_genplist_t *plist, const char *name, H5P_genprop_t *prop, void H5_ATTR_UNUSED *_udata) { - char * del_name = NULL; /* Pointer to deleted name */ - void * tmp_value = NULL; /* Temporary value for property */ + char *del_name = NULL; /* Pointer to deleted name */ + void *tmp_value = NULL; /* Temporary value for property */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -4896,8 +4896,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_PACKAGE @@ -5007,7 +5007,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_PACKAGE @@ -5140,12 +5140,12 @@ herr_t H5P_close(H5P_genplist_t *plist) { H5P_genclass_t *tclass; /* Temporary class pointer */ - 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 */ @@ -5404,12 +5404,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_PACKAGE diff --git a/src/H5Plapl.c b/src/H5Plapl.c index 88c28bf..451d0d9 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -160,7 +160,7 @@ const H5P_libclass_t H5P_CLS_LACC[1] = {{ /* Property value defaults */ static const size_t H5L_def_nlinks_g = H5L_ACS_NLINKS_DEF; /* Default number of soft links to traverse */ -static const char * H5L_def_elink_prefix_g = +static const char *H5L_def_elink_prefix_g = H5L_ACS_ELINK_PREFIX_DEF; /* Default external link prefix string */ static const hid_t H5L_def_fapl_id_g = H5L_ACS_ELINK_FAPL_DEF; /* Default fapl for external link access */ static const unsigned H5L_def_elink_flags_g = @@ -337,8 +337,8 @@ done: static herr_t H5P__lacc_elink_fapl_enc(const void *value, void **_pp, size_t *size) { - const hid_t * elink_fapl = (const hid_t *)value; /* Property to encode */ - uint8_t ** pp = (uint8_t **)_pp; + const hid_t *elink_fapl = (const hid_t *)value; /* Property to encode */ + uint8_t **pp = (uint8_t **)_pp; H5P_genplist_t *fapl_plist; /* Pointer to property list */ hbool_t non_default_fapl = FALSE; /* Whether the FAPL is non-default */ size_t fapl_size = 0; /* FAPL's encoded size */ @@ -408,7 +408,7 @@ done: static herr_t H5P__lacc_elink_fapl_dec(const void **_pp, void *_value) { - hid_t * elink_fapl = (hid_t *)_value; /* The elink FAPL value */ + hid_t *elink_fapl = (hid_t *)_value; /* The elink FAPL value */ const uint8_t **pp = (const uint8_t **)_pp; hbool_t non_default_fapl; /* Whether the FAPL is non-default */ herr_t ret_value = SUCCEED; /* Return value */ @@ -542,8 +542,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; @@ -685,7 +685,7 @@ static herr_t H5P__lacc_elink_pref_enc(const void *value, void **_pp, size_t *size) { const char *elink_pref = *(const char *const *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; size_t len = 0; uint64_t enc_value; unsigned enc_size; @@ -739,7 +739,7 @@ H5P__lacc_elink_pref_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__lacc_elink_pref_dec(const void **_pp, void *_value) { - char ** elink_pref = (char **)_value; + char **elink_pref = (char **)_value; const uint8_t **pp = (const uint8_t **)_pp; size_t len; uint64_t enc_value; /* Decoded property value */ @@ -1024,7 +1024,7 @@ ssize_t H5Pget_elink_prefix(hid_t plist_id, char *prefix /*out*/, 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 1066790..40475d0 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -801,7 +801,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 */ @@ -1358,7 +1358,7 @@ static herr_t H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) { const H5O_pline_t *pline = (const H5O_pline_t *)value; - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; size_t u; /* Local index variable */ FUNC_ENTER_PACKAGE_NOERR @@ -1449,7 +1449,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__ocrt_pipeline_dec(const void **_pp, void *_value) { - H5O_pline_t * pline = (H5O_pline_t *)_value; /* Property to set */ + H5O_pline_t *pline = (H5O_pline_t *)_value; /* Property to set */ const uint8_t **pp = (const uint8_t **)_pp; size_t nused; /* Number of filters used for pipeline */ unsigned enc_size; /* Size of encoded value (in bytes) */ @@ -1753,7 +1753,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 15e89be..f029e20 100644 --- a/src/H5Pocpypl.c +++ b/src/H5Pocpypl.c @@ -231,8 +231,8 @@ static herr_t H5P__copy_merge_comm_dt_list(H5O_copy_dtype_merge_list_t **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; @@ -363,8 +363,8 @@ static herr_t H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size) { const H5O_copy_dtype_merge_list_t *const *dt_list_ptr = (const H5O_copy_dtype_merge_list_t *const *)value; - uint8_t ** pp = (uint8_t **)_pp; - const H5O_copy_dtype_merge_list_t * dt_list; /* Pointer to merge named datatype list */ + uint8_t **pp = (uint8_t **)_pp; + const H5O_copy_dtype_merge_list_t *dt_list; /* Pointer to merge named datatype list */ size_t len; /* Length of path component */ FUNC_ENTER_PACKAGE_NOERR @@ -421,7 +421,7 @@ H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value) { H5O_copy_dtype_merge_list_t **dt_list = (H5O_copy_dtype_merge_list_t **)_value; /* Pointer to merge named datatype list */ - const uint8_t ** pp = (const uint8_t **)_pp; + const uint8_t **pp = (const uint8_t **)_pp; H5O_copy_dtype_merge_list_t *dt_list_tail = NULL, *tmp_dt_list = NULL; /* temporary merge named datatype lists */ size_t len; /* Length of path component */ @@ -723,7 +723,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 */ @@ -785,7 +785,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 */ @@ -832,7 +832,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 */ @@ -880,7 +880,7 @@ done: herr_t H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func /*out*/, void **op_data /*out*/) { - 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 2946931..0723e34 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 */ @@ -83,25 +83,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 */ @@ -110,8 +110,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 */ }; /* Property list/class iterator callback function pointer */ @@ -163,12 +163,12 @@ H5_DLL int H5P__iterate_pclass(const H5P_genclass_t *pclass, int *idx, H5P_it 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(H5P_genclass_t *pclass); -H5_DLL H5P_genprop_t *H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name); -H5_DLL hid_t H5P__new_plist_of_type(H5P_plist_type_t type); +H5_DLL H5P_genprop_t *H5P__find_prop_plist(const H5P_genplist_t *plist, const char *name); +H5_DLL hid_t H5P__new_plist_of_type(H5P_plist_type_t type); /* Encode/decode routines */ H5_DLL herr_t H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop, void *buf, size_t *nalloc); diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index 7cbb397..b74fcf9 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -92,22 +92,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; /*****************************/ @@ -176,7 +176,7 @@ H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size, v H5_DLL herr_t H5P_remove(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); /* Internal helper routines */ H5_DLL herr_t H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recurse); @@ -203,11 +203,11 @@ 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 DCPL routines */ diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index c073235..89fc967 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -218,7 +218,7 @@ static herr_t H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size) { const H5T_cset_t *encoding = (const H5T_cset_t *)value; /* Create local alias for values */ - uint8_t ** pp = (uint8_t **)_pp; + uint8_t **pp = (uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR @@ -254,7 +254,7 @@ H5P__strcrt_char_encoding_enc(const void *value, void **_pp, size_t *size) static herr_t H5P__strcrt_char_encoding_dec(const void **_pp, void *_value) { - H5T_cset_t * encoding = (H5T_cset_t *)_value; /* Character set encoding */ + H5T_cset_t *encoding = (H5T_cset_t *)_value; /* Character set encoding */ const uint8_t **pp = (const uint8_t **)_pp; FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5Ptest.c b/src/H5Ptest.c index 645988a..7c1571c 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_PACKAGE @@ -79,10 +79,10 @@ static hid_t H5R__open_attr_api_common(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t herr_t H5Rcreate_object(hid_t loc_id, const char *name, hid_t oapl_id, H5R_ref_t *ref_ptr) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t obj_type; /* Object type of loc_id */ hid_t file_id = H5I_INVALID_HID; /* File ID */ - H5VL_object_t * vol_obj_file = NULL; /* Object of file_id */ + H5VL_object_t *vol_obj_file = NULL; /* Object of file_id */ H5VL_object_specific_args_t obj_spec_vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ @@ -175,16 +175,16 @@ done: herr_t H5Rcreate_region(hid_t loc_id, const char *name, hid_t space_id, hid_t oapl_id, H5R_ref_t *ref_ptr) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t obj_type; /* Object type of loc_id */ hid_t file_id = H5I_INVALID_HID; /* File ID */ - H5VL_object_t * vol_obj_file = NULL; /* Object of file_id */ + H5VL_object_t *vol_obj_file = NULL; /* Object of file_id */ H5VL_object_specific_args_t obj_spec_vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ H5VL_file_cont_info_t cont_info = {H5VL_CONTAINER_INFO_VERSION, 0, 0, 0}; H5VL_file_get_args_t file_get_vol_cb_args; /* Arguments to VOL callback */ - struct H5S_t * space = NULL; /* Pointer to dataspace containing region */ + struct H5S_t *space = NULL; /* Pointer to dataspace containing region */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -276,10 +276,10 @@ done: herr_t H5Rcreate_attr(hid_t loc_id, const char *name, const char *attr_name, hid_t oapl_id, H5R_ref_t *ref_ptr) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t obj_type; /* Object type of loc_id */ hid_t file_id = H5I_INVALID_HID; /* File ID */ - H5VL_object_t * vol_obj_file = NULL; /* Object of file_id */ + H5VL_object_t *vol_obj_file = NULL; /* Object of file_id */ H5VL_object_specific_args_t obj_spec_vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ @@ -497,13 +497,13 @@ H5R__open_object_api_common(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, vo H5VL_object_t **_vol_obj_ptr) { hid_t loc_id; /* Reference location ID */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_PACKAGE @@ -591,8 +591,8 @@ H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_li hid_t rapl_id, hid_t oapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -635,16 +635,16 @@ H5R__open_region_api_common(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, vo H5VL_object_t **_vol_obj_ptr) { hid_t loc_id; /* Reference location ID */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5O_token_t obj_token = {0}; /* Object token */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ hid_t opened_obj_id = H5I_INVALID_HID; /* Opened object ID */ - H5S_t * space = NULL; /* Dataspace pointer (copy) */ + H5S_t *space = NULL; /* Dataspace pointer (copy) */ hid_t space_id = H5I_INVALID_HID; /* Dataspace ID */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -758,8 +758,8 @@ H5Ropen_region_async(const char *app_file, const char *app_func, unsigned app_li hid_t rapl_id, hid_t oapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -802,15 +802,15 @@ H5R__open_attr_api_common(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, void H5VL_object_t **_vol_obj_ptr) { hid_t loc_id; /* Reference location ID */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ hid_t opened_obj_id = H5I_INVALID_HID; /* Opened object ID */ - void * opened_attr = NULL; /* Opened attribute */ + void *opened_attr = NULL; /* Opened attribute */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_PACKAGE @@ -927,8 +927,8 @@ H5Ropen_attr_async(const char *app_file, const char *app_func, unsigned app_line hid_t rapl_id, hid_t aapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -972,7 +972,7 @@ herr_t H5Rget_obj_type3(H5R_ref_t *ref_ptr, hid_t rapl_id, H5O_type_t *obj_type /*out*/) { hid_t loc_id; /* Reference location ID */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ @@ -1055,7 +1055,7 @@ H5Rget_file_name(const H5R_ref_t *ref_ptr, char *buf /*out*/, size_t size) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, (-1), "unable to retrieve file name") } else { - H5VL_object_t * vol_obj; /* Object of loc_id */ + H5VL_object_t *vol_obj; /* Object of loc_id */ H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ size_t file_name_len = 0; /* Length of file name */ @@ -1096,7 +1096,7 @@ ssize_t H5Rget_obj_name(H5R_ref_t *ref_ptr, hid_t rapl_id, char *buf /*out*/, size_t size) { hid_t loc_id; /* Reference location ID */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ @@ -46,8 +46,8 @@ /* Private typedefs & structs */ struct H5RS_str_t { - char * s; /* String to be reference counted */ - char * end; /* Pointer to terminating NUL character at the end of the string */ + char *s; /* String to be reference counted */ + char *end; /* Pointer to terminating NUL character at the end of the string */ size_t len; /* Current length of the string */ size_t max; /* Size of allocated buffer */ hbool_t wrapped; /* Indicates that the string to be ref-counted is not copied */ diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h index ebca1a3..05daac2 100644 --- a/src/H5RSprivate.h +++ b/src/H5RSprivate.h @@ -54,7 +54,7 @@ H5_DLL herr_t H5RS_ancat(H5RS_str_t *rs, const char *s, size_t len); H5_DLL herr_t H5RS_aputc(H5RS_str_t *rs, int c); H5_DLL int H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2); H5_DLL size_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 */ diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 78434c7..1fddad9 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -92,7 +92,7 @@ H5R__decode_token_compat(H5VL_object_t *vol_obj, H5I_type_t type, H5R_type_t ref const unsigned char *buf, H5O_token_t *obj_token) { hid_t file_id = H5I_INVALID_HID; /* File ID for region reference */ - H5VL_object_t * vol_obj_file = NULL; + H5VL_object_t *vol_obj_file = NULL; H5VL_file_cont_info_t cont_info = {H5VL_CONTAINER_INFO_VERSION, 0, 0, 0}; H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ herr_t ret_value = SUCCEED; @@ -244,12 +244,12 @@ done: H5G_obj_t H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ - const unsigned char * buf = (const unsigned char *)ref; /* Reference buffer */ + const unsigned char *buf = (const unsigned char *)ref; /* Reference buffer */ H5O_type_t obj_type = H5O_TYPE_UNKNOWN; /* Type of the referenced object */ H5G_obj_t ret_value; /* Return value */ @@ -308,12 +308,12 @@ done: hid_t H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *ref) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ const unsigned char *buf = (const unsigned char *)ref; /* Reference buffer */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -373,7 +373,7 @@ done: herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_object_specific_args_t obj_spec_vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ @@ -381,8 +381,8 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t H5VL_file_cont_info_t cont_info = {H5VL_CONTAINER_INFO_VERSION, 0, 0, 0}; H5VL_file_get_args_t file_get_vol_cb_args; /* Arguments to VOL callback */ hid_t file_id = H5I_INVALID_HID; /* File ID for region reference */ - void * vol_obj_file = NULL; - unsigned char * buf = (unsigned char *)ref; /* Return reference pointer */ + void *vol_obj_file = NULL; + unsigned char *buf = (unsigned char *)ref; /* Return reference pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -500,12 +500,12 @@ done: herr_t H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref, H5O_type_t *obj_type /*out*/) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ - const unsigned char * buf = (const unsigned char *)ref; /* Reference pointer */ + const unsigned char *buf = (const unsigned char *)ref; /* Reference pointer */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -560,12 +560,12 @@ done: hid_t H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *ref) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ H5I_type_t opened_type; /* Opened object type */ - void * opened_obj = NULL; /* Opened object */ + void *opened_obj = NULL; /* Opened object */ const unsigned char *buf = (const unsigned char *)ref; /* Reference pointer */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -629,16 +629,16 @@ done: hid_t H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ - void * vol_obj_file = NULL; /* VOL file */ + void *vol_obj_file = NULL; /* VOL file */ H5VL_file_cont_info_t cont_info = {H5VL_CONTAINER_INFO_VERSION, 0, 0, 0}; H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ - H5F_t * f = NULL; /* Native file */ + H5F_t *f = NULL; /* Native file */ size_t buf_size = H5R_DSET_REG_REF_BUF_SIZE; /* Reference buffer size */ - H5S_t * space = NULL; /* Dataspace object */ + H5S_t *space = NULL; /* Dataspace object */ hid_t file_id = H5I_INVALID_HID; /* File ID for region reference */ - const unsigned char * buf = (const unsigned char *)ref; /* Reference pointer */ + const unsigned char *buf = (const unsigned char *)ref; /* Reference pointer */ hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -720,12 +720,12 @@ done: ssize_t H5Rget_name(hid_t id, H5R_type_t ref_type, const void *ref, char *name /*out*/, size_t size) { - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ H5VL_object_get_args_t vol_cb_args; /* Arguments to VOL callback */ H5VL_loc_params_t loc_params; /* Location parameters */ H5O_token_t obj_token = {0}; /* Object token */ - const unsigned char * buf = (const unsigned char *)ref; /* Reference pointer */ + const unsigned char *buf = (const unsigned char *)ref; /* Reference pointer */ size_t obj_name_len = 0; /* Length of object's name */ ssize_t ret_value = -1; /* Return value */ diff --git a/src/H5Rint.c b/src/H5Rint.c index 6493874..0fb607a 100644 --- a/src/H5Rint.c +++ b/src/H5Rint.c @@ -460,10 +460,10 @@ H5R__get_loc_id(const H5R_ref_priv_t *ref) hid_t H5R__reopen_file(H5R_ref_priv_t *ref, hid_t fapl_id) { - H5P_genplist_t * plist; /* Property list for FAPL */ - void * new_file = NULL; /* File object opened */ + H5P_genplist_t *plist; /* Property list for FAPL */ + void *new_file = NULL; /* File object opened */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - H5VL_object_t * vol_obj = NULL; /* VOL object for file */ + H5VL_object_t *vol_obj = NULL; /* VOL object for file */ uint64_t supported; /* Whether 'post open' operation is supported by VOL connector */ hid_t ret_value = H5I_INVALID_HID; @@ -1180,7 +1180,7 @@ H5R__decode_region(const unsigned char *buf, size_t *nbytes, H5S_t **space_ptr) const uint8_t *p = (const uint8_t *)buf; size_t buf_size = 0; unsigned rank; - H5S_t * space; + H5S_t *space; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1275,7 +1275,7 @@ H5R__decode_string(const unsigned char *buf, size_t *nbytes, char **string_ptr) { const uint8_t *p = (const uint8_t *)buf; size_t string_len; - char * string = NULL; + char *string = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1474,7 +1474,7 @@ H5R__decode_token_region_compat(H5F_t *f, const unsigned char *buf, size_t *nbyt H5O_token_t token = {0}; size_t data_size; const uint8_t *p; - H5S_t * space = NULL; + H5S_t *space = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h index 09144f9..eb6294b 100644 --- a/src/H5Rpkg.h +++ b/src/H5Rpkg.h @@ -52,19 +52,19 @@ /* Object reference */ typedef struct H5R_ref_priv_obj_t { H5O_token_t token; /* Object token */ - char * filename; /* File name */ + char *filename; /* File name */ } H5R_ref_priv_obj_t; /* Region reference */ typedef struct H5R_ref_priv_reg_t { H5R_ref_priv_obj_t obj; /* Object reference */ - H5S_t * space; /* Selection */ + H5S_t *space; /* Selection */ } H5R_ref_priv_reg_t; /* Attribute reference */ typedef struct H5R_ref_priv_attr_t { H5R_ref_priv_obj_t obj; /* Object reference */ - char * name; /* Attribute name */ + char *name; /* Attribute name */ } H5R_ref_priv_attr_t; /* Generic reference type (keep it cache aligned) */ @@ -741,7 +741,7 @@ H5S_get_simple_extent_npoints(const H5S_t *ds) hssize_t H5Sget_simple_extent_npoints(hid_t space_id) { - H5S_t * ds; + H5S_t *ds; hssize_t ret_value; FUNC_ENTER_API(FAIL) @@ -1492,7 +1492,7 @@ done: herr_t H5S_encode(H5S_t *obj, unsigned char **p, 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 */ @@ -1607,13 +1607,13 @@ done: H5S_t * H5S_decode(const unsigned char **p) { - H5F_t * f = NULL; /* Fake file structure*/ - H5S_t * ds; /* Decoded dataspace */ - H5S_extent_t * extent; /* Entent of decoded dataspace */ + H5F_t *f = NULL; /* Fake file structure*/ + H5S_t *ds; /* Decoded dataspace */ + H5S_extent_t *extent; /* Entent of decoded dataspace */ const unsigned char *pp = (*p); /* Local pointer for decoding */ 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 @@ -1720,7 +1720,7 @@ H5S_get_simple_extent_type(const H5S_t *space) 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) @@ -482,13 +482,13 @@ /* 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) */ 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 */ @@ -916,9 +916,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) @@ -1110,7 +1110,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 @@ -1193,7 +1193,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 */ @@ -1301,7 +1301,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 @@ -1393,7 +1393,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 @@ -1498,7 +1498,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 f4f7506..0e29591 100644 --- a/src/H5SLprivate.h +++ b/src/H5SLprivate.h @@ -63,15 +63,15 @@ typedef herr_t (*H5SL_operator_t)(void *item, void *key, void *operator_data /*i /********************/ /* 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); @@ -79,7 +79,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; /********************/ @@ -64,7 +64,7 @@ static herr_t H5SM__write_mesg(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *h static herr_t H5SM__decr_ref(void *record, void *op_data, hbool_t *changed); static herr_t H5SM__delete_from_index(H5F_t *f, 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); @@ -397,7 +397,7 @@ done: herr_t H5SM_get_fheap_addr(H5F_t *f, 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 */ @@ -447,8 +447,8 @@ static herr_t H5SM__create_index(H5F_t *f, H5SM_index_header_t *header) { 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_PACKAGE @@ -696,14 +696,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) { - 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_PACKAGE @@ -843,7 +843,7 @@ H5SM__bt2_convert_to_list_op(const void *record, void *op_data) static herr_t H5SM__convert_btree_to_list(H5F_t *f, H5SM_index_header_t *header) { - 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; @@ -1070,7 +1070,7 @@ htri_t H5SM_try_share(H5F_t *f, 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; @@ -1182,7 +1182,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; @@ -1259,15 +1259,15 @@ static herr_t H5SM__write_mesg(H5F_t *f, 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 = SIZE_MAX; /* Empty entry in list */ herr_t ret_value = SUCCEED; @@ -1559,13 +1559,13 @@ done: herr_t H5SM_delete(H5F_t *f, 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; @@ -1771,14 +1771,14 @@ static herr_t H5SM__delete_from_index(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *header, const H5O_shared_t *mesg, unsigned *cache_flags, size_t *mesg_size /*out*/, void **encoded_mesg /*out*/) { - 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; @@ -1966,7 +1966,7 @@ done: herr_t H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist) { - 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 */ H5AC_ring_t orig_ring = H5AC_RING_INV; /* Original ring value */ @@ -2122,7 +2122,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_PACKAGE_NOERR @@ -2153,17 +2153,17 @@ H5SM__get_refcount_bt2_cb(const void *_record, void *_op_data) herr_t H5SM_get_refcount(H5F_t *f, 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_TAG(H5AC__SOHM_TAG) @@ -2381,7 +2381,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_PACKAGE @@ -2535,7 +2535,7 @@ herr_t H5SM_table_debug(H5F_t *f, 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 */ @@ -2623,11 +2623,11 @@ done: herr_t H5SM_list_debug(H5F_t *f, haddr_t list_addr, FILE *stream, int indent, int fwidth, haddr_t table_addr) { - H5SM_master_table_t * table = NULL; /* SOHM master table */ - H5SM_list_t * list = NULL; /* SOHM index list for message type (if in list form) */ + H5SM_master_table_t *table = NULL; /* SOHM master table */ + H5SM_list_t *list = NULL; /* SOHM index list for message type (if in list form) */ H5SM_list_cache_ud_t lst_cache_udata; /* List user-data for metadata cache callback */ H5SM_table_cache_ud_t tbl_cache_udata; /* Table user-data for metadata cache callback */ - H5HF_t * fh = NULL; /* Fractal heap for SOHM messages */ + H5HF_t *fh = NULL; /* Fractal heap for SOHM messages */ unsigned index_num; /* Index of list, within master table */ unsigned x; /* Counter variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2731,10 +2731,10 @@ done: herr_t H5SM_ih_size(H5F_t *f, hsize_t *hdr_size, H5_ih_info_t *ih_info) { - 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 30b5285..4ab4671 100644 --- a/src/H5SMbtree2.c +++ b/src/H5SMbtree2.c @@ -40,7 +40,7 @@ /********************/ /* 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, int indent, int fwidth, const void *record, const void *_udata); @@ -86,9 +86,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_PACKAGE diff --git a/src/H5SMcache.c b/src/H5SMcache.c index ad90cf6..2920a1c 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -54,14 +54,14 @@ /* Metadata cache (H5AC) callbacks */ static herr_t H5SM__cache_table_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5SM__cache_table_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5SM__cache_table_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5SM__cache_table_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5SM__cache_table_image_len(const void *thing, size_t *image_len); static herr_t H5SM__cache_table_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5SM__cache_table_free_icr(void *thing); static herr_t H5SM__cache_list_get_initial_load_size(void *udata, size_t *image_len); static htri_t H5SM__cache_list_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void * H5SM__cache_list_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); +static void *H5SM__cache_list_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); static herr_t H5SM__cache_list_image_len(const void *thing, size_t *image_len); static herr_t H5SM__cache_list_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5SM__cache_list_free_icr(void *thing); @@ -200,13 +200,13 @@ static void * H5SM__cache_table_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5F_t * f; /* File pointer -- from user data */ - H5SM_master_table_t * table = NULL; /* Shared message table that we deserializing */ + H5F_t *f; /* File pointer -- from user data */ + H5SM_master_table_t *table = NULL; /* Shared message table that we deserializing */ H5SM_table_cache_ud_t *udata = (H5SM_table_cache_ud_t *)_udata; /* Pointer to user data */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into input buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into input buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ size_t u; /* Counter variable for index headers */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -352,7 +352,7 @@ static herr_t H5SM__cache_table_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { H5SM_master_table_t *table = (H5SM_master_table_t *)_thing; /* Shared message table to encode */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t u; /* Counter variable */ @@ -507,7 +507,7 @@ H5SM__cache_list_get_initial_load_size(void *_udata, size_t *image_len) htri_t H5SM__cache_list_verify_chksum(const void *_image, size_t H5_ATTR_UNUSED len, void *_udata) { - const uint8_t * image = (const uint8_t *)_image; /* Pointer into raw data buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into raw data buffer */ H5SM_list_cache_ud_t *udata = (H5SM_list_cache_ud_t *)_udata; /* User data for callback */ size_t chk_size; /* Exact size of the node with checksum at the end */ uint32_t stored_chksum; /* Stored metadata checksum value */ @@ -551,13 +551,13 @@ static void * H5SM__cache_list_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, hbool_t H5_ATTR_UNUSED *dirty) { - H5SM_list_t * list = NULL; /* The SOHM list being read in */ + H5SM_list_t *list = NULL; /* 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 */ - const uint8_t * image = (const uint8_t *)_image; /* Pointer into input buffer */ + const uint8_t *image = (const uint8_t *)_image; /* Pointer into input buffer */ uint32_t stored_chksum; /* Stored metadata checksum value */ size_t u; /* Counter variable for messages in list */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -667,9 +667,9 @@ H5SM__cache_list_image_len(const void *_thing, size_t *image_len) static herr_t H5SM__cache_list_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing) { - H5SM_list_t * list = (H5SM_list_t *)_thing; /* Instance being serialized */ + H5SM_list_t *list = (H5SM_list_t *)_thing; /* Instance being serialized */ H5SM_bt2_ctx_t ctx; /* Message encoding context */ - uint8_t * image = (uint8_t *)_image; /* Pointer into raw data buffer */ + uint8_t *image = (uint8_t *)_image; /* Pointer into raw data buffer */ uint32_t computed_chksum; /* Computed metadata checksum value */ size_t mesgs_serialized; /* Number of messages serialized */ size_t u; /* Local index variable */ diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c index 87fdc9b..d43d5a5 100644 --- a/src/H5SMmessage.c +++ b/src/H5SMmessage.c @@ -178,7 +178,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_PACKAGE @@ -279,7 +279,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_PACKAGE_NOERR @@ -323,7 +323,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_PACKAGE_NOERR diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h index ae9a5f6..3ec8109 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,9 +195,9 @@ 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 */ - H5HF_t * fheap; /* The heap for this message type, open. */ - void * encoding; /* The message encoded, or NULL */ + H5F_t *file; /* File in which sharing is happening */ + 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 @@ -234,7 +234,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 d6f96be..3ab6aa0 100644 --- a/src/H5SMtest.c +++ b/src/H5SMtest.c @@ -78,7 +78,7 @@ H5SM__get_mesg_count_test(H5F_t *f, unsigned type_id, size_t *mesg_count) /* 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 */ diff --git a/src/H5Sall.c b/src/H5Sall.c index 45e2b5d..32bc162 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -641,7 +641,7 @@ static herr_t H5S__all_deserialize(H5S_t **space, const uint8_t **p) { uint32_t version; /* Version number */ - H5S_t * tmp_space = NULL; /* Pointer to actual dataspace to use, + H5S_t *tmp_space = NULL; /* Pointer to actual dataspace to use, either *space or a newly allocated one */ herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 52ca0dd..53625bf 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -84,10 +84,10 @@ typedef hsize_t hbounds_t; * H5S__hyper_project_intersect() */ typedef struct { const H5S_hyper_span_t - * ds_span[H5S_MAX_RANK]; /* Array of the current spans in the destination space in each dimension */ + *ds_span[H5S_MAX_RANK]; /* Array of the current spans in the destination space in each dimension */ hsize_t ds_low[H5S_MAX_RANK]; /* Array of current low bounds (of iteration) for each element in ds_span */ H5S_hyper_span_info_t - * ps_span_info[H5S_MAX_RANK]; /* Array of span info structs for projected space during iteration */ + *ps_span_info[H5S_MAX_RANK]; /* Array of span info structs for projected space during iteration */ uint32_t ps_clean_bitmap; /* Bitmap of whether the nth rank has a clean projected space since the last time it was set to 1 */ unsigned ss_rank; /* Rank of source space */ @@ -109,7 +109,7 @@ typedef struct { /********************/ /* Local Prototypes */ /********************/ -static H5S_hyper_span_t * H5S__hyper_new_span(hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, +static H5S_hyper_span_t *H5S__hyper_new_span(hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, H5S_hyper_span_t *next); static H5S_hyper_span_info_t *H5S__hyper_new_span_info(unsigned rank); static H5S_hyper_span_info_t *H5S__hyper_copy_span_helper(H5S_hyper_span_info_t *spans, unsigned rank, @@ -152,7 +152,7 @@ static herr_t H5S__set_regular_hyperslab(H5S_t *space, const hsize_t start[], c const hsize_t *opt_stride, const hsize_t opt_count[], const hsize_t *opt_block); static herr_t H5S__fill_in_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2, H5S_t **result); -static H5S_t * H5S__combine_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2); +static H5S_t *H5S__combine_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2); static herr_t H5S__hyper_iter_get_seq_list_gen(H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len); static herr_t H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem, @@ -160,7 +160,7 @@ static herr_t H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t max static herr_t H5S__hyper_iter_get_seq_list_single(H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem, size_t *nseq, size_t *nelem, hsize_t *off, size_t *len); static herr_t H5S__hyper_proj_int_build_proj(H5S_hyper_project_intersect_ud_t *udata); -static herr_t H5S__hyper_proj_int_iterate(H5S_hyper_span_info_t * ss_span_info, +static herr_t H5S__hyper_proj_int_iterate(H5S_hyper_span_info_t *ss_span_info, const H5S_hyper_span_info_t *sis_span_info, hsize_t count, unsigned depth, H5S_hyper_project_intersect_ud_t *udata); static void H5S__hyper_get_clip_diminfo(hsize_t start, hsize_t stride, hsize_t *count, hsize_t *block, @@ -593,7 +593,7 @@ H5S__hyper_iter_init(H5S_t *space, H5S_sel_iter_t *iter) if (space->select.sel_info.hslab->diminfo_valid == H5S_DIMINFO_VALID_YES) { /* Initialize the information needed for regular hyperslab I/O */ const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */ - const hsize_t * mem_size; /* Temporary pointer to dataspace extent's dimension sizes */ + const hsize_t *mem_size; /* Temporary pointer to dataspace extent's dimension sizes */ unsigned cont_dim = 0; /* # of contiguous dimensions */ /* Set the temporary pointer to the dimension information */ @@ -971,7 +971,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; @@ -1105,9 +1105,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 */ @@ -1297,9 +1297,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 */ @@ -1413,14 +1413,14 @@ static herr_t H5S__hyper_iter_get_seq_list_gen(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; /* Cumulative size of each dimension in bytes */ + hsize_t *slab; /* Cumulative size of each dimension in bytes */ hsize_t loc_off; /* Byte 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, in elements */ - hsize_t * loc_arr; /* Byte offset of hyperslab span position within buffer */ - const hssize_t * sel_off; /* Offset within the dataspace extent */ + hsize_t *abs_arr; /* Absolute hyperslab span position, in elements */ + hsize_t *loc_arr; /* Byte offset of hyperslab span position within buffer */ + const hssize_t *sel_off; /* Offset within the dataspace extent */ size_t span_elmts = 0; /* Number of elements to actually use for this span */ size_t span_size = 0; /* Number of bytes in current span to actually process */ size_t io_left; /* Initial number of elements to process */ @@ -1875,9 +1875,9 @@ static herr_t H5S__hyper_iter_get_seq_list_opt(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 * slab; /* Hyperslab size */ - const hssize_t * sel_off; /* Selection offset in dataspace */ + hsize_t *mem_size; /* Size of the source buffer */ + hsize_t *slab; /* Hyperslab size */ + const hssize_t *sel_off; /* Selection offset in dataspace */ hsize_t offset[H5S_MAX_RANK]; /* Coordinate offset in dataspace */ hsize_t tmp_count[H5S_MAX_RANK]; /* Temporary block count */ hsize_t tmp_block[H5S_MAX_RANK]; /* Temporary block offset */ @@ -2327,11 +2327,11 @@ H5S__hyper_iter_get_seq_list_single(H5S_sel_iter_t *iter, size_t maxseq, size_t 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[H5S_MAX_RANK]; /* Base coordinate offset in dataspace */ hsize_t offset[H5S_MAX_RANK]; /* Coordinate offset in dataspace */ - hsize_t * slab; /* Hyperslab size */ + hsize_t *slab; /* Hyperslab size */ hsize_t fast_dim_block; /* Local copies of fastest changing dimension info */ hsize_t loc; /* Coordinate offset */ size_t tot_blk_count; /* Total number of blocks left to output */ @@ -2621,7 +2621,7 @@ H5S__hyper_iter_get_seq_list(H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem /* Check for the special case of just one H5Sselect_hyperslab call made */ if (iter->u.hyp.diminfo_valid) { const H5S_hyper_dim_t *tdiminfo; /* Temporary pointer to diminfo information */ - const hssize_t * sel_off; /* Selection offset in dataspace */ + const hssize_t *sel_off; /* Selection offset in dataspace */ 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 */ @@ -2880,9 +2880,9 @@ done: static H5S_hyper_span_info_t * H5S__hyper_copy_span_helper(H5S_hyper_span_info_t *spans, unsigned rank, unsigned op_info_i, uint64_t op_gen) { - 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 = NULL; /* Return value */ @@ -3210,7 +3210,7 @@ H5S__hyper_free_span(H5S_hyper_span_t *span) 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 */ @@ -3485,7 +3485,7 @@ H5S__get_select_hyper_nblocks(const H5S_t *space, hbool_t app_ref) 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) @@ -3830,7 +3830,7 @@ H5S__hyper_serialize_helper(const H5S_hyper_span_info_t *spans, hsize_t *start, uint8_t enc_size, uint8_t **p) { H5S_hyper_span_t *curr; /* Pointer to current hyperslab span */ - uint8_t * pp = (*p); /* Local pointer for decoding */ + uint8_t *pp = (*p); /* Local pointer for decoding */ FUNC_ENTER_PACKAGE_NOERR @@ -3951,8 +3951,8 @@ H5S__hyper_serialize(H5S_t *space, uint8_t **p) hsize_t offset[H5S_MAX_RANK]; /* Offset of element in dataspace */ hsize_t start[H5S_MAX_RANK]; /* Location of start of hyperslab */ hsize_t end[H5S_MAX_RANK]; /* Location of end of hyperslab */ - uint8_t * pp; /* Local pointer for encoding */ - uint8_t * lenp = NULL; /* pointer to length location for later storage */ + uint8_t *pp; /* Local pointer for encoding */ + uint8_t *lenp = NULL; /* pointer to length location for later storage */ uint32_t len = 0; /* number of bytes used */ uint32_t version; /* Version number */ uint8_t flags = 0; /* Flags for message */ @@ -4301,8 +4301,8 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p) else /* Verify the rank of the provided dataspace */ if (rank != tmp_space->extent.rank) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, - "rank of serialized selection does not match dataspace") + HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, + "rank of serialized selection does not match dataspace") if (flags & H5S_HYPER_REGULAR) { hsize_t stride[H5S_MAX_RANK]; /* Hyperslab stride information */ @@ -4372,9 +4372,9 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p) const hsize_t *stride; /* Hyperslab stride information */ const hsize_t *count; /* Hyperslab count information */ hsize_t end[H5S_MAX_RANK]; /* Hyperslab end information */ - hsize_t * tstart; /* Temporary hyperslab pointers */ - hsize_t * tend; /* Temporary hyperslab pointers */ - hsize_t * tblock; /* Temporary hyperslab pointers */ + hsize_t *tstart; /* Temporary hyperslab pointers */ + hsize_t *tend; /* Temporary hyperslab pointers */ + hsize_t *tblock; /* Temporary hyperslab pointers */ size_t num_elem; /* Number of elements in selection */ unsigned v; /* Local counting variable */ @@ -4906,7 +4906,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 */ @@ -5146,7 +5146,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 @@ -5778,9 +5778,9 @@ H5S__hyper_release(H5S_t *space) static H5S_hyper_span_t * H5S__hyper_coord_to_span(unsigned rank, const 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_PACKAGE @@ -6678,7 +6678,7 @@ H5S__hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space) delta_rank = (new_space->extent.rank - base_space->extent.rank); while (curr_dim < delta_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 = H5S__hyper_new_span_info(new_space->extent.rank))) { @@ -8016,7 +8016,7 @@ H5S__hyper_merge_spans_helper(H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf /* Work through the list of spans in the new list */ while (span_a != NULL && span_b != NULL) { 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 *tmp_span; /* Pointer to temporary new span */ /* Check if the 'a' span is completely before 'b' span */ /* AAAAAAA */ @@ -8532,8 +8532,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 */ int i; /* Counters */ H5S_hyper_span_info_t *ret_value = NULL; /* Return value */ @@ -8821,9 +8821,9 @@ H5S__hyper_update_diminfo(H5S_t *space, H5S_seloper_t op, const H5S_hyper_dim_t /* XOR: Make sure the slabs border */ if (high_start != (tmp_diminfo[curr_dim].start + (tmp_diminfo[curr_dim].count * tmp_diminfo[curr_dim].stride))) { - space->select.sel_info.hslab->diminfo_valid = H5S_DIMINFO_VALID_NO; - break; - } /* end if */ + space->select.sel_info.hslab->diminfo_valid = H5S_DIMINFO_VALID_NO; + break; + } /* end if */ /* Set count for combined selection */ tmp_diminfo[curr_dim].count = @@ -9725,7 +9725,7 @@ H5S__hyper_regular_and_single_block(H5S_t *space, const hsize_t start[], const h else /* Selection & block don't overlap, set to "none" selection */ if (H5S_select_none(space) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't convert selection") + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSELECT, FAIL, "can't convert selection") } /* end if */ else { hsize_t new_start[H5S_MAX_RANK]; /* New start for hyperslab selection */ @@ -10789,7 +10789,7 @@ H5S__modify_select(H5S_t *space1, H5S_seloper_t op, H5S_t *space2) else /* Combine spans from space1 & spans from space2, with the result in space1 */ if (H5S__fill_in_select(space1, op, space2, &space1) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't perform operation on two selections") + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCLIP, FAIL, "can't perform operation on two selections") done: FUNC_LEAVE_NOAPI(ret_value) @@ -11600,10 +11600,10 @@ H5S__hyper_project_intersection(H5S_t *src_space, H5S_t *dst_space, H5S_t *src_i H5S_t *proj_space, hbool_t share_selection) { H5S_hyper_project_intersect_ud_t udata; /* User data for subroutines */ - H5S_hyper_span_info_t * ss_span_info; - const H5S_hyper_span_info_t * ds_span_info; - H5S_hyper_span_info_t * ss_span_info_buf = NULL; - H5S_hyper_span_info_t * ds_span_info_buf = NULL; + H5S_hyper_span_info_t *ss_span_info; + const H5S_hyper_span_info_t *ds_span_info; + H5S_hyper_span_info_t *ss_span_info_buf = NULL; + H5S_hyper_span_info_t *ds_span_info_buf = NULL; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -11719,7 +11719,7 @@ H5S__hyper_project_intersection(H5S_t *src_space, H5S_t *dst_space, H5S_t *src_i else /* If we did not add anything to proj_space, select none instead */ if (H5S_select_none(proj_space) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection") + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't convert selection") done: /* Free ss_span_info_buf */ @@ -12172,13 +12172,13 @@ H5S_t * H5S_hyper_get_unlim_block(const H5S_t *space, hsize_t block_index) { H5S_hyper_sel_t *hslab; /* Convenience pointer to hyperslab info */ - H5S_t * space_out = NULL; /* Dataspace to return */ + H5S_t *space_out = NULL; /* Dataspace to return */ hsize_t start[H5S_MAX_RANK]; /* Hyperslab selection info for unlim. selection */ hsize_t stride[H5S_MAX_RANK]; hsize_t count[H5S_MAX_RANK]; hsize_t block[H5S_MAX_RANK]; unsigned u; /* Local index variable */ - H5S_t * ret_value = NULL; /* Return value */ + H5S_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -12362,7 +12362,7 @@ herr_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[] /*out*/, hsize_t stride[] /*out*/, hsize_t count[] /*out*/, hsize_t block[] /*out*/) { - H5S_t * space; /* Dataspace to query */ + H5S_t *space; /* Dataspace to query */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index a9108a5..30b5750 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -204,11 +204,11 @@ H5S__mpio_create_point_datatype(size_t elmt_size, hsize_t num_points, MPI_Aint * { MPI_Datatype elmt_type; /* MPI datatype for individual element */ hbool_t elmt_type_created = FALSE; /* Whether the element MPI datatype was created */ - int * inner_blocks = NULL; /* Arrays for MPI datatypes when "large" datatype needed */ - MPI_Aint * inner_disps = NULL; + int *inner_blocks = NULL; /* Arrays for MPI datatypes when "large" datatype needed */ + MPI_Aint *inner_disps = NULL; MPI_Datatype *inner_types = NULL; #if MPI_VERSION < 3 - 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 */ #endif hsize_t bigio_count; /* Transition point to create derived type */ @@ -371,7 +371,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 */ @@ -507,13 +507,13 @@ static herr_t H5S__mpio_permute_type(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 = NULL; /* Selection iteration info */ hbool_t sel_iter_init = FALSE; /* Selection iteration info has been initialized */ hssize_t snum_points; /* Signed number of elements in selection */ hsize_t num_points; /* Number of points in the selection */ - hsize_t * off = NULL; - size_t * len = NULL; + hsize_t *off = NULL; + size_t *len = NULL; size_t max_elem; /* Maximum number of elements allowed in sequences */ hsize_t u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -826,8 +826,8 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type, else /* Create the compound datatype for this operation (> 2GB) */ if (H5_mpio_create_large_type(elmt_size, 0, MPI_BYTE, &inner_type) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, - "couldn't create a large inner datatype in hyper selection") + HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, + "couldn't create a large inner datatype in hyper selection") /******************************************************* * Construct the type by walking the hyperslab dims @@ -1141,10 +1141,10 @@ H5S__obtain_datatype(H5S_hyper_span_info_t *spans, const hsize_t *down, size_t e hsize_t bigio_count; /* Transition point to create derived type */ 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 */ - int * blocklen = NULL; - MPI_Aint * disp = NULL; + int *blocklen = NULL; + MPI_Aint *disp = NULL; size_t u; /* Local index variable */ int mpi_code; /* MPI return status code */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1179,7 +1179,7 @@ H5S__obtain_datatype(H5S_hyper_span_info_t *spans, const hsize_t *down, size_t e /* 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; @@ -1271,8 +1271,8 @@ H5S__obtain_datatype(H5S_hyper_span_info_t *spans, const hsize_t *down, size_t e /* 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 afabf25..a898d60 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -150,7 +150,7 @@ struct H5S_pnt_list_t { struct H5S_hyper_span_t { hsize_t low, high; /* Low & high bounds of elements selected for span, inclusive */ 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 */ }; /* "Operation info" struct. Used to hold temporary information during copies, @@ -285,7 +285,7 @@ typedef struct { 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 @@ -293,7 +293,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_unlim_dim_func_t unlim_dim; /* Method to get unlimited dimension of selection (or -1 for none) */ H5S_sel_num_elem_non_unlim_func_t num_elem_non_unlim; /* Method to get the number of elements in a slice through the unlimited dimension */ @@ -303,9 +303,9 @@ typedef struct { H5S_sel_shape_same_func_t shape_same; /* Method to determine if two dataspaces' selections are the same shape */ H5S_sel_intersect_block_func_t - intersect_block; /* Method to determine if a dataspaces' selection intersects a block */ - H5S_sel_adjust_u_func_t adjust_u; /* Method to adjust a selection by an offset */ - H5S_sel_adjust_s_func_t adjust_s; /* Method to adjust a selection by an offset (signed) */ + intersect_block; /* Method to determine if a dataspaces' selection intersects a block */ + H5S_sel_adjust_u_func_t adjust_u; /* Method to adjust a selection by an offset */ + H5S_sel_adjust_s_func_t adjust_s; /* Method to adjust a selection by an offset (signed) */ H5S_sel_project_scalar project_scalar; /* Method to construct scalar dataspace projection */ H5S_sel_project_simple project_simple; /* Method to construct simple dataspace projection */ H5S_sel_iter_init_func_t iter_init; /* Method to initialize iterator for current selection */ @@ -321,7 +321,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; @@ -369,7 +369,7 @@ typedef struct H5S_sel_iter_class_t { H5S_sel_iter_next_block_func_t iter_next_block; /* Method to move selection iterator to the next block in the selection */ H5S_sel_iter_get_seq_list_func_t - iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */ + iter_get_seq_list; /* Method to retrieve a list of offset/length sequences for selection iterator */ 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 ca62d6a..453be1c 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -1002,7 +1002,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) @@ -1222,8 +1222,8 @@ static herr_t H5S__point_serialize(H5S_t *space, uint8_t **p) { H5S_pnt_node_t *curr; /* Point information nodes */ - uint8_t * pp; /* Local pointer for encoding */ - uint8_t * lenp = NULL; /* pointer to length location for later storage */ + uint8_t *pp; /* Local pointer for encoding */ + uint8_t *lenp = NULL; /* pointer to length location for later storage */ uint32_t len = 0; /* number of bytes used */ unsigned u; /* local counting variable */ uint32_t version; /* Version number */ @@ -1359,7 +1359,7 @@ H5S__point_deserialize(H5S_t **space, const uint8_t **p) hsize_t dims[H5S_MAX_RANK]; /* Dimension sizes */ uint32_t version; /* Version number */ uint8_t enc_size = 0; /* Encoded size of selection info */ - hsize_t * coord = NULL, *tcoord; /* Pointer to array of elements */ + hsize_t *coord = NULL, *tcoord; /* Pointer to array of elements */ const uint8_t *pp; /* Local pointer for decoding */ uint64_t num_elem = 0; /* Number of elements in selection */ unsigned rank; /* Rank of points */ @@ -1416,8 +1416,8 @@ H5S__point_deserialize(H5S_t **space, const uint8_t **p) else /* Verify the rank of the provided dataspace */ if (rank != tmp_space->extent.rank) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, - "rank of serialized selection does not match dataspace") + HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, + "rank of serialized selection does not match dataspace") /* decode the number of points */ switch (enc_size) { @@ -1693,9 +1693,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 */ @@ -2232,8 +2232,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 */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 2c31ba9..3eab05a 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -73,7 +73,7 @@ typedef struct { /* Irregular hyperslab selection fields */ hsize_t loc_off[H5S_MAX_RANK]; /* Byte offset in buffer, for each dimension's current offset */ 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 */ @@ -201,8 +201,8 @@ struct H5O_loc_t; typedef struct H5S_t H5S_t; /* Operations on dataspaces */ -H5_DLL herr_t H5S_init(void); -H5_DLL H5S_t * H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max); +H5_DLL herr_t H5S_init(void); +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); @@ -285,7 +285,7 @@ H5_DLL hsize_t H5S_hyper_get_clip_extent(const H5S_t *clip_space, const H5S_t *m hbool_t incl_trail); H5_DLL hsize_t H5S_hyper_get_clip_extent_match(const H5S_t *clip_space, const H5S_t *match_space, hsize_t match_clip_size, hbool_t incl_trail); -H5_DLL H5S_t * H5S_hyper_get_unlim_block(const H5S_t *space, hsize_t block_index); +H5_DLL H5S_t *H5S_hyper_get_unlim_block(const H5S_t *space, hsize_t block_index); H5_DLL hsize_t H5S_hyper_get_first_inc_block(const H5S_t *space, hsize_t clip_size, hbool_t *partial); /* Operations on selection iterators */ diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 87ac308..fec9e58 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -378,7 +378,7 @@ H5S_select_serialize(H5S_t *space, uint8_t **p) 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) @@ -991,7 +991,7 @@ H5S_select_adjust_s(H5S_t *space, const hssize_t *offset) herr_t H5Sselect_adjust(hid_t space_id, const hssize_t *offset) { - H5S_t * space; + H5S_t *space; hsize_t low_bounds[H5S_MAX_RANK]; hsize_t high_bounds[H5S_MAX_RANK]; unsigned u; @@ -1501,8 +1501,8 @@ H5S_select_iterate(void *buf, const H5T_t *type, H5S_t *space, const H5S_sel_ite { H5S_sel_iter_t *iter = NULL; /* Selection iteration info */ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ - hsize_t * off = NULL; /* Array to store sequence offsets */ - size_t * len = NULL; /* Array to store sequence lengths */ + hsize_t *off = NULL; /* Array to store sequence offsets */ + size_t *len = NULL; /* Array to store sequence lengths */ hssize_t nelmts; /* Number of elements in selection */ hsize_t space_size[H5S_MAX_RANK]; /* Dataspace size */ size_t max_elem; /* Maximum number of elements allowed in sequences */ @@ -1662,7 +1662,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) @@ -1759,8 +1759,8 @@ H5S_select_shape_same(H5S_t *space1, H5S_t *space2) /* Check special cases if both dataspaces aren't scalar */ /* (If only one is, the number of selected points check is sufficient) */ if (space1->extent.rank > 0 && space2->extent.rank > 0) { - H5S_t * space_a; /* Dataspace with larger rank */ - H5S_t * space_b; /* Dataspace with smaller rank */ + H5S_t *space_a; /* Dataspace with larger rank */ + H5S_t *space_b; /* Dataspace with smaller rank */ unsigned space_a_rank; /* Number of dimensions of dataspace A */ unsigned space_b_rank; /* Number of dimensions of dataspace B */ int space_a_dim; /* Current dimension in dataspace A */ @@ -2123,7 +2123,7 @@ done: htri_t H5Sselect_intersect_block(hid_t space_id, const hsize_t *start, const hsize_t *end) { - H5S_t * space; /* Dataspace to query */ + H5S_t *space; /* Dataspace to query */ unsigned u; /* Local index value */ htri_t ret_value = FAIL; /* Return value */ @@ -2210,7 +2210,7 @@ herr_t H5S_select_construct_projection(H5S_t *base_space, H5S_t **new_space_ptr, unsigned new_space_rank, hsize_t element_size, ptrdiff_t *buf_adj) { - 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 */ @@ -2437,8 +2437,8 @@ H5S_select_fill(const void *fill, size_t fill_size, H5S_t *space, void *_buf) { H5S_sel_iter_t *iter = NULL; /* Selection iteration info */ hbool_t iter_init = FALSE; /* Selection iteration info has been initialized */ - hsize_t * off = NULL; /* Array to store sequence offsets */ - size_t * len = NULL; /* Array to store sequence lengths */ + hsize_t *off = NULL; /* Array to store sequence offsets */ + size_t *len = NULL; /* Array to store sequence lengths */ hssize_t nelmts; /* Number of elements in selection */ size_t max_elem; /* Total number of elements in selection */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2552,8 +2552,8 @@ herr_t H5S_select_project_intersection(H5S_t *src_space, H5S_t *dst_space, H5S_t *src_intersect_space, H5S_t **new_space_ptr, hbool_t share_selection) { - H5S_t * new_space = NULL; /* New dataspace constructed */ - H5S_t * tmp_src_intersect_space = NULL; /* Temporary SIS converted from points->hyperslabs */ + H5S_t *new_space = NULL; /* New dataspace constructed */ + H5S_t *tmp_src_intersect_space = NULL; /* Temporary SIS converted from points->hyperslabs */ H5S_sel_iter_t *ss_iter = NULL; /* Selection iterator for src_space */ hbool_t ss_iter_init = FALSE; /* Whether ss_iter has been initialized */ H5S_sel_iter_t *ds_iter = NULL; /* Selection iterator for dst_space */ @@ -2954,7 +2954,7 @@ done: hid_t H5Ssel_iter_create(hid_t space_id, size_t elmt_size, unsigned flags) { - H5S_t * space; /* Dataspace with selection to iterate over */ + H5S_t *space; /* Dataspace with selection to iterate over */ H5S_sel_iter_t *sel_iter; /* Selection iterator created */ hid_t ret_value; /* Return value */ @@ -3094,7 +3094,7 @@ herr_t H5Ssel_iter_reset(hid_t sel_iter_id, hid_t space_id) { H5S_sel_iter_t *sel_iter; - H5S_t * space; + H5S_t *space; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) @@ -351,9 +351,9 @@ static herr_t H5T__close_cb(H5T_t *dt, void **request); static H5T_path_t *H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_func_t *conv); static hbool_t H5T__detect_vlen_ref(const H5T_t *dt); -static H5T_t * H5T__initiate_copy(const H5T_t *old_dt); -static H5T_t * H5T__copy_transient(H5T_t *old_dt); -static H5T_t * H5T__copy_all(H5T_t *old_dt); +static H5T_t *H5T__initiate_copy(const H5T_t *old_dt); +static H5T_t *H5T__copy_transient(H5T_t *old_dt); +static H5T_t *H5T__copy_all(H5T_t *old_dt); static herr_t H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, hbool_t set_memory_type, H5T_copy_func_t copyfn); @@ -569,7 +569,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 */ @@ -600,9 +600,9 @@ static const H5I_class_t H5I_DATATYPE_CLS[1] = {{ 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 */ @@ -707,39 +707,39 @@ done: herr_t H5T_init(void) { - H5T_t * native_schar = NULL; /* Datatype structure for native signed char */ - H5T_t * native_uchar = NULL; /* Datatype structure for native unsigned char */ - H5T_t * native_short = NULL; /* Datatype structure for native short */ - H5T_t * native_ushort = NULL; /* Datatype structure for native unsigned short */ - H5T_t * native_int = NULL; /* Datatype structure for native int */ - H5T_t * native_uint = NULL; /* Datatype structure for native unsigned int */ - H5T_t * native_long = NULL; /* Datatype structure for native long */ - H5T_t * native_ulong = NULL; /* Datatype structure for native unsigned long */ - H5T_t * native_llong = NULL; /* Datatype structure for native long long */ - H5T_t * native_ullong = NULL; /* Datatype structure for native unsigned long long */ - H5T_t * native_float = NULL; /* Datatype structure for native float */ - H5T_t * native_double = NULL; /* Datatype structure for native double */ - H5T_t * native_ldouble = NULL; /* Datatype structure for native long double */ - 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 deprecated reference objects */ - H5T_t * regref = NULL; /* Datatype structure for deprecated region references */ - H5T_t * ref = NULL; /* Datatype structure for opaque references */ + H5T_t *native_schar = NULL; /* Datatype structure for native signed char */ + H5T_t *native_uchar = NULL; /* Datatype structure for native unsigned char */ + H5T_t *native_short = NULL; /* Datatype structure for native short */ + H5T_t *native_ushort = NULL; /* Datatype structure for native unsigned short */ + H5T_t *native_int = NULL; /* Datatype structure for native int */ + H5T_t *native_uint = NULL; /* Datatype structure for native unsigned int */ + H5T_t *native_long = NULL; /* Datatype structure for native long */ + H5T_t *native_ulong = NULL; /* Datatype structure for native unsigned long */ + H5T_t *native_llong = NULL; /* Datatype structure for native long long */ + H5T_t *native_ullong = NULL; /* Datatype structure for native unsigned long long */ + H5T_t *native_float = NULL; /* Datatype structure for native float */ + H5T_t *native_double = NULL; /* Datatype structure for native double */ + H5T_t *native_ldouble = NULL; /* Datatype structure for native long double */ + 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 deprecated reference objects */ + H5T_t *regref = NULL; /* Datatype structure for deprecated region references */ + H5T_t *ref = NULL; /* Datatype structure for opaque references */ hsize_t dim[1] = {1}; /* Dimension info for array datatype */ herr_t status; hbool_t copied_dtype = @@ -1449,7 +1449,7 @@ static int H5T__unlock_cb(void *_dt, hid_t H5_ATTR_UNUSED id, void *_udata) { H5T_t *dt = (H5T_t *)_dt; - int * n = (int *)_udata; + int *n = (int *)_udata; FUNC_ENTER_PACKAGE_NOERR @@ -1818,7 +1818,7 @@ H5Tcopy(hid_t obj_id) break; case H5I_DATASET: { - H5VL_object_t * vol_obj; /* Object for obj_id */ + H5VL_object_t *vol_obj; /* Object for obj_id */ H5VL_dataset_get_args_t vol_cb_args; /* Arguments to VOL callback */ /* The argument is a dataset handle */ @@ -1933,11 +1933,11 @@ done: herr_t H5Tclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t type_id, hid_t es_id) { - H5T_t * dt; /* Pointer to datatype to close */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + H5T_t *dt; /* Pointer to datatype to close */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ H5VL_object_t *vol_obj = NULL; /* VOL object of dset_id */ - H5VL_t * connector = NULL; /* VOL connector */ + H5VL_t *connector = NULL; /* VOL connector */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -2074,7 +2074,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) @@ -2703,8 +2703,8 @@ done: herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_conv_t func) { - H5T_t * src; /*source data type descriptor */ - H5T_t * dst; /*destination data type desc */ + H5T_t *src; /*source data type descriptor */ + H5T_t *dst; /*destination data type desc */ H5T_conv_func_t conv_func; /* Conversion function wrapper */ herr_t ret_value = SUCCEED; /*return value */ @@ -2898,7 +2898,7 @@ done: H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata /*out*/) { - H5T_t * src, *dst; + H5T_t *src, *dst; H5T_path_t *path; H5T_conv_t ret_value; /* Return value */ @@ -2992,7 +2992,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; /* unregistered types */ + H5T_t *src, *dst; /* unregistered types */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -3524,8 +3524,8 @@ static herr_t H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, hbool_t set_memory_type, H5T_copy_func_t copyfn) { - H5T_t * tmp = NULL; /* Temporary copy of compound field's datatype */ - char * s; /* Temporary copy of compound field name / enum value name */ + H5T_t *tmp = NULL; /* Temporary copy of compound field's datatype */ + char *s; /* Temporary copy of compound field name / enum value name */ unsigned i; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3720,9 +3720,9 @@ done: H5T_t * H5T_copy(const H5T_t *old_dt, H5T_copy_t method) { - H5T_t * new_dt = NULL; /* New datatype */ + H5T_t *new_dt = NULL; /* New datatype */ H5T_copy_func_t copyfn; /* Pointer to correct copy routine */ - H5T_t * ret_value = NULL; /* Return value */ + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3796,9 +3796,9 @@ done: H5T_t * H5T_copy_reopen(H5T_t *old_dt) { - H5T_t * new_dt = NULL; /* New datatype */ + H5T_t *new_dt = NULL; /* New datatype */ H5T_shared_t *reopened_fo = NULL; /* Pointer to reopened existing named datatype */ - H5T_t * ret_value = NULL; /* Return value */ + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3864,7 +3864,7 @@ H5T_copy_reopen(H5T_t *old_dt) else /* Downgrade immutable datatypes to read-only */ if (H5T_STATE_IMMUTABLE == old_dt->shared->state) - new_dt->shared->state = H5T_STATE_RDONLY; + new_dt->shared->state = H5T_STATE_RDONLY; /* Finish making the copy of the datatype */ if (H5T__complete_copy(new_dt, old_dt, reopened_fo, TRUE, H5T_copy_reopen) < 0) @@ -4184,7 +4184,7 @@ H5T_close(H5T_t *dt) else /* 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 else */ } /* end if */ @@ -4309,7 +4309,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 */ @@ -4948,7 +4948,7 @@ H5T_path_t * H5T_path_find(const H5T_t *src, const H5T_t *dst) { H5T_conv_func_t conv_func; /* Conversion function wrapper */ - H5T_path_t * ret_value = NULL; /* Return value */ + H5T_path_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5Tarray.c b/src/H5Tarray.c index d8dc2fb..43a6a46 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -84,8 +84,8 @@ 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 */ @@ -140,7 +140,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 @@ -334,8 +334,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 3a284e3..b49271f 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -97,10 +97,10 @@ static herr_t H5T__commit_api_common(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * data = NULL; /* VOL-managed datatype data */ - H5VL_object_t * new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ - H5T_t * dt = NULL; /* High level datatype object that wraps the VOL object */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *data = NULL; /* VOL-managed datatype data */ + H5VL_object_t *new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ + H5T_t *dt = NULL; /* High level datatype object that wraps the VOL object */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters */ @@ -197,8 +197,8 @@ H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -327,10 +327,10 @@ done: herr_t H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) { - void * dt = NULL; /* datatype object created by VOL connector */ - H5VL_object_t * new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ - H5T_t * type = NULL; /* Datatype created */ - H5VL_object_t * vol_obj = NULL; /* object of loc_id */ + void *dt = NULL; /* datatype object created by VOL connector */ + H5VL_object_t *new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ + H5T_t *type = NULL; /* Datatype created */ + H5VL_object_t *vol_obj = NULL; /* object of loc_id */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -622,8 +622,8 @@ static hid_t H5T__open_api_common(hid_t loc_id, const char *name, hid_t tapl_id, void **token_ptr, H5VL_object_t **_vol_obj_ptr) { - void * dt = NULL; /* datatype object created by VOL connector */ - H5VL_object_t * tmp_vol_obj = NULL; /* Object for loc_id */ + void *dt = NULL; /* datatype object created by VOL connector */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for loc_id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for loc_id */ H5VL_loc_params_t loc_params; @@ -706,8 +706,8 @@ H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t tapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) @@ -790,7 +790,7 @@ H5Tget_create_plist(hid_t dtype_id) } /* end if */ /* If the datatype is committed, retrieve further information */ else { - H5VL_object_t * vol_obj = type->vol_obj; + H5VL_object_t *vol_obj = type->vol_obj; H5VL_datatype_get_args_t vol_cb_args; /* Arguments to VOL callback */ /* Set up VOL callback arguments */ @@ -977,13 +977,13 @@ done: H5T_t * H5T__open_name(const H5G_loc_t *loc, const char *name) { - H5T_t * dt = NULL; /* Datatype opened in file */ + H5T_t *dt = NULL; /* Datatype opened in file */ H5G_name_t path; /* Datatype group hier. path */ H5O_loc_t oloc; /* Datatype object location */ H5G_loc_t type_loc; /* Group object for datatype */ H5O_type_t obj_type; /* Type of object at location */ hbool_t obj_found = FALSE; /* Object at 'name' found */ - H5T_t * ret_value = NULL; /* Return value */ + H5T_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -1044,8 +1044,8 @@ H5T_t * H5T_open(const H5G_loc_t *loc) { 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) @@ -1241,11 +1241,11 @@ H5T_update_shared(H5T_t *dt) H5T_t * H5T_construct_datatype(H5VL_object_t *vol_obj) { - H5T_t * dt = NULL; /* Datatype object from VOL connector */ + H5T_t *dt = NULL; /* Datatype object from VOL connector */ H5VL_datatype_get_args_t vol_cb_args; /* Arguments to VOL callback */ size_t nalloc = 0; /* Size required to store serialized form of datatype */ - void * buf = NULL; /* Buffer to store serialized datatype */ - H5T_t * ret_value = NULL; + void *buf = NULL; /* Buffer to store serialized datatype */ + H5T_t *ret_value = NULL; FUNC_ENTER_NOAPI(NULL) diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index a2d21e1..6d31a1e 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -154,7 +154,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 de836dc..895b03d 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -712,11 +712,11 @@ { \ size_t elmtno; /*element number */ \ H5T_CONV_DECL_PREC(PREC) /*declare precision variables, or not */ \ - void * src_buf; /*'raw' source buffer */ \ - void * dst_buf; /*'raw' destination buffer */ \ - ST * src, *s; /*source buffer */ \ - DT * dst, *d; /*destination buffer */ \ - H5T_t * st, *dt; /*datatype descriptors */ \ + void *src_buf; /*'raw' source buffer */ \ + void *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? */ \ @@ -1038,10 +1038,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; @@ -1050,7 +1050,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 */ @@ -1157,8 +1157,8 @@ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmt size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background) { 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 */ @@ -1566,8 +1566,8 @@ H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, s size_t H5_ATTR_UNUSED bkg_stride, void *_buf, void H5_ATTR_UNUSED *background) { 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 */ @@ -1661,17 +1661,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) { - 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] = {0}; /*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 */ H5T_conv_cb_t cb_struct = {NULL, NULL}; /*conversion callback structure */ H5T_conv_ret_t except_ret; /*return of callback function */ hbool_t reverse; /*if reverse the order of destination */ @@ -1908,8 +1908,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_PACKAGE_NOERR @@ -1982,7 +1982,7 @@ static herr_t H5T__conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) { 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 */ @@ -2201,14 +2201,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) { - 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 */ @@ -2428,15 +2428,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) { - 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 */ @@ -2675,7 +2675,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 */ @@ -2815,9 +2815,9 @@ herr_t H5T__conv_enum(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) { - 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); @@ -3013,8 +3013,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) { - 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 */ @@ -3104,24 +3104,24 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si size_t bkg_stride, void *buf, void *bkg) { H5T_vlen_alloc_info_t 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 */ size_t bg_seq_len = 0; /* The number of elements in the background sequence */ 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 * s = NULL; /*source buffer */ - uint8_t * d = NULL; /*destination buffer */ - uint8_t * b = NULL; /*background buffer */ + H5T_t *src = NULL; /*source datatype */ + H5T_t *dst = NULL; /*destination datatype */ + 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 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 */ @@ -3481,14 +3481,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 @@ -3629,15 +3629,15 @@ herr_t H5T__conv_ref(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) { - H5T_t * src = NULL; /* source datatype */ - H5T_t * dst = NULL; /* destination datatype */ + H5T_t *src = NULL; /* source datatype */ + H5T_t *dst = NULL; /* destination datatype */ 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 */ - 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 */ size_t elmtno; /* element number counter */ herr_t ret_value = SUCCEED; /* return value */ @@ -3843,15 +3843,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) { - 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] = {0}; /*temp destination buffer */ size_t first; ssize_t sfirst; /*a signed version of `first' */ @@ -4282,8 +4282,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) { /* 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 */ @@ -4293,8 +4293,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] = {0}; /*temp destination buffer */ uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/ @@ -4867,8 +4867,8 @@ herr_t H5T__conv_s_s(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) { - 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 */ @@ -8391,8 +8391,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) { /* 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 */ @@ -8400,15 +8400,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] = {0}; /*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 */ @@ -9017,8 +9017,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) { /* 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 */ @@ -9026,8 +9026,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] = {0}; /*temp destination buffer */ uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/ @@ -9037,7 +9037,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 */ @@ -9482,7 +9482,7 @@ H5T__reverse_order(uint8_t *rev, uint8_t *s, size_t size, H5T_order_t order) herr_t H5T_reclaim(hid_t type_id, H5S_t *space, 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 */ herr_t ret_value = FAIL; /* Return value */ diff --git a/src/H5Tcset.c b/src/H5Tcset.c index dd145c9..77bdb6a 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -42,7 +42,7 @@ 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 116d34c..e99e6e1 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -98,10 +98,10 @@ H5FL_EXTERN(H5VL_object_t); herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) { - void * data = NULL; /* VOL-managed datatype data */ - H5VL_object_t * new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ - H5T_t * dt = NULL; /* High level datatype object that wraps the VOL object */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *data = NULL; /* VOL-managed datatype data */ + H5VL_object_t *new_obj = NULL; /* VOL object that holds the datatype object and the VOL info */ + H5T_t *dt = NULL; /* High level datatype object that wraps the VOL object */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; herr_t ret_value = SUCCEED; /* Return value */ @@ -163,8 +163,8 @@ done: hid_t H5Topen1(hid_t loc_id, const char *name) { - void * dt = NULL; /* Datatype object created by VOL connector */ - H5VL_object_t * vol_obj = NULL; /* Object of loc_id */ + void *dt = NULL; /* Datatype object created by VOL connector */ + H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_loc_params_t loc_params; hid_t ret_value = H5I_INVALID_HID; /* Return value */ diff --git a/src/H5Tdevelop.h b/src/H5Tdevelop.h index 2ae4178..b1d9f05 100644 --- a/src/H5Tdevelop.h +++ b/src/H5Tdevelop.h @@ -55,7 +55,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] --> diff --git a/src/H5Tenum.c b/src/H5Tenum.c index fb0057a..db60063 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -25,7 +25,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*/); /*------------------------------------------------------------------------- @@ -193,7 +193,7 @@ H5T__enum_insert(const H5T_t *dt, const char *name, const void *value) /* Increase table sizes */ if (dt->shared->u.enumer.nmembs >= dt->shared->u.enumer.nalloc) { - char ** names; + char **names; uint8_t *values; unsigned n = MAX(32, 2 * dt->shared->u.enumer.nalloc); @@ -357,11 +357,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_PACKAGE @@ -490,7 +490,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_PACKAGE diff --git a/src/H5Tfields.c b/src/H5Tfields.c index 68bc0a3..249a025 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -121,7 +121,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); @@ -215,7 +215,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 9527a5a..ac46204 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -40,7 +40,7 @@ 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 b3fa724..fb9d95b 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -233,7 +233,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) @@ -315,7 +315,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 9625290..92276a5 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -120,25 +120,25 @@ 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 * 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 *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_PACKAGE @@ -1159,7 +1159,7 @@ H5T__init_native_internal(void) /* Pointer to the global variable that receives the * identifier for `type`'s H5T_t: */ - hid_t * hidp; + hid_t *hidp; size_t size; // sizeof(`type`) H5T_atomic_t atomic; // `type` facts such as signedness } native_int_t; diff --git a/src/H5Toh.c b/src/H5Toh.c index e8bf02f..f71397e 100644 --- a/src/H5Toh.c +++ b/src/H5Toh.c @@ -40,8 +40,8 @@ /********************/ static htri_t H5O__dtype_isa(const H5O_t *loc); -static void * H5O__dtype_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); -static void * H5O__dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); +static void *H5O__dtype_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type); +static void *H5O__dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc); static H5O_loc_t *H5O__dtype_get_oloc(hid_t obj_id); /*********************/ @@ -120,7 +120,7 @@ static void * H5O__dtype_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type) { H5T_t *type = NULL; /* Datatype opened */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -159,7 +159,7 @@ static void * H5O__dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc) { 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_PACKAGE @@ -201,8 +201,8 @@ done: static H5O_loc_t * H5O__dtype_get_oloc(hid_t obj_id) { - H5T_t * type = NULL; /* Datatype opened */ - H5T_t * dt = NULL; + H5T_t *type = NULL; /* Datatype opened */ + H5T_t *dt = NULL; H5O_loc_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE diff --git a/src/H5Topaque.c b/src/H5Topaque.c index c5c2788..15753fe 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -84,7 +84,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 21b72a4..e3abd23 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -81,7 +81,7 @@ static herr_t H5T__set_order(H5T_t *dtype, H5T_order_t order); 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 520b44d..60a4092 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -170,8 +170,8 @@ typedef struct H5T_conv_func_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_func_t conv; /* Conversion function */ hbool_t is_hard; /*is it a hard function? */ hbool_t is_noop; /*is it the noop conversion? */ @@ -231,7 +231,7 @@ typedef struct H5T_atomic_t { unsigned version; /* version of encoded reference */ hbool_t opaque; /* opaque reference type */ H5T_loc_t loc; /* location of data in buffer */ - H5VL_object_t * file; /* file VOL pointer (if data is on disk) */ + H5VL_object_t *file; /* file VOL pointer (if data is on disk) */ const H5T_ref_class_t *cls; /* Pointer to ref class callbacks */ } r; /* reference types */ } u; @@ -246,7 +246,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 */ @@ -267,8 +267,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? */ - void * value; /*array of values */ - char ** name; /*array of symbol names */ + void *value; /*array of values */ + char **name; /*array of symbol names */ } H5T_enum_t; /* VL types */ @@ -307,7 +307,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 */ - H5VL_object_t * file; /* File object (if VL data is on disk) */ + H5VL_object_t *file; /* File object (if VL data is on disk) */ const H5T_vlen_class_t *cls; /* Pointer to VL class callbacks */ } H5T_vlen_t; @@ -339,8 +339,8 @@ 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 */ - struct H5T_t * parent; /*parent type for derived datatypes */ + 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 */ H5VL_object_t *owned_vol_obj; /* Vol object owned by this type (free on close) */ union { H5T_atomic_t atomic; /* an atomic datatype */ @@ -355,7 +355,7 @@ typedef struct H5T_shared_t { struct H5T_t { H5O_shared_t sh_loc; /* Shared message info (must be first) */ - H5T_shared_t * shared; /* all other information */ + H5T_shared_t *shared; /* all other information */ H5O_loc_t oloc; /* Object location, if the type is a named type */ H5G_name_t path; /* group hier. path if the type is a named type */ H5VL_object_t *vol_obj; /* pointer to VOL object when working with committed datatypes */ @@ -864,9 +864,9 @@ H5_DLL herr_t H5T__ref_reclaim(void *elem, const H5T_t *dt); H5_DLL htri_t H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc); /* 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 */ @@ -875,7 +875,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 aaa7202..069b947 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -72,15 +72,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 @@ -109,30 +109,30 @@ struct H5O_shared_t; H5_DLLVAR H5T_order_t H5T_native_order_g; /* Private functions */ -H5_DLL herr_t H5T_init(void); -H5_DLL H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); -H5_DLL H5T_t *H5T_copy_reopen(H5T_t *old_dt); -H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); -H5_DLL herr_t H5T_close(H5T_t *dt); -H5_DLL herr_t H5T_close_real(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 hbool_t H5T_get_force_conv(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_init(void); +H5_DLL H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); +H5_DLL H5T_t *H5T_copy_reopen(H5T_t *old_dt); +H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); +H5_DLL herr_t H5T_close(H5T_t *dt); +H5_DLL herr_t H5T_close_real(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 hbool_t H5T_get_force_conv(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 struct H5O_loc_t *H5T_oloc(H5T_t *dt); H5_DLL struct 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); -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_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst); +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); @@ -141,21 +141,21 @@ H5_DLL herr_t H5T_reclaim_cb(void *elem, const H5T_t *dt, unsigned ndim, const h H5_DLL herr_t H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt); H5_DLL htri_t H5T_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc); H5_DLL htri_t H5T_is_sensible(const H5T_t *dt); -H5_DLL uint32_t H5T_hash(H5F_t *file, const H5T_t *dt); -H5_DLL herr_t H5T_set_version(H5F_t *f, H5T_t *dt); -H5_DLL herr_t H5T_patch_file(H5T_t *dt, H5F_t *f); -H5_DLL herr_t H5T_patch_vlen_file(H5T_t *dt, H5VL_object_t *file); -H5_DLL herr_t H5T_own_vol_obj(H5T_t *dt, H5VL_object_t *vol_obj); -H5_DLL htri_t H5T_is_variable_str(const H5T_t *dt); -H5_DLL H5T_t *H5T_construct_datatype(H5VL_object_t *dt_obj); +H5_DLL uint32_t H5T_hash(H5F_t *file, const H5T_t *dt); +H5_DLL herr_t H5T_set_version(H5F_t *f, H5T_t *dt); +H5_DLL herr_t H5T_patch_file(H5T_t *dt, H5F_t *f); +H5_DLL herr_t H5T_patch_vlen_file(H5T_t *dt, H5VL_object_t *file); +H5_DLL herr_t H5T_own_vol_obj(H5T_t *dt, H5VL_object_t *vol_obj); +H5_DLL htri_t H5T_is_variable_str(const H5T_t *dt); +H5_DLL H5T_t *H5T_construct_datatype(H5VL_object_t *dt_obj); H5_DLL H5VL_object_t *H5T_get_named_type(const H5T_t *dt); -H5_DLL H5T_t * H5T_get_actual_type(H5T_t *dt); -H5_DLL herr_t H5T_save_refresh_state(hid_t tid, struct H5O_shared_t *cached_H5O_shared); -H5_DLL herr_t H5T_restore_refresh_state(hid_t tid, struct H5O_shared_t *cached_H5O_shared); -H5_DLL hbool_t H5T_already_vol_managed(const H5T_t *dt); -H5_DLL htri_t H5T_is_vl_storage(const H5T_t *dt); -H5_DLL herr_t H5T_invoke_vol_optional(H5T_t *dt, H5VL_optional_args_t *args, hid_t dxpl_id, void **req, - H5VL_object_t **vol_obj_ptr); +H5_DLL H5T_t *H5T_get_actual_type(H5T_t *dt); +H5_DLL herr_t H5T_save_refresh_state(hid_t tid, struct H5O_shared_t *cached_H5O_shared); +H5_DLL herr_t H5T_restore_refresh_state(hid_t tid, struct H5O_shared_t *cached_H5O_shared); +H5_DLL hbool_t H5T_already_vol_managed(const H5T_t *dt); +H5_DLL htri_t H5T_is_vl_storage(const H5T_t *dt); +H5_DLL herr_t H5T_invoke_vol_optional(H5T_t *dt, H5VL_optional_args_t *args, hid_t dxpl_id, void **req, + H5VL_object_t **vol_obj_ptr); /* Reference specific functions */ H5_DLL H5R_type_t H5T_get_ref_type(const H5T_t *dt); @@ -166,7 +166,7 @@ H5_DLL int H5T_link(const H5T_t *type, int adjust); 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); 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 01247b2..d1ec2bd 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -198,7 +198,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/H5Tref.c b/src/H5Tref.c index e8cab02..aea322a 100644 --- a/src/H5Tref.c +++ b/src/H5Tref.c @@ -63,7 +63,7 @@ /* For region compatibility support */ struct H5Tref_dsetreg { H5O_token_t token; /* Object token */ - H5S_t * space; /* Dataspace */ + H5S_t *space; /* Dataspace */ }; /********************/ @@ -409,9 +409,9 @@ static size_t H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, size_t H5_ATTR_UNUSED src_size, H5VL_object_t *dst_file, hbool_t *dst_copy) { - H5VL_object_t * vol_obj = NULL; /* VOL object for src ref's location */ + H5VL_object_t *vol_obj = NULL; /* VOL object for src ref's location */ const H5R_ref_priv_t *src_ref = (const H5R_ref_priv_t *)src_buf; - char * file_name_buf_dyn = + char *file_name_buf_dyn = NULL; /* Pointer to dynamically allocated buffer for file name, if static buffer is too small */ unsigned flags = 0; /* References flags */ size_t ret_value = 0; /* Return value */ @@ -439,7 +439,7 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf /* Force re-calculating encoding size if any flags are set */ if (flags || !src_ref->encode_size) { H5VL_file_get_args_t vol_cb_args; /* Arguments to VOL callback */ - char * file_name = NULL; /* Actual file name */ + char *file_name = NULL; /* Actual file name */ char file_name_buf_static[256]; /* File name */ size_t file_name_len = 0; /* Length of file name */ @@ -526,12 +526,12 @@ static herr_t H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, size_t H5_ATTR_UNUSED src_size, H5VL_object_t *dst_file, void *dst_buf, size_t dst_size) { - H5VL_object_t * vol_obj; /* VOL object for src ref's location */ + H5VL_object_t *vol_obj; /* VOL object for src ref's location */ const H5R_ref_priv_t *src_ref = (const H5R_ref_priv_t *)src_buf; hbool_t files_equal = TRUE; /* Whether src & dst references are in same file */ - char * file_name = NULL; /* Actual file name */ + char *file_name = NULL; /* Actual file name */ char file_name_buf_static[256] = {'\0'}; /* File name */ - char * file_name_buf_dyn = + char *file_name_buf_dyn = NULL; /* Pointer to dynamically allocated buffer for file name, if static buffer is too small */ unsigned flags = 0; /* References flags */ herr_t ret_value = SUCCEED; /* Return value */ @@ -641,7 +641,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t H5_ATTR_NDEBUG_UNUSED dst_size, void H5_ATTR_UNUSED *bg_buf) { - H5F_t * src_f = NULL; + H5F_t *src_f = NULL; hid_t file_id = H5I_INVALID_HID; H5R_ref_priv_t *dst_ref = (H5R_ref_priv_t *)dst_buf; H5R_ref_priv_t tmp_ref; /* Temporary reference to decode into */ @@ -815,8 +815,8 @@ static herr_t H5T__ref_disk_setnull(H5VL_object_t *dst_file, void *dst_buf, void *bg_buf) { H5VL_blob_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - uint8_t * q = (uint8_t *)dst_buf; - uint8_t * p_bg = (uint8_t *)bg_buf; + uint8_t *q = (uint8_t *)dst_buf; + uint8_t *p_bg = (uint8_t *)bg_buf; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -919,7 +919,7 @@ H5T__ref_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t H5_ATTR_ H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t dst_size) { const uint8_t *p = (const uint8_t *)src_buf; - uint8_t * q = (uint8_t *)dst_buf; + uint8_t *q = (uint8_t *)dst_buf; size_t blob_size = dst_size; herr_t ret_value = SUCCEED; @@ -964,9 +964,9 @@ H5T__ref_disk_write(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, size_t dst_size, void *bg_buf) { const uint8_t *p = (const uint8_t *)src_buf; - uint8_t * q = (uint8_t *)dst_buf; + uint8_t *q = (uint8_t *)dst_buf; size_t buf_size_left = dst_size; - uint8_t * p_bg = (uint8_t *)bg_buf; + uint8_t *p_bg = (uint8_t *)bg_buf; herr_t ret_value = SUCCEED; FUNC_ENTER_PACKAGE @@ -1027,7 +1027,7 @@ done: static herr_t H5T__ref_obj_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbool_t *isnull) { - H5F_t * src_f; + H5F_t *src_f; const uint8_t *p = (const uint8_t *)src_buf; haddr_t addr; herr_t ret_value = SUCCEED; @@ -1179,7 +1179,7 @@ done: static herr_t H5T__ref_dsetreg_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbool_t *isnull) { - H5F_t * src_f; + H5F_t *src_f; const uint8_t *p = (const uint8_t *)src_buf; haddr_t addr; herr_t ret_value = SUCCEED; @@ -1246,7 +1246,7 @@ H5T__ref_dsetreg_disk_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void #ifndef NDEBUG { - H5F_t * src_f; + H5F_t *src_f; hbool_t is_native = FALSE; /* Whether the src file is using the native VOL connector */ /* Check if using native VOL connector */ @@ -1284,7 +1284,7 @@ H5T__ref_dsetreg_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t H5_ATTR_UNUSED dst_size) { - H5F_t * src_f; + H5F_t *src_f; struct H5Tref_dsetreg *dst_reg = (struct H5Tref_dsetreg *)dst_buf; herr_t ret_value = SUCCEED; diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index 5937f74..bea5300 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -43,7 +43,7 @@ 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 4823940..1650fb8 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -53,7 +53,7 @@ /* Memory-based VL sequence callbacks */ static herr_t H5T__vlen_mem_seq_getlen(H5VL_object_t *file, const void *_vl, size_t *len); -static void * H5T__vlen_mem_seq_getptr(void *_vl); +static void *H5T__vlen_mem_seq_getptr(void *_vl); static herr_t H5T__vlen_mem_seq_isnull(const H5VL_object_t *file, void *_vl, hbool_t *isnull); static herr_t H5T__vlen_mem_seq_setnull(H5VL_object_t *file, void *_vl, void *_bg); static herr_t H5T__vlen_mem_seq_read(H5VL_object_t *file, void *_vl, void *_buf, size_t len); @@ -62,7 +62,7 @@ static herr_t H5T__vlen_mem_seq_write(H5VL_object_t *file, const H5T_vlen_alloc_ /* Memory-based VL string callbacks */ static herr_t H5T__vlen_mem_str_getlen(H5VL_object_t *file, const void *_vl, size_t *len); -static void * H5T__vlen_mem_str_getptr(void *_vl); +static void *H5T__vlen_mem_str_getptr(void *_vl); static herr_t H5T__vlen_mem_str_isnull(const H5VL_object_t *file, void *_vl, hbool_t *isnull); static herr_t H5T__vlen_mem_str_setnull(H5VL_object_t *file, void *_vl, void *_bg); static herr_t H5T__vlen_mem_str_read(H5VL_object_t *file, void *_vl, void *_buf, size_t len); @@ -543,7 +543,7 @@ H5T__vlen_mem_seq_write(H5VL_object_t H5_ATTR_UNUSED *file, const H5T_vlen_alloc } /* end if */ else /* Default to system malloc */ if (NULL == (vl.p = HDmalloc(len))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed for VL data") + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed for VL data") /* Copy the data into the newly allocated buffer */ H5MM_memcpy(vl.p, buf, len); @@ -718,7 +718,7 @@ static herr_t H5T__vlen_mem_str_write(H5VL_object_t H5_ATTR_UNUSED *file, 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 */ @@ -736,7 +736,7 @@ H5T__vlen_mem_str_write(H5VL_object_t H5_ATTR_UNUSED *file, const H5T_vlen_alloc } /* end if */ else /* Default to system malloc */ if (NULL == (t = (char *)HDmalloc((seq_len + 1) * base_size))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed for VL data") + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "memory allocation failed for VL data") /* 'write' the string into the buffer, with memcpy() */ len = (seq_len * base_size); @@ -795,7 +795,7 @@ static herr_t H5T__vlen_disk_isnull(const H5VL_object_t *file, void *_vl, hbool_t *isnull) { H5VL_blob_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - uint8_t * vl = (uint8_t *)_vl; /* Pointer to the user's hvl_t information */ + uint8_t *vl = (uint8_t *)_vl; /* Pointer to the user's hvl_t information */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -836,7 +836,7 @@ static herr_t H5T__vlen_disk_setnull(H5VL_object_t *file, void *_vl, void *bg) { H5VL_blob_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - uint8_t * vl = (uint8_t *)_vl; /* Pointer to the user's hvl_t information */ + uint8_t *vl = (uint8_t *)_vl; /* Pointer to the user's hvl_t information */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -1007,7 +1007,7 @@ H5T__vlen_reclaim(void *elem, const H5T_t *dt, H5T_vlen_alloc_info_t *alloc_info { unsigned u; /* Local index variable */ H5MM_free_t free_func; /* Free function */ - void * free_info; /* Free info */ + void *free_info; /* Free info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5UCprivate.h b/src/H5UCprivate.h index 9f4f15a..a4131cb 100644 --- a/src/H5UCprivate.h +++ b/src/H5UCprivate.h @@ -41,7 +41,7 @@ typedef herr_t (*H5UC_free_func_t)(void *o); /* Typedef for reference counted objects */ typedef struct H5UC_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 */ H5UC_free_func_t free_func; /* Function to free object */ } H5UC_t; @@ -701,8 +701,8 @@ done: hid_t H5VLget_file_type(void *file_obj, hid_t connector_id, hid_t dtype_id) { - H5T_t * dtype; /* unregistered type */ - H5T_t * file_type = NULL; /* copied file type */ + H5T_t *dtype; /* unregistered type */ + H5T_t *file_type = NULL; /* copied file type */ hid_t file_type_id = -1; /* copied file type id */ H5VL_object_t *file_vol_obj = NULL; /* VOL object for file */ hid_t ret_value = -1; /* Return value */ diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c index b9e9911..6a642ce 100644 --- a/src/H5VLcallback.c +++ b/src/H5VLcallback.c @@ -50,8 +50,8 @@ * VOL connector to open a given file with. */ typedef struct H5VL_file_open_find_connector_t { - const char * filename; - const H5VL_class_t * cls; + const char *filename; + const H5VL_class_t *cls; H5VL_connector_prop_t *connector_prop; hid_t fapl_id; } H5VL_file_open_find_connector_t; @@ -67,10 +67,10 @@ typedef herr_t (*H5VL_reg_opt_oper_t)(void *obj, const H5VL_class_t *cls, H5VL_o /********************/ /* Local Prototypes */ /********************/ -static void * H5VL__attr_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__attr_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req); -static void * H5VL__attr_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__attr_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t aapl_id, hid_t dxpl_id, void **req); static herr_t H5VL__attr_read(void *obj, const H5VL_class_t *cls, hid_t mem_type_id, void *buf, hid_t dxpl_id, void **req); @@ -83,10 +83,10 @@ static herr_t H5VL__attr_specific(void *obj, const H5VL_loc_params_t *loc_params static herr_t H5VL__attr_optional(void *obj, const H5VL_class_t *cls, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL__attr_close(void *obj, const H5VL_class_t *cls, hid_t dxpl_id, void **req); -static void * H5VL__dataset_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__dataset_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); -static void * H5VL__dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); static herr_t H5VL__dataset_read(void *dset, const H5VL_class_t *cls, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf, void **req); @@ -99,10 +99,10 @@ static herr_t H5VL__dataset_specific(void *obj, const H5VL_class_t *cls, H5VL_da static herr_t H5VL__dataset_optional(void *obj, const H5VL_class_t *cls, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL__dataset_close(void *obj, const H5VL_class_t *cls, hid_t dxpl_id, void **req); -static void * H5VL__datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req); -static void * H5VL__datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req); static herr_t H5VL__datatype_get(void *obj, const H5VL_class_t *cls, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req); @@ -111,9 +111,9 @@ static herr_t H5VL__datatype_specific(void *obj, const H5VL_class_t *cls, H5VL_d static herr_t H5VL__datatype_optional(void *obj, const H5VL_class_t *cls, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL__datatype_close(void *obj, const H5VL_class_t *cls, hid_t dxpl_id, void **req); -static void * H5VL__file_create(const H5VL_class_t *cls, const char *name, unsigned flags, hid_t fcpl_id, +static void *H5VL__file_create(const H5VL_class_t *cls, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req); -static void * H5VL__file_open(const H5VL_class_t *cls, const char *name, unsigned flags, hid_t fapl_id, +static void *H5VL__file_open(const H5VL_class_t *cls, const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); static herr_t H5VL__file_open_find_connector_cb(H5PL_type_t plugin_type, const void *plugin_info, void *op_data); @@ -124,10 +124,10 @@ static herr_t H5VL__file_specific(void *obj, const H5VL_class_t *cls, H5VL_file_ static herr_t H5VL__file_optional(void *obj, const H5VL_class_t *cls, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL__file_close(void *obj, const H5VL_class_t *cls, hid_t dxpl_id, void **req); -static void * H5VL__group_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__group_create(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req); -static void * H5VL__group_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, +static void *H5VL__group_open(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req); static herr_t H5VL__group_get(void *obj, const H5VL_class_t *cls, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req); @@ -151,7 +151,7 @@ static herr_t H5VL__link_specific(void *obj, const H5VL_loc_params_t *loc_params H5VL_link_specific_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL__link_optional(void *obj, const H5VL_loc_params_t *loc_params, const H5VL_class_t *cls, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); -static void * H5VL__object_open(void *obj, const H5VL_loc_params_t *params, const H5VL_class_t *cls, +static void *H5VL__object_open(void *obj, const H5VL_loc_params_t *params, const H5VL_class_t *cls, H5I_type_t *opened_type, hid_t dxpl_id, void **req); static herr_t H5VL__object_copy(void *src_obj, const H5VL_loc_params_t *src_loc_params, const char *src_name, void *dst_obj, const H5VL_loc_params_t *dst_loc_params, const char *dst_name, @@ -341,7 +341,7 @@ static herr_t H5VL__common_optional_op(hid_t id, H5I_type_t id_type, H5VL_reg_opt_oper_t reg_opt_op, H5VL_optional_args_t *args, hid_t dxpl_id, void **req, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for id */ hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ herr_t ret_value = SUCCEED; /* Return value */ @@ -384,7 +384,7 @@ done: herr_t H5VL_copy_connector_info(const H5VL_class_t *connector, void **dst_info, const void *src_info) { - void * new_connector_info = NULL; /* Copy of connector info */ + void *new_connector_info = NULL; /* Copy of connector info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -685,7 +685,7 @@ void * H5VLget_object(void *obj, hid_t connector_id) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE2("*x", "*xi", obj, connector_id); @@ -823,7 +823,7 @@ void * H5VLwrap_object(void *obj, H5I_type_t obj_type, hid_t connector_id, void *wrap_ctx) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE4("*x", "*xIti*x", obj, obj_type, connector_id, wrap_ctx); @@ -890,7 +890,7 @@ void * H5VLunwrap_object(void *obj, hid_t connector_id) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE2("*x", "*xi", obj, connector_id); @@ -1017,7 +1017,7 @@ H5VL_attr_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_para hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1055,7 +1055,7 @@ H5VLattr_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_ void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE10("*x", "*x*#i*siiiiix", obj, loc_params, connector_id, name, type_id, space_id, acpl_id, aapl_id, @@ -1121,7 +1121,7 @@ H5VL_attr_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params hid_t aapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1158,7 +1158,7 @@ H5VLattr_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id hid_t aapl_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE7("*x", "*x*#i*siix", obj, loc_params, connector_id, name, aapl_id, dxpl_id, req); @@ -1692,8 +1692,8 @@ H5VLattr_optional_op(const char *app_file, const char *app_func, unsigned app_li H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Attribute VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -1858,7 +1858,7 @@ H5VL_dataset_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_p void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -1897,7 +1897,7 @@ H5VLdataset_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connect void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE11("*x", "*x*#i*siiiiiix", obj, loc_params, connector_id, name, lcpl_id, type_id, space_id, @@ -1963,7 +1963,7 @@ H5VL_dataset_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_par hid_t dapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2000,7 +2000,7 @@ H5VLdataset_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector hid_t dapl_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE7("*x", "*x*#i*siix", obj, loc_params, connector_id, name, dapl_id, dxpl_id, req); @@ -2536,8 +2536,8 @@ H5VLdataset_optional_op(const char *app_file, const char *app_func, unsigned app H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Dataset VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -2718,7 +2718,7 @@ H5VL_datatype_commit(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_ hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2756,7 +2756,7 @@ H5VLdatatype_commit(void *obj, const H5VL_loc_params_t *loc_params, hid_t connec void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE10("*x", "*x*#i*siiiiix", obj, loc_params, connector_id, name, type_id, lcpl_id, tcpl_id, tapl_id, @@ -2822,7 +2822,7 @@ H5VL_datatype_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_pa hid_t tapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -2859,7 +2859,7 @@ H5VLdatatype_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connecto hid_t tapl_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE7("*x", "*x*#i*siix", obj, loc_params, connector_id, name, tapl_id, dxpl_id, req); @@ -3156,7 +3156,7 @@ herr_t H5VL_datatype_optional_op(H5VL_object_t *vol_obj, H5VL_optional_args_t *args, hid_t dxpl_id, void **req, H5VL_object_t **_vol_obj_ptr) { - H5VL_object_t * tmp_vol_obj = NULL; /* Object for id */ + H5VL_object_t *tmp_vol_obj = NULL; /* Object for id */ H5VL_object_t **vol_obj_ptr = (_vol_obj_ptr ? _vol_obj_ptr : &tmp_vol_obj); /* Ptr to object ptr for id */ hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ herr_t ret_value = SUCCEED; /* Return value */ @@ -3234,10 +3234,10 @@ herr_t H5VLdatatype_optional_op(const char *app_file, const char *app_func, unsigned app_line, hid_t type_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { - H5T_t * dt; /* Datatype for this operation */ + H5T_t *dt; /* Datatype for this operation */ H5VL_object_t *vol_obj = NULL; /* Datatype VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -3415,7 +3415,7 @@ H5VL_file_create(const H5VL_connector_prop_t *connector_prop, const char *name, hid_t fapl_id, hid_t dxpl_id, void **req) { H5VL_class_t *cls; /* VOL Class structure for callback info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3445,10 +3445,10 @@ void * H5VLfile_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - H5VL_class_t * cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + H5VL_class_t *cls; /* VOL connector's class struct */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE6("*x", "*sIuiiix", name, flags, fcpl_id, fapl_id, dxpl_id, req); @@ -3523,9 +3523,9 @@ H5VL__file_open_find_connector_cb(H5PL_type_t plugin_type, const void *plugin_in { H5VL_file_open_find_connector_t *udata = (H5VL_file_open_find_connector_t *)op_data; H5VL_file_specific_args_t vol_cb_args; /* Arguments to VOL callback */ - const H5VL_class_t * cls = (const H5VL_class_t *)plugin_info; - H5P_genplist_t * fapl_plist; - H5P_genplist_t * fapl_plist_copy; + const H5VL_class_t *cls = (const H5VL_class_t *)plugin_info; + H5P_genplist_t *fapl_plist; + H5P_genplist_t *fapl_plist_copy; hbool_t is_accessible = FALSE; /* Whether file is accessible */ ssize_t num_errors = 0; herr_t status; @@ -3634,7 +3634,7 @@ H5VL_file_open(H5VL_connector_prop_t *connector_prop, const char *name, unsigned hid_t dxpl_id, void **req) { H5VL_class_t *cls; /* VOL Class structure for callback info */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -3706,10 +3706,10 @@ done: void * H5VLfile_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req /*out*/) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ - H5VL_class_t * cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + H5VL_class_t *cls; /* VOL connector's class struct */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE5("*x", "*sIuiix", name, flags, fapl_id, dxpl_id, req); @@ -3881,7 +3881,7 @@ H5VL_file_specific(const H5VL_object_t *vol_obj, H5VL_file_specific_args_t *args /* Special treatment of file access check & delete operations */ /* (Retrieve the VOL connector from the FAPL, since the file isn't open) */ if (args->op_type == H5VL_FILE_IS_ACCESSIBLE || args->op_type == H5VL_FILE_DELETE) { - H5P_genplist_t * plist; /* Property list pointer */ + H5P_genplist_t *plist; /* Property list pointer */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ hid_t fapl_id; /* File access property list for accessing the file */ @@ -4075,8 +4075,8 @@ H5VLfile_optional_op(const char *app_file, const char *app_func, unsigned app_li H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* File VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -4250,7 +4250,7 @@ H5VL_group_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_par hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -4287,7 +4287,7 @@ H5VLgroup_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE9("*x", "*x*#i*siiiix", obj, loc_params, connector_id, name, lcpl_id, gcpl_id, gapl_id, dxpl_id, @@ -4353,7 +4353,7 @@ H5VL_group_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_param hid_t gapl_id, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -4390,7 +4390,7 @@ H5VLgroup_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_i hid_t gapl_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE7("*x", "*x*#i*siix", obj, loc_params, connector_id, name, gapl_id, dxpl_id, req); @@ -4722,8 +4722,8 @@ H5VLgroup_optional_op(const char *app_file, const char *app_func, unsigned app_l H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Group VOL object */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -5496,10 +5496,10 @@ herr_t H5VLlink_optional_op(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t lapl_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ herr_t ret_value = SUCCEED; /* Return value */ @@ -5588,7 +5588,7 @@ H5VL_object_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *params, hid_t dxpl_id, void **req) { hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -5625,7 +5625,7 @@ H5VLobject_open(void *obj, const H5VL_loc_params_t *params, hid_t connector_id, hid_t dxpl_id, void **req /*out*/) { H5VL_class_t *cls; /* VOL connector's class struct */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT H5TRACE6("*x", "*x*#i*Itix", obj, params, connector_id, opened_type, dxpl_id, req); @@ -6075,10 +6075,10 @@ H5VLobject_optional_op(const char *app_file, const char *app_func, unsigned app_ const char *name, hid_t lapl_id, H5VL_optional_args_t *args, hid_t dxpl_id, hid_t es_id) { - H5VL_object_t * vol_obj = NULL; /* Object for loc_id */ + H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ H5VL_loc_params_t loc_params; /* Location parameters for object access */ - void * token = NULL; /* Request token for async operation */ - void ** token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ + void *token = NULL; /* Request token for async operation */ + void **token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation */ hbool_t vol_wrapper_set = FALSE; /* Whether the VOL object wrapping context was set up */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5VLconnector.h b/src/H5VLconnector.h index af3530c..e017a92 100644 --- a/src/H5VLconnector.h +++ b/src/H5VLconnector.h @@ -66,7 +66,7 @@ typedef struct H5VL_loc_by_name { } H5VL_loc_by_name_t; typedef struct H5VL_loc_by_idx { - const char * name; + const char *name; H5_index_t idx_type; H5_iter_order_t order; hsize_t n; @@ -116,15 +116,15 @@ typedef enum H5VL_attr_get_t { typedef struct H5VL_attr_get_name_args_t { H5VL_loc_params_t loc_params; /* Location parameters for object access */ size_t buf_size; /* Size of attribute name buffer */ - char * buf; /* Buffer for attribute name (OUT) */ - size_t * attr_name_len; /* Actual length of attribute name (OUT) */ + char *buf; /* Buffer for attribute name (OUT) */ + size_t *attr_name_len; /* Actual length of attribute name (OUT) */ } H5VL_attr_get_name_args_t; /* Parameters for attribute 'get_info' operation */ typedef struct H5VL_attr_get_info_args_t { H5VL_loc_params_t loc_params; /* Location parameters for object access */ - const char * attr_name; /* Attribute name (for get_info_by_name) */ - H5A_info_t * ainfo; /* Attribute info (OUT) */ + const char *attr_name; /* Attribute name (for get_info_by_name) */ + H5A_info_t *ainfo; /* Attribute info (OUT) */ } H5VL_attr_get_info_args_t; /* Parameters for attribute 'get' operations */ @@ -174,9 +174,9 @@ typedef enum H5VL_attr_specific_t { typedef struct H5VL_attr_iterate_args_t { H5_index_t idx_type; /* Type of index to iterate over */ H5_iter_order_t order; /* Order of index iteration */ - hsize_t * idx; /* Start/stop iteration index (IN/OUT) */ + hsize_t *idx; /* Start/stop iteration index (IN/OUT) */ H5A_operator2_t op; /* Iteration callback function */ - void * op_data; /* Iteration callback context */ + void *op_data; /* Iteration callback context */ } H5VL_attr_iterate_args_t; /* Parameters for attribute 'delete_by_idx' operation */ @@ -203,7 +203,7 @@ typedef struct H5VL_attr_specific_args_t { /* H5VL_ATTR_EXISTS */ struct { const char *name; /* Name of attribute to check */ - hbool_t * exists; /* Whether attribute exists (OUT) */ + hbool_t *exists; /* Whether attribute exists (OUT) */ } exists; /* H5VL_ATTR_ITER */ @@ -321,7 +321,7 @@ typedef struct H5VL_datatype_get_args_t { /* H5VL_DATATYPE_GET_BINARY */ struct { - void * buf; /* Buffer to store serialized form of datatype (OUT) */ + void *buf; /* Buffer to store serialized form of datatype (OUT) */ size_t buf_size; /* Size of serialized datatype buffer */ } get_binary; @@ -385,16 +385,16 @@ typedef enum H5VL_file_get_t { typedef struct H5VL_file_get_name_args_t { H5I_type_t type; /* ID type of object pointer */ size_t buf_size; /* Size of file name buffer (IN) */ - char * buf; /* Buffer for file name (OUT) */ - size_t * file_name_len; /* Actual length of file name (OUT) */ + char *buf; /* Buffer for file name (OUT) */ + size_t *file_name_len; /* Actual length of file name (OUT) */ } H5VL_file_get_name_args_t; /* Parameters for file 'get_obj_ids' operation */ typedef struct H5VL_file_get_obj_ids_args_t { unsigned types; /* Type of objects to count */ size_t max_objs; /* Size of array of object IDs */ - hid_t * oid_list; /* Array of object IDs (OUT) */ - size_t * count; /* # of objects (OUT) */ + hid_t *oid_list; /* Array of object IDs (OUT) */ + size_t *count; /* # of objects (OUT) */ } H5VL_file_get_obj_ids_args_t; /* Parameters for file 'get' operations */ @@ -434,7 +434,7 @@ typedef struct H5VL_file_get_args_t { /* H5VL_FILE_GET_OBJ_COUNT */ struct { unsigned types; /* Type of objects to count */ - size_t * count; /* # of objects (OUT) */ + size_t *count; /* # of objects (OUT) */ } get_obj_count; /* H5VL_FILE_GET_OBJ_IDS */ @@ -472,7 +472,7 @@ typedef struct H5VL_file_specific_args_t { struct { const char *filename; /* Name of file to check */ hid_t fapl_id; /* File access property list to use */ - hbool_t * accessible; /* Whether file is accessible with FAPL settings (OUT) */ + hbool_t *accessible; /* Whether file is accessible with FAPL settings (OUT) */ } is_accessible; /* H5VL_FILE_DELETE */ @@ -483,7 +483,7 @@ typedef struct H5VL_file_specific_args_t { /* H5VL_FILE_IS_EQUAL */ struct { - void * obj2; /* Second file object to compare against */ + void *obj2; /* Second file object to compare against */ hbool_t *same_file; /* Whether files are the same (OUT) */ } is_equal; } args; @@ -501,7 +501,7 @@ typedef enum H5VL_group_get_t { /* Parameters for group 'get_info' operation */ typedef struct H5VL_group_get_info_args_t { H5VL_loc_params_t loc_params; /* Location parameters for object access */ - H5G_info_t * ginfo; /* Group info (OUT) */ + H5G_info_t *ginfo; /* Group info (OUT) */ } H5VL_group_get_info_args_t; /* Parameters for group 'get' operations */ @@ -531,7 +531,7 @@ typedef enum H5VL_group_specific_t { /* Parameters for group 'mount' operation */ typedef struct H5VL_group_spec_mount_args_t { const char *name; /* Name of location to mount child file */ - void * child_file; /* Pointer to child file object */ + void *child_file; /* Pointer to child file object */ hid_t fmpl_id; /* File mount property list to use */ } H5VL_group_spec_mount_args_t; @@ -579,7 +579,7 @@ typedef struct H5VL_link_create_args_t { union { /* H5VL_LINK_CREATE_HARD */ struct { - void * curr_obj; /* Current object */ + void *curr_obj; /* Current object */ H5VL_loc_params_t curr_loc_params; /* Location parameters for current object */ } hard; @@ -618,14 +618,14 @@ typedef struct H5VL_link_get_args_t { /* H5VL_LINK_GET_NAME */ struct { size_t name_size; /* Size of link name buffer (IN) */ - char * name; /* Buffer for link name (OUT) */ + char *name; /* Buffer for link name (OUT) */ size_t *name_len; /* Actual length of link name (OUT) */ } get_name; /* H5VL_LINK_GET_VAL */ struct { size_t buf_size; /* Size of link value buffer (IN) */ - void * buf; /* Buffer for link value (OUT) */ + void *buf; /* Buffer for link value (OUT) */ } get_val; } args; } H5VL_link_get_args_t; @@ -642,9 +642,9 @@ typedef struct H5VL_link_iterate_args_t { hbool_t recursive; /* Whether iteration is recursive */ H5_index_t idx_type; /* Type of index to iterate over */ H5_iter_order_t order; /* Order of index iteration */ - hsize_t * idx_p; /* Start/stop iteration index (OUT) */ + hsize_t *idx_p; /* Start/stop iteration index (OUT) */ H5L_iterate2_t op; /* Iteration callback function */ - void * op_data; /* Iteration callback context */ + void *op_data; /* Iteration callback context */ } H5VL_link_iterate_args_t; /* Parameters for link 'specific' operations */ @@ -692,7 +692,7 @@ typedef struct H5VL_object_get_args_t { /* H5VL_OBJECT_GET_NAME */ struct { size_t buf_size; /* Size of name buffer (IN) */ - char * buf; /* Buffer for name (OUT) */ + char *buf; /* Buffer for name (OUT) */ size_t *name_len; /* Actual length of name (OUT) */ } get_name; @@ -725,7 +725,7 @@ typedef struct H5VL_object_visit_args_t { H5_iter_order_t order; /* Order of index iteration */ unsigned fields; /* Flags for fields to provide in 'info' object for 'op' callback */ H5O_iterate2_t op; /* Iteration callback function */ - void * op_data; /* Iteration callback context */ + void *op_data; /* Iteration callback context */ } H5VL_object_visit_args_t; /* Parameters for object 'specific' operations */ @@ -847,7 +847,7 @@ typedef struct H5VL_info_class_t { herr_t (*free)(void *info); /* Callback to release a VOL info */ herr_t (*to_str)(const void *info, char **str); /* Callback to serialize connector's info into a string */ herr_t (*from_str)(const char *str, - void ** info); /* Callback to deserialize a string into connector's info */ + void **info); /* Callback to deserialize a string into connector's info */ } H5VL_info_class_t; /* VOL object wrap / retrieval callbacks */ @@ -856,7 +856,7 @@ typedef struct H5VL_wrap_class_t { void *(*get_object)(const void *obj); /* Callback to retrieve underlying object */ herr_t (*get_wrap_ctx)( const void *obj, - void ** wrap_ctx); /* Callback to retrieve the object wrapping context for the connector */ + void **wrap_ctx); /* Callback to retrieve the object wrapping context for the connector */ void *(*wrap_object)(void *obj, H5I_type_t obj_type, void *wrap_ctx); /* Callback to wrap a library object */ void *(*unwrap_object)(void *obj); /* Callback to unwrap a library object */ @@ -1018,7 +1018,7 @@ typedef struct H5VL_class_t { /* Overall connector fields & callbacks */ unsigned version; /**< VOL connector class struct version # */ H5VL_class_value_t value; /**< Value to identify connector */ - const char * name; /**< Connector name (MUST be unique!) */ + const char *name; /**< Connector name (MUST be unique!) */ unsigned conn_version; /**< Version # of connector */ unsigned cap_flags; /**< Capability flags for connector */ herr_t (*initialize)(hid_t vipl_id); /**< Connector initialization callback */ diff --git a/src/H5VLconnector_passthru.h b/src/H5VLconnector_passthru.h index 17029f0..5d65940 100644 --- a/src/H5VLconnector_passthru.h +++ b/src/H5VLconnector_passthru.h @@ -64,10 +64,10 @@ H5_DLL herr_t H5VLfinish_lib_state(void); H5_DLL herr_t H5VLfree_lib_state(void *state); /* Pass-through callbacks */ -H5_DLL void * H5VLget_object(void *obj, hid_t connector_id); +H5_DLL void *H5VLget_object(void *obj, hid_t connector_id); H5_DLL herr_t H5VLget_wrap_ctx(void *obj, hid_t connector_id, void **wrap_ctx); -H5_DLL void * H5VLwrap_object(void *obj, H5I_type_t obj_type, hid_t connector_id, void *wrap_ctx); -H5_DLL void * H5VLunwrap_object(void *obj, hid_t connector_id); +H5_DLL void *H5VLwrap_object(void *obj, H5I_type_t obj_type, hid_t connector_id, void *wrap_ctx); +H5_DLL void *H5VLunwrap_object(void *obj, hid_t connector_id); H5_DLL herr_t H5VLfree_wrap_ctx(void *wrap_ctx, hid_t connector_id); /* Public wrappers for generic callbacks */ @@ -84,10 +84,10 @@ H5_DLL herr_t H5VLconnector_info_to_str(const void *info, hid_t connector_id, ch H5_DLL herr_t H5VLconnector_str_to_info(const char *str, hid_t connector_id, void **info); /* Public wrappers for attribute callbacks */ -H5_DLL void * H5VLattr_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLattr_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VLattr_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLattr_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t aapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLattr_read(void *attr, hid_t connector_id, hid_t dtype_id, void *buf, hid_t dxpl_id, void **req); @@ -102,10 +102,10 @@ H5_DLL herr_t H5VLattr_optional(void *obj, hid_t connector_id, H5VL_optional_arg H5_DLL herr_t H5VLattr_close(void *attr, hid_t connector_id, hid_t dxpl_id, void **req); /* Public wrappers for dataset callbacks */ -H5_DLL void * H5VLdataset_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLdataset_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VLdataset_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLdataset_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLdataset_read(void *dset, hid_t connector_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf, void **req); @@ -120,10 +120,10 @@ H5_DLL herr_t H5VLdataset_optional(void *obj, hid_t connector_id, H5VL_optional_ H5_DLL herr_t H5VLdataset_close(void *dset, hid_t connector_id, hid_t dxpl_id, void **req); /* Public wrappers for named datatype callbacks */ -H5_DLL void * H5VLdatatype_commit(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLdatatype_commit(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VLdatatype_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLdatatype_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLdatatype_get(void *dt, hid_t connector_id, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req); @@ -134,9 +134,9 @@ H5_DLL herr_t H5VLdatatype_optional(void *obj, hid_t connector_id, H5VL_optional H5_DLL herr_t H5VLdatatype_close(void *dt, hid_t connector_id, hid_t dxpl_id, void **req); /* Public wrappers for file callbacks */ -H5_DLL void * H5VLfile_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, +H5_DLL void *H5VLfile_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VLfile_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); +H5_DLL void *H5VLfile_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLfile_get(void *file, hid_t connector_id, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLfile_specific(void *obj, hid_t connector_id, H5VL_file_specific_args_t *args, hid_t dxpl_id, @@ -146,10 +146,10 @@ H5_DLL herr_t H5VLfile_optional(void *obj, hid_t connector_id, H5VL_optional_arg H5_DLL herr_t H5VLfile_close(void *file, hid_t connector_id, hid_t dxpl_id, void **req); /* Public wrappers for group callbacks */ -H5_DLL void * H5VLgroup_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLgroup_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VLgroup_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLgroup_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLgroup_get(void *obj, hid_t connector_id, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req); @@ -176,7 +176,7 @@ H5_DLL herr_t H5VLlink_optional(void *obj, const H5VL_loc_params_t *loc_params, H5VL_optional_args_t *args, hid_t dxpl_id, void **req); /* Public wrappers for object callbacks */ -H5_DLL void * H5VLobject_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, +H5_DLL void *H5VLobject_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, H5I_type_t *opened_type, hid_t dxpl_id, void **req); H5_DLL herr_t H5VLobject_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, const char *src_name, void *dst_obj, const H5VL_loc_params_t *loc_params2, const char *dst_name, diff --git a/src/H5VLint.c b/src/H5VLint.c index 2bd5b36..73f11d3 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -58,8 +58,8 @@ /* Object wrapping context info */ typedef struct H5VL_wrap_ctx_t { unsigned rc; /* Ref. count for the # of times the context was set / reset */ - H5VL_t * connector; /* VOL connector for "outermost" class to start wrap */ - void * obj_wrap_ctx; /* "wrap context" for outermost connector */ + H5VL_t *connector; /* VOL connector for "outermost" class to start wrap */ + void *obj_wrap_ctx; /* "wrap context" for outermost connector */ } H5VL_wrap_ctx_t; /* Information needed for iterating over the registered VOL connector hid_t IDs. @@ -85,10 +85,10 @@ typedef struct { /********************/ static herr_t H5VL__free_cls(H5VL_class_t *cls, void **request); static int H5VL__get_connector_cb(void *obj, hid_t id, void *_op_data); -static void * H5VL__wrap_obj(void *obj, H5I_type_t obj_type); +static void *H5VL__wrap_obj(void *obj, H5I_type_t obj_type); static H5VL_object_t *H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t wrap_obj); -static void * H5VL__object(hid_t id, H5I_type_t obj_type); +static void *H5VL__object(hid_t id, H5I_type_t obj_type); static herr_t H5VL__free_vol_wrapper(H5VL_wrap_ctx_t *vol_wrap_ctx); /*********************/ @@ -315,7 +315,7 @@ static int H5VL__get_connector_cb(void *obj, hid_t id, void *_op_data) { H5VL_get_connector_ud_t *op_data = (H5VL_get_connector_ud_t *)_op_data; /* User data for callback */ - H5VL_class_t * cls = (H5VL_class_t *)obj; + H5VL_class_t *cls = (H5VL_class_t *)obj; int ret_value = H5_ITER_CONT; /* Callback return value */ FUNC_ENTER_PACKAGE_NOERR @@ -359,10 +359,10 @@ H5VL__set_def_conn(void) { H5P_genplist_t *def_fapl; /* Default file access property list */ H5P_genclass_t *def_fapclass; /* Default file access property class */ - const char * env_var; /* Environment variable for default VOL connector */ - char * buf = NULL; /* Buffer for tokenizing string */ + const char *env_var; /* Environment variable for default VOL connector */ + char *buf = NULL; /* Buffer for tokenizing string */ hid_t connector_id = -1; /* VOL conntector ID */ - void * vol_info = NULL; /* VOL connector info */ + void *vol_info = NULL; /* VOL connector info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -381,7 +381,7 @@ H5VL__set_def_conn(void) /* Only parse the string if it's set */ if (env_var && *env_var) { - char * lasts = NULL; /* Context pointer for strtok_r() call */ + char *lasts = NULL; /* Context pointer for strtok_r() call */ const char *tok = NULL; /* Token from strtok_r call */ htri_t connector_is_registered; /* Whether connector is already registered */ @@ -496,7 +496,7 @@ static void * H5VL__wrap_obj(void *obj, H5I_type_t obj_type) { H5VL_wrap_ctx_t *vol_wrap_ctx = NULL; /* Object wrapping context */ - void * ret_value = NULL; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -615,7 +615,7 @@ H5VL_conn_copy(H5VL_connector_prop_t *connector_prop) /* Copy connector info, if it exists */ if (connector_prop->connector_info) { H5VL_class_t *connector; /* Pointer to connector */ - void * new_connector_info = NULL; /* Copy of connector info */ + void *new_connector_info = NULL; /* Copy of connector info */ /* Retrieve the connector for the ID */ if (NULL == (connector = (H5VL_class_t *)H5I_object(connector_prop->connector_id))) @@ -767,9 +767,9 @@ H5VL_t * H5VL_new_connector(hid_t connector_id) { H5VL_class_t *cls = NULL; /* VOL connector class */ - H5VL_t * connector = NULL; /* New VOL connector struct */ + H5VL_t *connector = NULL; /* New VOL connector struct */ hbool_t conn_id_incr = FALSE; /* Whether the VOL connector ID has been incremented */ - H5VL_t * ret_value = NULL; /* Return value */ + H5VL_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -898,8 +898,8 @@ done: H5VL_object_t * H5VL_create_object_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id) { - H5VL_class_t * cls = NULL; /* VOL connector class */ - H5VL_t * connector = NULL; /* VOL connector struct */ + H5VL_class_t *cls = NULL; /* VOL connector class */ + H5VL_t *connector = NULL; /* VOL connector struct */ hbool_t conn_id_incr = FALSE; /* Whether the VOL connector ID has been incremented */ H5VL_object_t *ret_value = NULL; /* Return value */ @@ -1153,7 +1153,7 @@ H5VL_file_is_same(const H5VL_object_t *vol_obj1, const H5VL_object_t *vol_obj2, if (cmp_value) *same_file = FALSE; else { - void * obj2; /* Terminal object for second file */ + void *obj2; /* Terminal object for second file */ H5VL_file_specific_args_t vol_cb_args; /* Arguments to VOL callback */ /* Get unwrapped (terminal) object for vol_obj2 */ @@ -1194,7 +1194,7 @@ hid_t H5VL__register_connector(const void *_cls, hbool_t app_ref, hid_t vipl_id) { const H5VL_class_t *cls = (const H5VL_class_t *)_cls; - H5VL_class_t * saved = NULL; + H5VL_class_t *saved = NULL; hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_PACKAGE @@ -1722,7 +1722,7 @@ done: ssize_t H5VL__get_connector_name(hid_t id, char *name /*out*/, size_t size) { - H5VL_object_t * vol_obj; + H5VL_object_t *vol_obj; const H5VL_class_t *cls; size_t len; ssize_t ret_value = -1; @@ -1765,7 +1765,7 @@ done: H5VL_object_t * H5VL_vol_object(hid_t id) { - void * obj = NULL; + void *obj = NULL; H5I_type_t obj_type; H5VL_object_t *ret_value = NULL; @@ -1859,7 +1859,7 @@ static void * H5VL__object(hid_t id, H5I_type_t obj_type) { H5VL_object_t *vol_obj = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -2438,7 +2438,7 @@ H5VL_reset_vol_wrapper(void) else /* Save the updated wrapper context */ if (H5CX_set_vol_wrap_ctx(vol_wrap_ctx) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTSET, FAIL, "can't set VOL object wrap context") + HGOTO_ERROR(H5E_VOL, H5E_CANTSET, FAIL, "can't set VOL object wrap context") done: FUNC_LEAVE_NOAPI(ret_value) @@ -2457,7 +2457,7 @@ hid_t H5VL_wrap_register(H5I_type_t type, void *obj, hbool_t app_ref) { H5VL_wrap_ctx_t *vol_wrap_ctx = NULL; /* Object wrapping context */ - void * new_obj; /* Newly wrapped object */ + void *new_obj; /* Newly wrapped object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_NOAPI(H5I_INVALID_HID) diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 75d2276..7193326 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -286,7 +286,7 @@ herr_t H5VL_native_get_file_addr_len(hid_t loc_id, size_t *addr_len) { H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ - void * vol_obj = NULL; /* VOL Object of loc_id */ + void *vol_obj = NULL; /* VOL Object of loc_id */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -357,7 +357,7 @@ herr_t H5VLnative_addr_to_token(hid_t loc_id, haddr_t addr, H5O_token_t *token) { H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ - void * vol_obj = NULL; /* VOL Object of loc_id */ + void *vol_obj = NULL; /* VOL Object of loc_id */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -451,7 +451,7 @@ herr_t H5VLnative_token_to_addr(hid_t loc_id, H5O_token_t token, haddr_t *addr) { H5I_type_t vol_obj_type = H5I_BADID; /* Object type of loc_id */ - void * vol_obj = NULL; /* VOL Object of loc_id */ + void *vol_obj = NULL; /* VOL Object of loc_id */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) diff --git a/src/H5VLnative.h b/src/H5VLnative.h index 5e43c4e..6eaefb6 100644 --- a/src/H5VLnative.h +++ b/src/H5VLnative.h @@ -48,9 +48,9 @@ /* Parameters for attribute 'iterate old' operation */ typedef struct H5VL_native_attr_iterate_old_t { hid_t loc_id; - unsigned * attr_num; + unsigned *attr_num; H5A_operator1_t op; - void * op_data; + void *op_data; } H5VL_native_attr_iterate_old_t; /* Parameters for native connector's attribute 'optional' operations */ @@ -83,7 +83,7 @@ typedef union H5VL_native_attr_optional_args_t { typedef struct H5VL_native_dataset_chunk_read_t { const hsize_t *offset; uint32_t filters; - void * buf; + void *buf; } H5VL_native_dataset_chunk_read_t; /* Parameters for native connector's dataset 'chunk write' operation */ @@ -91,7 +91,7 @@ typedef struct H5VL_native_dataset_chunk_write_t { const hsize_t *offset; uint32_t filters; uint32_t size; - const void * buf; + const void *buf; } H5VL_native_dataset_chunk_write_t; /* Parameters for native connector's dataset 'get vlen buf size' operation */ @@ -104,7 +104,7 @@ typedef struct H5VL_native_dataset_get_vlen_buf_size_t { /* Parameters for native connector's dataset 'get chunk storage size' operation */ typedef struct H5VL_native_dataset_get_chunk_storage_size_t { const hsize_t *offset; /* Offset of chunk */ - hsize_t * size; /* Size of chunk (OUT) */ + hsize_t *size; /* Size of chunk (OUT) */ } H5VL_native_dataset_get_chunk_storage_size_t; /* Parameters for native connector's dataset 'get num chunks' operation */ @@ -117,18 +117,18 @@ typedef struct H5VL_native_dataset_get_num_chunks_t { typedef struct H5VL_native_dataset_get_chunk_info_by_idx_t { hid_t space_id; /* Space selection */ hsize_t chk_index; /* Chunk index within space */ - hsize_t * offset; /* Chunk coordinates (OUT) */ + hsize_t *offset; /* Chunk coordinates (OUT) */ unsigned *filter_mask; /* Filter mask for chunk (OUT) */ - haddr_t * addr; /* Address of chunk in file (OUT) */ - hsize_t * size; /* Size of chunk in file (OUT) */ + haddr_t *addr; /* Address of chunk in file (OUT) */ + hsize_t *size; /* Size of chunk in file (OUT) */ } H5VL_native_dataset_get_chunk_info_by_idx_t; /* Parameters for native connector's dataset 'get chunk info by coord' operation */ typedef struct H5VL_native_dataset_get_chunk_info_by_coord_t { const hsize_t *offset; /* Chunk coordinates */ - unsigned * filter_mask; /* Filter mask for chunk (OUT) */ - haddr_t * addr; /* Address of chunk in file (OUT) */ - hsize_t * size; /* Size of chunk in file (OUT) */ + unsigned *filter_mask; /* Filter mask for chunk (OUT) */ + haddr_t *addr; /* Address of chunk in file (OUT) */ + hsize_t *size; /* Size of chunk in file (OUT) */ } H5VL_native_dataset_get_chunk_info_by_coord_t; /* Parameters for native connector's dataset 'optional' operations */ @@ -170,7 +170,7 @@ typedef union H5VL_native_dataset_optional_args_t { /* H5VL_NATIVE_DATASET_CHUNK_ITER */ struct { H5D_chunk_iter_op_t op; /* Chunk iteration callback */ - void * op_data; /* Context to pass to iteration callback */ + void *op_data; /* Context to pass to iteration callback */ } chunk_iter; } H5VL_native_dataset_optional_args_t; @@ -217,7 +217,7 @@ typedef union H5VL_native_dataset_optional_args_t { /* Parameters for native connector's file 'get file image' operation */ typedef struct H5VL_native_file_get_file_image_t { size_t buf_size; /* Size of file image buffer */ - void * buf; /* Buffer for file image (OUT) */ + void *buf; /* Buffer for file image (OUT) */ size_t *image_len; /* Size of file image (OUT) */ } H5VL_native_file_get_file_image_t; @@ -226,7 +226,7 @@ typedef struct H5VL_native_file_get_free_sections_t { H5F_mem_t type; /* Type of file memory to query */ H5F_sect_info_t *sect_info; /* Array of sections (OUT) */ size_t nsects; /* Size of section array */ - size_t * sect_count; /* Actual # of sections of type (OUT) */ + size_t *sect_count; /* Actual # of sections of type (OUT) */ } H5VL_native_file_get_free_sections_t; /* Parameters for native connector's file 'get freespace' operation */ @@ -242,9 +242,9 @@ typedef struct H5VL_native_file_get_info_t { /* Parameters for native connector's file 'get metadata cache size' operation */ typedef struct H5VL_native_file_get_mdc_size_t { - size_t * max_size; /* Maximum amount of cached data (OUT) */ - size_t * min_clean_size; /* Minimum amount of cached data to keep clean (OUT) */ - size_t * cur_size; /* Current amount of cached data (OUT) */ + size_t *max_size; /* Maximum amount of cached data (OUT) */ + size_t *min_clean_size; /* Minimum amount of cached data to keep clean (OUT) */ + size_t *cur_size; /* Current amount of cached data (OUT) */ uint32_t *cur_num_entries; /* Current # of cached entries (OUT) */ } H5VL_native_file_get_mdc_size_t; @@ -412,16 +412,16 @@ typedef union H5VL_native_file_optional_args_t { typedef struct H5VL_native_group_iterate_old_t { H5VL_loc_params_t loc_params; /* Location parameters for iteration */ hsize_t idx; /* Index of link to begin iteration at */ - hsize_t * last_obj; /* Index of last link looked at (OUT) */ + hsize_t *last_obj; /* Index of last link looked at (OUT) */ H5G_iterate_t op; /* Group (link) operator callback */ - void * op_data; /* Context to pass to iterator callback */ + void *op_data; /* Context to pass to iterator callback */ } H5VL_native_group_iterate_old_t; /* Parameters for group 'get objinfo' operation */ typedef struct H5VL_native_group_get_objinfo_t { H5VL_loc_params_t loc_params; /* Location parameters for iteration */ hbool_t follow_link; /* Whether to follow links for query */ - H5G_stat_t * statbuf; /* Pointer to object info struct (OUT) */ + H5G_stat_t *statbuf; /* Pointer to object info struct (OUT) */ } H5VL_native_group_get_objinfo_t; /* Parameters for native connector's group 'optional' operations */ @@ -451,7 +451,7 @@ typedef union H5VL_native_group_optional_args_t { /* Parameters for native connector's object 'get comment' operation */ typedef struct H5VL_native_object_get_comment_t { size_t buf_size; /* Size of comment buffer */ - void * buf; /* Buffer for comment (OUT) */ + void *buf; /* Buffer for comment (OUT) */ size_t *comment_len; /* Actual size of comment (OUT) */ } H5VL_native_object_get_comment_t; diff --git a/src/H5VLnative_attr.c b/src/H5VLnative_attr.c index 834ae40..b7e9b13 100644 --- a/src/H5VLnative_attr.c +++ b/src/H5VLnative_attr.c @@ -79,10 +79,10 @@ H5VL__native_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const c H5G_loc_t loc; /* Object location */ H5G_loc_t obj_loc; /* Location used to open group */ hbool_t loc_found = FALSE; - H5T_t * type, *dt; /* Datatype to use for attribute */ - H5S_t * space; /* Dataspace to use for attribute */ - H5A_t * attr = NULL; - void * ret_value = NULL; + H5T_t *type, *dt; /* Datatype to use for attribute */ + H5S_t *space; /* Dataspace to use for attribute */ + H5A_t *attr = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -139,8 +139,8 @@ H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const cha hid_t H5_ATTR_UNUSED aapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { H5G_loc_t loc; /* Object location */ - H5A_t * attr = NULL; /* Attribute opened */ - void * ret_value; + H5A_t *attr = NULL; /* Attribute opened */ + void *ret_value; FUNC_ENTER_PACKAGE @@ -292,7 +292,7 @@ H5VL__native_attr_get(void *obj, H5VL_attr_get_args_t *args, hid_t H5_ATTR_UNUSE } else if (H5VL_OBJECT_BY_IDX == get_name_args->loc_params.type) { H5G_loc_t loc; - H5A_t * attr; + H5A_t *attr; /* check arguments */ if (H5G_loc_real(obj, get_name_args->loc_params.obj_type, &loc) < 0) @@ -329,7 +329,7 @@ H5VL__native_attr_get(void *obj, H5VL_attr_get_args_t *args, hid_t H5_ATTR_UNUSE /* H5Aget_info */ case H5VL_ATTR_GET_INFO: { H5VL_attr_get_info_args_t *get_info_args = &args->args.get_info; - H5A_t * attr = NULL; + H5A_t *attr = NULL; if (H5VL_OBJECT_BY_SELF == get_info_args->loc_params.type) { attr = (H5A_t *)obj; @@ -478,8 +478,8 @@ H5VL__native_attr_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_ /* H5Aiterate/iterate_by_name */ case H5VL_ATTR_ITER: { H5VL_attr_iterate_args_t *iter_args = &args->args.iterate; /* Arguments to iterate operation */ - static const char * self_name = "."; /* Name for 'self' location */ - const char * loc_name; /* Location name */ + static const char *self_name = "."; /* Name for 'self' location */ + const char *loc_name; /* Location name */ /* Set correct name, for type of location */ if (loc_params->type == H5VL_OBJECT_BY_SELF) /* H5Aiterate2 */ diff --git a/src/H5VLnative_blob.c b/src/H5VLnative_blob.c index 1107227..606bdeb 100644 --- a/src/H5VLnative_blob.c +++ b/src/H5VLnative_blob.c @@ -62,7 +62,7 @@ herr_t H5VL__native_blob_put(void *obj, const void *buf, size_t size, void *blob_id, void H5_ATTR_UNUSED *ctx) { - H5F_t * f = (H5F_t *)obj; /* Retrieve file pointer */ + H5F_t *f = (H5F_t *)obj; /* Retrieve file pointer */ uint8_t *id = (uint8_t *)blob_id; /* Pointer to blob ID */ H5HG_t hobjid; /* New VL sequence's heap ID */ herr_t ret_value = SUCCEED; /* Return value */ @@ -101,7 +101,7 @@ done: herr_t H5VL__native_blob_get(void *obj, const void *blob_id, void *buf, size_t size, void H5_ATTR_UNUSED *ctx) { - H5F_t * f = (H5F_t *)obj; /* Retrieve file pointer */ + H5F_t *f = (H5F_t *)obj; /* Retrieve file pointer */ const uint8_t *id = (const uint8_t *)blob_id; /* Pointer to the disk blob ID */ H5HG_t hobjid; /* Global heap ID for sequence */ size_t hobj_size = 0; /* Global heap object size returned from H5HG_read() */ diff --git a/src/H5VLnative_dataset.c b/src/H5VLnative_dataset.c index 4eefd14..26daa83 100644 --- a/src/H5VLnative_dataset.c +++ b/src/H5VLnative_dataset.c @@ -95,7 +95,7 @@ H5VL__native_dataset_io_setup(H5D_t *dset, hid_t dxpl_id, hid_t file_space_id, h HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "H5S_BLOCK is not allowed for file dataspace") else if (H5S_PLIST == file_space_id) { H5P_genplist_t *plist; /* Property list pointer */ - H5S_t * space; /* Dataspace to hold selection */ + H5S_t *space; /* Dataspace to hold selection */ /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER))) @@ -175,9 +175,9 @@ H5VL__native_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, cons hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { 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 */ - void * ret_value; + void *ret_value; FUNC_ENTER_PACKAGE @@ -238,9 +238,9 @@ void * H5VL__native_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { - H5D_t * dset = NULL; + H5D_t *dset = NULL; H5G_loc_t loc; /* Object location of group */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -495,7 +495,7 @@ done: herr_t H5VL__native_dataset_optional(void *obj, H5VL_optional_args_t *args, hid_t dxpl_id, void H5_ATTR_UNUSED **req) { - H5D_t * dset = (H5D_t *)obj; /* Dataset */ + H5D_t *dset = (H5D_t *)obj; /* Dataset */ H5VL_native_dataset_optional_args_t *opt_args = args->args; /* Pointer to native operation's arguments */ herr_t ret_value = SUCCEED; /* Return value */ @@ -573,7 +573,7 @@ H5VL__native_dataset_optional(void *obj, H5VL_optional_args_t *args, hid_t dxpl_ /* H5Dget_num_chunks */ case H5VL_NATIVE_DATASET_GET_NUM_CHUNKS: { H5VL_native_dataset_get_num_chunks_t *gnc_args = &opt_args->get_num_chunks; - const H5S_t * space = NULL; + const H5S_t *space = NULL; HDassert(dset->shared); HDassert(dset->shared->space); @@ -583,7 +583,7 @@ H5VL__native_dataset_optional(void *obj, H5VL_optional_args_t *args, hid_t dxpl_ space = dset->shared->space; else /* otherwise, use the given space ID */ if (NULL == (space = (const H5S_t *)H5I_object_verify(gnc_args->space_id, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a valid dataspace ID") + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a valid dataspace ID") /* Make sure the dataset is chunked */ if (H5D_CHUNKED != dset->shared->layout.type) @@ -599,7 +599,7 @@ H5VL__native_dataset_optional(void *obj, H5VL_optional_args_t *args, hid_t dxpl_ /* H5Dget_chunk_info */ case H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX: { H5VL_native_dataset_get_chunk_info_by_idx_t *gcibi_args = &opt_args->get_chunk_info_by_idx; - const H5S_t * space; + const H5S_t *space; HDassert(dset->shared); HDassert(dset->shared->space); @@ -609,7 +609,7 @@ H5VL__native_dataset_optional(void *obj, H5VL_optional_args_t *args, hid_t dxpl_ space = dset->shared->space; else /* otherwise, use the given space ID */ if (NULL == (space = (const H5S_t *)H5I_object_verify(gcibi_args->space_id, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a valid dataspace ID") + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a valid dataspace ID") /* Make sure the dataset is chunked */ if (H5D_CHUNKED != dset->shared->layout.type) diff --git a/src/H5VLnative_datatype.c b/src/H5VLnative_datatype.c index 027b4ac..ad62ae6 100644 --- a/src/H5VLnative_datatype.c +++ b/src/H5VLnative_datatype.c @@ -75,9 +75,9 @@ H5VL__native_datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, con hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { H5G_loc_t loc; /* Location to commit datatype */ - H5T_t * dt; /* Datatype for ID */ - H5T_t * type = NULL; /* copy of the original type which will be committed */ - void * ret_value = NULL; /* Return value */ + H5T_t *dt; /* Datatype for ID */ + H5T_t *type = NULL; /* copy of the original type which will be committed */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -144,9 +144,9 @@ H5VL__native_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const hid_t H5_ATTR_UNUSED tapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { - 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 */ - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5VLnative_file.c b/src/H5VLnative_file.c index 1e674dc..907a12d 100644 --- a/src/H5VLnative_file.c +++ b/src/H5VLnative_file.c @@ -77,7 +77,7 @@ H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { H5F_t *new_file = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -119,7 +119,7 @@ H5VL__native_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t H5 void H5_ATTR_UNUSED **req) { H5F_t *new_file = NULL; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE @@ -391,7 +391,7 @@ herr_t H5VL__native_file_optional(void *obj, H5VL_optional_args_t *args, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { - H5F_t * f = (H5F_t *)obj; /* File */ + H5F_t *f = (H5F_t *)obj; /* File */ H5VL_native_file_optional_args_t *opt_args = args->args; /* Pointer to native operation's arguments */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5VLnative_group.c b/src/H5VLnative_group.c index 08ac2aa..717333d 100644 --- a/src/H5VLnative_group.c +++ b/src/H5VLnative_group.c @@ -74,8 +74,8 @@ H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const void H5_ATTR_UNUSED **req) { H5G_loc_t loc; /* Location to create group */ - H5G_t * grp = NULL; /* New group created */ - void * ret_value; + H5G_t *grp = NULL; /* New group created */ + void *ret_value; FUNC_ENTER_PACKAGE @@ -140,8 +140,8 @@ H5VL__native_group_open(void *obj, const H5VL_loc_params_t *loc_params, const ch hid_t H5_ATTR_UNUSED gapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { H5G_loc_t loc; /* Location to open group */ - H5G_t * grp = NULL; /* New group opend */ - void * ret_value; + H5G_t *grp = NULL; /* New group opend */ + void *ret_value; FUNC_ENTER_PACKAGE diff --git a/src/H5VLnative_link.c b/src/H5VLnative_link.c index 042c778..4d6d3a8 100644 --- a/src/H5VLnative_link.c +++ b/src/H5VLnative_link.c @@ -80,7 +80,7 @@ H5VL__native_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_lo case H5VL_LINK_CREATE_HARD: { H5G_loc_t cur_loc; H5G_loc_t link_loc; - void * cur_obj = args->args.hard.curr_obj; + void *cur_obj = args->args.hard.curr_obj; H5VL_loc_params_t *cur_params = &args->args.hard.curr_loc_params; if (NULL != cur_obj && H5G_loc_real(cur_obj, cur_params->obj_type, &cur_loc) < 0) diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c index d237617..01311c9 100644 --- a/src/H5VLnative_object.c +++ b/src/H5VLnative_object.c @@ -75,7 +75,7 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req) { H5G_loc_t loc; - void * ret_value = NULL; + void *ret_value = NULL; FUNC_ENTER_PACKAGE diff --git a/src/H5VLnative_private.h b/src/H5VLnative_private.h index 1fd90c8..7746e61 100644 --- a/src/H5VLnative_private.h +++ b/src/H5VLnative_private.h @@ -42,10 +42,10 @@ extern "C" { #endif /* Attribute callbacks */ -H5_DLL void * H5VL__native_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, +H5_DLL void *H5VL__native_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req); -void * H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, +void *H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, hid_t aapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_attr_read(void *attr, hid_t dtype_id, void *buf, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_attr_write(void *attr, hid_t dtype_id, const void *buf, hid_t dxpl_id, void **req); @@ -56,10 +56,10 @@ H5_DLL herr_t H5VL__native_attr_optional(void *obj, H5VL_optional_args_t *args, H5_DLL herr_t H5VL__native_attr_close(void *attr, hid_t dxpl_id, void **req); /* Dataset callbacks */ -H5_DLL void * H5VL__native_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL__native_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_dataset_read(void *dset, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf, void **req); @@ -73,10 +73,10 @@ H5_DLL herr_t H5VL__native_dataset_optional(void *dset, H5VL_optional_args_t *ar H5_DLL herr_t H5VL__native_dataset_close(void *dset, hid_t dxpl_id, void **req); /* Datatype callbacks */ -H5_DLL void * H5VL__native_datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_datatype_commit(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL__native_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_datatype_get(void *dt, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_datatype_specific(void *dt, H5VL_datatype_specific_args_t *args, hid_t dxpl_id, @@ -84,9 +84,9 @@ H5_DLL herr_t H5VL__native_datatype_specific(void *dt, H5VL_datatype_specific_ar H5_DLL herr_t H5VL__native_datatype_close(void *dt, hid_t dxpl_id, void **req); /* File callbacks */ -H5_DLL void * H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, +H5_DLL void *H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL__native_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, +H5_DLL void *H5VL__native_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_file_get(void *file, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_file_specific(void *file, H5VL_file_specific_args_t *args, hid_t dxpl_id, @@ -95,10 +95,10 @@ H5_DLL herr_t H5VL__native_file_optional(void *file, H5VL_optional_args_t *args, H5_DLL herr_t H5VL__native_file_close(void *file, hid_t dxpl_id, void **req); /* Group callbacks */ -H5_DLL void * H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL__native_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +H5_DLL void *H5VL__native_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_group_get(void *obj, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL__native_group_specific(void *obj, H5VL_group_specific_args_t *args, hid_t dxpl_id, diff --git a/src/H5VLpassthru.c b/src/H5VLpassthru.c index 6eda875..986629f 100644 --- a/src/H5VLpassthru.c +++ b/src/H5VLpassthru.c @@ -85,24 +85,24 @@ static herr_t H5VL_pass_through_init(hid_t vipl_id); static herr_t H5VL_pass_through_term(void); /* VOL info callbacks */ -static void * H5VL_pass_through_info_copy(const void *info); +static void *H5VL_pass_through_info_copy(const void *info); static herr_t H5VL_pass_through_info_cmp(int *cmp_value, const void *info1, const void *info2); static herr_t H5VL_pass_through_info_free(void *info); static herr_t H5VL_pass_through_info_to_str(const void *info, char **str); static herr_t H5VL_pass_through_str_to_info(const char *str, void **info); /* VOL object wrap / retrieval callbacks */ -static void * H5VL_pass_through_get_object(const void *obj); +static void *H5VL_pass_through_get_object(const void *obj); static herr_t H5VL_pass_through_get_wrap_ctx(const void *obj, void **wrap_ctx); -static void * H5VL_pass_through_wrap_object(void *obj, H5I_type_t obj_type, void *wrap_ctx); -static void * H5VL_pass_through_unwrap_object(void *obj); +static void *H5VL_pass_through_wrap_object(void *obj, H5I_type_t obj_type, void *wrap_ctx); +static void *H5VL_pass_through_unwrap_object(void *obj); static herr_t H5VL_pass_through_free_wrap_ctx(void *obj); /* Attribute callbacks */ -static void * H5VL_pass_through_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +static void *H5VL_pass_through_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req); -static void * H5VL_pass_through_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +static void *H5VL_pass_through_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t aapl_id, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_attr_read(void *attr, hid_t mem_type_id, void *buf, hid_t dxpl_id, void **req); @@ -116,10 +116,10 @@ static herr_t H5VL_pass_through_attr_optional(void *obj, H5VL_optional_args_t *a static herr_t H5VL_pass_through_attr_close(void *attr, hid_t dxpl_id, void **req); /* Dataset callbacks */ -static void * H5VL_pass_through_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, +static void *H5VL_pass_through_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); -static void * H5VL_pass_through_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +static void *H5VL_pass_through_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_dataset_read(void *dset, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf, void **req); @@ -149,9 +149,9 @@ static herr_t H5VL_pass_through_datatype_optional(void *obj, H5VL_optional_args_ static herr_t H5VL_pass_through_datatype_close(void *dt, hid_t dxpl_id, void **req); /* File callbacks */ -static void * H5VL_pass_through_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, +static void *H5VL_pass_through_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req); -static void * H5VL_pass_through_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, +static void *H5VL_pass_through_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_file_get(void *file, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_file_specific(void *file, H5VL_file_specific_args_t *args, hid_t dxpl_id, @@ -161,10 +161,10 @@ static herr_t H5VL_pass_through_file_optional(void *file, H5VL_optional_args_t * static herr_t H5VL_pass_through_file_close(void *file, hid_t dxpl_id, void **req); /* Group callbacks */ -static void * H5VL_pass_through_group_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +static void *H5VL_pass_through_group_create(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req); -static void * H5VL_pass_through_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, +static void *H5VL_pass_through_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_group_get(void *obj, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_group_specific(void *obj, H5VL_group_specific_args_t *args, hid_t dxpl_id, @@ -191,7 +191,7 @@ static herr_t H5VL_pass_through_link_optional(void *obj, const H5VL_loc_params_t H5VL_optional_args_t *args, hid_t dxpl_id, void **req); /* Object callbacks */ -static void * H5VL_pass_through_object_open(void *obj, const H5VL_loc_params_t *loc_params, +static void *H5VL_pass_through_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_type_t *opened_type, hid_t dxpl_id, void **req); static herr_t H5VL_pass_through_object_copy(void *src_obj, const H5VL_loc_params_t *src_loc_params, const char *src_name, void *dst_obj, @@ -513,7 +513,7 @@ static void * H5VL_pass_through_info_copy(const void *_info) { const H5VL_pass_through_info_t *info = (const H5VL_pass_through_info_t *)_info; - H5VL_pass_through_info_t * new_info; + H5VL_pass_through_info_t *new_info; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL INFO Copy\n"); @@ -625,7 +625,7 @@ H5VL_pass_through_info_to_str(const void *_info, char **str) { const H5VL_pass_through_info_t *info = (const H5VL_pass_through_info_t *)_info; H5VL_class_value_t under_value = (H5VL_class_value_t)-1; - char * under_vol_string = NULL; + char *under_vol_string = NULL; size_t under_vol_str_len = 0; #ifdef ENABLE_PASSTHRU_LOGGING @@ -667,9 +667,9 @@ H5VL_pass_through_str_to_info(const char *str, void **_info) { H5VL_pass_through_info_t *info; unsigned under_vol_value; - const char * under_vol_info_start, *under_vol_info_end; + const char *under_vol_info_start, *under_vol_info_end; hid_t under_vol_id; - void * under_vol_info = NULL; + void *under_vol_info = NULL; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL INFO String To Info\n"); @@ -740,7 +740,7 @@ H5VL_pass_through_get_object(const void *obj) static herr_t H5VL_pass_through_get_wrap_ctx(const void *obj, void **wrap_ctx) { - const H5VL_pass_through_t * o = (const H5VL_pass_through_t *)obj; + const H5VL_pass_through_t *o = (const H5VL_pass_through_t *)obj; H5VL_pass_through_wrap_ctx_t *new_wrap_ctx; #ifdef ENABLE_PASSTHRU_LOGGING @@ -775,8 +775,8 @@ static void * H5VL_pass_through_wrap_object(void *obj, H5I_type_t obj_type, void *_wrap_ctx) { H5VL_pass_through_wrap_ctx_t *wrap_ctx = (H5VL_pass_through_wrap_ctx_t *)_wrap_ctx; - H5VL_pass_through_t * new_obj; - void * under; + H5VL_pass_through_t *new_obj; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL WRAP Object\n"); @@ -807,7 +807,7 @@ static void * H5VL_pass_through_unwrap_object(void *obj) { H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL UNWRAP Object\n"); @@ -876,7 +876,7 @@ H5VL_pass_through_attr_create(void *obj, const H5VL_loc_params_t *loc_params, co { H5VL_pass_through_t *attr; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL ATTRIBUTE Create\n"); @@ -913,7 +913,7 @@ H5VL_pass_through_attr_open(void *obj, const H5VL_loc_params_t *loc_params, cons { H5VL_pass_through_t *attr; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL ATTRIBUTE Open\n"); @@ -1129,7 +1129,7 @@ H5VL_pass_through_dataset_create(void *obj, const H5VL_loc_params_t *loc_params, { H5VL_pass_through_t *dset; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL DATASET Create\n"); @@ -1166,7 +1166,7 @@ H5VL_pass_through_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, c { H5VL_pass_through_t *dset; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL DATASET Open\n"); @@ -1391,7 +1391,7 @@ H5VL_pass_through_datatype_commit(void *obj, const H5VL_loc_params_t *loc_params { H5VL_pass_through_t *dt; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL DATATYPE Commit\n"); @@ -1428,7 +1428,7 @@ H5VL_pass_through_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, { H5VL_pass_through_t *dt; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL DATATYPE Open\n"); @@ -1591,9 +1591,9 @@ H5VL_pass_through_file_create(const char *name, unsigned flags, hid_t fcpl_id, h void **req) { H5VL_pass_through_info_t *info; - H5VL_pass_through_t * file; + H5VL_pass_through_t *file; hid_t under_fapl_id; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL FILE Create\n"); @@ -1647,9 +1647,9 @@ static void * H5VL_pass_through_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req) { H5VL_pass_through_info_t *info; - H5VL_pass_through_t * file; + H5VL_pass_through_t *file; hid_t under_fapl_id; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL FILE Open\n"); @@ -1731,11 +1731,11 @@ H5VL_pass_through_file_get(void *file, H5VL_file_get_args_t *args, hid_t dxpl_id static herr_t H5VL_pass_through_file_specific(void *file, H5VL_file_specific_args_t *args, hid_t dxpl_id, void **req) { - H5VL_pass_through_t * o = (H5VL_pass_through_t *)file; - H5VL_pass_through_t * new_o; + H5VL_pass_through_t *o = (H5VL_pass_through_t *)file; + H5VL_pass_through_t *new_o; H5VL_file_specific_args_t my_args; H5VL_file_specific_args_t *new_args; - H5VL_pass_through_info_t * info; + H5VL_pass_through_info_t *info; hid_t under_vol_id = -1; herr_t ret_value; @@ -1913,7 +1913,7 @@ H5VL_pass_through_group_create(void *obj, const H5VL_loc_params_t *loc_params, c { H5VL_pass_through_t *group; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL GROUP Create\n"); @@ -1950,7 +1950,7 @@ H5VL_pass_through_group_open(void *obj, const H5VL_loc_params_t *loc_params, con { H5VL_pass_through_t *group; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL GROUP Open\n"); @@ -2362,7 +2362,7 @@ H5VL_pass_through_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5 { H5VL_pass_through_t *new_obj; H5VL_pass_through_t *o = (H5VL_pass_through_t *)obj; - void * under; + void *under; #ifdef ENABLE_PASSTHRU_LOGGING printf("------- PASS THROUGH VOL OBJECT Open\n"); diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h index f929d03..12d6804 100644 --- a/src/H5VLprivate.h +++ b/src/H5VLprivate.h @@ -40,7 +40,7 @@ typedef struct H5VL_t { /* Internal vol object structure returned to the API */ typedef struct H5VL_object_t { - void * data; /* Pointer to connector-managed data for this object */ + void *data; /* Pointer to connector-managed data for this object */ H5VL_t *connector; /* Pointer to VOL connector struct */ size_t rc; /* Reference count */ } H5VL_object_t; @@ -66,8 +66,8 @@ typedef enum H5VL_get_connector_kind_t { /******************************/ /* Utility functions */ -H5_DLL herr_t H5VL_init_phase1(void); -H5_DLL herr_t H5VL_init_phase2(void); +H5_DLL herr_t H5VL_init_phase1(void); +H5_DLL herr_t H5VL_init_phase2(void); H5_DLL H5VL_t *H5VL_new_connector(hid_t connector_id); H5_DLL herr_t H5VL_cmp_connector_cls(int *cmp_value, const H5VL_class_t *cls1, const H5VL_class_t *cls2); H5_DLL herr_t H5VL_conn_copy(H5VL_connector_prop_t *value); @@ -91,10 +91,10 @@ H5_DLL herr_t H5VL_check_plugin_load(const H5VL_class_t *cls, const union H5PL_k */ /* Functions that manipulate VOL objects */ -H5_DLL void *H5VL_object(hid_t id); -H5_DLL void *H5VL_object_data(const H5VL_object_t *vol_obj); -H5_DLL void *H5VL_object_unwrap(const H5VL_object_t *vol_obj); -H5_DLL void *H5VL_object_verify(hid_t id, H5I_type_t obj_type); +H5_DLL void *H5VL_object(hid_t id); +H5_DLL void *H5VL_object_data(const H5VL_object_t *vol_obj); +H5_DLL void *H5VL_object_unwrap(const H5VL_object_t *vol_obj); +H5_DLL void *H5VL_object_verify(hid_t id, H5I_type_t obj_type); H5_DLL H5VL_object_t *H5VL_vol_object(hid_t id); H5_DLL H5VL_object_t *H5VL_create_object(void *object, H5VL_t *vol_connector); H5_DLL H5VL_object_t *H5VL_create_object_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id); @@ -106,8 +106,8 @@ H5_DLL herr_t H5VL_file_is_same(const H5VL_object_t *vol_obj1, const H5V /* Functions that wrap / unwrap VOL objects */ H5_DLL herr_t H5VL_get_wrap_ctx(const H5VL_class_t *connector, void *obj, void **wrap_ctx); -H5_DLL void * H5VL_wrap_object(const H5VL_class_t *connector, void *wrap_ctx, void *obj, H5I_type_t obj_type); -H5_DLL void * H5VL_unwrap_object(const H5VL_class_t *connector, void *obj); +H5_DLL void *H5VL_wrap_object(const H5VL_class_t *connector, void *wrap_ctx, void *obj, H5I_type_t obj_type); +H5_DLL void *H5VL_unwrap_object(const H5VL_class_t *connector, void *obj); H5_DLL herr_t H5VL_free_wrap_ctx(const H5VL_class_t *connector, void *wrap_ctx); H5_DLL herr_t H5VL_set_vol_wrapper(const H5VL_object_t *vol_obj); H5_DLL herr_t H5VL_inc_vol_wrapper(void *vol_wrap_ctx); @@ -154,10 +154,10 @@ H5_DLL herr_t H5VL_cmp_connector_info(const H5VL_class_t *connector, int *cmp_va H5_DLL herr_t H5VL_free_connector_info(hid_t connector_id, const void *info); /* Attribute functions */ -H5_DLL void * H5VL_attr_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_attr_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL_attr_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_attr_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t aapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_attr_read(const H5VL_object_t *vol_obj, hid_t dtype_id, void *buf, hid_t dxpl_id, void **req); @@ -172,10 +172,10 @@ H5_DLL herr_t H5VL_attr_optional(const H5VL_object_t *vol_obj, H5VL_optional_arg H5_DLL herr_t H5VL_attr_close(const H5VL_object_t *vol_obj, hid_t dxpl_id, void **req); /* Dataset functions */ -H5_DLL void * H5VL_dataset_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_dataset_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL_dataset_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_dataset_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t dapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_dataset_read(const H5VL_object_t *vol_obj, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf, void **req); @@ -190,10 +190,10 @@ H5_DLL herr_t H5VL_dataset_optional(const H5VL_object_t *vol_obj, H5VL_optional_ H5_DLL herr_t H5VL_dataset_close(const H5VL_object_t *vol_obj, hid_t dxpl_id, void **req); /* Datatype functions */ -H5_DLL void * H5VL_datatype_commit(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_datatype_commit(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL_datatype_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_datatype_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_datatype_get(const H5VL_object_t *vol_obj, H5VL_datatype_get_args_t *args, hid_t dxpl_id, void **req); @@ -206,9 +206,9 @@ H5_DLL herr_t H5VL_datatype_optional_op(H5VL_object_t *vol_obj, H5VL_optional_ar H5_DLL herr_t H5VL_datatype_close(const H5VL_object_t *vol_obj, hid_t dxpl_id, void **req); /* File functions */ -H5_DLL void * H5VL_file_create(const H5VL_connector_prop_t *connector_prop, const char *name, unsigned flags, +H5_DLL void *H5VL_file_create(const H5VL_connector_prop_t *connector_prop, const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL_file_open(H5VL_connector_prop_t *connector_prop, const char *name, unsigned flags, +H5_DLL void *H5VL_file_open(H5VL_connector_prop_t *connector_prop, const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_file_get(const H5VL_object_t *vol_obj, H5VL_file_get_args_t *args, hid_t dxpl_id, void **req); @@ -219,10 +219,10 @@ H5_DLL herr_t H5VL_file_optional(const H5VL_object_t *vol_obj, H5VL_optional_arg H5_DLL herr_t H5VL_file_close(const H5VL_object_t *vol_obj, hid_t dxpl_id, void **req); /* Group functions */ -H5_DLL void * H5VL_group_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_group_create(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id, void **req); -H5_DLL void * H5VL_group_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, +H5_DLL void *H5VL_group_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *loc_params, const char *name, hid_t gapl_id, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_group_get(const H5VL_object_t *vol_obj, H5VL_group_get_args_t *args, hid_t dxpl_id, void **req); @@ -250,7 +250,7 @@ H5_DLL herr_t H5VL_link_optional(const H5VL_object_t *vol_obj, const H5VL_loc_pa H5VL_optional_args_t *args, hid_t dxpl_id, void **req); /* Object functions */ -H5_DLL void * H5VL_object_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *params, +H5_DLL void *H5VL_object_open(const H5VL_object_t *vol_obj, const H5VL_loc_params_t *params, H5I_type_t *opened_type, hid_t dxpl_id, void **req); H5_DLL herr_t H5VL_object_copy(const H5VL_object_t *src_obj, const H5VL_loc_params_t *src_loc_params, const char *src_name, const H5VL_object_t *dst_obj, @@ -24,7 +24,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; @@ -441,7 +441,7 @@ H5VM_hyper_copy(unsigned n, const hsize_t *_size, const hsize_t *dst_size, const void *_dst, 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 */ @@ -653,7 +653,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 */ @@ -719,7 +719,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 */ @@ -784,7 +784,7 @@ H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsiz const hsize_t *dst_stride, void *_dst, 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]; @@ -1269,7 +1269,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 */ @@ -1471,11 +1471,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 */ @@ -822,7 +822,7 @@ H5Z__prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_typ /* 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 */ @@ -1288,7 +1288,7 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags, unsigned *filter_mask /*i int fclass_idx; /* Index of filter class in global table */ H5Z_class2_t *fclass = NULL; /* Filter class pointer */ #ifdef H5Z_DEBUG - H5Z_stats_t * fstats = NULL; /* Filter stats pointer */ + H5Z_stats_t *fstats = NULL; /* Filter stats pointer */ H5_timer_t timer; /* Timer for filter operations */ H5_timevals_t times; /* Elapsed time for each operation */ #endif diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 1b7bbea..00d12c1 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/H5Zdevelop.h b/src/H5Zdevelop.h index ae9f8ef..a7f332b 100644 --- a/src/H5Zdevelop.h +++ b/src/H5Zdevelop.h @@ -39,7 +39,7 @@ */ typedef struct H5Z_cb_t { H5Z_filter_func_t func; - void * op_data; + void *op_data; } H5Z_cb_t; /** @@ -161,7 +161,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 */ @@ -436,7 +436,7 @@ H5_DLL herr_t H5Zunregister(H5Z_filter_t id); //! <!-- [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/H5Zfletcher32.c b/src/H5Zfletcher32.c index 03c014e..22d1dd7 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 f14aa46..43dd0c1 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -216,7 +216,7 @@ H5Z__calc_parms_atomic(size_t *cd_values_actual_nparms) static herr_t H5Z__calc_parms_array(const H5T_t *type, size_t *cd_values_actual_nparms) { - 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 */ @@ -299,7 +299,7 @@ static herr_t H5Z__calc_parms_compound(const H5T_t *type, size_t *cd_values_actual_nparms) { 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 */ unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ @@ -531,7 +531,7 @@ static herr_t H5Z__set_parms_array(const H5T_t *type, unsigned *cd_values_index, unsigned cd_values[], hbool_t *need_not_compress) { - 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 */ @@ -636,7 +636,7 @@ H5Z__set_parms_compound(const H5T_t *type, unsigned *cd_values_index, unsigned c { int snmembers; /* Compound datatype's number of members */ unsigned 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) */ @@ -780,13 +780,13 @@ 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 */ unsigned cd_values_index; /* Index of array cd_values */ size_t cd_values_actual_nparms; /* Number of parameters in array cd_values[] */ 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 */ hbool_t need_not_compress; /* Flag if TRUE indicating no need to do nbit compression */ diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index 13eb26f..764f4cc 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -58,10 +58,10 @@ 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 */ }; /*****************************/ @@ -83,12 +83,12 @@ 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 htri_t H5Z_ignore_filters(hid_t dcpl_id, const H5T_t *type, const H5S_t *space); +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 htri_t H5Z_ignore_filters(hid_t dcpl_id, const H5T_t *type, const H5S_t *space); 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); @@ -105,6 +105,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/H5Zscaleoffset.c b/src/H5Zscaleoffset.c index 4865cc6..61b3fe4 100644 --- a/src/H5Zscaleoffset.c +++ b/src/H5Zscaleoffset.c @@ -130,7 +130,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 */ \ \ @@ -259,7 +259,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 */ \ \ @@ -452,7 +452,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) \ do { \ - 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 */ \ @@ -489,7 +489,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) \ do { \ - 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; \ \ @@ -505,8 +505,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 == \ @@ -597,7 +598,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ #define H5Z_scaleoffset_precompress_3(type, pow_fun, abs_fun, round_fun, lround_fun, llround_fun, data, \ d_nelmts, filavail, cd_values, minbits, minval, D_val) \ do { \ - 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; \ \ @@ -631,7 +632,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) \ do { \ - type * buf = (type *)data, filval = 0; \ + type *buf = (type *)data, filval = 0; \ unsigned i; \ \ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \ @@ -646,7 +647,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) \ do { \ - type * buf = (type *)data, filval = 0; \ + type *buf = (type *)data, filval = 0; \ unsigned i; \ \ if (filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \ @@ -694,10 +695,12 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ : (type)(*(long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + min); \ else if (sizeof(type) == sizeof(long long)) \ for (i = 0; i < d_nelmts; i++) \ - buf[i] = (type)( \ - (*(long long *)((void *)&buf[i]) == (long long)(((unsigned long long)1 << minbits) - 1)) \ - ? filval \ - : (type)(*(long long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + min); \ + buf[i] = \ + (type)((*(long long *)((void *)&buf[i]) == \ + (long long)(((unsigned long long)1 << minbits) - 1)) \ + ? filval \ + : (type)(*(long long *)((void *)&buf[i])) / pow_fun((type)10, (type)D_val) + \ + min); \ else \ HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \ } @@ -722,7 +725,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{ #define H5Z_scaleoffset_postdecompress_3(type, pow_fun, data, d_nelmts, filavail, cd_values, minbits, \ minval, D_val) \ do { \ - 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) \ @@ -929,9 +932,9 @@ done: 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 */ @@ -1121,7 +1124,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu 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 */ @@ -1229,7 +1232,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu */ 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; @@ -1451,7 +1454,7 @@ H5Z__scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffs 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 e35a63a..3db9638 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 c8f5014..56b816e 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 ecca109..accabc1 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,29 +71,29 @@ 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); static hid_t H5Z__xform_find_type(const H5T_t *type); static herr_t H5Z__xform_eval_full(H5Z_node *tree, size_t array_size, 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); @@ -107,7 +107,7 @@ static void H5Z__xform_reduce_tree(H5Z_node *tree); size_t u; \ \ if (((RESL).type == H5Z_XFORM_SYMBOL) && ((RESR).type != H5Z_XFORM_SYMBOL)) { \ - TYPE * p; \ + TYPE *p; \ double tree_val; \ \ tree_val = \ @@ -120,7 +120,7 @@ static void H5Z__xform_reduce_tree(H5Z_node *tree); } \ } \ 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 */ \ @@ -545,7 +545,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_PACKAGE @@ -945,7 +945,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 cf92398..6dff2bb 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -66,7 +66,7 @@ static const char *FileHeader = "\n\ * 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 */ @@ -132,7 +132,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; \ @@ -726,7 +726,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; @@ -782,7 +782,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 10579e4..7768741 100644 --- a/src/H5make_libsettings.c +++ b/src/H5make_libsettings.c @@ -149,7 +149,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; @@ -171,7 +171,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/H5mpi.c b/src/H5mpi.c index f951e1e..e95b590 100644 --- a/src/H5mpi.c +++ b/src/H5mpi.c @@ -341,9 +341,9 @@ herr_t H5_mpi_info_cmp(MPI_Info info1, MPI_Info info2, int *result) { hbool_t same = FALSE; - char * key = NULL; - char * value1 = NULL; - char * value2 = NULL; + char *key = NULL; + char *value1 = NULL; + char *value2 = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) @@ -627,7 +627,7 @@ H5_mpio_gatherv_alloc(void *send_buf, int send_count, MPI_Datatype send_type, co MPI_Comm comm, int mpi_rank, int mpi_size, void **out_buf, size_t *out_buf_num_entries) { size_t recv_buf_num_entries = 0; - void * recv_buf = NULL; + void *recv_buf = NULL; #if H5_CHECK_MPI_VERSION(3, 0) MPI_Count type_lb; MPI_Count type_extent; @@ -720,7 +720,7 @@ H5_mpio_gatherv_alloc_simple(void *send_buf, int send_count, MPI_Datatype send_t hbool_t allgather, int root, MPI_Comm comm, int mpi_rank, int mpi_size, void **out_buf, size_t *out_buf_num_entries) { - int * recv_counts_disps_array = NULL; + int *recv_counts_disps_array = NULL; int mpi_code; herr_t ret_value = SUCCEED; @@ -760,7 +760,7 @@ H5_mpio_gatherv_alloc_simple(void *send_buf, int send_count, MPI_Datatype send_t /* Set the displacements into the receive buffer for the gather operation */ if (allgather || (mpi_rank == root)) { size_t i; - int * displacements_ptr; + int *displacements_ptr; displacements_ptr = &recv_counts_disps_array[mpi_size]; diff --git a/src/H5private.h b/src/H5private.h index e09cdbd..87345ab 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -579,7 +579,7 @@ H5_DLL herr_t H5_timer_start(H5_timer_t *timer /*in,out*/); H5_DLL herr_t H5_timer_stop(H5_timer_t *timer /*in,out*/); H5_DLL herr_t H5_timer_get_times(H5_timer_t timer, H5_timevals_t *times /*in,out*/); H5_DLL herr_t H5_timer_get_total_times(H5_timer_t timer, H5_timevals_t *times /*in,out*/); -H5_DLL char * H5_timer_get_time_string(double seconds); +H5_DLL char *H5_timer_get_time_string(double seconds); /* Depth of object copy */ typedef enum { @@ -1742,17 +1742,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; @@ -2490,7 +2490,7 @@ H5_DLL herr_t H5CX_pop(hbool_t update_dxpl_props); * pointers but do not write to their targets or return pointers to const * specified locations. This helps us avoid compiler warnings. */ typedef union { - void * vp; + void *vp; const void *cvp; } H5_flexible_const_ptr_t; @@ -2587,7 +2587,7 @@ enum h5_arg_level { * end. */ struct h5_long_options { - const char * name; /* Name of the long option */ + const char *name; /* Name of the long option */ enum h5_arg_level has_arg; /* Whether we should look for an arg */ char shortval; /* The shortname equivalent of long arg * this gets returned from get_option diff --git a/src/H5system.c b/src/H5system.c index a369e3d..22c9578 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -73,7 +73,7 @@ static hbool_t H5_ntzset = FALSE; int HDvasprintf(char **bufp, const char *fmt, va_list _ap) { - char * buf; /* buffer to receive formatted string */ + char *buf; /* buffer to receive formatted string */ size_t bufsz; /* size of buffer to allocate */ for (bufsz = 32; (buf = HDmalloc(bufsz)) != NULL;) { @@ -659,9 +659,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 @@ -682,7 +682,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; @@ -909,7 +909,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 @@ -976,7 +976,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct /* long command line option */ int i; const char ch = '='; - char * arg = HDstrdup(&argv[H5_optind][2]); + char *arg = HDstrdup(&argv[H5_optind][2]); size_t arg_len = 0; H5_optarg = strchr(&argv[H5_optind][2], ch); diff --git a/src/H5trace.c b/src/H5trace.c index 8790a88..8df2984 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -240,7 +240,7 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) int argno = 0, ptr, asize_idx; hssize_t asize[16]; hssize_t i; - void * vp = NULL; + void *vp = NULL; /* FUNC_ENTER() should not be called */ @@ -2238,7 +2238,7 @@ H5_trace_args(H5RS_str_t *rs, const char *type, va_list ap) case 'p': /* H5P_class_t */ { 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 */ @@ -3956,9 +3956,9 @@ double H5_trace(const double *returning, const char *func, const char *type, ...) { va_list ap; - H5RS_str_t * rs = NULL; + H5RS_str_t *rs = NULL; hssize_t i; - FILE * out = H5_debug_g.trace; + FILE *out = H5_debug_g.trace; static hbool_t is_first_invocation = TRUE; H5_timer_t function_timer; H5_timevals_t function_times = {0.0, 0.0, 0.0}; diff --git a/src/H5win32defs.h b/src/H5win32defs.h index d3ad098..c027602 100644 --- a/src/H5win32defs.h +++ b/src/H5win32defs.h @@ -99,11 +99,11 @@ struct timezone { #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 int Wflock(int fd, int operation); -H5_DLL char * Wgetlogin(void); -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 int Wflock(int fd, int operation); +H5_DLL char *Wgetlogin(void); +H5_DLL herr_t H5_expand_windows_env_vars(char **env_var); H5_DLL 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/src/uthash.h b/src/uthash.h index f259ba2..ecf512d 100644 --- a/src/uthash.h +++ b/src/uthash.h @@ -534,7 +534,7 @@ typedef unsigned char uint8_t; if (head) { \ unsigned _bkt_i; \ unsigned _count = 0; \ - char * _prev; \ + char *_prev; \ for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) { \ unsigned _bkt_count = 0; \ _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ @@ -875,7 +875,7 @@ typedef unsigned char uint8_t; unsigned _he_bkt; \ unsigned _he_bkt_i; \ struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ - UT_hash_bucket * _he_new_buckets, *_he_newbkt; \ + UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ _he_new_buckets = \ (UT_hash_bucket *)uthash_malloc(sizeof(struct UT_hash_bucket) * (tbl)->num_buckets * 2U); \ if (!_he_new_buckets) { \ @@ -1018,7 +1018,7 @@ typedef unsigned char uint8_t; #define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ do { \ unsigned _src_bkt, _dst_bkt; \ - void * _last_elt = NULL, *_elt; \ + void *_last_elt = NULL, *_elt; \ UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh = NULL; \ ptrdiff_t _dst_hho = ((char *)(&(dst)->hh_dst) - (char *)(dst)); \ if ((src) != NULL) { \ @@ -1126,7 +1126,7 @@ typedef struct UT_hash_bucket { #define HASH_BLOOM_SIGNATURE 0xb12220f2u typedef struct UT_hash_table { - UT_hash_bucket * buckets; + UT_hash_bucket *buckets; unsigned num_buckets, log2_num_buckets; unsigned num_items; struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ @@ -1159,12 +1159,12 @@ typedef struct UT_hash_table { } UT_hash_table; typedef struct UT_hash_handle { - struct UT_hash_table * tbl; - void * prev; /* prev element in app order */ - void * next; /* next element in app order */ + struct UT_hash_table *tbl; + void *prev; /* prev element in app order */ + void *next; /* next element in app order */ struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ struct UT_hash_handle *hh_next; /* next hh in bucket order */ - const void * key; /* ptr to enclosing struct's key */ + const void *key; /* ptr to enclosing struct's key */ unsigned keylen; /* enclosing struct's key len */ unsigned hashv; /* result of hash-fcn(key) */ } UT_hash_handle; diff --git a/test/accum.c b/test/accum.c index 58b6c28..bb604f3 100644 --- a/test/accum.c +++ b/test/accum.c @@ -91,7 +91,7 @@ main(void) hid_t fid = -1; hid_t fapl = -1; /* File access property list */ char filename[1024]; - H5F_t * f = NULL; /* File for all tests */ + H5F_t *f = NULL; /* File for all tests */ /* Test Setup */ HDputs("Testing the metadata accumulator"); @@ -1942,8 +1942,8 @@ test_random_write(H5F_t *f) { 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 */ @@ -2096,13 +2096,13 @@ test_swmr_write_big(hbool_t newest_format) hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* File access property list */ - H5F_t * rf = NULL; /* File pointer */ + H5F_t *rf = NULL; /* File pointer */ char filename[1024]; uint8_t *wbuf2 = NULL, *rbuf = NULL; /* Buffers for reading & writing */ uint8_t wbuf[1024]; /* Buffer for reading & writing */ unsigned u; /* Local index variable */ hbool_t process_success = FALSE; - char * driver = NULL; /* VFD string (from env variable) */ + char *driver = NULL; /* VFD string (from env variable) */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ if (newest_format) diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 7bbc57c..491f0a3 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -45,12 +45,12 @@ main(void) { hid_t fid = -1; /* File ID */ hid_t fapl = -1; /* file access property list ID */ - H5F_t * f = NULL; /* File pointer */ + H5F_t *f = NULL; /* File pointer */ char filename[1024]; unsigned u; /* Local index variable */ uint8_t rbuf[1024]; /* Buffer for reading */ uint8_t buf[1024]; /* Buffer for holding the expected data */ - char * driver = NULL; /* VFD string (from env variable) */ + char *driver = NULL; /* VFD string (from env variable) */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ /* Skip this test if SWMR I/O is not supported for the VFD specified @@ -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 d72bd3d..20e08bd 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -342,7 +342,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); @@ -368,7 +368,7 @@ static int iter_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * idx = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *idx = (H5B2_test_rec_t *)_op_data; if (record->key != idx->key) return (H5_ITER_ERROR); @@ -397,7 +397,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); @@ -422,7 +422,7 @@ static int find_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * search = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; if (record->key != search->key) return (FALSE); @@ -450,7 +450,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); @@ -475,7 +475,7 @@ static int index_rec_cb(const void *_record, void *_op_data) { const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; - H5B2_test_rec_t * search = (H5B2_test_rec_t *)_op_data; + H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; HDassert(record); HDassert(search); @@ -503,7 +503,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; @@ -602,7 +602,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; @@ -626,7 +626,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 */ 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 */ @@ -867,8 +867,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1053,8 +1053,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1206,8 +1206,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1367,8 +1367,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1509,8 +1509,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1627,8 +1627,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -1822,8 +1822,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2050,8 +2050,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2284,8 +2284,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2455,8 +2455,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2634,8 +2634,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2811,8 +2811,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -2990,13 +2990,13 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -3232,8 +3232,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t modify; /* Modified value */ @@ -3642,8 +3642,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t modify; /* Modified value */ @@ -3904,8 +3904,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -4061,8 +4061,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -4226,8 +4226,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t idx; /* Index within B-tree, for iterator */ @@ -4372,8 +4372,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_stat_t bt2_stat; /* Statistics about B-tree created */ @@ -4493,8 +4493,8 @@ static unsigned test_update_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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ H5B2_test_rec_t record; /* Record to insert into tree */ H5B2_test_rec_t find; /* Record to find */ @@ -5084,8 +5084,8 @@ static unsigned test_update_lots(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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ time_t curr_time; /* Current time, for seeding random number generator */ H5B2_test_rec_t *records; /* Record #'s for random insertion */ @@ -5336,7 +5336,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 */ 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 */ @@ -5649,8 +5649,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -5873,8 +5873,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6069,8 +6069,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6247,8 +6247,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6372,8 +6372,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6599,8 +6599,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6747,8 +6747,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -6895,8 +6895,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7040,8 +7040,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7184,8 +7184,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7322,8 +7322,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7608,8 +7608,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7759,8 +7759,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -7910,8 +7910,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8062,8 +8062,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8214,8 +8214,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8340,8 +8340,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8465,8 +8465,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8591,8 +8591,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8717,8 +8717,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -8795,17 +8795,17 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + void *file_data = NULL; /* Copy of file data */ + 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 */ @@ -9236,12 +9236,12 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -9462,10 +9462,10 @@ 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 */ - 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 */ @@ -9733,8 +9733,8 @@ 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 */ - H5B2_t * bt2 = NULL; /* v2 B-tree wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + 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 */ @@ -9984,8 +9984,8 @@ test_open_twice_diff(hid_t fapl, const H5B2_create_t *cparam) hid_t file2 = -1; /* File ID */ hid_t file0 = -1; /* File ID */ hid_t file00 = -1; /* File ID */ - 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 */ H5B2_t *bt2 = NULL; /* v2 B-tree wrapper */ H5B2_t *bt2_2 = NULL; /* Second v2 B-tree wrapper */ haddr_t bt2_addr; /* Address of B-tree created */ @@ -10123,7 +10123,7 @@ main(void) unsigned nerrors = 0; /* Cumulative error count */ unsigned reopen; /* Whether to reopen B-tree during tests */ int ExpressMode; - const char * envval = NULL; + const char *envval = NULL; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ envval = HDgetenv(HDF5_DRIVER); diff --git a/test/cache.c b/test/cache.c index 45e6263..3c6c818 100644 --- a/test/cache.c +++ b/test/cache.c @@ -259,7 +259,7 @@ smoke_check_1(int express_test, unsigned paged) int32_t lag = 10; int32_t max_index = (10 * 1024) - 1; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #1P -- all clean, ins, dest, ren, 4/2 MB cache"); @@ -457,7 +457,7 @@ smoke_check_2(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #2P -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache"); @@ -654,7 +654,7 @@ smoke_check_3(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #3P -- all clean, ins, dest, ren, 2/1 KB cache"); @@ -852,7 +852,7 @@ smoke_check_4(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; int32_t lag = 10; int mile_stone = 1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; if (paged) TESTING("smoke check #4P -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache"); @@ -1049,8 +1049,8 @@ smoke_check_5(int express_test, unsigned paged) 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 @@ -1281,8 +1281,8 @@ smoke_check_6(int express_test, unsigned paged) 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 @@ -1513,8 +1513,8 @@ smoke_check_7(int express_test, unsigned paged) 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 @@ -1746,8 +1746,8 @@ smoke_check_8(int express_test, unsigned paged) 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 @@ -1989,8 +1989,8 @@ smoke_check_9(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; 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; if (paged) TESTING("smoke check #9P -- all clean, ins, dest, ren, 4/2 MB, corked"); @@ -2307,8 +2307,8 @@ smoke_check_10(int express_test, unsigned paged) int32_t max_index = (10 * 1024) - 1; 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; if (paged) TESTING("smoke check #10P -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked"); @@ -2621,7 +2621,7 @@ write_permitted_check(int int32_t max_index = (10 * 1024) - 1; 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 */ @@ -2833,10 +2833,10 @@ check_insert_entry(unsigned paged) 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; if (paged) @@ -4468,7 +4468,7 @@ static void check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, unsigned int spec_size, struct flush_cache_test_spec spec[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned u; size_t total_entry_size = 0; @@ -4653,7 +4653,7 @@ static void check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int flush_flags, unsigned int spec_size, struct pe_flush_cache_test_spec spec[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned u; int j; @@ -4847,8 +4847,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) const int max_num_spec = 10; const int max_num_check = 4; struct fo_flush_cache_test_spec *spec = NULL; - struct fo_flush_entry_check * checks = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + struct fo_flush_entry_check *checks = NULL; + H5C_t *cache_ptr = file_ptr->shared->cache; if (cache_ptr == NULL) { @@ -8221,7 +8221,7 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu unsigned expected_index_len, size_t expected_index_size, int check_size, struct fo_flush_entry_check check[]) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; int i; int j; @@ -8613,7 +8613,7 @@ static void check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; const int num_variable_entries = 10; const int num_monster_entries = 31; @@ -11065,7 +11065,7 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty hbool_t expected_deserialized, hbool_t expected_serialized, hbool_t expected_destroyed) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; test_entry_t *base_addr; test_entry_t *entry_ptr = NULL; @@ -11213,7 +11213,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e unsigned int flush_flags, hbool_t expected_serialized, hbool_t expected_destroyed) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; static char msg[128]; hbool_t expected_deserialized = TRUE; test_entry_t *base_addr; @@ -11377,7 +11377,7 @@ check_get_entry_status(unsigned paged) 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; @@ -11598,7 +11598,7 @@ check_expunge_entry(unsigned paged) 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; @@ -12263,7 +12263,7 @@ static unsigned check_move_entry(unsigned paged) { unsigned u; - 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, @@ -12364,11 +12364,11 @@ check_move_entry(unsigned paged) static void check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry_test_spec *spec_ptr) { - 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; if (cache_ptr == NULL) { @@ -12520,7 +12520,7 @@ check_pin_protected_entry(unsigned paged) { 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; @@ -12633,8 +12633,8 @@ check_resize_entry(unsigned paged) 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 = NULL; @@ -13500,8 +13500,8 @@ check_evictions_enabled(unsigned paged) 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; @@ -14422,7 +14422,7 @@ static unsigned check_duplicate_insert_err(unsigned paged) { herr_t result = -1; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -14506,7 +14506,7 @@ static unsigned check_double_pin_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14595,7 +14595,7 @@ static unsigned check_double_unpin_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14693,7 +14693,7 @@ static unsigned check_pin_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14800,8 +14800,8 @@ check_pin_entry_errs(unsigned paged) static unsigned check_double_protect_err(unsigned paged) { - H5F_t * file_ptr = NULL; - test_entry_t * entry_ptr; + H5F_t *file_ptr = NULL; + test_entry_t *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (paged) @@ -14883,7 +14883,7 @@ static unsigned check_double_unprotect_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -14964,7 +14964,7 @@ static unsigned check_mark_entry_dirty_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15047,7 +15047,7 @@ static unsigned check_expunge_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15159,8 +15159,8 @@ static unsigned check_move_entry_errs(unsigned paged) { 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_ptr = NULL; test_entry_t *entry_0_0_ptr; test_entry_t *entry_0_1_ptr; @@ -15276,7 +15276,7 @@ static unsigned check_resize_entry_errs(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15377,7 +15377,7 @@ static unsigned check_unprotect_ro_dirty_err(unsigned paged) { herr_t result; - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; if (paged) @@ -15501,9 +15501,9 @@ check_unprotect_ro_dirty_err(unsigned paged) static unsigned check_protect_ro_rw_err(unsigned paged) { - H5F_t * file_ptr = NULL; + H5F_t *file_ptr = NULL; test_entry_t *entry_ptr; - void * thing_ptr = NULL; + void *thing_ptr = NULL; if (paged) TESTING("protect a read only entry rw error (paged aggregation)"); @@ -15582,10 +15582,10 @@ check_protect_ro_rw_err(unsigned paged) static unsigned check_protect_retries(unsigned paged) { - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - test_entry_t * base_addr = NULL; - test_entry_t * entry_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + test_entry_t *base_addr = NULL; + test_entry_t *entry_ptr = NULL; H5C_cache_entry_t *cache_entry_ptr = NULL; int32_t type; int32_t idx; @@ -15719,8 +15719,8 @@ check_check_evictions_enabled_err(unsigned paged) { 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; if (paged) TESTING("get/set evictions enabled errors (paged aggregation)"); @@ -15872,8 +15872,8 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) 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, @@ -19727,8 +19727,8 @@ check_auto_cache_resize_disable(unsigned paged) 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, @@ -22326,8 +22326,8 @@ check_auto_cache_resize_epoch_markers(unsigned paged) 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, @@ -23014,8 +23014,8 @@ static unsigned check_auto_cache_resize_input_errs(unsigned paged) { 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, @@ -25247,8 +25247,8 @@ check_auto_cache_resize_aux_fcns(unsigned paged) { 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; @@ -25750,8 +25750,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) struct expected_entry_status *expected = NULL; 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; @@ -26467,8 +26467,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) static unsigned check_flush_deps(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ test_entry_t *base_addr; /* Base address of entries for test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned u; /* Local index variable */ @@ -28390,7 +28390,7 @@ done: static unsigned check_flush_deps_err(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned test_count; /* Test iteration variable */ @@ -28665,8 +28665,8 @@ done: static unsigned check_flush_deps_order(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ int entry_type = PICO_ENTRY_TYPE; /* Use very small entry size (size of entries doesn't matter) */ unsigned u; /* Local index variable */ unsigned flush_order; /* Index for tracking flush order */ @@ -31394,8 +31394,8 @@ done: static unsigned check_notify_cb(unsigned paged) { - H5F_t * file_ptr = NULL; /* File for this test */ - H5C_t * cache_ptr = NULL; /* Metadata cache for this test */ + H5F_t *file_ptr = NULL; /* File for this test */ + H5C_t *cache_ptr = NULL; /* Metadata cache for this test */ test_entry_t *base_addr; /* Base address of entries for test */ test_entry_t *entry_ptr; /* Cache entry to examine/manipulate */ int entry_type = NOTIFY_ENTRY_TYPE; /* Use entry w/notify callback (size of entries doesn't matter) */ @@ -31612,11 +31612,11 @@ static unsigned check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) { struct expected_entry_status *expected = NULL; - const char * fcn_name = "check_metadata_cork"; + const char *fcn_name = "check_metadata_cork"; 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; @@ -32320,7 +32320,7 @@ static void cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; expected = HDmalloc(36 * sizeof(struct expected_entry_status)); @@ -32560,7 +32560,7 @@ static void cedds__H5C_make_space_in_cache(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; const int num_huge_entries = 4; const int num_monster_entries = 32; @@ -32922,7 +32922,7 @@ static void cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) { struct expected_entry_status *expected = NULL; - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; herr_t result; H5C_auto_size_ctl_t saved_auto_size_ctl; @@ -33381,12 +33381,12 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) static void cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) { - H5C_t * cache_ptr = file_ptr->shared->cache; + H5C_t *cache_ptr = file_ptr->shared->cache; int i; int expected_hash_bucket = 0; haddr_t entry_addr; - test_entry_t * entry_ptr; - test_entry_t * base_addr = NULL; + test_entry_t *entry_ptr; + test_entry_t *base_addr = NULL; struct H5C_cache_entry_t *scan_ptr; /* clang-format off */ struct expected_entry_status expected[5] = @@ -34193,9 +34193,9 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) 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; hid_t fcpl_id = H5P_DEFAULT; diff --git a/test/cache_api.c b/test/cache_api.c index 1decef9..4deb905 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -69,8 +69,8 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) 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, diff --git a/test/cache_common.c b/test/cache_common.c index 41aa128..5146073 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -137,7 +137,7 @@ static void mark_flush_dep_clean(test_entry_t *entry_ptr); static herr_t get_initial_load_size(void *udata_ptr, size_t *image_len_ptr, int32_t entry_type); static herr_t get_final_load_size(const void *image, size_t image_len, void *udata, size_t *actual_len, int32_t entry_type); -static void * deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, +static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, int32_t entry_type); static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type); static herr_t pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, @@ -1805,8 +1805,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); @@ -2807,7 +2807,7 @@ void cork_entry_type(H5F_t *file_ptr, int32_t type) { if (pass) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t baddrs; cache_ptr = file_ptr->shared->cache; @@ -2842,7 +2842,7 @@ void uncork_entry_type(H5F_t *file_ptr, int32_t type) { if (pass) { - H5C_t * cache_ptr; + H5C_t *cache_ptr; haddr_t baddrs; cache_ptr = file_ptr->shared->cache; @@ -2877,7 +2877,7 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type) 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; @@ -3130,9 +3130,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; haddr_t baddrs; H5C_cache_entry_t *cache_entry_ptr; @@ -3230,9 +3230,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) { @@ -3526,7 +3526,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t local_max_index; @@ -3856,7 +3856,7 @@ void hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t i; @@ -3950,7 +3950,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; int32_t local_max_index; @@ -4208,7 +4208,7 @@ void hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; int32_t idx; int32_t i; @@ -4301,7 +4301,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t local_max_index[NUMBER_OF_ENTRY_TYPES]; @@ -4393,7 +4393,7 @@ hl_col_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, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx; int32_t lag = 200; @@ -4496,7 +4496,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int mile_stone = 1; int32_t type; int32_t idx; @@ -4600,7 +4600,7 @@ hl_col_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, int dirty_unprotects) { - H5C_t * cache_ptr = NULL; + H5C_t *cache_ptr = NULL; int32_t type = 0; int32_t idx = -1; int32_t lag = 50; @@ -4961,8 +4961,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) { @@ -5090,8 +5090,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c size_t cur_size; uint32_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) { @@ -5253,8 +5253,8 @@ void validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t compare_init, int test_num) { 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 3280511..acc05f0 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -264,7 +264,7 @@ typedef struct test_entry_t { * sanity checking. */ test_entry_action_t action; /* Action being performed on a test entry */ - H5F_t * file_ptr; /* pointer to the file in which the + H5F_t *file_ptr; /* pointer to the file in which the * entry resides, or NULL if the entry * is not in a file. */ @@ -393,7 +393,7 @@ typedef struct test_entry_t { unsigned flush_dep_npar; /* Number of flush dependency parents */ unsigned flush_dep_nchd; /* Number of flush dependency children */ unsigned - flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ + flush_dep_ndirty_chd; /* Number of dirty flush dependency children (including grandchildren, etc.) */ hbool_t pinned_from_client; /* entry was pinned by client call */ hbool_t pinned_from_cache; /* entry was pinned by cache internally */ unsigned flush_order; /* Order that entry was flushed in */ diff --git a/test/cache_image.c b/test/cache_image.c index 9a4b6b7..d07db67 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -507,7 +507,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl hbool_t config_fsm, hbool_t set_eoc, const char *hdf_file_name, unsigned cache_image_flags, hid_t *file_id_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr) { - const char * fcn_name = "open_hdf5_file()"; + const char *fcn_name = "open_hdf5_file()"; hbool_t show_progress = FALSE; hbool_t verbose = FALSE; int cp = 0; @@ -515,8 +515,8 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl hid_t fcpl_id = -1; hid_t file_id = -1; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; @@ -870,7 +870,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl static void attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fapl, const char *hdf_file_name) { - const char * fcn_name = "attempt_swmr_open_hdf5_file()"; + const char *fcn_name = "attempt_swmr_open_hdf5_file()"; hbool_t show_progress = FALSE; int cp = 0; hid_t fapl_id = -1; @@ -1274,8 +1274,8 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 1"); @@ -1551,8 +1551,8 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 2"); @@ -1815,8 +1815,8 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 3"); @@ -2181,8 +2181,8 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 4"); @@ -2510,8 +2510,8 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 5"); @@ -2791,8 +2791,8 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image control flow test 6"); @@ -3077,8 +3077,8 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image smoke check 1"); @@ -3488,8 +3488,8 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image smoke check 2"); @@ -3786,8 +3786,8 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image smoke check 3"); @@ -4163,8 +4163,8 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; int min_dset = 0; int max_dset = 0; @@ -4558,8 +4558,8 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) hbool_t show_progress = FALSE; hid_t file_id = -1; hid_t proc_gid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; int i; int min_group = 0; @@ -5054,12 +5054,12 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) static unsigned cache_image_smoke_check_6(hbool_t single_file_vfd) { - const char * fcn_name = "cache_image_smoke_check_6()"; + const char *fcn_name = "cache_image_smoke_check_6()"; char filename[512]; hbool_t show_progress = FALSE; 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; h5_stat_size_t file_size; int cp = 0; int min_dset = 0; @@ -5453,8 +5453,8 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image api error check 1"); @@ -5821,8 +5821,8 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image api error check 2"); @@ -6222,8 +6222,8 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; TESTING("metadata cache image api error check 3"); @@ -6499,13 +6499,13 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) static unsigned cache_image_api_error_check_4(hbool_t single_file_vfd) { - const char * fcn_name = "cache_image_api_error_check_4()"; + const char *fcn_name = "cache_image_api_error_check_4()"; char filename[512]; hbool_t show_progress = FALSE; hid_t 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; int cp = 0; H5AC_cache_image_config_t cache_image_config; @@ -7071,12 +7071,12 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) static unsigned get_free_sections_test(hbool_t single_file_vfd) { - const char * fcn_name = "get_free_sections_test()"; + const char *fcn_name = "get_free_sections_test()"; char filename[512]; hbool_t show_progress = FALSE; 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; h5_stat_size_t file_size; int cp = 0; @@ -7518,8 +7518,8 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) hbool_t show_progress = FALSE; hbool_t verbose = FALSE; 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; int cp = 0; #endif /* H5_HAVE_PARALLEL */ diff --git a/test/cache_logging.c b/test/cache_logging.c index 12f3d96..d62ab5e 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -38,7 +38,7 @@ test_logging_api(void) hbool_t is_enabled_out; hbool_t start_on_access; hbool_t start_on_access_out; - char * location = NULL; + char *location = NULL; size_t size; hid_t fid = -1; diff --git a/test/cache_tagging.c b/test/cache_tagging.c index f1571f0..6d15ee0 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -1789,7 +1789,7 @@ check_attribute_rename_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file output */ #endif /* NDEBUG */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -2002,7 +2002,7 @@ check_attribute_delete_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file output */ #endif /* NDEBUG */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -2680,7 +2680,7 @@ check_dataset_write_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during dataset write"); @@ -2838,7 +2838,7 @@ check_attribute_write_tags(hid_t fcpl, int type) #ifndef NDEBUG int verbose = FALSE; /* verbose file output */ #endif /* NDEBUG */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ int i, j, k = 0; /* iterators */ hid_t fapl = -1; /* File access prop list */ haddr_t root_tag = 0; @@ -3033,7 +3033,7 @@ check_dataset_read_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during dataset read"); @@ -3195,7 +3195,7 @@ check_dataset_size_retrieval(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dsize = 0; /* Testing Macro */ @@ -3359,7 +3359,7 @@ check_dataset_extend_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t newdims[2] = {DIMS * 2, DIMS}; /* dimensions */ /* Testing Macro */ @@ -3807,7 +3807,7 @@ check_link_removal_tags(hid_t fcpl, int type) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during link removal"); @@ -3996,7 +3996,7 @@ check_link_getname_tags(void) hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */ hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */ int i, j, k = 0; /* iterators */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ /* Testing Macro */ TESTING("tag application during link name retrieval"); @@ -4456,7 +4456,7 @@ check_invalid_tag_application(void) { #if H5C_DO_TAGGING_SANITY_CHECKS /* Variables */ - H5F_t * f = NULL; + H5F_t *f = NULL; hid_t fid = -1; haddr_t addr; H5HL_t *lheap = NULL; diff --git a/test/chunk_info.c b/test/chunk_info.c index f041c46..1ba02b0 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -504,11 +504,11 @@ test_get_chunk_info_highest_v18(hid_t fapl) #ifdef H5_HAVE_FILTER_DEFLATE int aggression = 9; /* Compression aggression setting */ const Bytef *z_src = (const Bytef *)(direct_buf); - Bytef * z_dst; /* Destination buffer */ + Bytef *z_dst; /* Destination buffer */ uLongf z_dst_nbytes = (uLongf)DEFLATE_SIZE_ADJUST(CHK_SIZE); uLong z_src_nbytes = (uLong)CHK_SIZE; #endif - void * inbuf = NULL; /* Pointer to new buffer */ + void *inbuf = NULL; /* Pointer to new buffer */ hsize_t chunk_size = CHK_SIZE; /* Size of a chunk, can be compressed or not */ hsize_t ii, jj; /* Array indices */ int n; /* Used as chunk index, but int to avoid conversion warning */ diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 83fa050..d985434 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -1713,7 +1713,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/cmpd_dtransform.c b/test/cmpd_dtransform.c index 0af24a9..6e38ec9 100644 --- a/test/cmpd_dtransform.c +++ b/test/cmpd_dtransform.c @@ -41,10 +41,10 @@ main(void) hid_t att_attr_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; const char *expr = "2*x"; - int * data = NULL; - int * data_res = NULL; - att_t * atts = NULL; - att_t * atts_res = NULL; + int *data = NULL; + int *data_res = NULL; + att_t *atts = NULL; + att_t *atts_res = NULL; /* Compound datatype */ if (NULL == (atts = HDmalloc(sizeof(att_t)))) diff --git a/test/cork.c b/test/cork.c index 53d9065..ad10fa2 100644 --- a/test/cork.c +++ b/test/cork.c @@ -101,8 +101,8 @@ verify_old_dset_cork(void) hsize_t dims[2] = {100, 20}; /* Dataset dimension sizes */ hsize_t max_dims[2] = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */ hsize_t chunk_dims[2] = {2, 5}; /* Dataset chunked dimension sizes */ - int ** buf = NULL; /* Data buffer (pointers to fake 2D array) */ - int * buf_data = NULL; /* Data buffer (actual data) */ + int **buf = NULL; /* Data buffer (pointers to fake 2D array) */ + int *buf_data = NULL; /* Data buffer (actual data) */ int i = 0, j = 0; /* Local index variables */ H5O_info2_t oinfo, oinfo2, oinfo3; /* Object metadata information */ hsize_t dims2[2] = {8, 16}; /* Dataset dimension sizes */ @@ -513,8 +513,8 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) hsize_t dims[2] = {100, 20}; /* Dataset dimension sizes */ hsize_t max_dims[2] = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */ hsize_t chunk_dims[2] = {2, 5}; /* Dataset chunked dimension sizes */ - int ** buf = NULL; /* Data buffer (pointers to fake 2D array) */ - int * buf_data = NULL; /* Data buffer (actual data) */ + int **buf = NULL; /* Data buffer (pointers to fake 2D array) */ + int *buf_data = NULL; /* Data buffer (actual data) */ int i = 0, j = 0; /* Local index variables */ H5O_info2_t oinfo, oinfo2, oinfo3; /* Object metadata information */ unsigned flags; /* File access flags */ @@ -1897,9 +1897,9 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) hsize_t cdims[RANK] = {2, 2}; /* Chunk dimensions */ int fillval = 0; /* Fill value */ int i, j, k = 0; /* Local index variables */ - int ** wbuf = NULL; /* Data buffer for writes (pointers to fake 2D array) */ - int * wbuf_data = NULL; /* Data buffer for writes (real data) */ - int * rbuf_data = NULL; /* Data buffer for reads (real data) */ + int **wbuf = NULL; /* Data buffer for writes (pointers to fake 2D array) */ + int *wbuf_data = NULL; /* Data buffer for writes (real data) */ + int *rbuf_data = NULL; /* Data buffer for reads (real data) */ hbool_t corked; /* Cork status of an object */ unsigned flags; /* File access flags */ diff --git a/test/dangle.c b/test/dangle.c index 7d8b851..f2b7497 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -541,7 +541,7 @@ test_dangle_force(void) hid_t aid, aid2; /* Attribute IDs */ hid_t tid, tid2; /* Named datatype IDs */ ssize_t count; /* Count of open objects */ - hid_t * objs = NULL; /* Pointer to list of open objects */ + hid_t *objs = NULL; /* Pointer to list of open objects */ size_t u; /* Local index variable */ TESTING("force dangling IDs to close, from API routines"); diff --git a/test/direct_chunk.c b/test/direct_chunk.c index 22f8be1..554a137 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.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 */ size_t buf_left = *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 */ size_t buf_left = *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 H5Dread_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 */ @@ -2167,7 +2167,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) - FAIL_STACK_ERROR; + FAIL_STACK_ERROR; /* * Close and release resources. @@ -2209,7 +2209,7 @@ test_single_chunk(unsigned config) else /* Read the data */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata) < 0) - FAIL_STACK_ERROR; + FAIL_STACK_ERROR; /* Verify that the data read was correct. */ for (i = 0; i < DIM0; i++) diff --git a/test/dsets.c b/test/dsets.c index 91f6315..6397d3d 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -283,14 +283,14 @@ const char *FILENAME[] = {"dataset", /* 0 */ /* Shared global arrays */ #define DSET_DIM1 100 #define DSET_DIM2 200 -int ** points = NULL; -int * points_data = NULL; +int **points = NULL; +int *points_data = NULL; double **points_dbl = NULL; -double * points_dbl_data = NULL; -int ** check = NULL; -int * check_data = NULL; +double *points_dbl_data = NULL; +int **check = NULL; +int *check_data = NULL; double **check_dbl = NULL; -double * check_dbl_data = NULL; +double *check_dbl_data = NULL; size_t count_nbytes_read = 0; size_t count_nbytes_written = 0; @@ -539,11 +539,11 @@ 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 = NULL; - int * rdata_bytes = NULL; + int **rdata = NULL; + int *rdata_bytes = NULL; TESTING("simple I/O"); @@ -703,8 +703,8 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hsize_t dims[2]; int f = -1; haddr_t offset; - int ** rdata = NULL; - int * rdata_bytes = NULL; + int **rdata = NULL; + int *rdata_bytes = NULL; TESTING("dataset offset with user block"); @@ -845,8 +845,8 @@ test_compact_io(hid_t fapl) int wbuf[16][8], rbuf[16][8]; char filename[FILENAME_BUF_SIZE]; H5F_libver_t low, high; /* File format bounds */ - H5F_t * fp; /* Internal file pointer */ - H5D_t * dsetp; /* Internal dataset pointer */ + H5F_t *fp; /* Internal file pointer */ + H5D_t *dsetp; /* Internal dataset pointer */ int i, j, n; /* Indices */ herr_t ret; /* Generic return value */ @@ -1063,8 +1063,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; @@ -1374,7 +1374,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 */ @@ -1545,7 +1545,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; @@ -1748,7 +1748,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 */ @@ -1808,7 +1808,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; @@ -1909,7 +1909,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 */ @@ -2852,7 +2852,7 @@ test_missing_filter(hid_t file) hsize_t dset_size; /* Dataset size */ size_t i, j; /* Local index variables */ herr_t ret; /* Generic return value */ - const char * testfile = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(FILE_DEFLATE_NAME); /* Corrected test file name */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ TESTING("dataset access with missing filter"); @@ -4275,7 +4275,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 */ @@ -4479,8 +4479,8 @@ test_nbit_int_size(hid_t file) hid_t dataspace, dataset, datatype, mem_datatype, dset_create_props; hsize_t dims[2], chunk_size[2]; hsize_t dset_size = 0; - int ** orig = NULL; - int * orig_data = NULL; + int **orig = NULL; + int *orig_data = NULL; double power; int i, j; size_t precision, offset; @@ -4660,7 +4660,7 @@ test_nbit_flt_size(hid_t file) hsize_t dims[2], chunk_size[2]; hsize_t dset_size = 0; float **orig = NULL; - float * orig_data = NULL; + float *orig_data = NULL; int i, j; size_t precision, offset; size_t spos, epos, esize, mpos, msize; @@ -7201,7 +7201,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 */ @@ -7575,12 +7575,12 @@ test_missing_chunk(hid_t file) hsize_t hs_start2[2], hs_stride2[2], hs_count2[2], hs_block2[2]; /* Hyperslab setting */ /* Buffers for reading/writing dataset */ - int * wdata = NULL; - int * rdata = NULL; + int *wdata = NULL; + int *rdata = NULL; int **wdata2 = NULL; int **rdata2 = NULL; - int * wdata2_bytes = NULL; - int * rdata2_bytes = NULL; + int *wdata2_bytes = NULL; + int *rdata2_bytes = NULL; /* Setting for 1-D dataset */ hsize_t dsize = 100, dmax = H5S_UNLIMITED; @@ -9057,12 +9057,12 @@ test_big_chunks_bypass_cache(hid_t fapl) /* Buffers for reading and writing data (1-D) */ int *wdata = NULL, *rdata1 = NULL, *rdata2 = NULL; /* Buffers for reading and writing data (2-D) */ - int ** t_wdata = NULL; - int ** t_rdata1 = NULL; - int ** t_rdata2 = NULL; - int * t_wdata_bytes = NULL; - int * t_rdata1_bytes = NULL; - int * t_rdata2_bytes = NULL; + int **t_wdata = NULL; + int **t_rdata1 = NULL; + int **t_rdata2 = NULL; + int *t_wdata_bytes = NULL; + int *t_rdata1_bytes = NULL; + int *t_rdata2_bytes = NULL; int i, j; /* Local index variables */ H5F_libver_t low; /* File format low bound */ H5D_chunk_index_t idx_type, t_idx_type; /* Dataset chunk index types */ @@ -9983,8 +9983,8 @@ test_chunk_fast_bug1(hid_t fapl) unsigned **wbuf = NULL; unsigned **rbuf = NULL; - unsigned * wbuf_bytes = NULL; - unsigned * rbuf_bytes = NULL; + unsigned *wbuf_bytes = NULL; + unsigned *rbuf_bytes = NULL; unsigned i, j; /* Local index variables */ @@ -10758,16 +10758,16 @@ test_fixed_array(hid_t fapl) int **chunks = NULL; /* # of chunks for dataset dimensions */ int **chunks_big = NULL; /* # of chunks for big dataset dimensions */ - int * chunks_bytes = NULL; - int * chunks_big_bytes = NULL; + int *chunks_bytes = NULL; + int *chunks_big_bytes = NULL; int chunk_row; /* chunk row index */ int chunk_col; /* chunk column index */ hsize_t **coord = NULL; /* datdaset coordinates */ hsize_t **coord_big = NULL; /* big datdaset coordinates */ - hsize_t * coord_bytes = NULL; - hsize_t * coord_big_bytes = NULL; + hsize_t *coord_bytes = NULL; + hsize_t *coord_big_bytes = NULL; H5D_chunk_index_t idx_type; /* Dataset chunk index type */ H5F_libver_t low, high; /* File format bounds */ @@ -11275,10 +11275,10 @@ test_single_chunk(hid_t fapl) hid_t did = -1, did_max = -1; /* Dataset ID for dataset with fixed dimensions */ hsize_t dim2[2] = {DSET_DIM1, DSET_DIM2}; /* Dataset dimensions */ hsize_t t_dim2[2] = {DSET_TMP_DIM1, DSET_TMP_DIM2}; /* Dataset dimensions */ - int * wbuf = NULL; /* write buffer */ - int * t_wbuf = NULL; /* write buffer */ - int * rbuf = NULL; /* read buffer */ - int * t_rbuf = NULL; /* read buffer */ + int *wbuf = NULL; /* write buffer */ + int *t_wbuf = NULL; /* write buffer */ + int *rbuf = NULL; /* read buffer */ + int *t_rbuf = NULL; /* read buffer */ H5D_chunk_index_t idx_type; /* Dataset chunk index type */ H5F_libver_t low, high; /* File format bounds */ @@ -11548,7 +11548,7 @@ test_idx_compatible(void) { hid_t fid = -1; /* File id */ hid_t did = -1; /* Dataset id */ - const char * filename = NULL; /* old test file name */ + const char *filename = NULL; /* old test file name */ unsigned j; /* Local index variable */ H5D_chunk_index_t idx_type; /* Chunked dataset index type */ @@ -13235,7 +13235,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; @@ -13547,7 +13547,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; @@ -14520,7 +14520,7 @@ dls_01_main(void) int status = 0; hid_t fapl = 0, fid = 0; const char *strings[DLS_01_DIMS] = {"String 1", "Test string 2", "Another string", "Final String"}; - char * buffer = NULL; + char *buffer = NULL; TESTING("Testing DLS bugfix 1"); @@ -15211,7 +15211,7 @@ test_h5s_plist(void) /* Bad stride value (stride of NULL is OK) */ stride = 0; ret = H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, &start, &stride, &count, - &block); + &block); stride = 1; } H5E_END_TRY; diff --git a/test/dt_arith.c b/test/dt_arith.c index 9734eed..6947998 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -817,7 +817,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; /*endianness */ size_t nelmts = NTESTELEM; unsigned int fails_this_test = 0; @@ -1589,21 +1589,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 endianness */ 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; @@ -2814,13 +2814,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 @@ -3415,7 +3415,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*/ @@ -3424,20 +3424,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 endianness */ int dendian; /*destination endianness */ 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 84e00cc..75eeee8 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -854,7 +854,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"); @@ -916,7 +916,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 4aebed8..547e890 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -583,7 +583,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; @@ -1161,8 +1161,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"); @@ -2042,7 +2042,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; @@ -2244,7 +2244,7 @@ test_compound_11(void) typedef struct { double d1; int i1; - char * s1; + char *s1; int i2; double d2; double d3; @@ -2253,7 +2253,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 */ @@ -2262,9 +2262,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; @@ -4950,7 +4950,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; @@ -5022,7 +5022,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; @@ -5031,7 +5031,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"); @@ -5241,7 +5241,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"); @@ -5414,7 +5414,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; @@ -5698,7 +5698,7 @@ error: static int opaque_long(void) { - char * long_tag = NULL; + char *long_tag = NULL; hid_t dt = -1; herr_t ret; @@ -6693,7 +6693,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}; @@ -7255,8 +7255,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"); @@ -8122,9 +8122,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; @@ -8380,7 +8380,7 @@ verify_version(hid_t dtype, H5F_libver_t low, unsigned *highest_version) { hid_t base_dtype = -1; hid_t mem_dtype = -1; - H5T_t * dtypep = NULL; /* Internal structure of a datatype */ + H5T_t *dtypep = NULL; /* Internal structure of a datatype */ H5T_class_t type_cls = H5T_NO_CLASS; /* Temporary var for datatype class */ int nmembers = 0; unsigned i; @@ -8562,8 +8562,8 @@ test_versionbounds(void) hid_t simple_cmp_type = -1; /* Simple cmpd dtype, contains no other cmpd */ hid_t outer_arr_type = -1; /* Outermost array datatype */ hid_t inner_arr_type = -1; /* Inner array datatype */ - H5F_t * filep = NULL; /* Pointer to internal structure of a file */ - H5T_t * dtypep = NULL; /* Pointer to internal structure of a datatype */ + H5F_t *filep = NULL; /* Pointer to internal structure of a file */ + H5T_t *dtypep = NULL; /* Pointer to internal structure of a datatype */ hsize_t arr_dim[] = {ARRAY_LEN}; /* Length of the array */ int low, high; /* Indices for iterating over versions */ H5F_libver_t versions[] = {H5F_LIBVER_EARLIEST, H5F_LIBVER_V18, H5F_LIBVER_V110, H5F_LIBVER_V112, diff --git a/test/earray.c b/test/earray.c index 0dd5c51..c9becda 100644 --- a/test/earray.c +++ b/test/earray.c @@ -603,7 +603,7 @@ static unsigned test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSED *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5EA_t *ea = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -848,7 +848,7 @@ static unsigned test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_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 */ H5EA_t *ea = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -920,8 +920,8 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { hid_t file = -1; /* File ID */ hid_t file2 = -1; /* File ID */ - 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 */ H5EA_t *ea = NULL; /* Extensible array wrapper */ H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -1033,8 +1033,8 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa hid_t file2 = -1; /* File ID */ hid_t file0 = -1; /* File ID */ hid_t file00 = -1; /* File ID */ - 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 */ H5EA_t *ea = NULL; /* Extensible array wrapper */ H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ @@ -1169,9 +1169,9 @@ static unsigned test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ - H5EA_t * ea2 = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ + H5EA_t *ea2 = NULL; /* Extensible array wrapper */ haddr_t ea_addr = HADDR_UNDEF; /* Array address in file */ h5_stat_size_t file_size; /* File size, after deleting array */ @@ -2070,9 +2070,9 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, h const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ - void * eiter_info; /* Extensible array iterator info */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ + void *eiter_info; /* Extensible array iterator info */ earray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ @@ -2248,8 +2248,8 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5EA_t * ea = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5EA_t *ea = NULL; /* Extensible array wrapper */ earray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ @@ -2652,7 +2652,7 @@ int main(void) { unsigned nerrors = 0; /* track errors */ - H5P_genplist_t * plist; /* Property list pointer for FAPL */ + H5P_genplist_t *plist; /* Property list pointer for FAPL */ H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info */ hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ int i; /* iterator */ diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index 47944b6..a80f9e6 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -27,7 +27,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high, hbool_t s { hid_t pl = (-1); /* Decoded property list */ hid_t fapl = -1; /* File access property list */ - void * temp_buf = NULL; /* Pointer to encoding buffer */ + void *temp_buf = NULL; /* Pointer to encoding buffer */ size_t temp_size = 0; /* Size of encoding buffer */ herr_t ret; /* Return value */ @@ -148,7 +148,7 @@ main(void) double w0 = 0.5; unsigned max_compact; unsigned min_dense; - const char * c_to_f = "x+32"; + const char *c_to_f = "x+32"; H5F_libver_t low, high; /* Low and high bounds */ H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index cafe475..5b2e233 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -162,7 +162,7 @@ test_plists(const char *filename_prefix) unsigned config_1, config_2; int fd_1, fd_2; size_t size_1 = 0, size_2 = 0; - void * buf_1 = NULL, *buf_2 = NULL; + void *buf_1 = NULL, *buf_2 = NULL; hid_t plist_1, plist_2; char filename[1024]; const char *testfile; diff --git a/test/err_compat.c b/test/err_compat.c index 6ad69d8..dbf8581 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -35,8 +35,8 @@ const char *FILENAME[] = {"errors_compat", NULL}; int **ipoints2 = NULL; int **icheck2 = NULL; -int * ipoints2_data = NULL; -int * icheck2_data = NULL; +int *ipoints2_data = NULL; +int *icheck2_data = NULL; #define DSET_NAME "a_dataset" @@ -115,9 +115,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))) @@ -162,9 +162,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))) @@ -213,7 +213,7 @@ test_error_compat(void) hsize_t dims[2]; H5E_auto1_t old_func1; H5E_auto2_t old_func2; - void * old_data = NULL; + void *old_data = NULL; herr_t ret; TESTING("error API H5Eset/get_auto"); diff --git a/test/error_test.c b/test/error_test.c index c546948..2b66168 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -38,8 +38,8 @@ const char *FILENAME[] = {"errors", NULL}; int **ipoints2 = NULL; int **icheck2 = NULL; -int * ipoints2_data = NULL; -int * icheck2_data = NULL; +int *ipoints2_data = NULL; +int *icheck2_data = NULL; hid_t ERR_CLS; hid_t ERR_CLS2; @@ -99,7 +99,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"); @@ -181,8 +181,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))) @@ -324,8 +324,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"; @@ -419,7 +419,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/event_set.c b/test/event_set.c index 60aef5d..df6b8cb 100644 --- a/test/event_set.c +++ b/test/event_set.c @@ -325,7 +325,7 @@ test_es_get_requests(void) { hid_t es_id; /* Event set ID */ hid_t connector_ids[2]; /* Connector IDs */ - void * requests[2]; /* Requests */ + void *requests[2]; /* Requests */ int req_targets[2]; /* Dummy targets for void * requests */ size_t count; /* # of events in set */ hbool_t op_failed; /* Whether an operation failed (unused) */ diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 2778818..253a9a6 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -136,7 +136,7 @@ generate_eoc_test_file(hid_t fapl_id) hsize_t chunk_dims[2]; /* chunk dimensions */ H5D_chunk_index_t idx_type; /* dataset chunk index type */ H5D_layout_t layout_type; /* dataset layout type */ - int * data = NULL; /* buffer for fake data */ + int *data = NULL; /* buffer for fake data */ int n; /* # of data elements */ int i; /* iterator (# subgroups) */ @@ -585,9 +585,9 @@ error: static herr_t check_group_layout(hid_t fid, const char *group_name) { - H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + H5F_t *file_ptr = NULL; /* ptr to internal file struct */ hid_t gid1 = -1, gid2 = -1; /* group IDs */ - H5G_t * grp_ptr = NULL; /* ptr to internal group struct */ + H5G_t *grp_ptr = NULL; /* ptr to internal group struct */ haddr_t tag1, tag2; /* MD cache tags for groups */ uint32_t before, during, after; /* cache sizes */ int i; /* iterator */ @@ -699,11 +699,11 @@ error: static herr_t check_dset_scheme(hid_t fid, const char *dset_name) { - H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + H5F_t *file_ptr = NULL; /* ptr to internal file struct */ hid_t did = -1; /* dataset ID */ - H5D_t * dset_ptr = NULL; /* ptr to internal dset struct */ + H5D_t *dset_ptr = NULL; /* ptr to internal dset struct */ haddr_t tag; /* MD cache tag for dataset */ - int * data = NULL; /* buffer for fake data */ + int *data = NULL; /* buffer for fake data */ uint32_t before, during, after; /* cache sizes */ /* NOTE: The TESTING() macro is called in main() */ diff --git a/test/extend.c b/test/extend.c index 2583de9..0c28c71 100644 --- a/test/extend.c +++ b/test/extend.c @@ -29,9 +29,9 @@ const char *FILENAME[] = {"extend", NULL}; /* Data buffers */ static int **buf1 = NULL; -static int * buf1_data = NULL; +static int *buf1_data = NULL; static int **buf2 = NULL; -static int * buf2_data = NULL; +static int *buf2_data = NULL; /*------------------------------------------------------------------------- * Function: write_data diff --git a/test/external.c b/test/external.c index 4f2ed08..eabc763 100644 --- a/test/external.c +++ b/test/external.c @@ -1318,7 +1318,7 @@ test_h5d_get_access_plist(hid_t fapl_id) hid_t sid = -1; /* data space */ hid_t did = -1; /* dataset */ hsize_t dims = 0; /* dataset size */ - char * buffer = NULL; /* saved prefix name from dapl */ + char *buffer = NULL; /* saved prefix name from dapl */ char filename[1024]; /* file names */ TESTING("H5Dget_access_plist() returns correct prefix"); diff --git a/test/farray.c b/test/farray.c index 5520799..5f7104f 100644 --- a/test/farray.c +++ b/test/farray.c @@ -420,7 +420,7 @@ static unsigned test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSED *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ H5FA_t *fa = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -548,7 +548,7 @@ static unsigned test_reopen(hid_t fapl, H5FA_create_t *cparam, farray_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 */ H5FA_t *fa = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -617,8 +617,8 @@ test_open_twice(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t *tpara { hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fid2 = H5I_INVALID_HID; /* File ID */ - 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 */ H5FA_t *fa = NULL; /* Fixed array wrapper */ H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -728,8 +728,8 @@ test_open_twice_diff(hid_t fapl_id, H5FA_create_t *cparam, farray_test_param_t * hid_t fid2 = H5I_INVALID_HID; /* File ID */ hid_t fid0 = H5I_INVALID_HID; /* File ID */ hid_t fid00 = H5I_INVALID_HID; /* File ID */ - 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 */ H5FA_t *fa = NULL; /* Fixed array wrapper */ H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ @@ -855,9 +855,9 @@ static unsigned test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Fixed array wrapper */ - H5FA_t * fa2 = NULL; /* Fixed array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Fixed array wrapper */ + H5FA_t *fa2 = NULL; /* Fixed array wrapper */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ h5_stat_size_t file_size; /* File size, after deleting array */ @@ -1345,9 +1345,9 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Fixed array wrapper */ - void * fiter_info; /* Fixed array iterator info */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Fixed array wrapper */ + void *fiter_info; /* Fixed array iterator info */ farray_state_t state; /* State of fixed array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ @@ -1503,8 +1503,8 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, hbool_t check_rest, const char *test_str) { hid_t file = -1; /* File ID */ - H5F_t * f = NULL; /* Internal file object pointer */ - H5FA_t * fa = NULL; /* Extensible array wrapper */ + H5F_t *f = NULL; /* Internal file object pointer */ + H5FA_t *fa = NULL; /* Extensible array wrapper */ farray_state_t state; /* State of extensible array */ uint64_t welmt; /* Element to write */ uint64_t relmt; /* Element to read */ diff --git a/test/fheap.c b/test/fheap.c index 7fec567..de5249c 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -157,8 +157,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 */ @@ -166,8 +166,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 */ @@ -432,8 +432,8 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, /* 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 == @@ -534,7 +534,7 @@ get_fill_size(const fheap_test_param_t *tparam) static int begin_test(fheap_test_param_t *tparam, const char *base_desc, fheap_heap_ids_t *keep_ids, size_t *fill_size) { - char * test_desc; /* Test description */ + char *test_desc; /* Test description */ const char *del_str = get_del_string(tparam); /* @@ -1028,8 +1028,8 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s { 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 */ @@ -1809,9 +1809,9 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { 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 */ @@ -1928,9 +1928,9 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { 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 */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -2082,11 +2082,11 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) 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 */ h5_stat_size_t empty_size; /* File size, w/o heap */ h5_stat_size_t file_size; /* File size, after deleting heap */ @@ -2259,10 +2259,10 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { 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 */ @@ -2437,8 +2437,8 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { hid_t file = -1; /* File ID */ 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 */ @@ -2775,8 +2775,8 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { hid_t file = -1; /* File ID */ 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 */ @@ -2897,7 +2897,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) { 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_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 */ @@ -3040,7 +3040,7 @@ test_reopen_hdr(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) hid_t file1 = -1; /* File ID */ hid_t file2 = -2; /* 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_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ hsize_t heap_size; /* Total size of heap on disk */ @@ -3171,8 +3171,8 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ 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 */ @@ -3286,8 +3286,8 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ 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 */ @@ -3387,8 +3387,8 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp { hid_t file = -1; /* File ID */ 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 */ @@ -3483,8 +3483,8 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -3582,8 +3582,8 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par { hid_t file = -1; /* File ID */ 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 */ @@ -3688,8 +3688,8 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ 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 */ @@ -3795,8 +3795,8 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ 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 */ @@ -3906,8 +3906,8 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t { hid_t file = -1; /* File ID */ 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 */ @@ -4002,8 +4002,8 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -4105,8 +4105,8 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ 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 */ @@ -4206,8 +4206,8 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ 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 */ @@ -4316,8 +4316,8 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ 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 */ @@ -4414,8 +4414,8 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para { hid_t file = -1; /* File ID */ 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 */ @@ -4510,8 +4510,8 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ { hid_t file = -1; /* File ID */ 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 */ @@ -4612,8 +4612,8 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe { hid_t file = -1; /* File ID */ 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 */ @@ -4722,8 +4722,8 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ { hid_t file = -1; /* File ID */ 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 */ @@ -4825,8 +4825,8 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ 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 */ @@ -4936,8 +4936,8 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap { hid_t file = -1; /* File ID */ 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 */ @@ -5044,8 +5044,8 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ 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 */ @@ -5142,8 +5142,8 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ 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 */ @@ -5251,8 +5251,8 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ 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 */ @@ -5354,8 +5354,8 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ 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 */ @@ -5464,8 +5464,8 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh { hid_t file = -1; /* File ID */ 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 */ @@ -5575,8 +5575,8 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ 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 */ @@ -5683,8 +5683,8 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ 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 */ @@ -5792,8 +5792,8 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ 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 */ @@ -5907,8 +5907,8 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh { hid_t file = -1; /* File ID */ 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 */ @@ -6028,8 +6028,8 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ 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_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea { hid_t file = -1; /* File ID */ 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 */ @@ -6254,8 +6254,8 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ 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 */ @@ -6381,8 +6381,8 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa { hid_t file = -1; /* File ID */ 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 */ @@ -6541,8 +6541,8 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara { hid_t file = -1; /* File ID */ 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 */ @@ -6705,8 +6705,8 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara { hid_t file = -1; /* File ID */ 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 */ @@ -6899,11 +6899,11 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -7068,12 +7068,12 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -7308,13 +7308,13 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ 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 */ @@ -7606,11 +7606,11 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ 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 = NULL; - unsigned char * heap_id_data = NULL; + unsigned char *heap_id_data = NULL; struct a_type_t1 { char a[10]; char b[40]; @@ -7736,8 +7736,8 @@ test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ { hid_t file = -1; /* File ID */ 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 */ @@ -7809,8 +7809,8 @@ test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -7897,8 +7897,8 @@ test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -7967,8 +7967,8 @@ test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_par { hid_t file = -1; /* File ID */ 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 */ @@ -8039,8 +8039,8 @@ test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ 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 */ @@ -8115,8 +8115,8 @@ test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ 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 */ @@ -8185,8 +8185,8 @@ test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ 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 */ @@ -8259,8 +8259,8 @@ test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param { hid_t file = -1; /* File ID */ 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 */ @@ -8340,8 +8340,8 @@ test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t { hid_t file = -1; /* File ID */ 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 */ @@ -8418,8 +8418,8 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ 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 */ @@ -8517,8 +8517,8 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t { hid_t file = -1; /* File ID */ 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 */ @@ -8627,8 +8627,8 @@ test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t { hid_t file = -1; /* File ID */ 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 */ @@ -8724,8 +8724,8 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes { hid_t file = -1; /* File ID */ 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 */ @@ -8870,8 +8870,8 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t * { hid_t file = -1; /* File ID */ 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 */ @@ -9036,8 +9036,8 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test { hid_t file = -1; /* File ID */ 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 */ @@ -9164,8 +9164,8 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ { hid_t file = -1; /* File ID */ 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 */ @@ -9292,8 +9292,8 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea { hid_t file = -1; /* File ID */ 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 */ @@ -9417,8 +9417,8 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_ { hid_t file = -1; /* File ID */ 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 */ @@ -9549,12 +9549,12 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_ { hid_t file = -1; /* File ID */ 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 */ @@ -9695,13 +9695,13 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5 { hid_t file = -1; /* File ID */ 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 */ @@ -9858,12 +9858,12 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_ { hid_t file = -1; /* File ID */ 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 */ @@ -10014,12 +10014,12 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t { hid_t file = -1; /* File ID */ 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 */ @@ -10198,8 +10198,8 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t { hid_t file = -1; /* File ID */ 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 */ @@ -10329,8 +10329,8 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H { hid_t file = -1; /* File ID */ 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 */ @@ -10466,17 +10466,17 @@ error: */ static unsigned 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 */ 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 */ @@ -10619,17 +10619,17 @@ error: */ static unsigned 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 */ 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 */ @@ -10781,12 +10781,12 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t { hid_t file = -1; /* File ID */ 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 */ @@ -10945,18 +10945,18 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s { hid_t file = -1; /* File ID */ 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 " @@ -11113,12 +11113,12 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5 { hid_t file = -1; /* File ID */ 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 */ @@ -11276,12 +11276,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo { hid_t file = -1; /* File ID */ 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 */ @@ -11459,12 +11459,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_ { hid_t file = -1; /* File ID */ 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 */ @@ -11679,12 +11679,12 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star { hid_t file = -1; /* File ID */ 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 */ @@ -11879,12 +11879,12 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_ { hid_t file = -1; /* File ID */ 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 */ @@ -12108,8 +12108,8 @@ test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -12239,8 +12239,8 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -12410,12 +12410,12 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ 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 */ @@ -12522,8 +12522,8 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * { hid_t file = -1; /* File ID */ 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 */ @@ -12636,14 +12636,14 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -12786,15 +12786,15 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -13016,16 +13016,16 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp { hid_t file = -1; /* File ID */ 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 */ @@ -13321,18 +13321,18 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -13744,15 +13744,15 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam { hid_t file = -1; /* File ID */ 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 */ @@ -13957,14 +13957,14 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -14107,15 +14107,15 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -14338,20 +14338,20 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar { hid_t file = -1; /* File ID */ 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 */ @@ -14942,8 +14942,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para { hid_t file = -1; /* File ID */ 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 */ @@ -15115,8 +15115,8 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ 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 */ @@ -15445,8 +15445,8 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa { hid_t file = -1; /* File ID */ 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 */ @@ -15649,8 +15649,8 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te { hid_t file = -1; /* File ID */ 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 */ @@ -15874,15 +15874,15 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ 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 */ @@ -16154,8 +16154,8 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) { hid_t file = -1; /* File ID */ 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 1ac39c3..d25f131 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -85,10 +85,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; @@ -339,9 +339,9 @@ test_callbacks(void) H5FD_file_image_callbacks_t callbacks; hid_t fapl_1; hid_t fapl_2; - udata_t * udata = NULL; - char * file_image = NULL; - char * temp_file_image; + udata_t *udata = NULL; + char *file_image = NULL; + char *temp_file_image; int count = 10; int i; size_t size; @@ -556,11 +556,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; @@ -717,9 +717,9 @@ static int test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, hbool_t user) { 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]; @@ -996,7 +996,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 e5a2133..c73b0f4 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; fill_c.a = 0; @@ -1414,7 +1414,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) { @@ -1497,7 +1497,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) { @@ -1609,12 +1609,12 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t 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, NULL, NULL, 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 */ @@ -2238,7 +2238,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 5936412..4e1d52a 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/filter_plugin.c b/test/filter_plugin.c index 1454156..05ad32c 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -180,15 +180,15 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) hid_t dxpl_id = -1; /* Dataset xfer property list ID */ hid_t write_dxpl_id = -1; /* Dataset xfer property list ID for writing */ hid_t sid = -1; /* Dataspace ID */ - void * tconv_buf = NULL; /* Temporary conversion buffer */ - int ** orig = NULL; /* Data written to the dataset */ - int ** read = NULL; /* Data read from the dataset */ + void *tconv_buf = NULL; /* Temporary conversion buffer */ + int **orig = NULL; /* Data written to the dataset */ + int **read = NULL; /* Data read from the dataset */ size_t r, c; /* Data rows and columns */ size_t hs_r, hs_c, hs_offr, hs_offc; /* Hypserslab sizes and offsets */ size_t i, j; /* Local index variables */ int n = 0; /* Value written to point array */ hbool_t are_same; /* Output from dataset compare function */ - int *** save_array = NULL; /* (Global) array where the final data go */ + int ***save_array = NULL; /* (Global) array where the final data go */ /* initialize */ r = (size_t)sizes_g[0]; @@ -589,8 +589,8 @@ error: static herr_t test_read_data(hid_t did, int *origin_data) { - int ** check = NULL; - int * data_p = origin_data; + int **check = NULL; + int *data_p = origin_data; size_t i, j; /* Local index variables */ if (allocate_and_init_2D_array(&check, sizes_g, NULL) < 0) @@ -729,7 +729,7 @@ error: static herr_t ensure_data_read_fails(hid_t did) { - int ** check = NULL; + int **check = NULL; herr_t ret = FAIL; if (allocate_and_init_2D_array(&check, sizes_g, NULL) < 0) diff --git a/test/filter_plugin1_dsets.c b/test/filter_plugin1_dsets.c index 29b6e73..19fd940 100644 --- a/test/filter_plugin1_dsets.c +++ b/test/filter_plugin1_dsets.c @@ -64,7 +64,7 @@ static size_t add_sub_value(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 value = 0; /* Data value to add/subtract */ diff --git a/test/filter_plugin2_dsets.c b/test/filter_plugin2_dsets.c index d2011d4..fed8176 100644 --- a/test/filter_plugin2_dsets.c +++ b/test/filter_plugin2_dsets.c @@ -65,7 +65,7 @@ static size_t mult_div_value(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/filter_plugin3_dsets.c b/test/filter_plugin3_dsets.c index 1d399e5..22da936 100644 --- a/test/filter_plugin3_dsets.c +++ b/test/filter_plugin3_dsets.c @@ -72,7 +72,7 @@ static size_t add_sub_value_hdf5(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 value = 0; /* Data value to add/subtract */ unsigned majnum = 0; /* Output data from the HDF5 library call */ diff --git a/test/filter_plugin4_groups.c b/test/filter_plugin4_groups.c index 630dcd6..97cb59a 100644 --- a/test/filter_plugin4_groups.c +++ b/test/filter_plugin4_groups.c @@ -82,7 +82,7 @@ append_to_group_name(unsigned int flags, size_t cd_nelmts, const unsigned int *c } else { /* WRITE - Append the suffix to the group name */ - void * outbuf = NULL; /* Pointer to new buffer */ + void *outbuf = NULL; /* Pointer to new buffer */ unsigned char *dst = NULL; /* Temporary pointer to destination buffer */ /* Get memory for the new, larger string buffer using the diff --git a/test/flush1.c b/test/flush1.c index 9d43673..4d1660f 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -123,7 +123,7 @@ add_dset_to_file(hid_t fid, const char *dset_name) hid_t dcpl_id = -1; /* dataset creation plist ID */ hid_t sid = -1; /* dataspace ID */ hid_t did = -1; /* dataset ID */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dims[1] = {NELEMENTS}; /* size of dataset */ hsize_t chunk_dims[1] = {CHUNK_SIZE}; /* chunk size */ int i; /* iterator */ @@ -189,7 +189,7 @@ error: int main(void) { - char * driver = NULL; /* name of current VFD (from env var) */ + char *driver = NULL; /* name of current VFD (from env var) */ hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ hid_t fid = -1; /* file ID */ hid_t fapl_id = -1; /* file access proplist ID */ diff --git a/test/flush2.c b/test/flush2.c index 99cad14..261c79c 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -63,7 +63,7 @@ dset_ok(hid_t fid, const char *dset_name) { hid_t sid = -1; /* dataspace ID */ hid_t did = -1; /* dataset ID */ - int * data = NULL; /* data buffer */ + int *data = NULL; /* data buffer */ hsize_t dims[1] = {0}; /* size of dataset */ int i; /* iterator */ @@ -239,7 +239,7 @@ error: int main(void) { - char * driver = NULL; /* name of current VFD (from env var) */ + char *driver = NULL; /* name of current VFD (from env var) */ hbool_t vfd_supports_swmr; /* whether the current VFD supports SWMR */ hid_t fapl_id = -1; /* file access proplist ID */ char filename[1024]; /* filename */ diff --git a/test/freespace.c b/test/freespace.c index f26c3d0..004d606 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -239,7 +239,7 @@ static herr_t TEST_sect_merging(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata) { TEST_free_section_t **sect1 = (TEST_free_section_t **)_sect1; - TEST_free_section_t * sect2 = (TEST_free_section_t *)_sect2; + TEST_free_section_t *sect2 = (TEST_free_section_t *)_sect2; herr_t ret_value = SUCCEED; /* Return value */ /* Check arguments. */ @@ -285,7 +285,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; @@ -310,7 +310,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 */ @@ -332,7 +332,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); @@ -444,8 +444,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*/ @@ -585,8 +585,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -929,8 +929,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1313,8 +1313,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -1791,8 +1791,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2138,8 +2138,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2426,8 +2426,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ @@ -2782,8 +2782,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 */ uint16_t nclasses; H5FS_create_t cparam; /* creation parameters */ diff --git a/test/gen_bounds.c b/test/gen_bounds.c index 87a9c18..6977c22 100644 --- a/test/gen_bounds.c +++ b/test/gen_bounds.c @@ -116,8 +116,8 @@ gen_earliest_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -260,8 +260,8 @@ gen_earliest_v18(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -378,8 +378,8 @@ gen_latest_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -487,8 +487,8 @@ gen_v18_latest(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -602,8 +602,8 @@ gen_v18_v18(void) hid_t dcpl = -1; /* Dataset creation property list ID */ hid_t space = -1; /* Dataspace ID */ hid_t dset = -1; /* Dataset ID */ - float * buf = NULL; /* Buffer for writing data */ - float * bufp = NULL; /* Pointer to data buffer */ + float *buf = NULL; /* Buffer for writing data */ + float *bufp = NULL; /* Pointer to data buffer */ hsize_t dims[RANK] = {DIM1, DIM2}; /* Dimensions */ hsize_t chunk_dims[RANK] = {CHK_DIM1, CHK_DIM2}; /* Dimensions of chunk */ int i, j; @@ -1001,7 +1001,7 @@ gen_ref_files(const char *filename, H5F_libver_t low_bound, H5F_libver_t high_bo hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t did = H5I_INVALID_HID; /* Dataset ID */ hsize_t dims[1] = {100}; /* Dimension size */ - unsigned * dwbuf = NULL; /* Buffer for writing data */ + unsigned *dwbuf = NULL; /* Buffer for writing data */ hid_t ref_sid = H5I_INVALID_HID; /* Dataspace ID for the reference dataset */ hid_t ref_did = H5I_INVALID_HID; /* Dataset ID for the reference dataset */ hsize_t rev_ref_dims[1] = {3}; /* Dimension size for the reference dataset */ diff --git a/test/gen_deflate.c b/test/gen_deflate.c index 1f434bb..79b68b1 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 aa58bb3..3033b6f 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/gen_plist.c b/test/gen_plist.c index 38f1b3d..14615e4 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -45,7 +45,7 @@ main(void) double w0 = 0.5; unsigned max_compact; unsigned min_dense; - const char * c_to_f = "x+32"; + const char *c_to_f = "x+32"; int little_endian; int word_length; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, @@ -84,7 +84,7 @@ main(void) /* check endianness */ { short int word = 0x0001; - char * byte = (char *)&word; + char *byte = (char *)&word; if (byte[0] == 1) /* little endian */ @@ -445,7 +445,7 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil { int fd = 0; /* file descriptor */ herr_t ret = 0; - void * temp_buf = NULL; + void *temp_buf = NULL; size_t temp_size = 0; ssize_t H5_ATTR_NDEBUG_UNUSED write_size; char filename[1024]; diff --git a/test/genall5.c b/test/genall5.c index ca96eeb..04743e6 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -575,7 +575,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) HDassert(!token_cmp); } /* end else-if */ else { - void * elinkval; + void *elinkval; const char *file = NULL; const char *path = NULL; @@ -983,7 +983,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) HDassert(!token_cmp); } /* end else-if */ else { - void * elinkval; + void *elinkval; const char *file = NULL; const char *path = NULL; @@ -1615,7 +1615,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) void ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -1710,7 +1710,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -1929,7 +1929,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) void ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t dcpl = -1; @@ -2054,7 +2054,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -2288,7 +2288,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) void ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * wdata = NULL; + int *wdata = NULL; unsigned u; hid_t dsid = -1; hid_t dcpl = -1; @@ -2414,7 +2414,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) void vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) { - int * rdata = NULL; + int *rdata = NULL; unsigned u; hid_t dsid = -1; hid_t sid = -1; @@ -2633,7 +2633,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) hid_t tid = -1; hsize_t dims[1] = {DSET_SMALL_DIMS}; herr_t ret; - hvl_t * wdata = NULL; + hvl_t *wdata = NULL; unsigned u; if (pass) { @@ -2678,7 +2678,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) if ((pass) && (write_data)) { for (u = 0; u < DSET_SMALL_DIMS; u++) { - int * tdata; + int *tdata; unsigned len; unsigned v; @@ -2785,7 +2785,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) int ndims; hsize_t dims[1], max_dims[1]; htri_t type_equal; - hvl_t * rdata = NULL; + hvl_t *rdata = NULL; unsigned u; herr_t ret; diff --git a/test/gheap.c b/test/gheap.c index acd514a..391ef58 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -69,7 +69,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]; @@ -178,7 +178,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]; @@ -278,7 +278,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; @@ -369,7 +369,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; @@ -466,9 +466,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 31d85b1..3df2807 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -117,7 +117,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, hbool_t subst_for_superblock); /*------------------------------------------------------------------------- @@ -524,7 +524,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu { const char *prefix = NULL; const char *driver_env_var = 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; @@ -865,7 +865,7 @@ h5_get_libver_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 */ @@ -1038,7 +1038,7 @@ h5_set_info_object(void) do { size_t len; - char * key_val, *endp, *namep; + char *key_val, *endp, *namep; if (*valp == ';') valp++; @@ -1190,7 +1190,7 @@ h5_get_file_size(const char *filename, hid_t fapl) else if (driver == H5FD_MULTI) { H5FD_mem_t mt; h5_stat_size_t tot_size = 0; - char * driver_env_var = NULL; + char *driver_env_var = NULL; driver_env_var = HDgetenv(HDF5_DRIVER); if (driver_env_var && !HDstrcmp(driver_env_var, "split")) { @@ -1486,7 +1486,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 */ if (!filename) @@ -1695,7 +1695,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., @@ -2084,12 +2084,12 @@ H5_get_srcdir(void) int h5_duplicate_file_by_bytes(const char *orig, const char *dest) { - FILE * orig_ptr = NULL; - FILE * dest_ptr = NULL; + FILE *orig_ptr = NULL; + FILE *dest_ptr = NULL; hsize_t fsize = 0; hsize_t read_size = 0; hsize_t max_buf = 0; - void * dup_buf = NULL; + void *dup_buf = NULL; int ret_value = 0; max_buf = 4096 * sizeof(char); diff --git a/test/h5test.h b/test/h5test.h index 3d18a2b..f746d44 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -208,10 +208,10 @@ 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_superblock(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_superblock(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); @@ -223,16 +223,16 @@ H5TEST_DLL h5_stat_size_t h5_get_file_size(const char *filename, hid_t fapl); H5TEST_DLL int print_func(const char *format, ...) H5_ATTR_FORMAT(printf, 1, 2); 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 H5VL_class_t *h5_get_dummy_vol_class(void); -H5TEST_DLL const char * h5_get_version_string(H5F_libver_t libver); -H5TEST_DLL int h5_compare_file_bytes(char *fname1, char *fname2); -H5TEST_DLL int h5_duplicate_file_by_bytes(const char *orig, const char *dest); -H5TEST_DLL herr_t h5_check_if_file_locking_enabled(hbool_t *are_enabled); -H5TEST_DLL hbool_t h5_using_default_driver(const char *drv_name); -H5TEST_DLL herr_t h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel); -H5TEST_DLL herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible); -H5TEST_DLL hbool_t h5_driver_uses_multiple_files(const char *drv_name, unsigned flags); +H5TEST_DLL H5FD_class_t *h5_get_dummy_vfd_class(void); +H5TEST_DLL H5VL_class_t *h5_get_dummy_vol_class(void); +H5TEST_DLL const char *h5_get_version_string(H5F_libver_t libver); +H5TEST_DLL int h5_compare_file_bytes(char *fname1, char *fname2); +H5TEST_DLL int h5_duplicate_file_by_bytes(const char *orig, const char *dest); +H5TEST_DLL herr_t h5_check_if_file_locking_enabled(hbool_t *are_enabled); +H5TEST_DLL hbool_t h5_using_default_driver(const char *drv_name); +H5TEST_DLL herr_t h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel); +H5TEST_DLL herr_t h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatible); +H5TEST_DLL hbool_t h5_driver_uses_multiple_files(const char *drv_name, unsigned flags); /* Functions that will replace components of a FAPL */ H5TEST_DLL herr_t h5_get_libver_fapl(hid_t fapl_id); diff --git a/test/hdfs.c b/test/hdfs.c index 74fc2bd..f114ed1 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -428,7 +428,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_hdfs_fapl_t config; }; diff --git a/test/hyperslab.c b/test/hyperslab.c index b816aae..18dd4dc 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]; @@ -1010,7 +1010,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 a6821db..a87f7f4 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -50,10 +50,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 dbfd1ef..8dc24f8 100644 --- a/test/links.c +++ b/test/links.c @@ -161,7 +161,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 */ @@ -866,7 +866,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]; @@ -6467,7 +6467,7 @@ link_iterate_deprec(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 */ @@ -6958,7 +6958,7 @@ link_iterate_old_deprec(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 */ @@ -9228,13 +9228,13 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) hid_t did = H5I_INVALID_HID; hid_t dapl_id = H5I_INVALID_HID; hid_t dcpl = H5I_INVALID_HID; - char * filename1 = NULL; - char * filename2 = NULL; - char * tmpname = NULL; - char * cwdpath = NULL; + char *filename1 = NULL; + char *filename2 = NULL; + char *tmpname = NULL; + char *cwdpath = NULL; hsize_t dims[2]; - int ** points = NULL; - int * points_data = NULL; + int **points = NULL; + int *points_data = NULL; int i, j, n; h5_stat_size_t filesize; h5_stat_size_t new_filesize; @@ -12448,17 +12448,17 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t group3 = H5I_INVALID_HID; hid_t group4 = H5I_INVALID_HID; hid_t group5 = H5I_INVALID_HID; - char * filename1 = NULL; - char * filename2a = NULL; - char * filename2b = NULL; - char * filename3a = NULL; - char * filename3b = NULL; - char * filename4a = NULL; - char * filename4b = NULL; - char * filename5a = NULL; - char * filename5b = NULL; - char * tmpname = NULL; - char * cwdpath = NULL; + char *filename1 = NULL; + char *filename2a = NULL; + char *filename2b = NULL; + char *filename3a = NULL; + char *filename3b = NULL; + char *filename4a = NULL; + char *filename4b = NULL; + char *filename5a = NULL; + char *filename5b = NULL; + char *tmpname = NULL; + char *cwdpath = NULL; hbool_t have_posix_compat_vfd; /* Whether VFD used is compatible w/POSIX I/O calls */ #endif /* H5_HAVE_SYMLINK */ @@ -18332,14 +18332,14 @@ link_info_by_idx_old(hid_t fapl) { hid_t file_id = -1; /* File ID */ hid_t group_id = -1, group_id2 = -1; /* Group IDs */ - H5F_t * f = NULL; + H5F_t *f = NULL; unsigned hard_link; /* Create hard or soft link? */ H5L_info2_t linfo; /* Link info struct */ char objname[NAME_BUF_SIZE]; /* Object name */ char valname[NAME_BUF_SIZE]; /* Link value name */ char filename[NAME_BUF_SIZE]; /* File name */ H5O_token_t objtoken[CORDER_NLINKS]; /* Tokens (Addresses) of the objects created */ - void * vol_obj_file = NULL; /* Object of file_id */ + void *vol_obj_file = NULL; /* Object of file_id */ char tmpname[NAME_BUF_SIZE]; /* Temporary link name */ char tmpval[NAME_BUF_SIZE]; /* Temporary link value */ unsigned u; /* Local index variable */ @@ -18964,10 +18964,10 @@ delete_by_idx_old(hid_t fapl) { hid_t file_id = -1; /* File ID */ hid_t group_id = -1, group_id2 = -1; /* Group IDs */ - H5F_t * f = NULL; + H5F_t *f = NULL; H5L_info2_t linfo; /* Link info struct */ H5_iter_order_t order; /* Order within in the index */ - void * vol_obj_file = NULL; /* Object of file_id */ + void *vol_obj_file = NULL; /* Object of file_id */ char objname[NAME_BUF_SIZE]; /* Object name */ char filename[NAME_BUF_SIZE]; /* File name */ H5O_token_t objtoken[CORDER_NLINKS]; /* Tokens (Addresses) of the objects created */ @@ -19552,7 +19552,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 */ @@ -20059,7 +20059,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 */ @@ -20312,7 +20312,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 */ - H5O_token_t * objno = NULL; /* Tokens (addresses) of the objects created */ + H5O_token_t *objno = NULL; /* Tokens (addresses) of the objects created */ unsigned u; /* Local index variable */ hid_t ret; /* Generic return value */ @@ -20930,7 +20930,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 */ - H5O_token_t * objno = NULL; /* Tokens (addresses) of the objects created */ + H5O_token_t *objno = NULL; /* Tokens (addresses) of the objects created */ herr_t ret; /* Generic return value */ unsigned u, v; /* Local index variables */ @@ -217,7 +217,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; @@ -366,7 +366,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; @@ -653,7 +653,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; @@ -877,7 +877,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) /* Can't run this test with multi-file VFDs */ if (!h5_driver_uses_multiple_files(env_h5_drvr, 0)) { 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 */ @@ -1061,7 +1061,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 */ H5FS_stat_t state; @@ -1172,7 +1172,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 */ H5MF_free_section_t *sect_node = NULL; haddr_t addr; @@ -1501,7 +1501,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 */ H5MF_free_section_t *sect_node1 = NULL, *sect_node2 = NULL; haddr_t addr; @@ -2008,7 +2008,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 */ haddr_t addr, saddr; haddr_t tmp; haddr_t ma_addr = HADDR_UNDEF; @@ -2183,7 +2183,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 */ hid_t fcpl; /* File creation property list */ h5_stat_size_t file_size, new_file_size; /* file size */ H5FD_mem_t type; @@ -2336,7 +2336,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; @@ -2493,7 +2493,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; @@ -2663,7 +2663,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; @@ -2812,7 +2812,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; @@ -2949,7 +2949,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; @@ -3123,7 +3123,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; @@ -3294,7 +3294,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 = 0, file_size; H5FD_mem_t type, stype; haddr_t new_addr, addr, saddr; @@ -3591,7 +3591,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 = 0, file_size; H5FD_mem_t type, stype; haddr_t addr1, addr2, addr3, saddr1; @@ -3842,7 +3842,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 = -1; 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; @@ -4139,7 +4139,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 */ H5MF_free_section_t *sect_node = NULL; haddr_t addr; H5FS_stat_t state; @@ -4499,7 +4499,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; @@ -4763,7 +4763,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; @@ -5108,7 +5108,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; @@ -5423,7 +5423,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; @@ -5641,7 +5641,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; @@ -5912,7 +5912,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; @@ -6123,7 +6123,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; @@ -6178,7 +6178,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; @@ -6302,7 +6302,7 @@ test_mf_fs_persist_split(void) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl = -1; /* File access property list 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, btype; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */ @@ -6617,7 +6617,7 @@ test_mf_fs_persist_multi(void) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl = -1; /* File access property list 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, btype, gtype; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File allocation type */ @@ -6630,7 +6630,7 @@ test_mf_fs_persist_multi(void) H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; /* Memory usage map */ hid_t memb_fapl[H5FD_MEM_NTYPES]; /* Member access properties */ char sv[H5FD_MEM_NTYPES][64]; /* Name generators */ - const char * memb_name[H5FD_MEM_NTYPES]; /* Name generators */ + const char *memb_name[H5FD_MEM_NTYPES]; /* Name generators */ haddr_t memb_addr[H5FD_MEM_NTYPES]; /* Member starting address */ TESTING("File's free-space managers are persistent for multi-file"); @@ -6939,7 +6939,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t fcpl = -1; /* File creation property list ID */ hid_t fapl2 = -1; /* File access property list 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; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ @@ -7114,7 +7114,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) hid_t fcpl = -1; /* File creation property list */ hid_t fapl2 = -1; /* File access property list */ 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; /* File allocation type */ H5FS_stat_t fs_stat; /* Information for free-space manager */ haddr_t addr1, addr2, addr3, addr4; /* File address for H5FD_MEM_SUPER */ @@ -7304,7 +7304,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for hid_t fcpl = -1; /* File creation property list template */ hid_t fapl2 = -1; /* File access property list template */ 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; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ haddr_t addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */ @@ -7473,7 +7473,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format hid_t fcpl = -1; /* File creation property list template */ hid_t fapl2 = -1; /* File access property list template */ 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; /* File allocation type */ H5FD_mem_t tt; /* File allocation type */ haddr_t addr1, addr2, addr3, addr4, addr5, addr6; /* File address for H5FD_MEM_SUPER */ @@ -7676,7 +7676,7 @@ test_dichotomy(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; @@ -7752,7 +7752,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split) { 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; @@ -7811,7 +7811,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ hid_t fapl_new = -1; /* File access property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Addresses for small raw data blocks */ haddr_t gaddr1; /* Addresses for large data blocks */ @@ -8042,7 +8042,7 @@ test_page_try_shrink(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1; /* Address for small metadata block */ haddr_t saddr1; /* Address for small raw data block */ haddr_t gaddr1; /* Address for large data block */ @@ -8173,7 +8173,7 @@ test_page_small_try_extend(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1, addr2, addr3; /* Addresses for small metadata blocks */ haddr_t saddr1; /* Address for small raw data block */ hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ @@ -8353,7 +8353,7 @@ test_page_large_try_extend(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for large data blocks */ hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ htri_t was_extended; /* Whether the block can be extended or not */ @@ -8516,7 +8516,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t gaddr1, gaddr2, gaddr3, gaddr4; /* Addresses for blocks */ hbool_t contig_addr_vfd; /* Whether VFD used has a contiguous address space */ H5FS_stat_t fs_stat; /* Information for free-space manager */ @@ -8670,7 +8670,7 @@ test_page_small(const char *env_h5_drvr, hid_t fapl) { hid_t fid = -1; /* File ID */ hid_t fcpl = -1; /* File creation property list */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr2, addr3, addr4, addr5; /* Addresses for blocks */ haddr_t addr9, addr10, addr11; /* Address for small metadata blocks */ haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ @@ -8845,7 +8845,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) hid_t fcpl = -1; /* File creation property list ID */ hid_t fcpl2 = -1; /* File creation property list ID */ hid_t fapl_new = -1; /* File access property list ID */ - H5F_t * f = NULL; /* Internal file object pointer */ + H5F_t *f = NULL; /* Internal file object pointer */ haddr_t addr1, addr2; /* Addresses for small metadata blocks */ haddr_t saddr1, saddr2; /* Addresses for small raw data blocks */ haddr_t gaddr1, gaddr2; /* Addresses for blocks */ @@ -8885,7 +8885,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) hid_t memb_fapl; 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; diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 34a4481..f1170f0 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -136,7 +136,7 @@ static void mybzero(void *dest, size_t size) { size_t i = 0; - char * s = NULL; + char *s = NULL; HDassert(dest != NULL); s = (char *)dest; for (i = 0; i < size; i++) { @@ -1919,7 +1919,7 @@ test_basic_dataset_write(const struct mt_opts *opts) hid_t dspace_id = H5I_INVALID_HID; hid_t dtype_id = H5T_NATIVE_INT; hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE}; - int * buf = NULL; + int *buf = NULL; int i = 0; int j = 0; @@ -2440,7 +2440,7 @@ test_concurrent_access(const struct mt_opts *opts) hid_t dspace_id = H5I_INVALID_HID; hid_t dtype_id = H5T_NATIVE_INT; hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE}; - int * buf = NULL; + int *buf = NULL; int i = 0; int j = 0; diff --git a/test/mtime.c b/test/mtime.c index 0d56d15..22e7403 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -55,7 +55,7 @@ main(void) hid_t fapl, file, space, dset; hsize_t size[1] = {2}; time_t now; - struct tm * tm; + struct tm *tm; H5O_info2_t oi1, oi2; signed char buf1[32], buf2[32]; char filename[1024]; diff --git a/test/ntypes.c b/test/ntypes.c index 4a42f16..a9f0cba 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -75,7 +75,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; struct { int arr[DIM0][DIM1]; } *ipoints2 = NULL; @@ -338,9 +338,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"); @@ -661,12 +661,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"); @@ -876,9 +876,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"); @@ -1115,9 +1115,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"); @@ -1337,10 +1337,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"}; struct { short arr[DIM0][DIM1]; } *spoints2 = NULL; @@ -1501,9 +1501,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"); @@ -1684,7 +1684,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; struct { int arr[DIM0][DIM1][5]; } *ipoints3 = NULL; @@ -1834,12 +1834,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"); @@ -2044,7 +2044,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 */ @@ -2487,7 +2487,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 */ @@ -2794,7 +2794,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 3f8f70a..b0050f7 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -787,8 +787,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) @@ -1358,8 +1358,8 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) htri_t is_committed2; /* If the datatype is committed */ 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 */ @@ -2466,7 +2466,7 @@ test_copy_dataset_versionbounds(hid_t fcpl_src, hid_t fapl_src) H5F_libver_t low, high; /* File format bounds */ unsigned srcdset_layoutversion; /* Layout version of source dataset */ int i, j; /* Local index variables */ - H5D_t * dsetp = NULL; /* Pointer to internal dset structure */ + H5D_t *dsetp = NULL; /* Pointer to internal dset structure */ herr_t ret; /* Generic return value */ TESTING("H5Ocopy(): simple dataset with version bounds"); @@ -5995,7 +5995,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) @@ -10233,7 +10233,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]; @@ -10429,7 +10429,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]; @@ -10628,7 +10628,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]; @@ -10867,7 +10867,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/objcopy_ref.c b/test/objcopy_ref.c index ef20cb4..bee722a 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -571,8 +571,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) @@ -1070,8 +1070,8 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) htri_t is_committed2; /* If the datatype is committed */ 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 */ diff --git a/test/ohdr.c b/test/ohdr.c index dc0497f..d6fee11 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -73,12 +73,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"); @@ -188,8 +188,8 @@ test_ohdr_cache(char *filename, hid_t fapl) hid_t file = -1; /* File ID */ hid_t my_fapl; /* FAPL 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 */ @@ -328,7 +328,7 @@ test_ohdr_swmr(hbool_t new_format) hid_t sid = -1; /* Dataspace ID */ hid_t plist = -1; /* Dataset creation property list */ size_t compact_size = 1024; /* The size of compact dataset */ - int * wbuf = NULL; /* Buffer for writing */ + int *wbuf = NULL; /* Buffer for writing */ hsize_t dims[1]; /* Dimension sizes */ size_t u; /* Iterator */ int n; /* Data variable */ @@ -908,8 +908,8 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) hid_t sid = H5I_INVALID_HID; hid_t did = H5I_INVALID_HID; hid_t aid = H5I_INVALID_HID; - char * in_buf = NULL; - char * out_buf = NULL; + char *in_buf = NULL; + char *out_buf = NULL; size_t buf_size = 0; int out_val = 0; int in_val = 0; @@ -1833,8 +1833,8 @@ main(void) { hid_t fapl = -1; hid_t file = -1; - H5F_t * f = NULL; - const char * env_h5_drvr; /* File driver value from environment */ + H5F_t *f = NULL; + const char *env_h5_drvr; /* File driver value from environment */ hbool_t single_file_vfd; /* Whether VFD used stores data in a single file */ char filename[1024]; H5O_hdr_info_t hdr_info; /* Object info */ diff --git a/test/page_buffer.c b/test/page_buffer.c index 3825662..b005fc8 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -91,7 +91,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) hid_t grp_id = -1; hid_t filespace = -1; hsize_t dimsf[2] = {NX, NY}; /* dataset dimensions */ - int * data = NULL; /* pointer to data buffer to write */ + int *data = NULL; /* pointer to data buffer to write */ hid_t dcpl = -1; int i; int num_elements; @@ -229,7 +229,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size hid_t file_id = -1; hid_t dset_id = -1; hid_t grp_id = -1; - int * data = NULL; /* pointer to data buffer to write */ + int *data = NULL; /* pointer to data buffer to write */ int i; int j; int num_elements; @@ -312,7 +312,7 @@ set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) hbool_t multi = FALSE; 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; @@ -581,8 +581,8 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) size_t page_count = 0; int i, num_elements = 2000; haddr_t addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Raw Data Handling"); @@ -861,8 +861,8 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) int num_elements = 2000; haddr_t addr = HADDR_UNDEF; haddr_t search_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("LRU Processing"); @@ -1118,8 +1118,8 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) H5PB_t *page_buf; haddr_t meta_addr = HADDR_UNDEF; haddr_t raw_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Minimum Metadata threshold Processing"); HDprintf("\n"); @@ -1750,8 +1750,8 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) size_t base_meta_cnt = 0; haddr_t meta_addr = HADDR_UNDEF; haddr_t raw_addr = HADDR_UNDEF; - int * data = NULL; - H5F_t * f = NULL; + int *data = NULL; + H5F_t *f = NULL; TESTING("Statistics Collection"); diff --git a/test/ros3.c b/test/ros3.c index a340985..2bfca96 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -442,7 +442,7 @@ test_fapl_config_validation(void) *************************/ struct testcase { - const char * msg; + const char *msg; herr_t expected; H5FD_ros3_fapl_t config; }; @@ -830,7 +830,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; @@ -1088,7 +1088,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 "); @@ -1262,7 +1262,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"); @@ -1406,7 +1406,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 f6e9ea3..d3998f3 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -459,10 +459,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]; }; @@ -512,10 +512,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 */ @@ -765,7 +765,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"); @@ -1135,7 +1135,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; /********* @@ -1220,9 +1220,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 */ }; @@ -1418,14 +1418,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[] = { @@ -1830,9 +1830,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; @@ -2033,7 +2033,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; @@ -2194,9 +2194,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]; }; @@ -2298,11 +2298,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]; @@ -2398,7 +2398,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"); @@ -2508,7 +2508,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 61290a3..01f38ae 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -178,7 +178,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 */ if (!new_format || (new_format && contig_addr_vfd)) @@ -2253,7 +2253,7 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum 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 */ @@ -2302,8 +2302,9 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ for (i = 0; i < 4; i++) { - dims[i] = (hsize_t)( - index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + dims[i] = + (hsize_t)(index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) + : 10); dim_log->arr[0][i] = dims[i]; } /* end for */ @@ -2473,7 +2474,7 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum 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 hyperslab operations on memory */ @@ -2551,8 +2552,9 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ for (i = 0; i < 4; i++) { - dims[i] = (hsize_t)( - index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + dims[i] = + (hsize_t)(index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) + : 10); dim_log->arr[0][i] = dims[i]; } diff --git a/test/stab.c b/test/stab.c index 255ad39..fd4e15c 100644 --- a/test/stab.c +++ b/test/stab.c @@ -200,7 +200,7 @@ test_long(hid_t fcpl, 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; @@ -649,7 +649,7 @@ long_compact(hid_t fcpl, 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/swmr.c b/test/swmr.c index 9ab96d0..230073e 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -856,7 +856,7 @@ test_metadata_read_retry_info(hid_t in_fapl) hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fid1 = H5I_INVALID_HID; /* File ID */ H5F_retry_info_t info, info1; /* The collection of metadata retries */ - H5F_t * f = NULL, *f1 = NULL; /* Internal file object pointers */ + H5F_t *f = NULL, *f1 = NULL; /* Internal file object pointers */ unsigned i, j, n; /* Local index variables */ hid_t did1 = H5I_INVALID_HID; /* Dataset ID */ hid_t did2 = H5I_INVALID_HID; /* Dataset ID */ @@ -3208,7 +3208,7 @@ tssw_persist_dapl_verify(hid_t did, hid_t vdsid1, hid_t vdsid2, hsize_t boundary hid_t vds_dapl2 = H5I_INVALID_HID; hsize_t boundary_out = 0; H5D_append_cb_t append_func_out = NULL; - void * append_func_ud_out = NULL; + void *append_func_ud_out = NULL; size_t rdcc_nslots_out = 0; size_t rdcc_nbytes_out = 0; double rdcc_w0_out = 0.; @@ -3311,12 +3311,12 @@ test_start_swmr_write_persist_dapl(hid_t in_fapl) hsize_t chunk_dim[1] = {2}; /* Chunk dimension sizes */ hsize_t boundary = 23; H5D_append_cb_t append_func = dummy_append_flush_cb; - void * append_func_ud = &boundary; + void *append_func_ud = &boundary; size_t rdcc_nslots = 125; size_t rdcc_nbytes = 23434; double rdcc_w0 = 0.68419; - const char * efile_prefix = "dummy_efile_prefix"; - const char * virtual_prefix = "dummy_virtual_prefix"; + const char *efile_prefix = "dummy_efile_prefix"; + const char *virtual_prefix = "dummy_virtual_prefix"; hsize_t gap_size = 421; H5D_vds_view_t virtual_view = H5D_VDS_FIRST_MISSING; char filename[NAME_BUF_SIZE]; /* File name */ @@ -3592,7 +3592,7 @@ test_object_flush_cb(hid_t in_fapl) hsize_t dims[2] = {5, 10}; /* Dataset dimension sizes */ int buf[50]; /* Data buffer */ H5F_flush_cb_t ret_cb; /* The callback function set in object flush property */ - void * ret_ct; /* The user data set in object flush property */ + void *ret_ct; /* The user data set in object flush property */ unsigned flush_ct = 0; /* The user data for object flush property */ char filename[NAME_BUF_SIZE]; /* File name */ int i; /* Local index variable */ @@ -3866,7 +3866,7 @@ test_append_flush_generic(void) unsigned count = 0; /* The user data for append flush property */ hsize_t ret_boundary[3]; /* The boundary set in append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in append flush property */ - unsigned * ret_count; /* The user data set in append flush property */ + unsigned *ret_count; /* The user data set in append flush property */ herr_t ret; /* The return value */ TESTING("H5Fget/set_append_flush() for a generic dataset access property list"); @@ -4049,7 +4049,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -4271,7 +4271,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -4493,7 +4493,7 @@ test_append_flush_dataset_multiple(hid_t in_fapl) hsize_t ret_boundary[3]; /* Boundary size set in the append flush property */ H5D_append_cb_t ret_cb; /* The callback function set in the append flush property */ - unsigned * ret_count; /* The user data set in the append flush property */ + unsigned *ret_count; /* The user data set in the append flush property */ char filename[NAME_BUF_SIZE]; /* file name */ @@ -7731,8 +7731,8 @@ main(void) { int nerrors = 0; /* The # of errors */ hid_t fapl = -1; /* File access property list ID */ - char * driver = NULL; /* VFD string (from env variable) */ - char * lock_env_var = NULL; /* file locking env var pointer */ + char *driver = NULL; /* VFD string (from env variable) */ + char *lock_env_var = NULL; /* file locking env var pointer */ hbool_t use_file_locking; /* read from env var */ hbool_t file_locking_enabled = FALSE; /* Checks if the file system supports locks */ diff --git a/test/swmr_common.h b/test/swmr_common.h index 5fcf923..84fe4d4 100644 --- a/test/swmr_common.h +++ b/test/swmr_common.h @@ -40,7 +40,7 @@ /* Information about a symbol/dataset */ typedef struct { - char * name; /* Dataset name for symbol */ + char *name; /* Dataset name for symbol */ hid_t dsid; /* Dataset ID for symbol */ hsize_t nrecords; /* Number of records for the symbol */ } symbol_info_t; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index db3eba0..3369562 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -394,7 +394,7 @@ main(int argc, char *argv[]) int ncommon = 5; /* # of common symbols to poll */ int nrandom = 10; /* # of random symbols to poll */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t use_seed = FALSE; /* Set to 1 if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ unsigned u; /* Local index variables */ diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index d046b40..54ea363 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -358,7 +358,7 @@ main(int argc, char *argv[]) long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ int comp_level = -1; /* Compression level (-1 is no compression) */ diff --git a/test/swmr_writer.c b/test/swmr_writer.c index c4178f0..c8fe716 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -281,7 +281,7 @@ main(int argc, char *argv[]) long nrecords = 0; /* # of records to append */ long flush_count = 10000; /* # of records to write between flushing file */ hbool_t verbose = TRUE; /* Whether to emit some informational messages */ - FILE * verbose_file = NULL; /* File handle for verbose output */ + FILE *verbose_file = NULL; /* File handle for verbose output */ hbool_t old = FALSE; /* Whether to use non-latest-format when opening file */ hbool_t use_seed = FALSE; /* Set to TRUE if a seed was set on the command line */ unsigned random_seed = 0; /* Random # seed */ diff --git a/test/tarray.c b/test/tarray.c index 4669fc7..6742bb1 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]; @@ -579,7 +579,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 */ @@ -791,7 +791,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 */ @@ -1046,7 +1046,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 */ @@ -1082,7 +1082,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 */ /* @@ -1915,7 +1915,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 d214719..1898191 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -164,7 +164,7 @@ typedef struct { int stop; /* # of iterations to stop after */ hsize_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); @@ -191,7 +191,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}; @@ -806,7 +806,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 */ @@ -1430,7 +1430,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) { @@ -7206,10 +7206,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 */ @@ -8441,7 +8441,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 */ @@ -8778,7 +8778,7 @@ test_attr_shared_rename(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 */ @@ -9225,7 +9225,7 @@ test_attr_shared_delete(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 */ @@ -9597,7 +9597,7 @@ test_attr_shared_unlink(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 e7499ed..d7e3651 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -642,7 +642,7 @@ void TestAlarmOn(void) { #ifdef H5_HAVE_ALARM - 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 3babae5..f8e0a0a 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1096,7 +1096,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; @@ -2527,7 +2527,7 @@ test_file_double_file_dataset_open(hbool_t new_format) const char *data[] = {"String 1", "String 2", "String 3", "String 4", "String 5"}; /* Input Data */ const char *e_data[] = {"String 1", "String 2", "String 3", "String 4", "String 5", "String 6", "String 7"}; /* Input Data */ - char * buffer[5]; /* Output buffer */ + char *buffer[5]; /* Output buffer */ int wbuf[4] = {1, 2, 3, 4}; /* Input data */ herr_t ret; /* Generic return value */ @@ -3084,7 +3084,7 @@ cal_chksum(const char *file, uint32_t *chksum) { int curr_num_errs = GetTestNumErrs(); /* Retrieve the current # of errors */ int fdes = -1; /* File descriptor */ - void * file_data = NULL; /* Copy of file data */ + void *file_data = NULL; /* Copy of file data */ ssize_t bytes_read; /* # of bytes read */ h5_stat_t sb; /* Stat buffer for file */ herr_t ret; /* Generic return value */ @@ -4318,7 +4318,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) { 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; @@ -5862,7 +5862,7 @@ static void test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non_def_fsm) { hid_t fid = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ hbool_t ok; /* The result is ok or not */ herr_t ret; /* The return value */ @@ -6028,7 +6028,7 @@ static void test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non_def_fsm) { hid_t fid = H5I_INVALID_HID; /* File ID */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ hid_t new_fapl = H5I_INVALID_HID; /* File access property list */ unsigned super_vers; /* Superblock version */ H5F_libver_t low, high; /* Low and high bounds */ @@ -6187,7 +6187,7 @@ test_libver_bounds_obj(hid_t fapl) hid_t gid = H5I_INVALID_HID; /* Group ID */ hid_t fcpl = H5I_INVALID_HID; /* File creation property list */ hid_t new_fapl = H5I_INVALID_HID; /* File access property list */ - H5F_t * f = NULL; /* Internal file pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ H5O_native_info_t ninfo; /* Object info */ H5G_info_t ginfo; /* Group info */ @@ -6352,8 +6352,8 @@ test_libver_bounds_dataset(hid_t fapl) hid_t did = H5I_INVALID_HID; /* Dataset ID */ hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list */ - H5D_t * dset = NULL; /* Internal dataset pointer */ - H5F_t * f = NULL; /* Internal file pointer */ + H5D_t *dset = NULL; /* Internal dataset pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ hsize_t fix_dims2[2] = {10, 4}; /* Dimension sizes */ @@ -6595,8 +6595,8 @@ test_libver_bounds_dataspace(hid_t fapl) hid_t sid_compact = H5I_INVALID_HID, sid_contig = H5I_INVALID_HID; /* Dataspace IDs */ hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list */ hid_t dcpl_compact = H5I_INVALID_HID, dcpl_contig = H5I_INVALID_HID; /* Dataset creation property lists */ - H5S_t * space = NULL, *space_null = NULL; /* Internal dataspace pointers */ - H5F_t * f = NULL; /* Internal file pointer */ + H5S_t *space = NULL, *space_null = NULL; /* Internal dataspace pointers */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ hsize_t dims[1] = {1}; /* Dimension sizes */ hsize_t dims2[2] = {5, 4}; /* Dimension sizes */ @@ -6942,9 +6942,9 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid) hsize_t dims2[2] = {5, 4}; /* Dimension sizes */ hsize_t max_dims2[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dimension sizes */ hsize_t chunks[2] = {2, 3}; /* Chunk dimension sizes */ - H5T_t * dtype = NULL; /* Internal datatype pointer */ - H5T_t * str_dtype = NULL; /* Internal datatype pointer for the string datatype */ - H5F_t * f = NULL; /* Internal file pointer */ + H5T_t *dtype = NULL; /* Internal datatype pointer */ + H5T_t *str_dtype = NULL; /* Internal datatype pointer for the string datatype */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ @@ -7181,8 +7181,8 @@ test_libver_bounds_attributes(hid_t fapl) hid_t sid = H5I_INVALID_HID; /* Dataspace ID */ hid_t aid = H5I_INVALID_HID; /* Attribute ID */ hid_t attr_cpl = H5I_INVALID_HID; /* Attribute creation property list */ - H5A_t * attr = NULL; /* Internal attribute pointer */ - H5F_t * f = NULL; /* Internal file pointer */ + H5A_t *attr = NULL; /* Internal attribute pointer */ + H5F_t *f = NULL; /* Internal file pointer */ H5F_libver_t low, high; /* Low and high bounds */ herr_t ret; /* Return value */ diff --git a/test/tgenprop.c b/test/tgenprop.c index f54fbbc..0a5e569 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -82,7 +82,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 */ @@ -1780,7 +1780,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 */ @@ -1853,7 +1853,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/th5o.c b/test/th5o.c index 4ffcbef..6110ff4 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -931,8 +931,8 @@ test_h5o_link(void) hsize_t dims[2] = {TEST6_DIM1, TEST6_DIM2}; htri_t committed; /* Whether the named datatype is committed */ H5F_libver_t low, high; /* File format bounds */ - int * wdata; - int * rdata; + int *wdata; + int *rdata; int i, n; herr_t ret; /* Value returned from API calls */ diff --git a/test/th5s.c b/test/th5s.c index ac82646..a9959ce 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -1601,7 +1601,7 @@ static herr_t test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, uint8_t expected_enc_size, hbool_t expected_to_fail) { - char * buf = NULL; /* Pointer to the encoded buffer */ + char *buf = NULL; /* Pointer to the encoded buffer */ size_t buf_size; /* Size of the encoded buffer */ hid_t d_sid = -1; /* The decoded dataspace ID */ htri_t check; @@ -2500,9 +2500,9 @@ test_h5s_chunk(void) hsize_t dims[2]; hsize_t csize[2]; double **chunk_data_dbl = NULL; - double * chunk_data_dbl_data = NULL; - float ** chunk_data_flt = NULL; - float * chunk_data_flt_data = NULL; + double *chunk_data_dbl_data = NULL; + float **chunk_data_flt = NULL; + float *chunk_data_flt_data = NULL; int i, j; /* Allocate memory */ @@ -3291,7 +3291,7 @@ test_versionbounds(void) hid_t dset_space = -1; /* Retrieved dataset's dataspace ID */ hsize_t dim[1]; /* Dataset dimensions */ H5F_libver_t low, high; /* File format bounds */ - H5S_t * spacep = NULL; /* Pointer to internal dataspace */ + H5S_t *spacep = NULL; /* Pointer to internal dataspace */ herr_t ret = 0; /* Generic return value */ /* Output message about test being performed */ @@ -32,8 +32,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; @@ -254,10 +254,10 @@ test_search_func(void H5_ATTR_UNUSED *ptr1, hid_t H5_ATTR_UNUSED id, void H5_ATT 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)); @@ -691,7 +691,7 @@ test_remove_clear_type(void) { H5I_type_t obj_type; rct_obj_list_t obj_list; - rct_obj_t * objects = NULL; /* Convenience pointer to objects stored in master list */ + rct_obj_t *objects = NULL; /* Convenience pointer to objects stored in master list */ size_t list_size; long i, j; herr_t ret; /* return value */ @@ -894,7 +894,7 @@ static herr_t realize_future_cb(void *_future_obj, hid_t *actual_id) { future_obj_t *future_obj = (future_obj_t *)_future_obj; /* Future object */ - int * actual_obj; /* Pointer to the actual object */ + int *actual_obj; /* Pointer to the actual object */ /* Check for bad future object */ if (NULL == future_obj) @@ -948,7 +948,7 @@ static herr_t realize_future_generate_cb(void *_future_obj, hid_t *actual_id) { future_obj_t *future_obj = (future_obj_t *)_future_obj; /* Future object */ - int * actual_obj; /* Pointer to the actual object */ + int *actual_obj; /* Pointer to the actual object */ if (NULL != future_obj) return FAIL; @@ -984,8 +984,8 @@ test_future_ids(void) hid_t future_id; /* ID for future object */ int fake_future_obj; /* "Fake" future object for tests */ future_obj_t *future_obj; /* Future object */ - int * actual_obj; /* Actual object */ - int * actual_obj2; /* Another actual object */ + int *actual_obj; /* Actual object */ + int *actual_obj2; /* Another actual object */ H5I_type_t id_type; /* Type of ID */ H5T_class_t type_class; /* Datatype class */ herr_t ret; /* Return value */ diff --git a/test/timer.c b/test/timer.c index 11b7427..ea9787a 100644 --- a/test/timer.c +++ b/test/timer.c @@ -126,7 +126,7 @@ static herr_t test_timer_system_user(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; herr_t err; @@ -194,7 +194,7 @@ static herr_t test_timer_elapsed(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; herr_t err; @@ -238,7 +238,7 @@ static herr_t test_timer_functionality(void) { int i; - char * buf = NULL; + char *buf = NULL; H5_timer_t timer; H5_timevals_t times; diff --git a/test/titerate.c b/test/titerate.c index d870750..f422f7c 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -130,7 +130,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 */ @@ -418,7 +418,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 */ @@ -745,8 +745,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 */ @@ -1010,7 +1010,7 @@ test_corrupted_attnamelen(void) int err_status; /* Status returned by H5Aiterate2 */ herr_t ret; /* Return value */ hbool_t driver_is_default_compatible; - const char * testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ + const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */ const char *err_message = "attribute name has different length than stored length"; /* the error message produced when the failure occurs */ diff --git a/test/tmisc.c b/test/tmisc.c index 9fa8f2f..db48c11 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -444,8 +444,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(); @@ -1249,8 +1249,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 */ @@ -2026,7 +2026,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; @@ -2309,10 +2309,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 */ @@ -3861,7 +3861,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 */ @@ -3927,7 +3927,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 */ @@ -5686,8 +5686,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 */ @@ -5815,8 +5815,8 @@ test_misc33(void) static void test_misc34(void) { - void * mem = NULL; /* allocated buffer */ - char * dup = NULL; /* 'duplicated' string */ + void *mem = NULL; /* allocated buffer */ + char *dup = NULL; /* 'duplicated' string */ size_t sz = 0; /* buffer size */ /* Output message about test being performed */ @@ -5974,7 +5974,7 @@ static int test_misc36_context; static void test_misc36_cb1(void *_ctx) { - int * ctx = (int *)_ctx; /* Set up context pointer */ + int *ctx = (int *)_ctx; /* Set up context pointer */ hbool_t is_terminating; /* Flag indicating the library is terminating */ herr_t ret; /* Return value */ @@ -5995,7 +5995,7 @@ test_misc36_cb1(void *_ctx) static void test_misc36_cb2(void *_ctx) { - int * ctx = (int *)_ctx; /* Set up context pointer */ + int *ctx = (int *)_ctx; /* Set up context pointer */ hbool_t is_terminating; /* Flag indicating the library is terminating */ herr_t ret; /* Return value */ diff --git a/test/trefer.c b/test/trefer.c index 95e601e..4bd5128 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -99,10 +99,10 @@ test_reference_params(void) H5R_ref_t *wbuf, /* buffer to write to disk */ *rbuf, /* buffer read from disk */ *tbuf; /* temp. buffer read from disk */ - unsigned * obuf; + unsigned *obuf; H5R_type_t type; /* Reference type */ unsigned int i; /* Counters */ - const char * write_comment = "Foo!"; /* Comments for group */ + const char *write_comment = "Foo!"; /* Comments for group */ hid_t ret_id; /* Generic hid_t return value */ ssize_t name_size; /* Size of reference name */ herr_t ret; /* Generic return value */ @@ -331,7 +331,7 @@ test_reference_obj(void) hid_t dapl_id; /* Dataset access property list */ H5R_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ - unsigned * ibuf, *obuf; + unsigned *ibuf, *obuf; unsigned i, j; /* Counters */ H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ @@ -567,7 +567,7 @@ test_reference_vlen_obj(void) hid_t dapl_id; /* Dataset access property list */ H5R_ref_t *wbuf, /* buffer to write to disk */ *rbuf = NULL; /* buffer read from disk */ - unsigned * ibuf, *obuf; + unsigned *ibuf, *obuf; unsigned i, j; /* Counters */ H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ @@ -831,7 +831,7 @@ test_reference_cmpnd_obj(void) hsize_t dims1[] = {SPACE1_DIM1}; hsize_t cmpnd_dims[] = {1}; hid_t dapl_id; /* Dataset access property list */ - unsigned * ibuf, *obuf; + unsigned *ibuf, *obuf; unsigned i; /* Counter */ H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ @@ -1127,15 +1127,15 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) 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 */ H5R_ref_t *wbuf = NULL, /* buffer to write to disk */ *rbuf = NULL; /* buffer read from disk */ H5R_ref_t nvrbuf[3] = {{{{0}}}, {{{101}}}, {{{255}}}}; /* buffer with non-valid refs */ - uint8_t * dwbuf = NULL, /* Buffer for writing numeric data to disk */ + uint8_t *dwbuf = NULL, /* Buffer for writing numeric data to disk */ *drbuf = NULL; /* 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; /* Counters */ hssize_t hssize_ret; /* hssize_t return value */ @@ -1590,14 +1590,14 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) 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 */ H5R_ref_t *wbuf = NULL, /* buffer to write to disk */ *rbuf = NULL; /* 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; /* Temporary pointer to uint8 data */ + uint8_t *tu8; /* Temporary pointer to uint8 data */ H5O_type_t obj_type; /* Object type */ int i; /* Counter */ herr_t ret; /* Generic return value */ @@ -2011,7 +2011,7 @@ static herr_t test_deref_iter_op(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_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 */ @@ -2738,10 +2738,10 @@ test_reference_compat_conv(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 */ - hobj_ref_t * wbuf_obj = NULL; /* Buffer to write to disk */ - H5R_ref_t * rbuf_obj = NULL; /* Buffer read from disk */ + hobj_ref_t *wbuf_obj = NULL; /* Buffer to write to disk */ + H5R_ref_t *rbuf_obj = NULL; /* Buffer read from disk */ hdset_reg_ref_t *wbuf_reg = NULL; /* Buffer to write to disk */ - H5R_ref_t * rbuf_reg = NULL; /* Buffer read from disk */ + H5R_ref_t *rbuf_reg = NULL; /* Buffer read from disk */ H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ unsigned int i; /* Counter */ @@ -3052,7 +3052,7 @@ test_reference_perf(void) *rbuf_deprec; /* deprecated references */ hdset_reg_ref_t *wbuf_reg_deprec, /* deprecated references*/ *rbuf_reg_deprec; /* deprecated references*/ - unsigned * ibuf, *obuf; + unsigned *ibuf, *obuf; unsigned i, j; /* Counters */ H5O_type_t obj_type; /* Object type */ herr_t ret; /* Generic return value */ @@ -3453,7 +3453,7 @@ void test_reference(void) { H5F_libver_t low, high; /* Low and high bounds */ - const char * env_h5_drvr; /* File Driver value from environment */ + const char *env_h5_drvr; /* File Driver value from environment */ /* Output message about test being performed */ MESSAGE(5, ("Testing References\n")); diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index 755df68..584dbc4 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -75,7 +75,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 */ @@ -259,7 +259,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]; @@ -518,15 +518,15 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) 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 */ @@ -963,14 +963,14 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) 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 */ @@ -1350,7 +1350,7 @@ static herr_t test_deref_iter_op(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_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 89e62db..ab62295 100644 --- a/test/trefstr.c +++ b/test/trefstr.c @@ -342,7 +342,7 @@ test_refstr_acat(void) H5RS_str_t *rs; /* Ref-counted string created */ const char *s; /* Pointer to raw string in ref-counted string */ char buf[256]; /* Buffer to compare against */ - char * large_str, *large_str2; /* Large strings to append */ + char *large_str, *large_str2; /* Large strings to append */ int cmp; /* Comparison value */ herr_t ret; /* Generic return value */ diff --git a/test/tselect.c b/test/tselect.c index 0d4176b..b80ae27 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -455,8 +455,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) + @@ -1958,10 +1958,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 */ @@ -2811,7 +2811,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 */ @@ -2936,9 +2936,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]; @@ -6248,7 +6248,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 */ @@ -6390,8 +6390,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. @@ -7349,7 +7349,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; /**************************************************************** @@ -7361,7 +7361,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*/ @@ -7401,7 +7401,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 */ @@ -7477,7 +7477,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 */ @@ -7577,7 +7577,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 */ @@ -7688,7 +7688,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 */ @@ -7808,7 +7808,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 */ @@ -13500,8 +13500,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 */ @@ -15249,7 +15249,7 @@ test_sel_iter(void) coord1[9][0] = 0; coord1[9][1] = 3; ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, - (const hsize_t *)coord1); + (const hsize_t *)coord1); CHECK(ret, FAIL, "H5Sselect_elements"); break; @@ -15368,7 +15368,7 @@ test_sel_iter(void) coord1[9][0] = 0; coord1[9][1] = 3; ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)POINT1_NPOINTS, - (const hsize_t *)coord1); + (const hsize_t *)coord1); CHECK(ret, FAIL, "H5Sselect_elements"); break; diff --git a/test/tskiplist.c b/test/tskiplist.c index 31b5cff..46112a4 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 */ @@ -1172,7 +1172,7 @@ test_skiplist_free(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}; */ @@ -1236,7 +1236,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}; */ @@ -1300,7 +1300,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}; @@ -1379,7 +1379,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}; @@ -1458,7 +1458,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}; @@ -1505,7 +1505,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 cf813a8..d4115d9 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -3694,7 +3694,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 da78a7d..15730f2 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -76,7 +76,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 9fafaca..d105ffe 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 acaa9d6..2154f87 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 d30ed48..4ab29c4 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) @@ -175,7 +175,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/tunicode.c b/test/tunicode.c index 7d4dba6..06a31b4 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 5168d39..e8aa157 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -39,7 +39,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); @@ -55,7 +55,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 */ @@ -85,7 +85,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 */ /* @@ -117,8 +117,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 */ @@ -253,8 +253,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 */ @@ -486,7 +486,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 */ @@ -583,7 +583,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); @@ -673,7 +673,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 0c4cf68..5a998bc 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; - const char * str_id; - const char * str_name; - const char * str_desc; - const char * str_orig; - const char * str_stat; + const char *str_id; + const char *str_name; + const char *str_desc; + const char *str_orig; + const char *str_stat; unsigned int ver; double val; double ma; double mi; - const char * str_form; - const char * str_unit; + const char *str_form; + const 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.0, 100.0, 1.0, "liquid", "meter"}; const dtype1_struct wdata = {3, 4, "", NULL, "\0", "foo", "two", 6, 8.0, 200.0, 2.0, "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 265c497..7967eb9 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -568,8 +568,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 */ diff --git a/test/unregister.c b/test/unregister.c index b456589..e09c547 100644 --- a/test/unregister.c +++ b/test/unregister.c @@ -90,8 +90,8 @@ test_unregister_filters(hid_t fapl_id) char filename[FILENAME_BUF_SIZE]; const hsize_t chunk_dims[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2}; /* Chunk dimensions */ hsize_t dims[2]; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; herr_t ret; TESTING("Unregistering filter"); @@ -49,7 +49,7 @@ typedef struct options_t { hsize_t dims[UC_RANK]; /* dataset initial dims */ hsize_t max_dims[UC_RANK]; /* dataset max dims */ hsize_t nplanes; /* number of planes to write, default proportional to chunksize */ - char * filename; /* use case data filename */ + char *filename; /* use case data filename */ part_t launch; /* launch writer, reader or both */ hbool_t use_swmr; /* use swmr open (1) or not */ int iterations; /* iterations, default 1 */ diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index d40e56d..ea674ec 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -40,7 +40,7 @@ const char *progname_g = "use_disable_mdc_flushes"; /* program name */ goto done; \ } -char * filename_g; +char *filename_g; hsize_t nplanes_g; int use_swmr_g; int chunkplanes_g; @@ -298,7 +298,7 @@ write_file(void) hid_t dsid; /* dataset ID */ hid_t fapl; /* File access property list */ hid_t dcpl; /* Dataset creation property list */ - char * name; + char *name; UC_CTYPE *buffer, *bufptr; /* data buffer */ hsize_t cz = (hsize_t)chunksize_g; /* Chunk size */ hid_t f_sid; /* dataset file space id */ @@ -121,8 +121,8 @@ vds_select_equal(hid_t space1, hid_t space2) { H5S_sel_type type1; H5S_sel_type type2; - hsize_t * buf1 = NULL; - hsize_t * buf2 = NULL; + hsize_t *buf1 = NULL; + hsize_t *buf2 = NULL; size_t i; htri_t ret_value = TRUE; @@ -364,7 +364,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex hid_t file = -1; /* File */ hid_t dset = -1; /* Virtual dataset */ H5D_space_status_t space_status; /* Dataset space status */ - void * plist_buf = NULL; /* Serialized property list buffer */ + void *plist_buf = NULL; /* Serialized property list buffer */ H5O_native_info_t ninfo; /* Object info struct */ htri_t tri_ret; @@ -1184,11 +1184,11 @@ error: static int test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ @@ -1462,12 +1462,12 @@ error: static int test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * vfilename2 = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *vfilename2 = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ @@ -7400,14 +7400,14 @@ error: static int test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) { - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * srcfilename2 = NULL; - char * srcfilename2_map = NULL; - char * vfilename = NULL; - char * printf_srcfilename_map = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *srcfilename2 = NULL; + char *srcfilename2_map = NULL; + char *vfilename = NULL; + char *printf_srcfilename_map = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; const char *printf_srcfilename_map_orig = "vds_src_%b"; const char *srcfilenamepct_map_orig = "vds%%%%_src"; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ @@ -12304,7 +12304,7 @@ main(void) int test_api_config; unsigned bit_config; H5F_libver_t low, high; /* Low and high bounds */ - const char * env_h5_drvr; /* File Driver value from environment */ + const char *env_h5_drvr; /* File Driver value from environment */ hbool_t driver_is_parallel; int nerrors = 0; diff --git a/test/vds_env.c b/test/vds_env.c index fb4a300..74b3caa 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -45,12 +45,12 @@ static int test_vds_prefix_second(unsigned config, hid_t fapl) { const char *srcfilenamepct_map_orig = "vds%%%%_src"; - char * srcfilename = NULL; - char * srcfilename_map = NULL; - char * vfilename = NULL; - char * vfilename2 = NULL; - char * srcfilenamepct = NULL; - char * srcfilenamepct_map = NULL; + char *srcfilename = NULL; + char *srcfilename_map = NULL; + char *vfilename = NULL; + char *vfilename2 = NULL; + char *srcfilenamepct = NULL; + char *srcfilenamepct_map = NULL; hid_t srcfile[4] = {-1, -1, -1, -1}; /* Files with source dsets */ hid_t vfile = -1; /* File with virtual dset */ hid_t dcpl = -1; /* Dataset creation property list */ @@ -326,7 +326,7 @@ main(void) hid_t fapl, my_fapl; unsigned bit_config; H5F_libver_t low, high; /* Low and high bounds */ - const char * env_h5_drvr; /* File Driver value from environment */ + const char *env_h5_drvr; /* File Driver value from environment */ hbool_t driver_is_parallel; int nerrors = 0; diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c index 727cd80..e6f9813 100644 --- a/test/vds_swmr_reader.c +++ b/test/vds_swmr_reader.c @@ -29,7 +29,7 @@ main(void) int n_elements = 0; /* size of buffer (elements) */ size_t size = 0; /* size of buffer (bytes) */ - int * buffer = NULL; /* data buffer */ + int *buffer = NULL; /* data buffer */ int n_dims = -1; /* # dimensions in dataset */ hsize_t dims[RANK]; /* current size of dataset */ @@ -143,8 +143,8 @@ static int __k; /* Helper structure to pass around dataset information. */ struct splitter_dataset_def { - void * buf; /* contents of dataset */ - const char * dset_name; /* dataset name, always added to root group */ + void *buf; /* contents of dataset */ + const char *dset_name; /* dataset name, always added to root group */ hid_t mem_type_id; /* datatype */ const hsize_t *dims; /* dimensions */ int n_dims; /* rank */ @@ -202,7 +202,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"); @@ -319,16 +319,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 */ @@ -707,14 +707,14 @@ 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; - void * proto_points = NULL, *proto_check = NULL; - int * points = NULL, *check = NULL, *p1 = NULL, *p2 = NULL; + void *proto_points = NULL, *proto_check = 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; @@ -1024,9 +1024,9 @@ test_family(void) char filename[1024]; char dname[] = "dataset"; unsigned int i, j; - int * fhandle = NULL, *fhandle2 = NULL; - int ** buf = NULL; - int * buf_data = NULL; + int *fhandle = NULL, *fhandle2 = NULL; + int **buf = NULL; + int *buf_data = NULL; hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE}; hsize_t file_size; @@ -1338,8 +1338,8 @@ test_family_member_fapl(void) char dname[] = "dataset"; unsigned i = 0; unsigned j = 0; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE}; TESTING("Family member FAPL"); @@ -1495,20 +1495,20 @@ 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}; char dname[] = "dataset"; char meta[] = "this is some metadata on this file"; int i, j; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; TESTING("MULTI file driver"); @@ -1759,8 +1759,8 @@ test_multi_compat(void) char sv[H5FD_MEM_NTYPES][32]; hsize_t dims[2] = {MULTI_SIZE, MULTI_SIZE}; int i, j; - int ** buf = NULL; - int * buf_data = NULL; + int **buf = NULL; + int *buf_data = NULL; TESTING("MULTI file driver backward compatibility"); @@ -1939,7 +1939,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; @@ -2065,7 +2065,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"); @@ -2174,7 +2174,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*/ @@ -2482,8 +2482,8 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err hid_t fapl_id_out = H5I_INVALID_HID; hid_t fapl_id_cpy = H5I_INVALID_HID; H5FD_splitter_vfd_config_t *vfd_config = NULL; - char * filename_rw = NULL; - FILE * logfile = NULL; + char *filename_rw = NULL; + FILE *logfile = NULL; int ret_value = 0; if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) @@ -2712,7 +2712,7 @@ error: static int splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) { - char * filename_rw = NULL; + char *filename_rw = NULL; H5FD_splitter_vfd_config_t *vfd_config = NULL; hid_t fapl_id = H5I_INVALID_HID; hid_t file_id = H5I_INVALID_HID; @@ -3055,8 +3055,8 @@ done: static int splitter_tentative_open_test(hid_t child_fapl_id) { - const char * filename_tmp = "splitter_tmp.h5"; - char * filename_rw = NULL; + const char *filename_tmp = "splitter_tmp.h5"; + char *filename_rw = NULL; H5FD_splitter_vfd_config_t *vfd_config = NULL; hid_t fapl_id = H5I_INVALID_HID; hid_t file_id = H5I_INVALID_HID; @@ -4057,7 +4057,7 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz { hbool_t result = TRUE; /* will set to FALSE on failure */ char fill_char = base_fill_char; - void * temp_buf = NULL; + void *temp_buf = NULL; uint32_t i; uint32_t j; H5FD_mem_t mem_types[6] = {H5FD_MEM_SUPER, H5FD_MEM_BTREE, H5FD_MEM_DRAW, @@ -4163,7 +4163,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a { hbool_t result = TRUE; /* will set to FALSE on failure */ char fill_char = base_fill_char; - void * temp_buf = NULL; + void *temp_buf = NULL; uint32_t fix_point; uint32_t i; uint32_t j; @@ -4411,7 +4411,7 @@ test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], con uint32_t i; size_t j; const char *w_buf; - char * r_buf; + char *r_buf; const char *mem_type_names[7] = {"H5FD_MEM_DEFAULT", "H5FD_MEM_SUPER", "H5FD_MEM_BTREE", "H5FD_MEM_DRAW", "H5FD_MEM_GHEAP", "H5FD_MEM_LHEAP", "H5FD_MEM_OHDR"}; size_t size = SIZE_MAX; @@ -4484,7 +4484,7 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad H5FD_mem_t type = H5FD_MEM_NTYPES; const char *w_buf; - char * r_buf; + char *r_buf; HDfprintf(stdout, "\n\nDumping test vector \"%s\" of length %d\n\n", name, count); @@ -4562,9 +4562,9 @@ test_vector_io(const char *vfd_name) hid_t fapl_id = -1; /* file access property list ID */ haddr_t eoa; /* file eoa */ char filename[1024]; /* filename */ - char * buf; /* tmp ptr to buf */ + char *buf; /* tmp ptr to buf */ unsigned flags = 0; /* file open flags */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ uint32_t i; /* index */ uint32_t j; /* index */ uint32_t count = VECTOR_LEN; /* length of vectors */ @@ -4598,12 +4598,12 @@ test_vector_io(const char *vfd_name) const void *f_write_bufs_0[VECTOR_LEN]; /* fixed write bufs vector */ const void *f_write_bufs_1[VECTOR_LEN]; /* fixed write bufs vector */ const void *f_write_bufs_2[VECTOR_LEN]; /* fixed write bufs vector */ - void * read_bufs_0[VECTOR_LEN]; /* read bufs vector */ - void * read_bufs_1[VECTOR_LEN]; /* read bufs vector */ - void * read_bufs_2[VECTOR_LEN]; /* read bufs vector */ - void * f_read_bufs_0[VECTOR_LEN]; /* fixed read bufs vector */ - void * f_read_bufs_1[VECTOR_LEN]; /* fixed read bufs vector */ - void * f_read_bufs_2[VECTOR_LEN]; /* fixed read bufs vector */ + void *read_bufs_0[VECTOR_LEN]; /* read bufs vector */ + void *read_bufs_1[VECTOR_LEN]; /* read bufs vector */ + void *read_bufs_2[VECTOR_LEN]; /* read bufs vector */ + void *f_read_bufs_0[VECTOR_LEN]; /* fixed read bufs vector */ + void *f_read_bufs_1[VECTOR_LEN]; /* fixed read bufs vector */ + void *f_read_bufs_2[VECTOR_LEN]; /* fixed read bufs vector */ HDsnprintf(test_title, sizeof(test_title), "vector I/O with %s VFD", vfd_name); @@ -5118,7 +5118,7 @@ test_selection_io(const char *vfd_name) hid_t fapl_id = -1; /* file access property list ID */ char filename[1024]; /* filename */ unsigned flags = 0; /* file open flags */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int i; /* index */ int j; /* index */ int i2; /* index */ @@ -5136,13 +5136,13 @@ test_selection_io(const char *vfd_name) size_t element_sizes[2] = {sizeof(int), sizeof(int)}; /* element sizes vector */ int wbuf1[SEL_IO_DIM0 * SEL_IO_DIM1]; /* 1D write buffer */ int wbuf2[SEL_IO_DIM0][SEL_IO_DIM1]; /* 2D write buffer */ - int * wbufs[2] = {wbuf1, wbuf2[0]}; /* Array of write buffers */ + int *wbufs[2] = {wbuf1, wbuf2[0]}; /* Array of write buffers */ int fbuf1[SEL_IO_DIM0 * SEL_IO_DIM1]; /* 1D file buffer */ int fbuf2[SEL_IO_DIM0][SEL_IO_DIM1]; /* 2D file buffer */ - int * fbufs[2] = {fbuf1, fbuf2[0]}; /* Array of file buffers */ + int *fbufs[2] = {fbuf1, fbuf2[0]}; /* Array of file buffers */ int erbuf1[SEL_IO_DIM0 * SEL_IO_DIM1]; /* 1D expected read buffer */ int erbuf2[SEL_IO_DIM0][SEL_IO_DIM1]; /* 2D expected read buffer */ - int * erbufs[2] = {erbuf1, erbuf2[0]}; /* Array of expected read buffers */ + int *erbufs[2] = {erbuf1, erbuf2[0]}; /* Array of expected read buffers */ int shorten_element_sizes; /* Whether to shorten the element sizes array */ HDsnprintf(test_title, sizeof(test_title), "selection I/O with %s VFD", vfd_name); @@ -772,7 +772,7 @@ test_basic_file_operation(const char *env_h5_drvr) hid_t obj_id_list[1]; hsize_t file_size; unsigned intent; - void * os_file_handle = NULL; + void *os_file_handle = NULL; H5F_info2_t finfo; char name[32]; @@ -1627,7 +1627,7 @@ exercise_reg_opt_oper(hid_t fake_vol_id, hid_t reg_opt_vol_id, H5VL_subclass_t s { char op_name[256]; /* Operation name to register */ hid_t obj_id = H5I_INVALID_HID; - H5VL_object_t * vol_obj; + H5VL_object_t *vol_obj; H5VL_optional_args_t vol_cb_args; int fake_obj, fake_arg; int op_val = -1, op_val2 = -1; @@ -1831,7 +1831,7 @@ test_register_opt_operation(void) hid_t reg_opt_vol_id = H5I_INVALID_HID; struct { H5VL_subclass_t subcls; - const char * subcls_name; + const char *subcls_name; H5I_type_t id_type; reg_opt_oper_t reg_opt_op; } test_params[] = {{H5VL_SUBCLS_ATTR, "attr", H5I_ATTR, {.obj_op = H5VLattr_optional_op}}, @@ -1980,7 +1980,7 @@ test_async_vol_props(void) hid_t vol_id = H5I_INVALID_HID; H5VL_pass_through_info_t passthru_info; unsigned cap_flags = 0; - char * conn_env_str = NULL; + char *conn_env_str = NULL; TESTING("Async VOL props"); diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index ad8a15e..2f50e5f 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -73,12 +73,12 @@ 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.*/ #define NFILENAME 3 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ParaTest", "Hugefile", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ MPI_Comm test_comm = MPI_COMM_WORLD; @@ -554,7 +554,7 @@ MpioTest2G(MPI_Comm comm) hid_t file_id, dset_id; /* file and dataset identifiers */ hid_t plist_id; /* property list identifier */ hid_t filespace; /* file and memory dataspace identifiers */ - int * data; /* pointer to data buffer to write */ + int *data; /* pointer to data buffer to write */ size_t tot_size_bytes; hid_t dcpl_id; hid_t memorydataspace; @@ -714,7 +714,7 @@ dataset_writeInd(void) 1, }; /* dataset dim sizes */ hsize_t data_size; - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -854,8 +854,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[MAX_RANK]; /* for hyperslab setting */ @@ -983,7 +983,7 @@ dataset_writeAll(void) hsize_t dims[MAX_RANK] = { 1, }; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -1499,8 +1499,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[MAX_RANK]; /* for hyperslab setting */ @@ -1857,7 +1857,7 @@ dataset_readAll(void) start[0] = (hsize_t)dim0 / (hsize_t)mpi_size * (hsize_t)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++; @@ -1916,7 +1916,7 @@ extend_writeInd(void) const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ hsize_t max_dims[MAX_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[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2294,9 +2294,9 @@ extend_readInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[MAX_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[MAX_RANK]; /* for hyperslab setting */ @@ -2476,7 +2476,7 @@ extend_writeAll(void) const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ hsize_t max_dims[MAX_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[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2715,9 +2715,9 @@ extend_readAll(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[MAX_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[MAX_RANK]; /* for hyperslab setting */ hsize_t count[MAX_RANK], stride[MAX_RANK]; /* for hyperslab setting */ @@ -2912,8 +2912,8 @@ compress_readAll(void) unsigned u; /* Local index variable */ unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ - 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 = test_comm; MPI_Info info = MPI_INFO_NULL; @@ -3095,8 +3095,8 @@ none_selection_chunk(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[MAX_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[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -3353,8 +3353,8 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_write = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_read = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_expected = H5D_MPIO_NO_COLLECTIVE; - 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; @@ -3362,7 +3362,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; @@ -3876,7 +3876,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; @@ -4188,8 +4188,8 @@ dataset_atomicity(void) hid_t sid; /* Dataspace ID */ hid_t dataset1; /* Dataset IDs */ hsize_t dims[MAX_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_bigio.c b/testpar/t_bigio.c index 406e7bf..68e828d 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -467,7 +467,7 @@ dataset_big_write(void) hsize_t start[RANK]; /* for hyperslab setting */ hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ hsize_t block[RANK]; /* for hyperslab setting */ - hsize_t * coords = NULL; + hsize_t *coords = NULL; herr_t ret; /* Generic return value */ hid_t fid; /* HDF5 file ID */ hid_t acc_tpl; /* File access templates */ @@ -776,7 +776,7 @@ dataset_big_read(void) hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ hsize_t block[RANK]; /* for hyperslab setting */ size_t num_points; - hsize_t * coords = NULL; + hsize_t *coords = NULL; herr_t ret; /* Generic return value */ /* allocate memory for data buffer */ @@ -1114,7 +1114,7 @@ single_rank_independent_io(void) hid_t fspace_id = -1; hid_t mspace_id = -1; herr_t ret; - int * data = NULL; + int *data = NULL; uint64_t i; fapl_id = H5Pcreate(H5P_FILE_ACCESS); @@ -1418,8 +1418,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_cache.c b/testpar/t_cache.c index 8792892..d940fb2 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -41,7 +41,7 @@ const char *FILENAME[NFILENAME] = {"CacheTestDummy", NULL}; #ifndef PATH_MAX #define PATH_MAX 512 #endif /* !PATH_MAX */ -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ haddr_t max_addr = 0; /* used to store the end of * the address space used by @@ -2313,7 +2313,7 @@ datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t le { herr_t ret_value = SUCCEED; int idx; - struct datum * entry_ptr; + struct datum *entry_ptr; struct H5AC_aux_t *aux_ptr; HDassert(thing_ptr); @@ -2383,7 +2383,7 @@ datum_notify(H5C_notify_action_t action, void *thing) { hbool_t was_dirty = FALSE; herr_t ret_value = SUCCEED; - struct datum * entry_ptr; + struct datum *entry_ptr; struct H5AC_aux_t *aux_ptr; struct mssg_t mssg; int idx; @@ -3260,7 +3260,7 @@ 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) { - struct datum * entry_ptr; + struct datum *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (nerrors == 0) { @@ -3749,8 +3749,8 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr 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; haddr_t actual_base_addr; HDassert(fid_ptr != NULL); @@ -5119,8 +5119,8 @@ smoke_check_1(int metadata_write_strategy) 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) { @@ -5283,8 +5283,8 @@ smoke_check_2(int metadata_write_strategy) 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) { @@ -5488,8 +5488,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) { @@ -5773,8 +5773,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) { @@ -6048,8 +6048,8 @@ smoke_check_5(int metadata_write_strategy) 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) { @@ -6262,7 +6262,7 @@ trace_file_check(int metadata_write_strategy) hbool_t success = TRUE; const char *((*expected_output)[]) = NULL; - const char * expected_output_0[] = {"### HDF5 metadata cache trace file version 1 ###\n", + const char *expected_output_0[] = {"### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config", "H5AC_insert_entry", "H5AC_insert_entry", @@ -6288,7 +6288,7 @@ trace_file_check(int metadata_write_strategy) "H5AC_flush", "H5AC_flush", NULL}; - const char * expected_output_1[] = {"### HDF5 metadata cache trace file version 1 ###\n", + const char *expected_output_1[] = {"### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config", "H5AC_insert_entry", "H5AC_insert_entry", @@ -6322,9 +6322,9 @@ trace_file_check(int metadata_write_strategy) size_t expected_line_len; size_t 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; @@ -6640,8 +6640,8 @@ smoke_check_6(int metadata_write_strategy) 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) { diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 4229a77..c9aa080 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -140,8 +140,8 @@ construct_test_file(int test_file_index) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; int min_dset = 0; int max_dset = 0; @@ -843,7 +843,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons const hbool_t all_coll_metadata_ops, const hbool_t coll_metadata_write, const int md_write_strat) { - const char * fcn_name = "open_hdf5_file()"; + const char *fcn_name = "open_hdf5_file()"; hbool_t show_progress = FALSE; hbool_t verbose = FALSE; int cp = 0; @@ -851,8 +851,8 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons hid_t fcpl_id = -1; hid_t file_id = -1; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; @@ -2085,8 +2085,8 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) int i; int num_dsets = PAR_NUM_DSETS; 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; MPI_Comm dummy_comm = MPI_COMM_WORLD; MPI_Info dummy_info = MPI_INFO_NULL; @@ -2692,8 +2692,8 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; pass = TRUE; @@ -2959,8 +2959,8 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; pass = TRUE; @@ -3219,12 +3219,12 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) static hbool_t smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) { - const char * fcn_name = "smoke_check_1()"; + const char *fcn_name = "smoke_check_1()"; char filename[512]; hbool_t show_progress = FALSE; 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; int cp = 0; int i; int num_dsets = PAR_NUM_DSETS; diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index 20efaa1..f711601 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_coll_md_read.c b/testpar/t_coll_md_read.c index cabdea0..e402428 100644 --- a/testpar/t_coll_md_read.c +++ b/testpar/t_coll_md_read.c @@ -56,7 +56,7 @@ void test_partial_no_selection_coll_md_read(void) { const char *filename; - hsize_t * dataset_dims = NULL; + hsize_t *dataset_dims = NULL; hsize_t max_dataset_dims[PARTIAL_NO_SELECTION_DATASET_NDIMS]; hsize_t sel_dims[1]; hsize_t chunk_dims[PARTIAL_NO_SELECTION_DATASET_NDIMS] = {PARTIAL_NO_SELECTION_Y_DIM_SCALE, @@ -73,8 +73,8 @@ test_partial_no_selection_coll_md_read(void) hid_t fspace_id = H5I_INVALID_HID; hid_t mspace_id = H5I_INVALID_HID; int mpi_rank, mpi_size; - void * data = NULL; - void * read_buf = NULL; + void *data = NULL; + void *read_buf = NULL; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -255,7 +255,7 @@ test_multi_chunk_io_addrmap_issue(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - void * read_buf = NULL; + void *read_buf = NULL; int mpi_rank; int data[5][5] = {{0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}}; @@ -402,8 +402,8 @@ test_link_chunk_io_sort_chunk_issue(void) hid_t fspace_id = H5I_INVALID_HID; hid_t mspace_id = H5I_INVALID_HID; int mpi_rank, mpi_size; - void * data = NULL; - void * read_buf = NULL; + void *data = NULL; + void *read_buf = NULL; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); diff --git a/testpar/t_dset.c b/testpar/t_dset.c index f34cc1d..1504791 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 */ @@ -1060,8 +1060,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 */ @@ -1418,7 +1418,7 @@ dataset_readAll(void) start[0] = (hsize_t)(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++; @@ -1477,7 +1477,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 */ @@ -1855,9 +1855,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 */ @@ -2036,7 +2036,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 */ @@ -2274,9 +2274,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 */ @@ -2470,8 +2470,8 @@ compress_readAll(void) unsigned u; /* Local index variable */ unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ - 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; @@ -2653,8 +2653,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 */ @@ -2911,8 +2911,8 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_write = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_read = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_expected = H5D_MPIO_NO_COLLECTIVE; - 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; @@ -2920,7 +2920,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; @@ -3449,7 +3449,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; @@ -3761,8 +3761,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.c b/testpar/t_file.c index 229fd6c..ce979e3 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -124,8 +124,8 @@ test_page_buffer_access(void) size_t page_count = 0; int i, num_elements = 200; haddr_t raw_addr, meta_addr; - int * data; - H5F_t * f = NULL; + int *data; + H5F_t *f = NULL; herr_t ret; /* generic return value */ const char *filename; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ @@ -440,13 +440,13 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str hsize_t count[RANK]; hsize_t stride[RANK]; hsize_t block[RANK]; - DATATYPE * data_array = NULL; + DATATYPE *data_array = NULL; hsize_t dims[RANK], i; hsize_t num_elements; int k; char dset_name[20]; - H5F_t * f = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *f = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret; @@ -593,7 +593,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t { hid_t file_id, dset_id, grp_id, grp_id2; hid_t sid, mem_dataspace; - DATATYPE * data_array = NULL; + DATATYPE *data_array = NULL; hsize_t dims[RANK]; hsize_t start[RANK]; hsize_t count[RANK]; @@ -602,8 +602,8 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t int i, k, ndims; hsize_t num_elements; char dset_name[20]; - H5F_t * f = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *f = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret; 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 5c0d10f..efbe847 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); @@ -207,7 +207,7 @@ test_filter_read(void) unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ herr_t hrc; - const char * filename; + const char *filename; #ifdef H5_HAVE_FILTER_FLETCHER32 hsize_t fletcher32_size; /* Size of dataset with Fletcher32 checksum */ #endif diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 01f309a..bee63f7 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -76,16 +76,16 @@ static void test_write_filtered_dataset_no_overlap_partial(const char *parent_gr hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_single_unlim_dim_no_overlap(const char * parent_group, +static void test_write_filtered_dataset_single_unlim_dim_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_single_unlim_dim_overlap(const char * parent_group, +static void test_write_filtered_dataset_single_unlim_dim_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char * parent_group, +static void test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_multi_unlim_dim_overlap(const char * parent_group, +static void test_write_filtered_dataset_multi_unlim_dim_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_filter_t filter_id, @@ -96,27 +96,27 @@ static void test_write_filtered_dataset_point_selection(const char *parent_group hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_interleaved_write(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_transformed_filtered_dataset_no_overlap(const char * parent_group, +static void test_write_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_3d_filtered_dataset_no_overlap_separate_pages(const char * parent_group, +static void test_write_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_3d_filtered_dataset_no_overlap_same_pages(const char * parent_group, +static void test_write_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_no_conversion_unshared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_no_conversion_shared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_type_conversion_unshared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_type_conversion_shared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); #endif @@ -136,27 +136,27 @@ static void test_read_filtered_dataset_point_selection(const char *parent_group, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_transformed_filtered_dataset_no_overlap(const char * parent_group, +static void test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_3d_filtered_dataset_no_overlap_separate_pages(const char * parent_group, +static void test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_3d_filtered_dataset_no_overlap_same_pages(const char * parent_group, +static void test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_no_conversion_unshared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_no_conversion_shared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_type_conversion_unshared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_type_conversion_shared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); @@ -966,9 +966,10 @@ test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filte data[i] = (C_DATATYPE)GEN_DATA(i); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -1957,7 +1958,7 @@ test_write_filtered_dataset_point_selection(const char *parent_group, H5Z_filter C_DATATYPE *data = NULL; C_DATATYPE *correct_buf = NULL; C_DATATYPE *read_buf = NULL; - hsize_t * coords = NULL; + hsize_t *coords = NULL; hsize_t dataset_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t chunk_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t sel_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; @@ -2042,9 +2043,10 @@ test_write_filtered_dataset_point_selection(const char *parent_group, H5Z_filter data[i] = (C_DATATYPE)GEN_DATA(i); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -2869,19 +2871,21 @@ test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fi for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) /* Add the Column Index */ - correct_buf[i] = (C_DATATYPE)( - (i % (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the Row Index */ - + ((i % (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * - WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / - (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the amount that gets added when a rank moves down to its next - section vertically in the dataset */ - + ((hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS) * - (i / (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * - WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); + correct_buf[i] = (C_DATATYPE)((i % (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the Row Index */ + + ((i % (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / + (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the amount that gets added when a rank moves down to its next + section vertically in the dataset */ + + ((hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS) * + (i / (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -3719,8 +3723,8 @@ test_read_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t filt hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from one-chunk filtered dataset"); @@ -3920,8 +3924,8 @@ test_read_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fil hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks"); @@ -4121,8 +4125,8 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from shared filtered chunks"); @@ -4137,9 +4141,10 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter VRFY((NULL != correct_buf), "HDcalloc succeeded"); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -4339,8 +4344,8 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from filtered chunks with a single process having no selection"); @@ -4691,7 +4696,7 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ C_DATATYPE *correct_buf = NULL; C_DATATYPE *read_buf = NULL; C_DATATYPE *global_buf = NULL; - hsize_t * coords = NULL; + hsize_t *coords = NULL; hsize_t dataset_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t chunk_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t sel_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; @@ -4701,8 +4706,8 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from filtered chunks with point selection"); @@ -4717,9 +4722,10 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ VRFY((NULL != correct_buf), "HDcalloc succeeded"); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -4916,8 +4922,8 @@ test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing interleaved read from filtered chunks"); @@ -5131,9 +5137,9 @@ test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group { MPI_Datatype vector_type; MPI_Datatype resized_vector_type; - C_DATATYPE * read_buf = NULL; - C_DATATYPE * correct_buf = NULL; - C_DATATYPE * global_buf = NULL; + C_DATATYPE *read_buf = NULL; + C_DATATYPE *correct_buf = NULL; + C_DATATYPE *global_buf = NULL; hsize_t dataset_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; hsize_t chunk_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; hsize_t sel_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; @@ -5363,8 +5369,8 @@ test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_ hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared transformed and filtered chunks"); @@ -5588,8 +5594,8 @@ test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5 hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks on the same pages in 3D dataset"); @@ -5786,9 +5792,9 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil { MPI_Datatype vector_type; MPI_Datatype resized_vector_type; - C_DATATYPE * read_buf = NULL; - C_DATATYPE * correct_buf = NULL; - C_DATATYPE * global_buf = NULL; + C_DATATYPE *read_buf = NULL; + C_DATATYPE *correct_buf = NULL; + C_DATATYPE *global_buf = NULL; hsize_t dataset_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; hsize_t chunk_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; hsize_t sel_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; @@ -5817,19 +5823,21 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) /* Add the Column Index */ - correct_buf[i] = (C_DATATYPE)( - (i % (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the Row Index */ - + ((i % (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * - READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / - (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the amount that gets added when a rank moves down to its next - section vertically in the dataset */ - + ((hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS) * - (i / (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * - READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); + correct_buf[i] = (C_DATATYPE)((i % (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the Row Index */ + + ((i % (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / + (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the amount that gets added when a rank moves down to its next + section vertically in the dataset */ + + ((hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS) * + (i / (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -6030,8 +6038,8 @@ test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks in Compound Datatype dataset without Datatype " @@ -6257,8 +6265,8 @@ test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from shared filtered chunks in Compound Datatype dataset without Datatype " @@ -6490,8 +6498,8 @@ test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_grou hid_t filetype = H5I_INVALID_HID, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks in Compound Datatype dataset with Datatype " @@ -6726,8 +6734,8 @@ test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, hid_t filetype = H5I_INVALID_HID, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs( @@ -7815,7 +7823,7 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t * edge chunk and writes to just a portion of the edge chunk. */ static void -test_edge_chunks_partial_write(const char H5_ATTR_PARALLEL_UNUSED * parent_group, +test_edge_chunks_partial_write(const char H5_ATTR_PARALLEL_UNUSED *parent_group, H5Z_filter_t H5_ATTR_PARALLEL_UNUSED filter_id, hid_t H5_ATTR_PARALLEL_UNUSED fapl_id, hid_t H5_ATTR_PARALLEL_UNUSED dcpl_id, hid_t H5_ATTR_PARALLEL_UNUSED dxpl_id) @@ -7847,8 +7855,8 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing fill values"); @@ -8198,8 +8206,8 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_ hid_t dxpl_id) { H5D_alloc_time_t alloc_time; - C_DATATYPE * data = NULL; - C_DATATYPE * read_buf = NULL; + C_DATATYPE *data = NULL; + C_DATATYPE *read_buf = NULL; hsize_t dataset_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; hsize_t chunk_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; hsize_t sel_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; @@ -8412,8 +8420,8 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing fill time H5D_FILL_TIME_NEVER"); diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 54d75e6..a47c748 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -139,12 +139,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(); @@ -219,8 +219,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; @@ -583,8 +583,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, ii, j, k, l; /* Local index variables */ herr_t ret; /* Generic return value */ const char *filename; @@ -827,13 +827,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(); @@ -926,7 +926,7 @@ independent_group_read(void) int mpi_rank, m; hid_t plist, fid; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; herr_t ret; @@ -1046,7 +1046,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(); @@ -1201,7 +1201,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(); @@ -1516,10 +1516,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; @@ -1766,7 +1766,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. @@ -1843,10 +1843,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: @@ -2222,10 +2222,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: @@ -2554,7 +2554,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 47cb6af..886b247 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -199,7 +199,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 7e90cd2..9185921 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_pread.c b/testpar/t_pread.c index d79130b..194f941 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -110,7 +110,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) hid_t dcpl_id = H5P_DEFAULT; hsize_t chunk[1]; float nextValue; - float * data_slice = NULL; + float *data_slice = NULL; pass = TRUE; @@ -514,7 +514,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) hsize_t count = COUNT; hsize_t dims[1] = {0}; float nextValue; - float * data_slice = NULL; + float *data_slice = NULL; pass = TRUE; diff --git a/testpar/t_prop.c b/testpar/t_prop.c index c08a022..3089f01 100644 --- a/testpar/t_prop.c +++ b/testpar/t_prop.c @@ -26,7 +26,7 @@ test_encode_decode(hid_t orig_pl, int mpi_rank, int recv_proc) MPI_Status status; hid_t pl; /* Decoded property list */ size_t buf_size = 0; - void * sbuf = NULL; + void *sbuf = NULL; herr_t ret; /* Generic return value */ if (mpi_rank == 0) { @@ -113,7 +113,7 @@ test_plist_ed(void) unsigned max_compact; unsigned min_dense; hsize_t max_size[1]; /*data space maximum size */ - const char * c_to_f = "x+32"; + const char *c_to_f = "x+32"; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, TRUE, FALSE, diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index d265761..201f331 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; @@ -830,12 +830,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++) { @@ -1062,10 +1063,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); @@ -1335,10 +1337,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; @@ -1625,10 +1628,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); @@ -2531,7 +2535,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; @@ -2708,10 +2712,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, @@ -2929,10 +2934,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 @@ -3256,10 +3262,11 @@ ckrbrd_hs_dr_pio_test__m2d_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)); 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; @@ -3553,10 +3560,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); @@ -3944,7 +3952,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 */ @@ -3956,7 +3964,7 @@ void * old_client_data; /* previous error handler arg.*/ #define NFILENAME 2 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ShapeSameTest", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ #ifdef USE_PAUSE diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7c21e7e..44a78e1 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -68,7 +68,7 @@ static hid_t create_subfiling_ioc_fapl(void) { H5FD_subfiling_config_t *subfiling_conf = NULL; - H5FD_ioc_config_t * ioc_conf = NULL; + H5FD_ioc_config_t *ioc_conf = NULL; hid_t ioc_fapl = H5I_INVALID_HID; hid_t ret_value = H5I_INVALID_HID; @@ -141,7 +141,7 @@ static void test_create_and_close(void) { H5FD_subfiling_config_t subfiling_config; - const char * test_filenames[2]; + const char *test_filenames[2]; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c index 49c2a42..0547008 100644 --- a/testpar/t_vfd.c +++ b/testpar/t_vfd.c @@ -282,7 +282,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ unsigned flags = 0; /* file open flags */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ HDassert(vfd_name); HDassert(lf_ptr); @@ -676,14 +676,14 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; uint32_t count; H5FD_mem_t types[1]; haddr_t addrs[1]; size_t sizes[1]; - void * bufs[1]; + void *bufs[1]; pass = TRUE; @@ -913,14 +913,14 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; uint32_t count; H5FD_mem_t types[1]; haddr_t addrs[1]; size_t sizes[1]; - void * bufs[1]; + void *bufs[1]; pass = TRUE; @@ -1221,14 +1221,14 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; uint32_t count; H5FD_mem_t types[4]; haddr_t addrs[4]; size_t sizes[4]; - void * bufs[4]; + void *bufs[4]; pass = TRUE; @@ -1578,7 +1578,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -1588,7 +1588,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ H5FD_mem_t types[4]; haddr_t addrs[4]; size_t sizes[4]; - void * bufs[4]; + void *bufs[4]; pass = TRUE; @@ -2013,7 +2013,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -2022,7 +2022,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ H5FD_mem_t types[(INTS_PER_RANK / 16) + 1]; haddr_t addrs[(INTS_PER_RANK / 16) + 1]; size_t sizes[2]; - void * bufs[(INTS_PER_RANK / 16) + 1]; + void *bufs[(INTS_PER_RANK / 16) + 1]; pass = TRUE; @@ -2258,7 +2258,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; uint32_t count; @@ -2451,7 +2451,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -2711,7 +2711,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -2978,7 +2978,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -3281,7 +3281,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; @@ -3723,7 +3723,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int base_index; @@ -3986,7 +3986,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer hbool_t show_progress = FALSE; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ - H5FD_t * lf = NULL; /* VFD struct ptr */ + H5FD_t *lf = NULL; /* VFD struct ptr */ int cp = 0; int i; int j; diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 0f284f9..f5fe5f5 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -43,7 +43,7 @@ int dxfer_coll_type = DXFER_COLLECTIVE_IO; #define NFILENAME 2 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ParaTest", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ #ifdef USE_PAUSE diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index debd54a..7eb17ba 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; @@ -486,11 +486,11 @@ trav_grp_objs(const char *path, const H5O_info2_t *oinfo, const char *already_vi static herr_t trav_grp_symlinks(const char *path, const H5L_info2_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(" "); @@ -601,8 +601,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; @@ -1107,8 +1107,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; @@ -1157,7 +1157,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 4afb3f6..33ca593 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 */ h5tools_vol_info_t vol_info[2]; /* VOL information for input file, output file */ h5tools_vfd_info_t vfd_info[2]; /* VFD information for input file, output file */ hbool_t custom_vol[2]; /* Using a custom input, output VOL? */ diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 0c28789..0cacba1 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -113,8 +113,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; @@ -504,10 +504,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; @@ -1424,7 +1424,7 @@ diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t region2_id, di /* print differences if found */ if (nfound_b && opts->mode_verbose) { H5O_info2_t oi1, oi2; - char * obj1_str = NULL, *obj2_str = NULL; + char *obj1_str = NULL, *obj2_str = NULL; H5Oget_info3(obj1_id, &oi1, H5O_INFO_BASIC); H5Oget_info3(obj2_id, &oi2, H5O_INFO_BASIC); diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 63b6d8f..a5276d8 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 */ @@ -612,8 +612,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 e6872f0..e86d995 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 06f6b2d..93886d2 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; @@ -625,7 +625,7 @@ h5tools_set_fapl_vol(hid_t fapl_id, h5tools_vol_info_t *vol_info) { htri_t connector_is_registered; hid_t connector_id = H5I_INVALID_HID; - void * connector_info = NULL; + void *connector_info = NULL; herr_t ret_value = SUCCEED; switch (vol_info->type) { @@ -1367,8 +1367,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 */ @@ -1532,8 +1532,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 */ @@ -1776,7 +1776,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"); @@ -1985,7 +1985,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; @@ -2149,7 +2149,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 d3501b3..0620791 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -350,11 +350,11 @@ typedef struct h5tool_format_t { * * listv: h5watch: vector containing info about the list of compound fields to be printed. */ - const char * cmpd_name; - const char * cmpd_sep; - const char * cmpd_pre; - const char * cmpd_suf; - const char * cmpd_end; + const char *cmpd_name; + const char *cmpd_sep; + const char *cmpd_pre; + const char *cmpd_suf; + const char *cmpd_end; const struct H5LD_memb_t *const *cmpd_listv; /* @@ -510,7 +510,7 @@ typedef struct h5tool_format_t { } h5tool_format_t; typedef struct subset_d { - hsize_t * data; + hsize_t *data; unsigned int len; } subset_d; @@ -560,7 +560,7 @@ typedef struct h5tools_vol_info_t { /* Field specifying either the connector's name or value (ID) */ union { - const char * name; + const char *name; H5VL_class_value_t value; } u; } h5tools_vol_info_t; @@ -573,7 +573,7 @@ typedef struct h5tools_vfd_info_t { /* Field specifying either the driver's name or value (ID) */ union { - const char * name; + const char *name; H5FD_class_value_t value; } u; } h5tools_vfd_info_t; @@ -615,29 +615,29 @@ extern "C" { H5TOOLS_DLLVAR const char *volnames[]; 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 e76328f..a651230 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -185,13 +185,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); @@ -207,8 +207,8 @@ void h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h static void h5tools_print_virtual_selection(hid_t vspace, 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 */ + h5tools_str_t *buffer, /* string into which to render */ + hsize_t *curr_pos, /* total data element position */ size_t ncols); void @@ -349,8 +349,8 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont hbool_t h5tools_dump_region_attribute(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 */ + h5tools_str_t *buffer, /* string into which to render */ + hsize_t *curr_pos, /* total data element position */ size_t ncols, hsize_t region_elmt_counter, /* element counter */ hsize_t elmt_counter) { @@ -490,14 +490,14 @@ done: 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 */ @@ -512,7 +512,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); @@ -674,7 +674,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) { @@ -682,7 +682,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; @@ -897,7 +897,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]; @@ -906,7 +906,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; @@ -1041,7 +1041,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; @@ -1261,10 +1261,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 */ { @@ -2062,7 +2062,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; @@ -2091,7 +2091,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_info2_t oinfo; - obj_t * obj = NULL; /* Found object */ + obj_t *obj = NULL; /* Found object */ H5Oget_info3(type, &oinfo, H5O_INFO_BASIC); obj = search_obj(h5dump_type_table, &oinfo.token); @@ -2744,7 +2744,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 i; unsigned nmembs = 0; /*number of members */ @@ -3016,8 +3016,8 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, h5tools_context_t *c static void h5tools_print_virtual_selection(hid_t vspace, 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 */ + h5tools_str_t *buffer, /* string into which to render */ + hsize_t *curr_pos, /* total data element position */ size_t ncols) { switch (H5Sget_select_type(vspace)) { @@ -3095,7 +3095,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); @@ -3205,7 +3205,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); } @@ -3482,7 +3482,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * for (i = 0; i < nfilters; 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); if (filtn < 0) continue; /* nothing to print for invalid filter */ @@ -3770,7 +3770,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 */ @@ -4306,7 +4306,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; - H5R_ref_t * ref_buf = NULL; + H5R_ref_t *ref_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 1c97a52..c68f64c 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -35,7 +35,7 @@ typedef struct { H5O_token_t obj_token; /* Object token */ - 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 551002c..130ba6a 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -44,7 +44,7 @@ typedef struct H5LD_memb_t { /* 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); @@ -667,15 +667,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; H5_GCC_CLANG_DIAG_OFF("format-nonliteral") @@ -748,7 +748,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'; @@ -1101,7 +1101,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai case H5R_OBJECT1: { /* Object references -- show the type and OID of the referenced object. */ H5O_info2_t oi; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; H5TOOLS_DEBUG("ref_type is H5R_OBJECT1"); if ((obj = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { @@ -1211,7 +1211,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai * Object references -- show the type and OID of the referenced object. */ H5O_info2_t oi; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF_OBJ"); obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, vp); diff --git a/tools/lib/h5tools_str.h b/tools/lib/h5tools_str.h index f58cd3d..5d35636 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, ...) H5_ATTR_FORMAT(printf, 2, 3); -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, ...) H5_ATTR_FORMAT(printf, 2, 3); +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 66d3ef6..f92f8a7 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -45,7 +45,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(hid_t fid, table_t **tbl); @@ -224,12 +224,12 @@ help_ref_msg(FILE *output) 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 compiler... */ - char ** elems_re = NULL; /* temporary pointer, for realloc */ - char * cpy = NULL; + char **elems = NULL; /* more like *elems[], but compiler... */ + char **elems_re = NULL; /* temporary pointer, for realloc */ + char *cpy = NULL; herr_t ret_value = SUCCEED; unsigned init_slots = 2; @@ -467,7 +467,7 @@ static void dump_table(hid_t fid, char *tablename, table_t *table) { unsigned u; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; PRINTSTREAM(rawoutstream, "%s: # of entries = %d\n", tablename, table->nobjs); for (u = 0; u < table->nobjs; u++) { @@ -508,7 +508,7 @@ dump_tables(find_objs_t *info) *------------------------------------------------------------------------- */ H5_ATTR_PURE obj_t * - search_obj(table_t *table, const H5O_token_t *obj_token) +search_obj(table_t *table, const H5O_token_t *obj_token) { unsigned u; int token_cmp; @@ -911,8 +911,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 */ @@ -1130,8 +1130,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 4cf4e40..15b44ca 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; @@ -44,7 +44,7 @@ H5TOOLS_DLLVAR hsize_t H5TOOLS_BUFSIZE; /*struct taken from the dumper. needed in table struct*/ typedef struct obj_t { H5O_token_t obj_token; - 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; @@ -109,7 +109,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() */ H5O_token_t obj_token; /* OUT: target object token */ 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 cca36e4..712e413 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -21,7 +21,7 @@ */ typedef struct trav_addr_path_t { H5O_token_t token; - 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 */ unsigned fields; /* Fields needed in H5O_info2_t struct */ } trav_ud_traverse_t; @@ -168,9 +168,9 @@ static herr_t traverse_cb(hid_t loc_id, const char *path, const H5L_info2_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) { @@ -704,7 +704,7 @@ trav_table_addlink(trav_table_t *table, const H5O_token_t *obj_token, const char 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 */ @@ -814,7 +814,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); @@ -964,7 +964,7 @@ trav_print_visit_lnk(const char *path, const H5L_info2_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 58d347d..a250d23 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; H5O_token_t obj_token; /* object token */ 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 { H5O_token_t obj_token; /* object token */ 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 e49a155..27780a8 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -515,8 +515,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; @@ -667,7 +667,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"); @@ -686,7 +686,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"); @@ -705,7 +705,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"); @@ -724,7 +724,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"); @@ -743,8 +743,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) { @@ -766,7 +766,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"); @@ -785,7 +785,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"); @@ -804,17 +804,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) { @@ -836,7 +836,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"); @@ -855,7 +855,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"); @@ -874,7 +874,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"); @@ -893,7 +893,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"); @@ -912,17 +912,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"); @@ -942,7 +942,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") @@ -994,7 +994,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/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index eacd05b..2da54e2 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/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 h5_long_options l_opts[] = {{"destination", require_arg, 'd'}, {"flag", require_arg, 'f'}, {"help", no_arg, 'h'}, @@ -31,11 +31,11 @@ static struct h5_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/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 2619a9d..433f0c7 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/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 h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"version", no_arg, 'V'}, {"report", no_arg, 'r'}, @@ -100,8 +100,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; @@ -160,7 +160,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/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 22b869c..be68a47 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -18,7 +18,7 @@ /* Name of tool */ #define PROGRAMNAME "h5dump" -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; @@ -70,7 +70,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; }; @@ -81,7 +81,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 h5_long_options l_opts[] = {{"attribute", require_arg, 'a'}, {"binary", optional_arg, 'b'}, {"count", require_arg, 'c'}, @@ -569,8 +569,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; @@ -623,7 +623,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'; @@ -678,7 +678,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) { @@ -1344,7 +1344,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/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h index a53d1ba..6ad1cb6 100644 --- a/tools/src/h5dump/h5dump.h +++ b/tools/src/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/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index 939e5fe..7ca103e 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/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_info2_t *linfo, void H5_ATT 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 */ @@ -631,7 +631,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 */ @@ -764,7 +764,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 */ @@ -918,7 +918,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; @@ -1092,7 +1092,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; @@ -1309,11 +1309,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 / */ @@ -1373,7 +1373,7 @@ obj_search(const char *path, const H5O_info2_t *oi, const char H5_ATTR_UNUSED *a 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; @@ -1412,9 +1412,9 @@ lnk_search(const char *path, const H5L_info2_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] != '/') @@ -1525,12 +1525,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 */ @@ -1669,7 +1669,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 (dump_opts.display_data) { if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) { @@ -2043,9 +2043,9 @@ dump_extlink(hid_t group, const char *linkname, const char *objname) { hid_t oid; H5O_info2_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/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h index 308f602..1139390 100644 --- a/tools/src/h5dump/h5dump_extern.h +++ b/tools/src/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/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c index 827daf3..ee94ec8 100644 --- a/tools/src/h5dump/h5dump_xml.c +++ b/tools/src/h5dump/h5dump_xml.c @@ -134,10 +134,10 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_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 */ @@ -585,7 +585,7 @@ int xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen) { H5O_token_t obj_token; - char * obj_tok_str = NULL; + char *obj_tok_str = NULL; int lookup_ret; if (outlen < 22) @@ -659,8 +659,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) @@ -749,8 +749,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) @@ -851,7 +851,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; @@ -873,7 +873,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 */ @@ -903,7 +903,7 @@ xml_print_datatype(hid_t type, unsigned in_group) if (!in_group && H5Tcommitted(type) > 0) { H5O_info2_t oinfo; - obj_t * found_obj; /* Found object */ + obj_t *found_obj; /* Found object */ /* detect a shared datatype, output only once */ H5Oget_info3(type, &oinfo, H5O_INFO_BASIC); @@ -1571,7 +1571,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 */ @@ -1604,7 +1604,7 @@ xml_dump_datatype(hid_t type) if (H5Tcommitted(type) > 0) { H5O_info2_t oinfo; - obj_t * found_obj; /* Found object */ + obj_t *found_obj; /* Found object */ /* Datatype is a shared or named datatype */ H5Oget_info3(type, &oinfo, H5O_INFO_BASIC); @@ -1703,7 +1703,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 */ @@ -1879,7 +1879,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)); @@ -2046,7 +2046,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); @@ -2362,14 +2362,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 = NULL; - char * dtxid = NULL; - char * parentxid = NULL; - char * t_tmp = NULL; - char * t_prefix = NULL; - char * t_name = NULL; + char *tmp = NULL; + char *dtxid = NULL; + char *parentxid = NULL; + char *t_tmp = NULL; + char *t_prefix = NULL; + char *t_name = NULL; tmp = (char *)HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2); if (tmp == NULL) { @@ -2570,14 +2570,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 */ @@ -2952,11 +2952,11 @@ xml_print_refs(hid_t did, int source) hid_t space = H5I_INVALID_HID; hssize_t ssiz = -1; hsize_t i; - H5R_ref_t * refbuf = NULL; - char * buf = NULL; + H5R_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 */ @@ -3105,12 +3105,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 */ @@ -3277,7 +3277,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 */ @@ -3414,11 +3414,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 */ @@ -3766,20 +3766,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 */ @@ -4377,8 +4377,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 */ @@ -4387,7 +4387,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/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c index 50d0f5d..9854eac 100644 --- a/tools/src/h5format_convert/h5format_convert.c +++ b/tools/src/h5format_convert/h5format_convert.c @@ -38,7 +38,7 @@ static int verbose_g = 0; * Command-line options: The user can specify short or long-named * parameters. */ -static const char * s_opts = "hVvd:n"; +static const char *s_opts = "hVvd:n"; static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"version", no_arg, 'V'}, {"verbose", no_arg, 'v'}, {"dname", require_arg, 'd'}, {"noop", no_arg, 'n'}, {"enable-error-stack", no_arg, 'E'}, diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index 9da348a..5e1a942 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/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"; @@ -356,7 +356,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"; @@ -470,7 +470,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; @@ -642,7 +642,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; @@ -653,9 +653,9 @@ readUIntegerData(FILE *strm, struct Input *in) hsize_t len = 1; hsize_t i; int j; - const char * err1 = "Unable to get unsigned integer value from file.\n"; - const char * err2 = "Unrecognized input class type.\n"; - const char * err3 = "Invalid input size.\n"; + const char *err1 = "Unable to get unsigned integer value from file.\n"; + const char *err2 = "Unrecognized input class type.\n"; + const char *err3 = "Invalid input size.\n"; for (j = 0; j < in->rank; j++) len *= in->sizeOfDimension[j]; @@ -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; @@ -2524,7 +2524,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"; @@ -2554,7 +2554,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"; @@ -4601,7 +4601,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/src/h5import/h5import.h b/tools/src/h5import/h5import.h index efd40e1..2ebeecc 100644 --- a/tools/src/h5import/h5import.h +++ b/tools/src/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/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c index 45978bb..275e6e9 100644 --- a/tools/src/h5jam/h5jam.c +++ b/tools/src/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"; +static const char *s_opts = "hi:u:o:c:V"; static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"i", require_arg, 'i'}, {"u", require_arg, 'u'}, {"o", require_arg, 'o'}, {"clobber", no_arg, 'c'}, {NULL, 0, '\0'}}; diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c index 8ff354e..75a2b41 100644 --- a/tools/src/h5jam/h5unjam.c +++ b/tools/src/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 h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"i", require_arg, 'i'}, {"u", require_arg, 'u'}, {"o", require_arg, 'o'}, {"delete", no_arg, 'd'}, {NULL, 0, '\0'}}; diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index b7ee380..a14bb79 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -109,7 +109,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 */ @@ -836,7 +836,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 */ @@ -895,7 +895,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 */ @@ -1120,7 +1120,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)) @@ -1317,8 +1317,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; - H5R_ref_t * ref_buf = NULL; + h5tool_format_t *info = &ls_dataformat; + H5R_ref_t *ref_buf = NULL; H5TOOLS_START_DEBUG(" "); @@ -1486,8 +1486,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; - H5R_ref_t * ref_buf = NULL; + h5tool_format_t *info = &ls_dataformat; + H5R_ref_t *ref_buf = NULL; H5TOOLS_START_DEBUG(" "); @@ -1663,7 +1663,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(" "); @@ -1771,7 +1771,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)); @@ -1843,7 +1843,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)); @@ -1994,7 +1994,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"), @@ -2050,7 +2050,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)); @@ -2081,11 +2081,11 @@ static herr_t list_obj(const char *name, const H5O_info2_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(" "); @@ -2152,8 +2152,8 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi * which is common to all objects. */ if (verbose_g > 0) { size_t buf_size = 0; - char * comment = NULL; - char * obj_tok_str = NULL; + char *comment = NULL; + char *obj_tok_str = NULL; ssize_t cmt_bufsize = -1; uint64_t supported = 0; @@ -2258,14 +2258,14 @@ done: static herr_t list_lnk(const char *name, const H5L_info2_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)); @@ -2451,7 +2451,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)); @@ -2642,9 +2642,9 @@ int main(int argc, char *argv[]) { hid_t file_id = H5I_INVALID_HID; - char * fname = NULL, *oname = NULL, *x = NULL; - const char * s = NULL; - char * rest; + char *fname = NULL, *oname = NULL, *x = NULL; + const char *s = NULL; + char *rest; int argno; static char root_name[] = "/"; char drivername[50]; @@ -3082,7 +3082,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/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index b546c43..26968e3 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -118,7 +118,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, @@ -153,7 +153,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 */ @@ -388,7 +388,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) @@ -1222,15 +1222,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; @@ -2191,15 +2190,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/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index 37108d7..3c54214 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -91,7 +91,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 */ @@ -111,7 +111,7 @@ static const char *progname = "h5perf"; #ifndef HDF5_PARAPREFIX #define HDF5_PARAPREFIX "" #endif -char * paraprefix = NULL; /* for command line option para-prefix */ +char *paraprefix = NULL; /* for command line option para-prefix */ MPI_Info h5_io_info_g = MPI_INFO_NULL; /* MPI INFO object for IO */ /* @@ -766,7 +766,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/src/h5perf/pio_perf.h b/tools/src/h5perf/pio_perf.h index 89541bf..05f8d5b 100644 --- a/tools/src/h5perf/pio_perf.h +++ b/tools/src/h5perf/pio_perf.h @@ -71,7 +71,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/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index eff5f61..376fc0b 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -84,7 +84,7 @@ typedef union { } 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); @@ -107,7 +107,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 */ @@ -127,7 +127,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 */ @@ -288,7 +288,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; @@ -767,7 +767,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; @@ -1274,7 +1274,7 @@ done: static void do_cleanupfile(iotype iot, char *filename) { - char * temp = NULL; + char *temp = NULL; size_t temp_sz; int j; hid_t driver; diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index c85ee42..fc300fb 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -97,7 +97,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 h5_long_options l_opts[] = {{"align", require_arg, 'a'}, {"api", require_arg, 'A'}, #if 0 @@ -1187,7 +1187,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/src/h5perf/sio_perf.h b/tools/src/h5perf/sio_perf.h index bff737f..a417bdb 100644 --- a/tools/src/h5perf/sio_perf.h +++ b/tools/src/h5perf/sio_perf.h @@ -77,7 +77,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/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c index d0aad79..56e396b 100644 --- a/tools/src/h5repack/h5repack.c +++ b/tools/src/h5repack/h5repack.c @@ -117,7 +117,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 */ @@ -361,7 +361,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 */ @@ -697,7 +697,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 > 0) { @@ -816,7 +816,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 > 0) HDprintf(" <%s>", name); diff --git a/tools/src/h5repack/h5repack.h b/tools/src/h5repack/h5repack.h index 65e5d40..ad81cf7 100644 --- a/tools/src/h5repack/h5repack.h +++ b/tools/src/h5repack/h5repack.h @@ -125,7 +125,7 @@ typedef struct { int grp_indexed; /* Set the minimum number of links to store in the indexed format */ int msg_size[8]; /* Minimum size of shared messages: dataspace, datatype, fill value, filter pipeline, attribute */ - const char * ublock_filename; /* user block file name */ + const char *ublock_filename; /* user block file name */ hsize_t ublock_size; /* user block size */ hsize_t meta_block_size; /* metadata aggregation block size (for H5Pset_meta_block_size) */ hsize_t threshold; /* alignment threshold for H5Pset_alignment */ @@ -201,13 +201,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/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c index 25df5c7..08d7127 100644 --- a/tools/src/h5repack/h5repack_copy.c +++ b/tools/src/h5repack/h5repack_copy.c @@ -65,7 +65,7 @@ copy_objects(const char *fnamein, const char *fnameout, pack_opt_t *options) hid_t grp_in = H5I_INVALID_HID; /* group ID */ hid_t gcpl_in = H5I_INVALID_HID; /* group creation property list */ hid_t fcpl = H5P_DEFAULT; /* file creation property list ID */ - trav_table_t * travt = NULL; + trav_table_t *travt = NULL; hsize_t ub_size = 0; /* size of user block */ H5F_fspace_strategy_t set_strategy; /* Strategy to be set in output file */ hbool_t set_persist; /* Persist free-space status to be set in output file */ @@ -628,7 +628,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti hid_t ocpl_id = H5I_INVALID_HID; /* property to pass copy options */ hid_t lcpl_id = H5I_INVALID_HID; /* link creation property list */ hid_t dxpl_id = H5I_INVALID_HID; /* dataset transfer 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 */ @@ -638,8 +638,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/src/h5repack/h5repack_filters.c b/tools/src/h5repack/h5repack_filters.c index 76bac5e..3198062 100644 --- a/tools/src/h5repack/h5repack_filters.c +++ b/tools/src/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; @@ -236,13 +236,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/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c index 3259b89..e1f23f2 100644 --- a/tools/src/h5repack/h5repack_refs.c +++ b/tools/src/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; /*------------------------------------------------------------------------- @@ -227,7 +227,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; /*------------------------------------------------------------------------- @@ -453,10 +453,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; @@ -812,7 +812,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/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c index 71ee72e..7a333e1 100644 --- a/tools/src/h5repack/h5repack_verify.c +++ b/tools/src/h5repack/h5repack_verify.c @@ -46,7 +46,7 @@ h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options hid_t tid = H5I_INVALID_HID; /* type ID */ int ok = 1; /* step results */ unsigned int i; - trav_table_t * travt = NULL; + trav_table_t *travt = NULL; hid_t fcpl_in = H5I_INVALID_HID; /* file creation property for input file */ hid_t fcpl_out = H5I_INVALID_HID; /* file creation property for output file */ H5F_fspace_strategy_t in_strategy, out_strategy; /* file space handling strategy for in/output file */ @@ -60,7 +60,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/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index d5b9a1a..047b573 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -84,7 +84,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 */ @@ -109,7 +109,7 @@ typedef struct iter_t { hsize_t free_hdr; /* Size of free space manager metadata in the file */ unsigned long num_small_sects[SIZE_SMALL_SECTS]; /* Size of small free-space sections */ unsigned sect_nbins; /* Number of bins for free-space section sizes */ - unsigned long * sect_bins; /* Pointer to array of bins for free-space section sizes */ + unsigned long *sect_bins; /* Pointer to array of bins for free-space section sizes */ hsize_t datasets_index_storage_size; /* meta size for chunked dataset's indexing type */ hsize_t datasets_heap_storage_size; /* heap size for dataset with external storage */ unsigned long nexternal; /* Number of external files for a dataset */ @@ -649,7 +649,7 @@ static herr_t obj_stats(const char *path, const H5O_info2_t *oi, const char *already_visited, void *_iter) { H5O_native_info_t native_info; - iter_t * iter = (iter_t *)_iter; + iter_t *iter = (iter_t *)_iter; herr_t ret_value = SUCCEED; /* If the object has already been seen then just return */ @@ -1685,7 +1685,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/src/misc/h5clear.c b/tools/src/misc/h5clear.c index 15c170d..c86763f 100644 --- a/tools/src/misc/h5clear.c +++ b/tools/src/misc/h5clear.c @@ -34,7 +34,7 @@ /* Default increment is 1 megabytes for the --increment option */ #define DEFAULT_INCREMENT (1024 * 1024) -static char * fname_g = NULL; +static char *fname_g = NULL; static hbool_t clear_status_flags = FALSE; static hbool_t remove_cache_image = FALSE; static hbool_t print_filesize = FALSE; @@ -44,7 +44,7 @@ static hsize_t increment = DEFAULT_INCREMENT; /* * Command-line options: only publicize long options */ -static const char * s_opts = "hVsmzi*"; +static const char *s_opts = "hVsmzi*"; static struct h5_long_options l_opts[] = { {"help", no_arg, 'h'}, {"version", no_arg, 'V'}, {"status", no_arg, 's'}, {"image", no_arg, 'm'}, {"filesize", no_arg, 'z'}, {"increment", optional_arg, 'i'}, @@ -226,7 +226,7 @@ leave(int ret) int main(int argc, char *argv[]) { - char * fname = NULL; /* File name */ + char *fname = NULL; /* File name */ hid_t fapl = H5I_INVALID_HID; /* File access property list */ hid_t fid = H5I_INVALID_HID; /* File ID */ haddr_t image_addr; diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c index e03c72d..ccb91d2 100644 --- a/tools/src/misc/h5debug.c +++ b/tools/src/misc/h5debug.c @@ -240,14 +240,14 @@ main(int argc, char *argv[]) hid_t fid = H5I_INVALID_HID; hid_t fapl = H5I_INVALID_HID; H5VL_object_t *vol_obj; - H5F_t * f; + H5F_t *f; haddr_t addr = 0; int extra_count = 0; /* Number of extra arguments */ haddr_t extra[10]; uint8_t sig[H5F_SIGNATURE_LEN]; size_t u; H5E_auto2_t func = NULL; - void * edata = NULL; + void *edata = NULL; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t status = SUCCEED; int exit_value = 0; diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index 1b8b23d..a786df6 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -22,7 +22,7 @@ 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 h5_long_options l_opts[] = { {"help", no_arg, 'h'}, {"latest", no_arg, 'l'}, {"parents", no_arg, 'p'}, {"verbose", no_arg, 'v'}, {"version", no_arg, 'V'}, {"vol-value", require_arg, '1'}, @@ -31,12 +31,12 @@ static struct h5_long_options l_opts[] = { /* 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/src/misc/h5repart.c b/tools/src/misc/h5repart.c index 89be169..779b6f9 100644 --- a/tools/src/misc/h5repart.c +++ b/tools/src/misc/h5repart.c @@ -157,7 +157,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 */ @@ -169,13 +169,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/test/h5copy/dynlib_copy.c b/tools/test/h5copy/dynlib_copy.c index b954a22..f474a55 100644 --- a/tools/test/h5copy/dynlib_copy.c +++ b/tools/test/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/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c index e415c97..03d42ed 100644 --- a/tools/test/h5copy/h5copygentest.c +++ b/tools/test/h5copy/h5copygentest.c @@ -281,7 +281,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/test/h5diff/dynlib_diff.c b/tools/test/h5diff/dynlib_diff.c index 433522d..9d277e0 100644 --- a/tools/test/h5diff/dynlib_diff.c +++ b/tools/test/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/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c index 66d9f42..f388568 100644 --- a/tools/test/h5diff/h5diffgentest.c +++ b/tools/test/h5diff/h5diffgentest.c @@ -3429,8 +3429,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 */ @@ -3441,9 +3441,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 */ @@ -3466,9 +3466,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 */ @@ -3507,8 +3507,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 */ @@ -3518,9 +3518,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 */ @@ -3534,9 +3534,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; @@ -4732,15 +4732,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); @@ -5210,7 +5210,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 */ @@ -5224,7 +5224,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 */ @@ -5240,7 +5240,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 */ @@ -6199,7 +6199,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 */ @@ -6213,7 +6213,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 */ @@ -6229,7 +6229,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 */ @@ -7191,7 +7191,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 */ @@ -7205,7 +7205,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 */ @@ -7220,7 +7220,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 */ @@ -7807,12 +7807,12 @@ 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 */ hsize_t dims2[] = {2}; /* 2 references */ - hdset_reg_ref_t * rbuf; /* buffer for write the references */ + hdset_reg_ref_t *rbuf; /* buffer for write the references */ hsize_t start[10]; /* starting location of hyperslab */ hsize_t count[10]; /* element count of hyperslab */ hsize_t coord[5][2]; /* coordinates for point selection */ @@ -7927,7 +7927,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/test/h5dump/binread.c b/tools/test/h5dump/binread.c index 341a085..4e46c57 100644 --- a/tools/test/h5dump/binread.c +++ b/tools/test/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/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c index 433522d..9d277e0 100644 --- a/tools/test/h5dump/dynlib_dump.c +++ b/tools/test/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/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index 1c495a1..30e0c46 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -457,10 +457,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 */ @@ -1798,7 +1798,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 */ @@ -2114,7 +2114,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 */ uint64_t supports_comments = 0; @@ -2352,9 +2352,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 */ @@ -2769,7 +2769,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 */ @@ -3047,7 +3047,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 */ @@ -3567,7 +3567,7 @@ gent_array8(void) herr_t H5_ATTR_NDEBUG_UNUSED status = -1; hsize_t sdims[] = {F64_DIM0}; hsize_t tdims[] = {F64_DIM1}; - int * wdata; /* Write buffer */ + int *wdata; /* Write buffer */ unsigned int i; /* Allocate data buffer */ @@ -3859,8 +3859,8 @@ gent_multi(void) H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES]; hid_t memb_fapl[H5FD_MEM_NTYPES]; const char *memb_name[H5FD_MEM_NTYPES]; - char ** sv = NULL; - char * sv_data = NULL; + char **sv = NULL; + char *sv_data = NULL; haddr_t memb_addr[H5FD_MEM_NTYPES]; sv_data = (char *)HDcalloc(H5FD_MEM_NTYPES * 1024, sizeof(char)); @@ -3990,10 +3990,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); @@ -6258,7 +6258,7 @@ gent_longlinks(void) hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group ID */ hid_t H5_ATTR_NDEBUG_UNUSED 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 */ @@ -6480,7 +6480,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; @@ -10015,15 +10015,15 @@ gent_intsattrs(void) double arr[F66_XDIM][F66_YDIM8]; } * dsetdbl; - 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; @@ -10357,8 +10357,8 @@ gent_floatsattrs(void) long double arr[F89_XDIM][F89_YDIM128]; } * dset128; - float * aset32 = NULL; - double * aset64 = NULL; + float *aset32 = NULL; + double *aset64 = NULL; long double *aset128 = NULL; float val32bits; @@ -11189,7 +11189,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/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c index 26a0fb9..f353dd4 100644 --- a/tools/test/h5format_convert/h5fc_chk_idx.c +++ b/tools/test/h5format_convert/h5fc_chk_idx.c @@ -43,8 +43,8 @@ usage(void) int main(int argc, char *argv[]) { - char * fname = NULL; - char * dname = NULL; + char *fname = NULL; + char *dname = NULL; hid_t fid = H5I_INVALID_HID; hid_t did = H5I_INVALID_HID; H5D_chunk_index_t idx_type; diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c index 4e67e98..86befb7 100644 --- a/tools/test/h5jam/getub.c +++ b/tools/test/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 h5_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/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c index 16604b3..3f99048 100644 --- a/tools/test/h5jam/h5jamgentest.c +++ b/tools/test/h5jam/h5jamgentest.c @@ -363,10 +363,10 @@ error: static herr_t create_textfile(const char *name, size_t size) { - char * buf = NULL; + char *buf = NULL; int fd = -1; size_t i; - char * bp = NULL; + char *bp = NULL; if ((fd = HDcreat(name, 0777)) < 0) goto error; diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c index f264d9b..a625b59 100644 --- a/tools/test/h5jam/tellub.c +++ b/tools/test/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 h5_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/test/h5ls/dynlib_ls.c b/tools/test/h5ls/dynlib_ls.c index 433522d..9d277e0 100644 --- a/tools/test/h5ls/dynlib_ls.c +++ b/tools/test/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/test/h5repack/dynlib_rpk.c b/tools/test/h5repack/dynlib_rpk.c index bef032a..b9e863b 100644 --- a/tools/test/h5repack/dynlib_rpk.c +++ b/tools/test/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/test/h5repack/dynlib_vrpk.c b/tools/test/h5repack/dynlib_vrpk.c index a45de65..981b848 100644 --- a/tools/test/h5repack/dynlib_vrpk.c +++ b/tools/test/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/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c index da4ea54..0e3f64f 100644 --- a/tools/test/h5repack/h5repacktst.c +++ b/tools/test/h5repack/h5repacktst.c @@ -2502,7 +2502,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; @@ -4168,7 +4168,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}; @@ -4672,7 +4672,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/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c index 7589144..5b898db 100644 --- a/tools/test/misc/h5perf_gentest.c +++ b/tools/test/misc/h5perf_gentest.c @@ -42,7 +42,7 @@ typedef struct { phase_t e; float f_array[FIXED_LEN]; hvl_t i_vlen; - char * s_vlen; + char *s_vlen; } test_comp_t; typedef struct { @@ -140,19 +140,19 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz tid_vlen_i, tid_vlen_s; char name[32], tmp_name1[32], tmp_name2[32], tmp_name3[32]; hsize_t dims[1] = {dim0}, dims2d[2] = {dim0, (dim0 / 4 + 1)}, dims_array[1] = {FIXED_LEN}, dim1[1] = {2}; - char * enum_names[4] = {"SOLID", "LIQUID", "GAS", "PLASMA"}; + char *enum_names[4] = {"SOLID", "LIQUID", "GAS", "PLASMA"}; test_comp_t *buf_comp = NULL, *buf_comp_large = NULL; - int * buf_int = NULL; + int *buf_int = NULL; float(*buf_float_a)[FIXED_LEN] = NULL; double **buf_double2d = NULL; - hvl_t * buf_vlen_i = NULL; + hvl_t *buf_vlen_i = NULL; char(*buf_str)[FIXED_LEN]; - char ** buf_vlen_s = NULL; + char **buf_vlen_s = NULL; hobj_ref_t buf_ref[2]; hdset_reg_ref_t buf_reg_ref[2]; size_t offset, len; herr_t status; - char * names[NTYPES] = {"int", + char *names[NTYPES] = {"int", "ulong", "float", "double", @@ -543,9 +543,9 @@ add_attrs(hid_t oid, int idx) long long l = -2147483647; float f = 123456789.987654321; double d = 987654321.123456789; - char * s[7] = {"Parting", "is such", "sweeter", "sorrow."}; + char *s[7] = {"Parting", "is such", "sweeter", "sorrow."}; float f_array[4] = {1.0, 2.22, 3.333, 4.444}; - char * s_vlen[4] = {"Parting", "is such", "sweet", "sorrow."}; + char *s_vlen[4] = {"Parting", "is such", "sweet", "sorrow."}; hsize_t dims1[1] = {1}, dims2[1] = {4}, dims3[2] = {3, 5}; int int3d[4][3][5]; size_t offset = 0; diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c index b068985..5fd454e 100644 --- a/tools/test/misc/h5repart_gentest.c +++ b/tools/test/misc/h5repart_gentest.c @@ -26,7 +26,7 @@ #define FILENAME "family_file%05d.h5" int **buf = NULL; -int * buf_data = NULL; +int *buf_data = NULL; int main(void) diff --git a/tools/test/misc/vds/UC_1_one_dim_gen.c b/tools/test/misc/vds/UC_1_one_dim_gen.c index a816fb8..5ccc7d0 100644 --- a/tools/test/misc/vds/UC_1_one_dim_gen.c +++ b/tools/test/misc/vds/UC_1_one_dim_gen.c @@ -62,7 +62,7 @@ main(void) hsize_t start[RANK]; /* starting point for hyperslab */ hsize_t map_start = 0; /* starting point in the VDS map */ - int * buffer = NULL; /* data buffer */ + int *buffer = NULL; /* data buffer */ hsize_t count = 0; /* number of elements in a plane */ int n_planes = -1; /* number of planes to write */ int value = -1; /* value written to datasets */ diff --git a/tools/test/misc/vds/UC_2_two_dims_gen.c b/tools/test/misc/vds/UC_2_two_dims_gen.c index 85bd63d..bf8bd3a 100644 --- a/tools/test/misc/vds/UC_2_two_dims_gen.c +++ b/tools/test/misc/vds/UC_2_two_dims_gen.c @@ -70,7 +70,7 @@ main(void) hsize_t start[RANK]; /* starting point for hyperslab */ hsize_t extent[RANK]; /* dataset extents */ - int * buffer = NULL; /* data buffer */ + int *buffer = NULL; /* data buffer */ int value = -1; /* value written to datasets */ hsize_t count = 0; /* number of elements in a plane */ int n_planes = -1; /* number of planes to write */ diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c index 5e2dde2..9e4d3f0 100644 --- a/tools/test/perform/chunk.c +++ b/tools/test/perform/chunk.c @@ -328,7 +328,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/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c index 1d7756b..c99f2f1 100644 --- a/tools/test/perform/direct_write_perf.c +++ b/tools/test/perform/direct_write_perf.c @@ -145,7 +145,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/tools/test/perform/overhead.c b/tools/test/perform/overhead.c index c974928..38c7f0a 100644 --- a/tools/test/perform/overhead.c +++ b/tools/test/perform/overhead.c @@ -175,7 +175,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/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index 24b3754..6223d96 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/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 h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"compressability", require_arg, 'c'}, {"file-size", require_arg, 's'}, @@ -113,7 +113,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; @@ -305,7 +305,7 @@ static unsigned long parse_size_directive(const char *size) { unsigned long s; - char * endptr; + char *endptr; s = HDstrtoul(size, &endptr, 10); @@ -385,7 +385,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) { unsigned long i, iters; diff --git a/utils/mirror_vfd/mirror_remote.c b/utils/mirror_vfd/mirror_remote.c index 8bb9544..170d61d 100644 --- a/utils/mirror_vfd/mirror_remote.c +++ b/utils/mirror_vfd/mirror_remote.c @@ -29,7 +29,7 @@ void mirror_log(struct mirror_log_info *info, unsigned int level, const char *format, ...) { - FILE * stream = MIRROR_LOG_DEFAULT_STREAM; + FILE *stream = MIRROR_LOG_DEFAULT_STREAM; unsigned int verbosity = MIRROR_LOG_DEFAULT_VERBOSITY; hbool_t custom = FALSE; @@ -80,7 +80,7 @@ mirror_log(struct mirror_log_info *info, unsigned int level, const char *format, void mirror_log_bytes(struct mirror_log_info *info, unsigned int level, size_t n_bytes, const unsigned char *buf) { - FILE * stream = MIRROR_LOG_DEFAULT_STREAM; + FILE *stream = MIRROR_LOG_DEFAULT_STREAM; unsigned int verbosity = MIRROR_LOG_DEFAULT_VERBOSITY; if (buf == NULL) { diff --git a/utils/mirror_vfd/mirror_remote.h b/utils/mirror_vfd/mirror_remote.h index 9415f7f..02cf41b 100644 --- a/utils/mirror_vfd/mirror_remote.h +++ b/utils/mirror_vfd/mirror_remote.h @@ -35,7 +35,7 @@ typedef struct mirror_log_info { uint32_t magic; - FILE * stream; + FILE *stream; unsigned int verbosity; char prefix[MIRROR_LOG_PREFIX_MAX + 1]; } loginfo_t; diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c index d6b5254..95480dc 100644 --- a/utils/mirror_vfd/mirror_server.c +++ b/utils/mirror_vfd/mirror_server.c @@ -143,7 +143,7 @@ static void mybzero(void *dest, size_t size) { size_t i = 0; - char * s = NULL; + char *s = NULL; HDassert(dest); s = (char *)dest; for (i = 0; i < size; i++) { @@ -403,8 +403,8 @@ accept_connection(struct server_run *run) { struct sockaddr_in client_addr; /**/ socklen_t clilen; /**/ - struct hostent * host_port = NULL; /**/ - char * hostaddrp; /**/ + struct hostent *host_port = NULL; /**/ + char *hostaddrp; /**/ int connfd = -1; /* connection file descriptor */ if (run == NULL || run->magic != SERVER_RUN_MAGIC) { diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c index 5726db5..f8d7544 100644 --- a/utils/mirror_vfd/mirror_writer.c +++ b/utils/mirror_vfd/mirror_writer.c @@ -88,8 +88,8 @@ struct mirror_session { int sockfd; uint32_t token; uint32_t xmit_count; - H5FD_t * file; - loginfo_t * loginfo; + H5FD_t *file; + loginfo_t *loginfo; H5FD_mirror_xmit_reply_t reply; }; @@ -127,7 +127,7 @@ struct sock_comm { uint32_t magic; int recd_die; H5FD_mirror_xmit_t *xmit_recd; - char * raw; + char *raw; size_t raw_size; }; @@ -151,7 +151,7 @@ struct sock_comm { */ struct mirror_writer_opts { uint32_t magic; - char * logpath; + char *logpath; }; static void mybzero(void *dest, size_t size); @@ -171,7 +171,7 @@ static void mybzero(void *dest, size_t size) { size_t i = 0; - char * s = NULL; + char *s = NULL; HDassert(dest); s = (char *)dest; for (i = 0; i < size; i++) { @@ -289,7 +289,7 @@ session_stop(struct mirror_session *session) static struct mirror_session * session_start(int socketfd, const H5FD_mirror_xmit_open_t *xmit_open) { - struct mirror_session * session = NULL; + struct mirror_session *session = NULL; struct mirror_writer_opts opts; #if 0 /* TODO: behaviro option */ char logpath[H5FD_MIRROR_XMIT_FILEPATH_MAX] = ""; @@ -731,7 +731,7 @@ do_write(struct mirror_session *session, const unsigned char *xmit_buf) haddr_t addr = 0; haddr_t sum_bytes_written = 0; H5FD_mem_t type = 0; - char * buf = NULL; + char *buf = NULL; ssize_t nbytes_in_packet = 0; H5FD_mirror_xmit_write_t xmit_write; diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index 5a22d75..e91fd19 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -85,7 +85,7 @@ struct distribute_option { uint64_t separators[MAX_DISTRIBUTE_SEPARATORS]; }; -static const char * s_opts = "hl*E*i:o:T:"; +static const char *s_opts = "hl*E*i:o:T:"; static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"log_text", optional_arg, 'l'}, {"error", optional_arg, 'E'}, @@ -309,10 +309,10 @@ distribute_separator_add(struct distribute_option *option, uint64_t separator) static int distribution_parse(struct distribute_option *option, const char *string) { - char * ptr; - char * next; + char *ptr; + char *next; unsigned long long separator; - char * str; + char *str; int status = 0; if (strncmp(string, "size", strlen("size")) != 0) { @@ -456,7 +456,7 @@ print_file(mfu_flist flist, uint64_t idx) else { /* get type */ mfu_filetype type = mfu_flist_file_get_type(flist, idx); - char * type_str = type_str_unknown; + char *type_str = type_str_unknown; if (type == MFU_TYPE_DIR) { type_str = type_str_dir; } @@ -527,7 +527,7 @@ print_file_text(mfu_flist flist, uint64_t idx, char *buffer, size_t bufsize) else { /* get type */ mfu_filetype type = mfu_flist_file_get_type(flist, idx); - char * type_str = type_str_unknown; + char *type_str = type_str_unknown; if (type == MFU_TYPE_DIR) { type_str = type_str_dir; } @@ -581,7 +581,7 @@ dh5tool_flist_write_text(const char *name, mfu_flist bflist) } uint64_t idx = 0; - char * ptr = NULL; + char *ptr = NULL; /* if we block things up into 128MB chunks, how many iterations * to write everything? */ @@ -763,7 +763,7 @@ fill_file_list(mfu_flist new_flist, const char *config_filename, int myrank, int return -1; while (HDfgets(linebuf, sizeof(linebuf), config) != NULL) { struct stat statbuf; - char * eol = HDstrchr(linebuf, '\n'); + char *eol = HDstrchr(linebuf, '\n'); if (eol) *eol = '\0'; if (HDstat(linebuf, &statbuf) == 0) { @@ -784,7 +784,7 @@ count_dirpaths(int argc, int startcnt, const char *argv[], int **index_out) int k; int path_cnt = 0; int idx_count = (argc - startcnt); - int * index = NULL; + int *index = NULL; struct stat pathcheck; if (idx_count > 0) { @@ -850,7 +850,7 @@ copy_args(int argc, const char *argv[], int *mfu_argc, int *copy_len) typedef struct hash_entry { int hash; - char * name; + char *name; struct hash_entry *next; /* table Collision */ int nextCount; } hash_entry_t; @@ -934,7 +934,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const if (log_output_in_single_file || use_stdout) { pid_t pid; int pipefd[2]; - buf_t * thisbuft = NULL; + buf_t *thisbuft = NULL; buf_t **bufs = buf_cache; if (bufs == NULL) { @@ -1061,8 +1061,8 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const char logpath[2048]; char logErrors[2048]; char current_dir[2048]; - char * logbase = HDstrdup(basename(filepath)); - char * thisapp = HDstrdup(basename(toolname)); + char *logbase = HDstrdup(basename(filepath)); + char *thisapp = HDstrdup(basename(toolname)); if (processing_inputfile == 0) log_instance = get_copy_count(logbase, thisapp); @@ -1153,7 +1153,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) size_t b_offset; /* get pointer to encoded argc count and argv array */ - int * count_ptr = arg; + int *count_ptr = arg; char *buf = (char *)arg + sizeof(int); /* get number of argv parameters */ @@ -1182,7 +1182,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) if (buf[0] == '&') { const char *fname_arg = NULL; mfu_flist flist_arg; - void * check_ptr[2] = {NULL, NULL}; + void *check_ptr[2] = {NULL, NULL}; HDmemcpy(check_ptr, &buf[1], sizeof(void *)); flist_arg = (mfu_flist)check_ptr[0]; @@ -1257,7 +1257,7 @@ process_input_file(char *inputname, int myrank, int size) char linebuf[PATH_MAX] = { '\0', }; - FILE * config = HDfopen(inputname, "r"); + FILE *config = HDfopen(inputname, "r"); mfu_flist flist1 = NULL; if (config == NULL) @@ -1272,10 +1272,10 @@ process_input_file(char *inputname, int myrank, int size) while (HDfgets(linebuf, sizeof(linebuf), config) != NULL) { const char *delim = " \n"; - char * cmdline = NULL; - char * cmd = NULL; - char * arg = NULL; - char * argv[256]; + char *cmdline = NULL; + char *cmd = NULL; + char *arg = NULL; + char *argv[256]; int fileindex[256]; int filecount = 0; int token = 0; @@ -1368,7 +1368,7 @@ main(int argc, char *argv[]) int args_byte_length = -1; int mfu_argc = argc; - char * args_buf = NULL; + char *args_buf = NULL; char **h5tool_argv = copy_args(argc, argv, &mfu_argc, &args_byte_length); char *inputname = NULL; |