summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-03 20:15:55 (GMT)
committerGitHub <noreply@github.com>2021-03-03 20:15:55 (GMT)
commite65814bf8eda709b27a60fe3e396a22e4bc34864 (patch)
treec9f9cc67a4dd93453cc4bf7054b5a8192e663337
parentc14fa9cebf58213bc4e2c0ac87e520c473e14071 (diff)
downloadhdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.zip
hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.gz
hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.bz2
1 10 merges from develop (#419)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev
-rw-r--r--.github/CODEOWNERS8
-rwxr-xr-xbin/make_err4
-rwxr-xr-xbin/make_overflow4
-rwxr-xr-xbin/make_vers4
-rw-r--r--c++/src/H5ArrayType.h6
-rw-r--r--c++/src/H5AtomType.h6
-rw-r--r--c++/src/H5Attribute.cpp2
-rw-r--r--c++/src/H5Attribute.h6
-rw-r--r--c++/src/H5Classes.h6
-rw-r--r--c++/src/H5CompType.h6
-rw-r--r--c++/src/H5Cpp.h6
-rw-r--r--c++/src/H5CppDoc.h6
-rw-r--r--c++/src/H5DaccProp.h6
-rw-r--r--c++/src/H5DataSet.h6
-rw-r--r--c++/src/H5DataSpace.h6
-rw-r--r--c++/src/H5DataType.h6
-rw-r--r--c++/src/H5DcreatProp.h6
-rw-r--r--c++/src/H5DxferProp.h6
-rw-r--r--c++/src/H5EnumType.h6
-rw-r--r--c++/src/H5Exception.h6
-rw-r--r--c++/src/H5FaccProp.h6
-rw-r--r--c++/src/H5FcreatProp.h6
-rw-r--r--c++/src/H5File.h6
-rw-r--r--c++/src/H5FloatType.h6
-rw-r--r--c++/src/H5IntType.h6
-rw-r--r--c++/src/H5LaccProp.h6
-rw-r--r--c++/src/H5LcreatProp.h6
-rw-r--r--c++/src/H5Library.h6
-rw-r--r--c++/src/H5Location.h6
-rw-r--r--c++/src/H5Object.cpp15
-rw-r--r--c++/src/H5Object.h6
-rw-r--r--c++/src/H5OcreatProp.h6
-rw-r--r--c++/src/H5PredType.cpp3
-rw-r--r--c++/src/H5PredType.h6
-rw-r--r--c++/src/H5PropList.h6
-rw-r--r--c++/src/H5StrType.cpp3
-rw-r--r--c++/src/H5StrType.h6
-rw-r--r--c++/src/H5VarLenType.h6
-rw-r--r--c++/test/h5cpputil.h4
-rw-r--r--config/cmake/HDF5PluginCache.cmake2
-rw-r--r--fortran/src/H5_f.c19
-rw-r--r--fortran/src/H5f90.h6
-rw-r--r--fortran/src/H5f90i.h6
-rw-r--r--fortran/src/H5f90proto.h6
-rw-r--r--hl/c++/src/H5PacketTable.h2
-rw-r--r--hl/fortran/src/H5IMcc.h4
-rw-r--r--hl/fortran/src/H5LTf90proto.h6
-rw-r--r--hl/src/H5DOpublic.h4
-rw-r--r--hl/src/H5DSprivate.h4
-rw-r--r--hl/src/H5DSpublic.h4
-rw-r--r--hl/src/H5HLprivate2.h6
-rw-r--r--hl/src/H5IM.c8
-rw-r--r--hl/src/H5IMprivate.h4
-rw-r--r--hl/src/H5IMpublic.h4
-rw-r--r--hl/src/H5LDprivate.h6
-rw-r--r--hl/src/H5LDpublic.h6
-rw-r--r--hl/src/H5LT.c14
-rw-r--r--hl/src/H5LTprivate.h4
-rw-r--r--hl/src/H5LTpublic.h4
-rw-r--r--hl/src/H5PTprivate.h4
-rw-r--r--hl/src/H5PTpublic.h4
-rw-r--r--hl/src/H5TBprivate.h4
-rw-r--r--hl/src/H5TBpublic.h4
-rw-r--r--hl/src/hdf5_hl.h7
-rw-r--r--hl/test/h5hltest.h6
-rw-r--r--hl/tools/gif2h5/hdfgifwr.c12
-rw-r--r--src/H5ACmodule.h6
-rw-r--r--src/H5ACpkg.h6
-rw-r--r--src/H5ACprivate.h6
-rw-r--r--src/H5ACpublic.h4
-rw-r--r--src/H5Amodule.h6
-rw-r--r--src/H5Apkg.h6
-rw-r--r--src/H5Aprivate.h6
-rw-r--r--src/H5Apublic.h6
-rw-r--r--src/H5B2module.h6
-rw-r--r--src/H5B2pkg.h6
-rw-r--r--src/H5B2private.h6
-rw-r--r--src/H5Bmodule.h6
-rw-r--r--src/H5Bpkg.h34
-rw-r--r--src/H5Bprivate.h6
-rw-r--r--src/H5CSprivate.h6
-rw-r--r--src/H5CXmodule.h6
-rw-r--r--src/H5CXprivate.h10
-rw-r--r--src/H5Clog.h6
-rw-r--r--src/H5Cmodule.h6
-rw-r--r--src/H5Cpkg.h6
-rw-r--r--src/H5Cprivate.h16
-rw-r--r--src/H5Cpublic.h6
-rw-r--r--src/H5Dmodule.h6
-rw-r--r--src/H5Dpkg.h6
-rw-r--r--src/H5Dprivate.h6
-rw-r--r--src/H5Dpublic.h6
-rw-r--r--src/H5EAmodule.h6
-rw-r--r--src/H5EApkg.h6
-rw-r--r--src/H5EAprivate.h6
-rw-r--r--src/H5Emodule.h6
-rw-r--r--src/H5Epkg.h6
-rw-r--r--src/H5Eprivate.h12
-rw-r--r--src/H5Epublic.h6
-rw-r--r--src/H5FAmodule.h6
-rw-r--r--src/H5FApkg.h6
-rw-r--r--src/H5FAprivate.h6
-rw-r--r--src/H5FDdirect.h2
-rw-r--r--src/H5FDdrvr_module.h6
-rw-r--r--src/H5FDhdfs.h2
-rw-r--r--src/H5FDmodule.h6
-rw-r--r--src/H5FDmpio.h2
-rw-r--r--src/H5FDmulti.c2
-rw-r--r--src/H5FDpkg.h6
-rw-r--r--src/H5FDprivate.h6
-rw-r--r--src/H5FDpublic.h4
-rw-r--r--src/H5FDstdio.c32
-rw-r--r--src/H5FLmodule.h6
-rw-r--r--src/H5FLprivate.h4
-rw-r--r--src/H5FOprivate.h6
-rw-r--r--src/H5FSmodule.h6
-rw-r--r--src/H5FSpkg.h6
-rw-r--r--src/H5FSprivate.h6
-rw-r--r--src/H5Fdeprec.c22
-rw-r--r--src/H5Fmodule.h6
-rw-r--r--src/H5Fpkg.h6
-rw-r--r--src/H5Fprivate.h16
-rw-r--r--src/H5Fpublic.h20
-rw-r--r--src/H5Gmodule.h6
-rw-r--r--src/H5Gpkg.h6
-rw-r--r--src/H5Gprivate.h6
-rw-r--r--src/H5Gpublic.h6
-rw-r--r--src/H5HFmodule.h6
-rw-r--r--src/H5HFpkg.h6
-rw-r--r--src/H5HFprivate.h6
-rw-r--r--src/H5HGmodule.h6
-rw-r--r--src/H5HGpkg.h6
-rw-r--r--src/H5HGprivate.h6
-rw-r--r--src/H5HLmodule.h6
-rw-r--r--src/H5HLpkg.h6
-rw-r--r--src/H5HLprivate.h4
-rw-r--r--src/H5HPprivate.h6
-rw-r--r--src/H5Imodule.h18
-rw-r--r--src/H5Ipkg.h6
-rw-r--r--src/H5Iprivate.h6
-rw-r--r--src/H5Ipublic.h6
-rw-r--r--src/H5Lmodule.h6
-rw-r--r--src/H5Lpkg.h6
-rw-r--r--src/H5Lprivate.h6
-rw-r--r--src/H5Lpublic.h6
-rw-r--r--src/H5MFmodule.h6
-rw-r--r--src/H5MFpkg.h6
-rw-r--r--src/H5MFprivate.h6
-rw-r--r--src/H5MMprivate.h6
-rw-r--r--src/H5MMpublic.h6
-rw-r--r--src/H5MPmodule.h6
-rw-r--r--src/H5MPpkg.h6
-rw-r--r--src/H5MPprivate.h6
-rw-r--r--src/H5Omodule.h6
-rw-r--r--src/H5Opkg.h6
-rw-r--r--src/H5Oprivate.h6
-rw-r--r--src/H5Opublic.h12
-rw-r--r--src/H5PBmodule.h6
-rw-r--r--src/H5PBpkg.h6
-rw-r--r--src/H5PBprivate.h6
-rw-r--r--src/H5PLextern.h6
-rw-r--r--src/H5PLmodule.h6
-rw-r--r--src/H5PLpkg.h6
-rw-r--r--src/H5PLprivate.h6
-rw-r--r--src/H5PLpublic.h6
-rw-r--r--src/H5Pmodule.h6
-rw-r--r--src/H5Ppkg.h6
-rw-r--r--src/H5Pprivate.h6
-rw-r--r--src/H5Ppublic.h12
-rw-r--r--src/H5RSprivate.h6
-rw-r--r--src/H5Rmodule.h6
-rw-r--r--src/H5Rpkg.h6
-rw-r--r--src/H5Rprivate.h6
-rw-r--r--src/H5Rpublic.h6
-rw-r--r--src/H5SLmodule.h6
-rw-r--r--src/H5SLprivate.h6
-rw-r--r--src/H5SMmodule.h6
-rw-r--r--src/H5SMpkg.h6
-rw-r--r--src/H5SMprivate.h6
-rw-r--r--src/H5STprivate.h6
-rw-r--r--src/H5Smodule.h6
-rw-r--r--src/H5Spkg.h16
-rw-r--r--src/H5Sprivate.h6
-rw-r--r--src/H5Spublic.h6
-rw-r--r--src/H5TSprivate.h12
-rw-r--r--src/H5Tmodule.h6
-rw-r--r--src/H5Tpkg.h6
-rw-r--r--src/H5Tprivate.h6
-rw-r--r--src/H5Tpublic.h6
-rw-r--r--src/H5UCprivate.h6
-rw-r--r--src/H5VMprivate.h2
-rw-r--r--src/H5WBprivate.h6
-rw-r--r--src/H5Zmodule.h6
-rw-r--r--src/H5Zpkg.h6
-rw-r--r--src/H5Zprivate.h4
-rw-r--r--src/H5Zpublic.h4
-rw-r--r--src/H5private.h24
-rw-r--r--src/H5public.h141
-rw-r--r--src/H5win32defs.h7
-rw-r--r--src/hdf5.h4
-rw-r--r--test/H5srcdir.h6
-rw-r--r--test/h5test.h4
-rw-r--r--test/stab.c2
-rw-r--r--test/tattr.c4
-rw-r--r--tools/lib/h5diff_array.c4
-rw-r--r--tools/lib/h5tools_dump.c3
-rw-r--r--tools/lib/h5tools_utils.c2
207 files changed, 753 insertions, 737 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6061711..a80d51c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,7 +13,7 @@ CMakeTests.* @byrnHDF @derobins
/bin/ @lrknox @derobins
-/c++/ @bmribler @byrnHDF
+/c++/ @bmribler @byrnHDF @derobins
/config/ @lrknox @derobins @byrnHDF
@@ -23,7 +23,7 @@ CMakeTests.* @byrnHDF @derobins
/fortran/ @brtnfld @epourmal
-/hl/ @bmribler @byrnHDF
+/hl/ @bmribler @byrnHDF @derobins
/java/ @jhendersonHDF @byrnHDF
@@ -37,6 +37,6 @@ CMakeTests.* @byrnHDF @derobins
/testpar/ @jhendersonHDF @rawarren @jrmainzer
-/tools/ @byrnHDF @bmribler
+/tools/ @byrnHDF @bmribler @derobins
-/utils/ @lrknox @byrnHDF
+/utils/ @lrknox @byrnHDF @derobins
diff --git a/bin/make_err b/bin/make_err
index 68a32f4..f2b044a 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -64,8 +64,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;
# Print the ifdef info
- print $fh "\n#ifndef _${file}_H\n";
- print $fh "#define _${file}_H\n";
+ print $fh "\n#ifndef ${file}_H\n";
+ print $fh "#define ${file}_H\n";
}
##############################################################################
diff --git a/bin/make_overflow b/bin/make_overflow
index d1d16ee..37d6ded 100755
--- a/bin/make_overflow
+++ b/bin/make_overflow
@@ -93,8 +93,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;
# Print the ifdef info
- print $fh "\n#ifndef _${file}_H\n";
- print $fh "#define _${file}_H\n";
+ print $fh "\n#ifndef ${file}_H\n";
+ print $fh "#define ${file}_H\n";
}
##############################################################################
diff --git a/bin/make_vers b/bin/make_vers
index 344bcbc..5236e01 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -78,8 +78,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;
# Print the ifdef info
- print $fh "\n#ifndef _${file}_H\n";
- print $fh "#define _${file}_H\n";
+ print $fh "\n#ifndef ${file}_H\n";
+ print $fh "#define ${file}_H\n";
}
##############################################################################
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index c2a6493..4302352 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5ArrayType_H
-#define __H5ArrayType_H
+#ifndef H5ArrayType_H
+#define H5ArrayType_H
namespace H5 {
@@ -69,4 +69,4 @@ class H5_DLLCPP ArrayType : public DataType {
}; // end of ArrayType
} // namespace H5
-#endif // __H5ArrayType_H
+#endif // H5ArrayType_H
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index f5664b8..84da5e9 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5AtomType_H
-#define __H5AtomType_H
+#ifndef H5AtomType_H
+#define H5AtomType_H
namespace H5 {
@@ -83,4 +83,4 @@ class H5_DLLCPP AtomType : public DataType {
}; // end of AtomType
} // namespace H5
-#endif // __H5AtomType_H
+#endif // H5AtomType_H
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 08367c5..81e656f 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -41,7 +41,7 @@ namespace H5 {
using std::cerr;
using std::endl;
-class H5_DLLCPP H5Object; // forward declaration for UserData4Aiterate
+class H5Object; // forward declaration for UserData4Aiterate
//--------------------------------------------------------------------------
// Function: Attribute default constructor
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index 5a13c2e..41e5a31 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Attribute_H
-#define __H5Attribute_H
+#ifndef H5Attribute_H
+#define H5Attribute_H
namespace H5 {
@@ -104,4 +104,4 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
}; // end of Attribute
} // namespace H5
-#endif // __H5Attribute_H
+#endif // H5Attribute_H
diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h
index 42e3d69..7820ce2 100644
--- a/c++/src/H5Classes.h
+++ b/c++/src/H5Classes.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Classes_H
-#define __H5Classes_H
+#ifndef H5Classes_H
+#define H5Classes_H
namespace H5 {
class Exception;
@@ -43,4 +43,4 @@ class H5File;
class Attribute;
class H5Library;
} // namespace H5
-#endif // __H5Classes_H
+#endif // H5Classes_H
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index 6d2ce7e..6a4c093 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5CompType_H
-#define __H5CompType_H
+#ifndef H5CompType_H
+#define H5CompType_H
namespace H5 {
@@ -124,4 +124,4 @@ class H5_DLLCPP CompType : public DataType {
}; // end of CompType
} // namespace H5
-#endif // __H5CompType_H
+#endif // H5CompType_H
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index 8fea1f9..9272bdb 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Cpp_H
-#define __H5Cpp_H
+#ifndef H5Cpp_H
+#define H5Cpp_H
#include "H5Include.h"
#include "H5Exception.h"
@@ -58,4 +58,4 @@
#define HOFFSET(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
#endif
-#endif // __H5Cpp_H
+#endif // H5Cpp_H
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index 29f3afc..4337a6f 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5CppDoc_H
-#define __H5CppDoc_H
+#ifndef H5CppDoc_H
+#define H5CppDoc_H
//-------------------------------------------------------------------------
// The following section will be used to generate the 'Mainpage'
@@ -92,4 +92,4 @@
/// This example shows how to work with groups.
///\example h5group.cpp
-#endif // __H5CppDoc_H
+#endif // H5CppDoc_H
diff --git a/c++/src/H5DaccProp.h b/c++/src/H5DaccProp.h
index 627c4a4..7d6b250 100644
--- a/c++/src/H5DaccProp.h
+++ b/c++/src/H5DaccProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DSetAccPropList_H
-#define __H5DSetAccPropList_H
+#ifndef H5DSetAccPropList_H
+#define H5DSetAccPropList_H
namespace H5 {
@@ -69,4 +69,4 @@ class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
}; // end of DSetAccPropList
} // namespace H5
-#endif // __H5DSetAccPropList_H
+#endif // H5DSetAccPropList_H
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index c07aad5..c745470 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DataSet_H
-#define __H5DataSet_H
+#ifndef H5DataSet_H
+#define H5DataSet_H
namespace H5 {
@@ -153,4 +153,4 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
}; // end of DataSet
} // namespace H5
-#endif // __H5DataSet_H
+#endif // H5DataSet_H
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 14d030f..f16acfc 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DataSpace_H
-#define __H5DataSpace_H
+#ifndef H5DataSpace_H
+#define H5DataSpace_H
namespace H5 {
@@ -155,4 +155,4 @@ class H5_DLLCPP DataSpace : public IdComponent {
}; // end of DataSpace
} // namespace H5
-#endif // __H5DataSpace_H
+#endif // H5DataSpace_H
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index f97f806..49f5348 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DataType_H
-#define __H5DataType_H
+#ifndef H5DataType_H
+#define H5DataType_H
namespace H5 {
@@ -183,4 +183,4 @@ class H5_DLLCPP DataType : public H5Object {
}; // end of DataType
} // namespace H5
-#endif // __H5DataType_H
+#endif // H5DataType_H
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 74c4be0..3c032ee 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DSCreatPropList_H
-#define __H5DSCreatPropList_H
+#ifndef H5DSCreatPropList_H
+#define H5DSCreatPropList_H
namespace H5 {
@@ -159,4 +159,4 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
}; // end of DSetCreatPropList
} // namespace H5
-#endif // __H5DSCreatPropList_H
+#endif // H5DSCreatPropList_H
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index cb4c2c3..11bad65 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5DSetMemXferPropList_H
-#define __H5DSetMemXferPropList_H
+#ifndef H5DSetMemXferPropList_H
+#define H5DSetMemXferPropList_H
namespace H5 {
@@ -131,4 +131,4 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
}; // end of DSetMemXferPropList
} // namespace H5
-#endif // __H5DSetMemXferPropList_H
+#endif // H5DSetMemXferPropList_H
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index b228d31..484405a 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5EnumType_H
-#define __H5EnumType_H
+#ifndef H5EnumType_H
+#define H5EnumType_H
namespace H5 {
@@ -87,4 +87,4 @@ class H5_DLLCPP EnumType : public DataType {
}; // end of EnumType
} // namespace H5
-#endif // __H5EnumType_H
+#endif // H5EnumType_H
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index c7b117b..566c818 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Exception_H
-#define __H5Exception_H
+#ifndef H5Exception_H
+#define H5Exception_H
#include <string>
@@ -176,4 +176,4 @@ class H5_DLLCPP IdComponentException : public Exception {
}; // end of IdComponentException
} // namespace H5
-#endif // __H5Exception_H
+#endif // H5Exception_H
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index a02e250..998f870 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5FileAccPropList_H
-#define __H5FileAccPropList_H
+#ifndef H5FileAccPropList_H
+#define H5FileAccPropList_H
namespace H5 {
@@ -168,4 +168,4 @@ class H5_DLLCPP FileAccPropList : public PropList {
}; // end of FileAccPropList
} // namespace H5
-#endif // __H5FileAccPropList_H
+#endif // H5FileAccPropList_H
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 2b3f46f..00ae0b1 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5FileCreatPropList_H
-#define __H5FileCreatPropList_H
+#ifndef H5FileCreatPropList_H
+#define H5FileCreatPropList_H
namespace H5 {
@@ -109,4 +109,4 @@ class H5_DLLCPP FileCreatPropList : public PropList {
}; // end of FileCreatPropList
} // namespace H5
-#endif // __H5FileCreatPropList_H
+#endif // H5FileCreatPropList_H
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index a350b47..b107f67 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5File_H
-#define __H5File_H
+#ifndef H5File_H
+#define H5File_H
namespace H5 {
@@ -127,4 +127,4 @@ class H5_DLLCPP H5File : public Group {
}; // end of H5File
} // namespace H5
-#endif // __H5File_H
+#endif // H5File_H
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index e254646..c76be95 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5FloatType_H
-#define __H5FloatType_H
+#ifndef H5FloatType_H
+#define H5FloatType_H
namespace H5 {
@@ -84,4 +84,4 @@ class H5_DLLCPP FloatType : public AtomType {
}; // end of FloatType
} // namespace H5
-#endif // __H5FloatType_H
+#endif // H5FloatType_H
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 7841518..185c8f0 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5IntType_H
-#define __H5IntType_H
+#ifndef H5IntType_H
+#define H5IntType_H
namespace H5 {
@@ -66,4 +66,4 @@ class H5_DLLCPP IntType : public AtomType {
}; // end of IntType
} // namespace H5
-#endif // __H5IntType_H
+#endif // H5IntType_H
diff --git a/c++/src/H5LaccProp.h b/c++/src/H5LaccProp.h
index e6cf888..4fa516c 100644
--- a/c++/src/H5LaccProp.h
+++ b/c++/src/H5LaccProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5LinkAccPropList_H
-#define __H5LinkAccPropList_H
+#ifndef H5LinkAccPropList_H
+#define H5LinkAccPropList_H
namespace H5 {
@@ -70,4 +70,4 @@ class H5_DLLCPP LinkAccPropList : public PropList {
}; // end of LinkAccPropList
} // namespace H5
-#endif // __H5LinkAccPropList_H
+#endif // H5LinkAccPropList_H
diff --git a/c++/src/H5LcreatProp.h b/c++/src/H5LcreatProp.h
index e5a9d7a..aea38e7 100644
--- a/c++/src/H5LcreatProp.h
+++ b/c++/src/H5LcreatProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5LinkCreatPropList_H
-#define __H5LinkCreatPropList_H
+#ifndef H5LinkCreatPropList_H
+#define H5LinkCreatPropList_H
namespace H5 {
@@ -77,4 +77,4 @@ class H5_DLLCPP LinkCreatPropList : public PropList {
}; // end of LinkCreatPropList
} // namespace H5
-#endif // __H5LinkCreatPropList_H
+#endif // H5LinkCreatPropList_H
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index 9a73eee..3df8d56 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Library_H
-#define __H5Library_H
+#ifndef H5Library_H
+#define H5Library_H
namespace H5 {
@@ -69,4 +69,4 @@ class H5_DLLCPP H5Library {
}; // end of H5Library
} // namespace H5
-#endif // __H5Library_H
+#endif // H5Library_H
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index a749cdd..7d40fb0 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Location_H
-#define __H5Location_H
+#ifndef H5Location_H
+#define H5Location_H
#include "H5Classes.h" // constains forward class declarations
@@ -321,4 +321,4 @@ class H5_DLLCPP H5Location : public IdComponent {
}; // end of H5Location
} // namespace H5
-#endif // __H5Location_H
+#endif // H5Location_H
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 7bd5479..7e3d14d 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -42,8 +42,11 @@ namespace H5 {
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// userAttrOpWrpr interfaces between the user's function and the
// C library function H5Aiterate2
-extern "C" herr_t
-userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, void *op_data)
+extern "C" {
+
+static herr_t
+userAttrOpWrpr(H5_ATTR_UNUSED hid_t loc_id, const char *attr_name, H5_ATTR_UNUSED const H5A_info_t *ainfo,
+ void *op_data)
{
H5std_string s_attr_name = H5std_string(attr_name);
UserData4Aiterate *myData = reinterpret_cast<UserData4Aiterate *>(op_data);
@@ -52,9 +55,9 @@ userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, voi
}
// userVisitOpWrpr interfaces between the user's function and the
-// C library function H5Ovisit2
-extern "C" herr_t
-userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info, void *op_data)
+// C library function H5Ovisit3
+static herr_t
+userVisitOpWrpr(H5_ATTR_UNUSED hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info, void *op_data)
{
H5std_string s_attr_name = H5std_string(attr_name);
UserData4Visit *myData = reinterpret_cast<UserData4Visit *>(op_data);
@@ -62,6 +65,8 @@ userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info_t *obj_info,
return status;
}
+} // extern "C"
+
//--------------------------------------------------------------------------
// Function: H5Object default constructor (protected)
// Programmer Binh-Minh Ribler - 2000
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index b11c895..baf38f1 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5Object_H
-#define __H5Object_H
+#ifndef H5Object_H
+#define H5Object_H
namespace H5 {
@@ -132,4 +132,4 @@ class H5_DLLCPP H5Object : public H5Location {
}; // end of H5Object
} // namespace H5
-#endif // __H5Object_H
+#endif // H5Object_H
diff --git a/c++/src/H5OcreatProp.h b/c++/src/H5OcreatProp.h
index ec6e9c8..7f6d411 100644
--- a/c++/src/H5OcreatProp.h
+++ b/c++/src/H5OcreatProp.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5ObjCreatPropList_H
-#define __H5ObjCreatPropList_H
+#ifndef H5ObjCreatPropList_H
+#define H5ObjCreatPropList_H
namespace H5 {
@@ -75,4 +75,4 @@ class H5_DLLCPP ObjCreatPropList : public PropList {
}; // end of ObjCreatPropList
} // namespace H5
-#endif // __H5ObjCreatPropList_H
+#endif // H5ObjCreatPropList_H
diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index dd70353..b58569f 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -27,6 +27,7 @@
#include "H5DataType.h"
#include "H5AtomType.h"
#include "H5PredType.h"
+#include "H5private.h"
namespace H5 {
@@ -82,7 +83,7 @@ PredType::operator=(const PredType &rhs)
// These dummy functions do not inherit from DataType - they'll
// throw an DataTypeIException if invoked.
void
-PredType::commit(H5Location &loc, const char *name)
+PredType::commit(H5_ATTR_UNUSED H5Location &loc, H5_ATTR_UNUSED const char *name)
{
throw DataTypeIException("PredType::commit",
"Error: Attempted to commit a predefined datatype. Invalid operation!");
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index c3ba6a2..b40d2b3 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5PredType_H
-#define __H5PredType_H
+#ifndef H5PredType_H
+#define H5PredType_H
namespace H5 {
@@ -442,4 +442,4 @@ class H5_DLLCPP PredType : public AtomType {
}; // end of PredType
} // namespace H5
-#endif // __H5PredType_H
+#endif // H5PredType_H
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index cdd9619..12c8b4b 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5PropList_H
-#define __H5PropList_H
+#ifndef H5PropList_H
+#define H5PropList_H
namespace H5 {
@@ -144,4 +144,4 @@ class H5_DLLCPP PropList : public IdComponent {
}; // end of PropList
} // namespace H5
-#endif // __H5PropList_H
+#endif // H5PropList_H
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 7bbe3ab..473cab3 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -32,6 +32,7 @@
#include "H5StrType.h"
#include "H5DataSet.h"
#include "H5PredType.h"
+#include "H5private.h"
namespace H5 {
@@ -102,7 +103,7 @@ StrType::StrType(const PredType &pred_type, const size_t &size) : AtomType()
// This constructor replaced the previous one.
// Programmer Binh-Minh Ribler - Nov 28, 2005
//--------------------------------------------------------------------------
-StrType::StrType(const int dummy, const size_t &size) : AtomType()
+StrType::StrType(H5_ATTR_UNUSED const int dummy, const size_t &size) : AtomType()
{
// use DataType::copy to make a copy of the string predefined type
// then set its length
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index b24cbef..d272c53 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5StrType_H
-#define __H5StrType_H
+#ifndef H5StrType_H
+#define H5StrType_H
namespace H5 {
@@ -78,4 +78,4 @@ class H5_DLLCPP StrType : public AtomType {
}; // end of StrType
} // namespace H5
-#endif // __H5StrType_H
+#endif // H5StrType_H
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index 674b49d..f767e0e 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -12,8 +12,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef __H5VarLenType_H
-#define __H5VarLenType_H
+#ifndef H5VarLenType_H
+#define H5VarLenType_H
namespace H5 {
@@ -61,4 +61,4 @@ class H5_DLLCPP VarLenType : public DataType {
}; // end of VarLenType
} // namespace H5
-#endif // __H5VarLenType_H
+#endif // H5VarLenType_H
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index 6a9187a..4439ae3 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -19,8 +19,8 @@
***************************************************************************/
-#ifndef _h5cpputil_h
-#define _h5cpputil_h
+#ifndef H5cpputil_H
+#define H5cpputil_H
#include "h5test.h"
diff --git a/config/cmake/HDF5PluginCache.cmake b/config/cmake/HDF5PluginCache.cmake
index 2b9e48c..3b085dd 100644
--- a/config/cmake/HDF5PluginCache.cmake
+++ b/config/cmake/HDF5PluginCache.cmake
@@ -20,7 +20,7 @@ set (HDF5_REPACK_EXECUTABLE $<TARGET_FILE:h5repack-shared> CACHE STRING "hdf5 h5
set (H5PL_ALLOW_EXTERNAL_SUPPORT "${HDF5_ALLOW_EXTERNAL_SUPPORT}" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
-set (H5PL_GIT_URL "https://git@bitbucket.hdfgroup.org/scm/test/h5plugin.git" CACHE STRING "Use plugins from HDF repository" FORCE)
+set (H5PL_GIT_URL "https://github.com/HDFGroup/hdf5_plugins.git" CACHE STRING "Use plugins from HDF repository" FORCE)
set (H5PL_GIT_BRANCH "master" CACHE STRING "" FORCE)
set (H5PL_TGZ_NAME "${PLUGIN_TGZ_NAME}" CACHE STRING "Use plugins from compressed file" FORCE)
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 430c876..e443b09 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -53,10 +53,9 @@ int_f
h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes)
/******/
{
- int ret_value = -1;
- hid_t c_type_id;
- size_t tmp_val;
- int i;
+ int ret_value = -1;
+ hid_t c_type_id;
+ int i;
/* Fortran INTEGER may not be the same as C; do all checking to find
an appropriate size
@@ -148,8 +147,7 @@ h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes)
if ((c_type_id = H5Tcopy(H5T_FORTRAN_S1)) < 0)
return ret_value;
- tmp_val = 1;
- if (H5Tset_size(c_type_id, tmp_val) < 0)
+ if (H5Tset_size(c_type_id, 1) < 0)
return ret_value;
if (H5Tset_strpad(c_type_id, H5T_STR_SPACEPAD) < 0)
return ret_value;
@@ -386,6 +384,7 @@ h5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f *floatingtypes, int_f *
ret_value = 0;
return ret_value;
}
+
/****if* H5_f/h5init_flags_c
* NAME
* h5init_flags_c
@@ -440,7 +439,6 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags, haddr_t_f *h5_haddr_generic_flags)
/******/
{
- int ret_value = -1;
/*
* H5D flags
*/
@@ -676,14 +674,12 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
/*
* H5R flags
*/
-
h5r_flags[0] = (int_f)H5R_OBJECT;
h5r_flags[1] = (int_f)H5R_DATASET_REGION;
/*
* H5S flags
*/
-
h5s_hid_flags[0] = (hid_t_f)H5S_ALL;
h5s_hsize_flags[0] = (hsize_t_f)H5S_UNLIMITED;
@@ -709,6 +705,7 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
h5s_flags[15] = (int_f)H5S_SEL_POINTS;
h5s_flags[16] = (int_f)H5S_SEL_HYPERSLABS;
h5s_flags[17] = (int_f)H5S_SEL_ALL;
+
/*
* H5T flags
*/
@@ -747,6 +744,7 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
h5t_flags[32] = (int_f)H5T_ARRAY;
h5t_flags[33] = (int_f)H5T_DIR_ASCEND;
h5t_flags[34] = (int_f)H5T_DIR_DESCEND;
+
/*
* H5Z flags
*/
@@ -792,8 +790,7 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid
h5_haddr_generic_flags[0] = (haddr_t_f)HADDR_UNDEF; /* undefined address */
- ret_value = 0;
- return ret_value;
+ return 0;
}
int_f
diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h
index e8655e4..3cc617f 100644
--- a/fortran/src/H5f90.h
+++ b/fortran/src/H5f90.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5f90_H
-#define _H5f90_H
+#ifndef H5f90_H
+#define H5f90_H
#include "hdf5.h"
#include "H5private.h"
@@ -27,4 +27,4 @@
#define H5_MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif /* _H5f90_H */
+#endif /* H5f90_H */
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index 37e563b..dbb6a16 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5f90i_H
-#define _H5f90i_H
+#ifndef H5f90i_H
+#define H5f90i_H
/*
* Include generated header. This header defines integer types,
@@ -36,4 +36,4 @@ typedef char *_fcd;
#endif
-#endif /* _H5f90i_H */
+#endif /* H5f90i_H */
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index ccd32b3..1480ca8 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5f90proto_H
-#define _H5f90proto_H
+#ifndef H5f90proto_H
+#define H5f90proto_H
#include "H5public.h"
#include "H5f90.h"
@@ -637,4 +637,4 @@ H5_FCDLL int_f h5literate_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namele
int_f *order, hsize_t_f *idx, H5L_iterate_t op, void *op_data,
hid_t_f *lapl_id);
-#endif /* _H5f90proto_H */
+#endif /* H5f90proto_H */
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 735901f..825caf7 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -163,7 +163,7 @@ class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable {
/* Destructor
* Cleans up the packet table
*/
- virtual ~FL_PacketTable(){};
+ virtual ~FL_PacketTable() {}
/* AppendPacket
* Adds a single packet to the packet table. Takes a pointer
diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h
index 0527a39..7473c00 100644
--- a/hl/fortran/src/H5IMcc.h
+++ b/hl/fortran/src/H5IMcc.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5IMCC_H
-#define _H5IMCC_H
+#ifndef H5IMCC_H
+#define H5IMCC_H
#include "H5LTprivate.h"
#include "H5IMprivate.h"
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index a912d0b..8847c01 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5LTf90proto_H
-#define _H5LTf90proto_H
+#ifndef H5LTf90proto_H
+#define H5LTf90proto_H
#include "H5public.h"
#include "H5f90i.h"
@@ -206,4 +206,4 @@ int_f h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_
size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size,
size_t_f *namelen2, size_t_f *lenmax, _fcd field_names, size_t_f *maxlen_out);
-#endif /* _H5LTf90proto_H */
+#endif /* H5LTf90proto_H */
diff --git a/hl/src/H5DOpublic.h b/hl/src/H5DOpublic.h
index 50d58f5..88616a3 100644
--- a/hl/src/H5DOpublic.h
+++ b/hl/src/H5DOpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5DOpublic_H
-#define _H5DOpublic_H
+#ifndef H5DOpublic_H
+#define H5DOpublic_H
#ifdef __cplusplus
extern "C" {
diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h
index 42dd6bf..0403a4c 100644
--- a/hl/src/H5DSprivate.h
+++ b/hl/src/H5DSprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5DSprivate_H
-#define _H5DSprivate_H
+#ifndef H5DSprivate_H
+#define H5DSprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
diff --git a/hl/src/H5DSpublic.h b/hl/src/H5DSpublic.h
index ca7ad3b..7306cbc 100644
--- a/hl/src/H5DSpublic.h
+++ b/hl/src/H5DSpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5DSpublic_H
-#define _H5DSpublic_H
+#ifndef H5DSpublic_H
+#define H5DSpublic_H
#define DIMENSION_SCALE_CLASS "DIMENSION_SCALE"
#define DIMENSION_LIST "DIMENSION_LIST"
diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h
index 1202f00..c696b77 100644
--- a/hl/src/H5HLprivate2.h
+++ b/hl/src/H5HLprivate2.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5HLprivate2_H
-#define _H5HLprivate2_H
+#ifndef H5HLprivate2_H
+#define H5HLprivate2_H
/* Public HDF5 header */
#include "hdf5.h"
@@ -23,4 +23,4 @@
/* HDF5 private functions */
#include "H5private.h"
-#endif /* _H5HLprivate2_H */
+#endif /* H5HLprivate2_H */
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 64cb535..310d665 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -160,7 +160,8 @@ H5IMmake_image_24bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t
*-------------------------------------------------------------------------
*/
static herr_t
-find_palette(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data)
+find_palette(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const H5A_info_t *ainfo,
+ H5_ATTR_UNUSED void *op_data)
{
int ret = H5_ITER_CONT;
@@ -168,11 +169,6 @@ find_palette(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_d
if (name == NULL)
return -1;
- /* Shut compiler up */
- loc_id = loc_id;
- ainfo = ainfo;
- op_data = op_data;
-
/* Define a positive value for return value if the attribute was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
diff --git a/hl/src/H5IMprivate.h b/hl/src/H5IMprivate.h
index 8803a4c..3570ea3 100644
--- a/hl/src/H5IMprivate.h
+++ b/hl/src/H5IMprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5IMprivate_H
-#define _H5IMprivate_H
+#ifndef H5IMprivate_H
+#define H5IMprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
diff --git a/hl/src/H5IMpublic.h b/hl/src/H5IMpublic.h
index fae4902..2843942 100644
--- a/hl/src/H5IMpublic.h
+++ b/hl/src/H5IMpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5IMpublic_H
-#define _H5IMpublic_H
+#ifndef H5IMpublic_H
+#define H5IMpublic_H
#ifdef __cplusplus
extern "C" {
diff --git a/hl/src/H5LDprivate.h b/hl/src/H5LDprivate.h
index 2728f8b..862e5b7 100644
--- a/hl/src/H5LDprivate.h
+++ b/hl/src/H5LDprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5LDprivate_H
-#define _H5LDprivate_H
+#ifndef H5LDprivate_H
+#define H5LDprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
@@ -50,4 +50,4 @@ H5_HLDLL int H5LD_construct_vector(char *fields, H5LD_memb_t *listv[], hid_t pa
}
#endif
-#endif /* end _H5LDprivate_H */
+#endif /* end H5LDprivate_H */
diff --git a/hl/src/H5LDpublic.h b/hl/src/H5LDpublic.h
index a19f8d0..011b208 100644
--- a/hl/src/H5LDpublic.h
+++ b/hl/src/H5LDpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5LDpublic_H
-#define _H5LDpublic_H
+#ifndef H5LDpublic_H
+#define H5LDpublic_H
#ifdef __cplusplus
extern "C" {
@@ -27,4 +27,4 @@ H5_HLDLL herr_t H5LDget_dset_elmts(hid_t did, const hsize_t *prev_dims, const hs
}
#endif
-#endif /* _H5LDpublic_H */
+#endif /* H5LDpublic_H */
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 56c9af1..18af730 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1297,7 +1297,8 @@ out:
*/
static herr_t
-find_dataset(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *op_data)
+find_dataset(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const H5L_info_t *linfo,
+ void *op_data)
{
/* Define a default zero value for return. This will cause the iterator to continue if
* the dataset is not found yet.
@@ -1308,10 +1309,6 @@ find_dataset(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *op_d
if (name == NULL)
return ret;
- /* Shut the compiler up */
- loc_id = loc_id;
- linfo = linfo;
-
/* Define a positive value for return value if the dataset was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
@@ -1841,7 +1838,8 @@ H5LTset_attribute_double(hid_t loc_id, const char *obj_name, const char *attr_na
*-------------------------------------------------------------------------
*/
static herr_t
-find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data)
+find_attr(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const H5A_info_t *ainfo,
+ void *op_data)
{
int ret = H5_ITER_CONT;
@@ -1849,10 +1847,6 @@ find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_data
if (name == NULL)
return H5_ITER_CONT;
- /* Shut compiler up */
- loc_id = loc_id;
- ainfo = ainfo;
-
/* Define a positive value for return value if the attribute was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
diff --git a/hl/src/H5LTprivate.h b/hl/src/H5LTprivate.h
index ddcbbbf..5a97d9c 100644
--- a/hl/src/H5LTprivate.h
+++ b/hl/src/H5LTprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5LTprivate_H
-#define _H5LTprivate_H
+#ifndef H5LTprivate_H
+#define H5LTprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h
index 417fce8..2af9b07 100644
--- a/hl/src/H5LTpublic.h
+++ b/hl/src/H5LTpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5LTpublic_H
-#define _H5LTpublic_H
+#ifndef H5LTpublic_H
+#define H5LTpublic_H
/* Flag definitions for H5LTopen_file_image() */
#define H5LT_FILE_IMAGE_OPEN_RW 0x0001 /* Open image for read-write */
diff --git a/hl/src/H5PTprivate.h b/hl/src/H5PTprivate.h
index 7277dd2..9ca7676 100644
--- a/hl/src/H5PTprivate.h
+++ b/hl/src/H5PTprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5PTprivate_H
-#define _H5PTprivate_H
+#ifndef H5PTprivate_H
+#define H5PTprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
diff --git a/hl/src/H5PTpublic.h b/hl/src/H5PTpublic.h
index ec744f8..d74baa5 100644
--- a/hl/src/H5PTpublic.h
+++ b/hl/src/H5PTpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5PTpublic_H
-#define _H5PTpublic_H
+#ifndef H5PTpublic_H
+#define H5PTpublic_H
#ifdef __cplusplus
extern "C" {
diff --git a/hl/src/H5TBprivate.h b/hl/src/H5TBprivate.h
index abe43c4..95b58e6 100644
--- a/hl/src/H5TBprivate.h
+++ b/hl/src/H5TBprivate.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5TBprivate_H
-#define _H5TBprivate_H
+#ifndef H5TBprivate_H
+#define H5TBprivate_H
/* High-level library internal header file */
#include "H5HLprivate2.h"
diff --git a/hl/src/H5TBpublic.h b/hl/src/H5TBpublic.h
index 1324fbd..1750490 100644
--- a/hl/src/H5TBpublic.h
+++ b/hl/src/H5TBpublic.h
@@ -11,8 +11,8 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifndef _H5TBpublic_H
-#define _H5TBpublic_H
+#ifndef H5TBpublic_H
+#define H5TBpublic_H
#ifdef __cplusplus
extern "C" {
diff --git a/hl/src/hdf5_hl.h b/hl/src/hdf5_hl.h
index 580c09a..9960b97 100644
--- a/hl/src/hdf5_hl.h
+++ b/hl/src/hdf5_hl.h
@@ -17,8 +17,9 @@
* fill this file with lots of gunk...
*/
-#ifndef _HDF5_HL_H
-#define _HDF5_HL_H
+#ifndef HDF5_HL_H
+#define HDF5_HL_H
+
#include "hdf5.h" /* hdf5 main library */
#include "H5DOpublic.h" /* dataset optimization */
#include "H5DSpublic.h" /* dimension scales */
@@ -28,4 +29,4 @@
#include "H5PTpublic.h" /* packet table */
#include "H5LDpublic.h" /* lite dataset */
-#endif /*H5_INCLUDE_HL*/
+#endif /*HDF5_HL_H*/
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index 7d9c5d1..14f3e14 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -18,8 +18,8 @@
* Purpose: Test support stuff.
*/
-#ifndef _H5HLTEST_H
-#define _H5HLTEST_H
+#ifndef H5HLTEST_H
+#define H5HLTEST_H
/* Get the HDF5 test header */
#include "h5test.h"
@@ -48,4 +48,4 @@
int test_packet_table_with_varlen(void);
-#endif /* _H5HLTEST_H */
+#endif /* H5HLTEST_H */
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c
index 333c808..8068829 100644
--- a/hl/tools/gif2h5/hdfgifwr.c
+++ b/hl/tools/gif2h5/hdfgifwr.c
@@ -152,12 +152,12 @@ hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, byte *rmap, byte *gmap
}
/* Shut compiler up... */
- ptype = ptype;
- rmap = rmap;
- gmap = gmap;
- bmap = bmap;
- numcols = numcols;
- colorstyle = colorstyle;
+ (void)ptype;
+ (void)rmap;
+ (void)gmap;
+ (void)bmap;
+ (void)numcols;
+ (void)colorstyle;
for (i = 0; i < 256; i++) {
pc2nc[i] = pc2ncmap[i];
diff --git a/src/H5ACmodule.h b/src/H5ACmodule.h
index 87babab..d1f9697 100644
--- a/src/H5ACmodule.h
+++ b/src/H5ACmodule.h
@@ -18,8 +18,8 @@
* H5AC package. Including this header means that the source file
* is part of the H5AC package.
*/
-#ifndef _H5ACmodule_H
-#define _H5ACmodule_H
+#ifndef H5ACmodule_H
+#define H5ACmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG_INIT YES
-#endif /* _H5ACmodule_H */
+#endif /* H5ACmodule_H */
diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h
index ce4306f..7da46a0 100644
--- a/src/H5ACpkg.h
+++ b/src/H5ACpkg.h
@@ -30,8 +30,8 @@
#error "Do not include this file outside the H5AC package!"
#endif
-#ifndef _H5ACpkg_H
-#define _H5ACpkg_H
+#ifndef H5ACpkg_H
+#define H5ACpkg_H
/* Get package's private header */
#include "H5ACprivate.h" /* Metadata cache */
@@ -423,4 +423,4 @@ H5_DLL herr_t H5AC__set_sync_point_done_callback(H5C_t *cache_ptr,
H5_DLL herr_t H5AC__set_write_done_callback(H5C_t *cache_ptr, void (*write_done)(void));
#endif /* H5_HAVE_PARALLEL */
-#endif /* _H5ACpkg_H */
+#endif /* H5ACpkg_H */
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 81a192f..4f4601f 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -23,8 +23,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5ACprivate_H
-#define _H5ACprivate_H
+#ifndef H5ACprivate_H
+#define H5ACprivate_H
#include "H5ACpublic.h" /*public prototypes */
@@ -457,4 +457,4 @@ H5_DLL hbool_t H5AC_get_serialization_in_progress(H5F_t *f);
H5_DLL hbool_t H5AC_cache_is_clean(const H5F_t *f, H5AC_ring_t inner_ring);
#endif /* NDEBUG */ /* end debugging functions */
-#endif /* !_H5ACprivate_H */
+#endif /* H5ACprivate_H */
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index 51244b4..e6cebff 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5ACpublic_H
-#define _H5ACpublic_H
+#ifndef H5ACpublic_H
+#define H5ACpublic_H
/* Public headers needed by this file */
#include "H5public.h"
diff --git a/src/H5Amodule.h b/src/H5Amodule.h
index 383b5fd..eb3a133 100644
--- a/src/H5Amodule.h
+++ b/src/H5Amodule.h
@@ -18,8 +18,8 @@
* H5A package. Including this header means that the source file
* is part of the H5A package.
*/
-#ifndef _H5Amodule_H
-#define _H5Amodule_H
+#ifndef H5Amodule_H
+#define H5Amodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_ATTR
#define H5_MY_PKG_INIT YES
-#endif /* _H5Amodule_H */
+#endif /* H5Amodule_H */
diff --git a/src/H5Apkg.h b/src/H5Apkg.h
index dd99939..a493526 100644
--- a/src/H5Apkg.h
+++ b/src/H5Apkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5A package!"
#endif
-#ifndef _H5Apkg_H
-#define _H5Apkg_H
+#ifndef H5Apkg_H
+#define H5Apkg_H
/*
* Define this to enable debugging.
@@ -267,4 +267,4 @@ H5_DLL htri_t H5A__is_shared_test(hid_t aid);
H5_DLL herr_t H5A__get_shared_rc_test(hid_t attr_id, hsize_t *ref_count);
#endif /* H5A_TESTING */
-#endif /* _H5Apkg_H */
+#endif /* H5Apkg_H */
diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h
index a13e662..30f3582 100644
--- a/src/H5Aprivate.h
+++ b/src/H5Aprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5D module
*/
-#ifndef _H5Aprivate_H
-#define _H5Aprivate_H
+#ifndef H5Aprivate_H
+#define H5Aprivate_H
/* Include package's public header */
#include "H5Apublic.h"
@@ -77,4 +77,4 @@ H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, H5_index
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 */
+#endif /* H5Aprivate_H */
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 4e2f0d1..28a0e85 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5A module.
*/
-#ifndef _H5Apublic_H
-#define _H5Apublic_H
+#ifndef H5Apublic_H
+#define H5Apublic_H
/* Public headers needed by this file */
#include "H5Ipublic.h" /* IDs */
@@ -112,4 +112,4 @@ H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op,
}
#endif
-#endif /* _H5Apublic_H */
+#endif /* H5Apublic_H */
diff --git a/src/H5B2module.h b/src/H5B2module.h
index 05fc8e1..aa0e163 100644
--- a/src/H5B2module.h
+++ b/src/H5B2module.h
@@ -18,8 +18,8 @@
* H5B2 package. Including this header means that the source file
* is part of the H5B2 package.
*/
-#ifndef _H5B2module_H
-#define _H5B2module_H
+#ifndef H5B2module_H
+#define H5B2module_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG_INIT NO
-#endif /* _H5B2module_H */
+#endif /* H5B2module_H */
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index 9efac2f..8d620cc 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5B2 package!"
#endif
-#ifndef _H5B2pkg_H
-#define _H5B2pkg_H
+#ifndef H5B2pkg_H
+#define H5B2pkg_H
/* Get package's private header */
#include "H5B2private.h"
@@ -453,4 +453,4 @@ H5_DLL int H5B2__get_node_depth_test(H5B2_t *bt2, void *udata);
H5_DLL herr_t H5B2__get_node_info_test(H5B2_t *bt2, void *udata, H5B2_node_info_test_t *ninfo);
#endif /* H5B2_TESTING */
-#endif /* _H5B2pkg_H */
+#endif /* H5B2pkg_H */
diff --git a/src/H5B2private.h b/src/H5B2private.h
index ced3992..21ea823 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5B2private_H
-#define _H5B2private_H
+#ifndef H5B2private_H
+#define H5B2private_H
/* Private headers needed by this file */
#include "H5ACprivate.h" /* Metadata cache */
@@ -149,4 +149,4 @@ H5_DLL herr_t H5B2_patch_file(H5B2_t *fa, H5F_t *f);
/* Statistics routines */
H5_DLL herr_t H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info);
-#endif /* _H5B2private_H */
+#endif /* H5B2private_H */
diff --git a/src/H5Bmodule.h b/src/H5Bmodule.h
index 9a1bc13..cfd3d53 100644
--- a/src/H5Bmodule.h
+++ b/src/H5Bmodule.h
@@ -18,8 +18,8 @@
* H5B package. Including this header means that the source file
* is part of the H5B package.
*/
-#ifndef _H5Bmodule_H
-#define _H5Bmodule_H
+#ifndef H5Bmodule_H
+#define H5Bmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG_INIT NO
-#endif /* _H5Bmodule_H */
+#endif /* H5Bmodule_H */
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index a226f6b..0a79628 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -12,25 +12,25 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
- * Programmer: Quincey Koziol
- * Thursday, May 15, 2003
+ * Programmer: Quincey Koziol
+ * Thursday, May 15, 2003
*
- * Purpose: This file contains declarations which are visible only within
- * the H5B package. Source files outside the H5B package should
- * include H5Bprivate.h instead.
+ * Purpose: This file contains declarations which are visible only within
+ * the H5B package. Source files outside the H5B package should
+ * include H5Bprivate.h instead.
*/
#if !(defined H5B_FRIEND || defined H5B_MODULE)
#error "Do not include this file outside the H5B package!"
#endif
-#ifndef _H5Bpkg_H
-#define _H5Bpkg_H
+#ifndef H5Bpkg_H
+#define H5Bpkg_H
/* Get package's private header */
#include "H5Bprivate.h"
/* Other private headers needed by this file */
-#include "H5ACprivate.h" /* Metadata cache */
+#include "H5ACprivate.h" /* Metadata cache */
#include "H5FLprivate.h" /* Free Lists */
/**************************/
@@ -49,20 +49,20 @@
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 */
- unsigned level; /*node level */
- unsigned nchildren; /*number of child pointers */
- haddr_t left; /*address of left sibling */
- haddr_t right; /*address of right sibling */
+ 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 */
+ haddr_t right; /*address of right sibling */
uint8_t *native; /*array of keys in native format */
- haddr_t *child; /*2k child pointers */
+ haddr_t *child; /*2k child pointers */
} 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 */
- const struct H5B_class_t *type; /* Type of tree */
- H5UC_t * rc_shared; /* Ref-counted shared info */
+ const struct H5B_class_t *type; /* Type of tree */
+ H5UC_t * rc_shared; /* Ref-counted shared info */
} H5B_cache_ud_t;
/*****************************/
@@ -86,4 +86,4 @@ H5_DLL herr_t H5B__node_dest(H5B_t *bt);
herr_t H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata);
#endif
-#endif /*_H5Bpkg_H*/
+#endif /*H5Bpkg_H*/
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 1fb25ef..265b6c6 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5Bprivate_H
-#define _H5Bprivate_H
+#ifndef H5Bprivate_H
+#define H5Bprivate_H
/* Private headers needed by this file */
#include "H5private.h" /* Generic Functions */
@@ -157,4 +157,4 @@ H5_DLL herr_t H5B_shared_free(void *_shared);
H5_DLL herr_t H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B_class_t *type,
void *udata);
H5_DLL htri_t H5B_valid(H5F_t *f, const H5B_class_t *type, haddr_t addr);
-#endif /* _H5Bprivate_H */
+#endif /* H5Bprivate_H */
diff --git a/src/H5CSprivate.h b/src/H5CSprivate.h
index 5fe2a56..a238ec7 100644
--- a/src/H5CSprivate.h
+++ b/src/H5CSprivate.h
@@ -14,8 +14,8 @@
/*
* Header file for function stacks, etc.
*/
-#ifndef _H5CSprivate_H
-#define _H5CSprivate_H
+#ifndef H5CSprivate_H
+#define H5CSprivate_H
#ifdef NOT_YET
#include "H5CSpublic.h"
@@ -32,4 +32,4 @@ H5_DLL herr_t H5CS_print_stack(const struct H5CS_t *stack, FILE *stream)
H5_DLL struct H5CS_t *H5CS_copy_stack(void);
H5_DLL herr_t H5CS_close_stack(struct H5CS_t *stack);
-#endif /* _H5CSprivate_H */
+#endif /* H5CSprivate_H */
diff --git a/src/H5CXmodule.h b/src/H5CXmodule.h
index 7d51b46..9fbaab4 100644
--- a/src/H5CXmodule.h
+++ b/src/H5CXmodule.h
@@ -18,8 +18,8 @@
* H5CX package. Including this header means that the source file
* is part of the H5CX package.
*/
-#ifndef _H5CXmodule_H
-#define _H5CXmodule_H
+#ifndef H5CXmodule_H
+#define H5CXmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_CONTEXT
#define H5_MY_PKG_INIT YES
-#endif /* _H5CXmodule_H */
+#endif /* H5CXmodule_H */
diff --git a/src/H5CXprivate.h b/src/H5CXprivate.h
index f633a91..1766b5f 100644
--- a/src/H5CXprivate.h
+++ b/src/H5CXprivate.h
@@ -13,8 +13,8 @@
/*
* Header file for API contexts, etc.
*/
-#ifndef _H5CXprivate_H
-#define _H5CXprivate_H
+#ifndef H5CXprivate_H
+#define H5CXprivate_H
/* Include package's public header */
#ifdef NOT_YET
@@ -46,10 +46,10 @@
/***************************************/
/* Library private routines */
-#ifndef _H5private_H
+#ifndef H5private_H
H5_DLL herr_t H5CX_push(void);
H5_DLL herr_t H5CX_pop(void);
-#endif /* _H5private_H */
+#endif /* H5private_H */
H5_DLL void H5CX_push_special(void);
H5_DLL hbool_t H5CX_is_def_dxpl(void);
@@ -153,4 +153,4 @@ H5_DLL herr_t H5CX_test_set_mpio_coll_rank0_bcast(hbool_t rank0_bcast);
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
#endif /* H5_HAVE_PARALLEL */
-#endif /* _H5CXprivate_H */
+#endif /* H5CXprivate_H */
diff --git a/src/H5Clog.h b/src/H5Clog.h
index 1703b53..bd5c413 100644
--- a/src/H5Clog.h
+++ b/src/H5Clog.h
@@ -15,8 +15,8 @@
* Purpose: Cache logging header file
*/
-#ifndef _H5Clog_H
-#define _H5Clog_H
+#ifndef H5Clog_H
+#define H5Clog_H
/* Get package's private header */
#include "H5Cprivate.h" /* Cache */
@@ -136,4 +136,4 @@ H5_DLL herr_t H5C_log_write_remove_entry_msg(H5C_t *cache, const H5C_cache_entry
H5_DLL herr_t H5C_log_json_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
H5_DLL herr_t H5C_log_trace_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
-#endif /* _H5Clog_H */
+#endif /* H5Clog_H */
diff --git a/src/H5Cmodule.h b/src/H5Cmodule.h
index b1951ff..26216ec 100644
--- a/src/H5Cmodule.h
+++ b/src/H5Cmodule.h
@@ -18,8 +18,8 @@
* H5C package. Including this header means that the source file
* is part of the H5C package.
*/
-#ifndef _H5Cmodule_H
-#define _H5Cmodule_H
+#ifndef H5Cmodule_H
+#define H5Cmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG_INIT NO
-#endif /* _H5Cmodule_H */
+#endif /* H5Cmodule_H */
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 006bc61..98ae523 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -33,8 +33,8 @@
#error "Do not include this file outside the H5C package!"
#endif
-#ifndef _H5Cpkg_H
-#define _H5Cpkg_H
+#ifndef H5Cpkg_H
+#define H5Cpkg_H
/* Get package's private header */
#include "H5Cprivate.h"
@@ -5092,5 +5092,5 @@ H5_DLL herr_t H5C__untag_entry(H5C_t *cache, H5C_cache_entry_t *entry);
H5_DLL herr_t H5C__verify_cork_tag_test(hid_t fid, haddr_t tag, hbool_t status);
#endif /* H5C_TESTING */
-#endif /* _H5Cpkg_H */
+#endif /* H5Cpkg_H */
/* clang-format on */
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index b2f2ac2..6863763 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -13,24 +13,24 @@
/*-------------------------------------------------------------------------
*
- * Created: H5Cprivate.h
+ * Created: H5Cprivate.h
* 6/3/04
* John Mainzer
*
- * Purpose: Constants and typedefs available to the rest of the
- * library.
+ * Purpose: Constants and typedefs available to the rest of the
+ * library.
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5Cprivate_H
-#define _H5Cprivate_H
+#ifndef H5Cprivate_H
+#define H5Cprivate_H
-#include "H5Cpublic.h" /* public prototypes */
+#include "H5Cpublic.h" /* public prototypes */
/* Private headers needed by this header */
#include "H5private.h" /* Generic Functions */
-#include "H5Fprivate.h" /* File access */
+#include "H5Fprivate.h" /* File access */
/**************************/
/* Library Private Macros */
@@ -2321,4 +2321,4 @@ H5_DLL herr_t H5C_verify_entry_type(H5C_t *cache_ptr, haddr_t addr, const H5C_c
H5_DLL herr_t H5C_validate_index_list(H5C_t *cache_ptr);
#endif /* NDEBUG */
-#endif /* !_H5Cprivate_H */
+#endif /* H5Cprivate_H */
diff --git a/src/H5Cpublic.h b/src/H5Cpublic.h
index 56bfdb2..0e6fb84 100644
--- a/src/H5Cpublic.h
+++ b/src/H5Cpublic.h
@@ -19,12 +19,10 @@
*
* Purpose: Public include file for cache functions.
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
-#ifndef _H5Cpublic_H
-#define _H5Cpublic_H
+#ifndef H5Cpublic_H
+#define H5Cpublic_H
/* Public headers needed by this file */
#include "H5public.h"
diff --git a/src/H5Dmodule.h b/src/H5Dmodule.h
index 44044d8..1f4d7c1 100644
--- a/src/H5Dmodule.h
+++ b/src/H5Dmodule.h
@@ -18,8 +18,8 @@
* H5D package. Including this header means that the source file
* is part of the H5D package.
*/
-#ifndef _H5Dmodule_H
-#define _H5Dmodule_H
+#ifndef H5Dmodule_H
+#define H5Dmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_DATASET
#define H5_MY_PKG_INIT YES
-#endif /* _H5Dmodule_H */
+#endif /* H5Dmodule_H */
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index f7c8127..e5252c6 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5D package!"
#endif
-#ifndef _H5Dpkg_H
-#define _H5Dpkg_H
+#ifndef H5Dpkg_H
+#define H5Dpkg_H
/* Get package's private header */
#include "H5Dprivate.h"
@@ -745,4 +745,4 @@ H5_DLL herr_t H5D__layout_type_test(hid_t did, H5D_layout_t *layout_type);
H5_DLL herr_t H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused);
#endif /* H5D_TESTING */
-#endif /*_H5Dpkg_H*/
+#endif /*H5Dpkg_H*/
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 1e6cc76..4ca35b4 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5D module
*/
-#ifndef _H5Dprivate_H
-#define _H5Dprivate_H
+#ifndef H5Dprivate_H
+#define H5Dprivate_H
/* Include package's public header */
#include "H5Dpublic.h"
@@ -190,4 +190,4 @@ H5_DLL herr_t H5D_virtual_free_parsed_name(H5O_storage_virtual_name_seg_t *name_
H5_DLL herr_t H5D_btree_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, unsigned ndims,
const uint32_t *dim);
-#endif /* _H5Dprivate_H */
+#endif /* H5Dprivate_H */
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index ec979e1..a7e231b 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5D module.
*/
-#ifndef _H5Dpublic_H
-#define _H5Dpublic_H
+#ifndef H5Dpublic_H
+#define H5Dpublic_H
/* System headers needed by this file */
@@ -204,4 +204,4 @@ H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t size[]);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Dpublic_H */
+#endif /* H5Dpublic_H */
diff --git a/src/H5EAmodule.h b/src/H5EAmodule.h
index 9067028..1833e40 100644
--- a/src/H5EAmodule.h
+++ b/src/H5EAmodule.h
@@ -18,8 +18,8 @@
* H5EA package. Including this header means that the source file
* is part of the H5EA package.
*/
-#ifndef _H5EAmodule_H
-#define _H5EAmodule_H
+#ifndef H5EAmodule_H
+#define H5EAmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_EARRAY
#define H5_MY_PKG_INIT NO
-#endif /* _H5EAmodule_H */
+#endif /* H5EAmodule_H */
diff --git a/src/H5EApkg.h b/src/H5EApkg.h
index 4a3966a..bfa8588 100644
--- a/src/H5EApkg.h
+++ b/src/H5EApkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5EA package!"
#endif
-#ifndef _H5EApkg_H
-#define _H5EApkg_H
+#ifndef H5EApkg_H
+#define H5EApkg_H
/* Get package's private header */
#include "H5EAprivate.h"
@@ -461,4 +461,4 @@ H5_DLL herr_t H5EA__get_cparam_test(const H5EA_t *ea, H5EA_create_t *cparam);
H5_DLL int H5EA__cmp_cparam_test(const H5EA_create_t *cparam1, const H5EA_create_t *cparam2);
#endif /* H5EA_TESTING */
-#endif /* _H5EApkg_H */
+#endif /* H5EApkg_H */
diff --git a/src/H5EAprivate.h b/src/H5EAprivate.h
index 3b1d7b8..19dabd9 100644
--- a/src/H5EAprivate.h
+++ b/src/H5EAprivate.h
@@ -23,8 +23,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5EAprivate_H
-#define _H5EAprivate_H
+#ifndef H5EAprivate_H
+#define H5EAprivate_H
/* Include package's public header */
#ifdef NOT_YET
@@ -155,4 +155,4 @@ H5_DLL herr_t H5EA_get_stats(const H5EA_t *ea, H5EA_stat_t *stats);
#ifdef H5EA_DEBUGGING
#endif /* H5EA_DEBUGGING */
-#endif /* _H5EAprivate_H */
+#endif /* H5EAprivate_H */
diff --git a/src/H5Emodule.h b/src/H5Emodule.h
index fe5fdcc..1670c03 100644
--- a/src/H5Emodule.h
+++ b/src/H5Emodule.h
@@ -18,8 +18,8 @@
* H5E package. Including this header means that the source file
* is part of the H5E package.
*/
-#ifndef _H5Emodule_H
-#define _H5Emodule_H
+#ifndef H5Emodule_H
+#define H5Emodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_ERROR
#define H5_MY_PKG_INIT YES
-#endif /* _H5Emodule_H */
+#endif /* H5Emodule_H */
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index 19cdda0..30ff084 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5E package!"
#endif
-#ifndef _H5Epkg_H
-#define _H5Epkg_H
+#ifndef H5Epkg_H
+#define H5Epkg_H
/* Get package's private header */
#include "H5Eprivate.h"
@@ -140,4 +140,4 @@ H5_DLL herr_t H5E__get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **clie
H5_DLL herr_t H5E__set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data);
H5_DLL herr_t H5E__pop(H5E_t *err_stack, size_t count);
-#endif /* _H5Epkg_H */
+#endif /* H5Epkg_H */
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index 14a73ba..58010a3 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -14,8 +14,8 @@
/*
* Header file for error values, etc.
*/
-#ifndef _H5Eprivate_H
-#define _H5Eprivate_H
+#ifndef H5Eprivate_H
+#define H5Eprivate_H
#include "H5Epublic.h"
@@ -114,12 +114,18 @@ typedef struct H5E_t H5E_t;
#define HSYS_DONE_ERROR(majorcode, minorcode, retcode, str) \
{ \
int myerrno = errno; \
+ /* Other projects may rely on the description format to get the errno and any changes should be \
+ * considered as an API change \
+ */ \
HDONE_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno, \
HDstrerror(myerrno)); \
}
#define HSYS_GOTO_ERROR(majorcode, minorcode, retcode, str) \
{ \
int myerrno = errno; \
+ /* Other projects may rely on the description format to get the errno and any changes should be \
+ * considered as an API change \
+ */ \
HGOTO_ERROR(majorcode, minorcode, retcode, "%s, errno = %d, error message = '%s'", str, myerrno, \
HDstrerror(myerrno)); \
}
@@ -203,4 +209,4 @@ H5_DLL herr_t H5E_printf_stack(H5E_t *estack, const char *file, const char *func
H5_DLL herr_t H5E_clear_stack(H5E_t *estack);
H5_DLL herr_t H5E_dump_api_stack(hbool_t is_api);
-#endif /* _H5Eprivate_H */
+#endif /* H5Eprivate_H */
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 403bee7..cb7d700 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5E module.
*/
-#ifndef _H5Epublic_H
-#define _H5Epublic_H
+#ifndef H5Epublic_H
+#define H5Epublic_H
#include <stdio.h> /*FILE arg of H5Eprint() */
@@ -218,4 +218,4 @@ H5_DLL char * H5Eget_minor(H5E_minor_t min);
}
#endif
-#endif /* end _H5Epublic_H */
+#endif /* end H5Epublic_H */
diff --git a/src/H5FAmodule.h b/src/H5FAmodule.h
index fce8265..ef814ae 100644
--- a/src/H5FAmodule.h
+++ b/src/H5FAmodule.h
@@ -18,8 +18,8 @@
* H5FA package. Including this header means that the source file
* is part of the H5FA package.
*/
-#ifndef _H5FAmodule_H
-#define _H5FAmodule_H
+#ifndef H5FAmodule_H
+#define H5FAmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_FARRAY
#define H5_MY_PKG_INIT NO
-#endif /* _H5FAmodule_H */
+#endif /* H5FAmodule_H */
diff --git a/src/H5FApkg.h b/src/H5FApkg.h
index e66be59..c4bf934 100644
--- a/src/H5FApkg.h
+++ b/src/H5FApkg.h
@@ -22,8 +22,8 @@
#error "Do not include this file outside the H5FA package!"
#endif
-#ifndef _H5FApkg_H
-#define _H5FApkg_H
+#ifndef H5FApkg_H
+#define H5FApkg_H
/* Get package's private header */
#include "H5FAprivate.h"
@@ -299,4 +299,4 @@ H5_DLL herr_t H5FA__get_cparam_test(const H5FA_t *ea, H5FA_create_t *cparam);
H5_DLL int H5FA__cmp_cparam_test(const H5FA_create_t *cparam1, const H5FA_create_t *cparam2);
#endif /* H5FA_TESTING */
-#endif /* _H5FApkg_H */
+#endif /* H5FApkg_H */
diff --git a/src/H5FAprivate.h b/src/H5FAprivate.h
index f945273..26057bf 100644
--- a/src/H5FAprivate.h
+++ b/src/H5FAprivate.h
@@ -21,8 +21,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5FAprivate_H
-#define _H5FAprivate_H
+#ifndef H5FAprivate_H
+#define H5FAprivate_H
/* Include package's public header */
#ifdef NOT_YET
@@ -137,4 +137,4 @@ H5_DLL herr_t H5FA_get_stats(const H5FA_t *ea, H5FA_stat_t *stats);
#ifdef H5FA_DEBUGGING
#endif /* H5FA_DEBUGGING */
-#endif /* _H5FAprivate_H */
+#endif /* H5FAprivate_H */
diff --git a/src/H5FDdirect.h b/src/H5FDdirect.h
index 17e9cf8..eec10de 100644
--- a/src/H5FDdirect.h
+++ b/src/H5FDdirect.h
@@ -23,7 +23,7 @@
#ifdef H5_HAVE_DIRECT
#define H5FD_DIRECT (H5FD_direct_init())
#else
-#define H5FD_DIRECT (-1)
+#define H5FD_DIRECT (H5I_INVALID_HID)
#endif /* H5_HAVE_DIRECT */
#ifdef H5_HAVE_DIRECT
diff --git a/src/H5FDdrvr_module.h b/src/H5FDdrvr_module.h
index cf7d765..1d20fce 100644
--- a/src/H5FDdrvr_module.h
+++ b/src/H5FDdrvr_module.h
@@ -18,8 +18,8 @@
* H5FD driver package. Including this header means that the source file
* is part of the H5FD driver package.
*/
-#ifndef _H5FDdrvr_module_H
-#define _H5FDdrvr_module_H
+#ifndef H5FDdrvr_module_H
+#define H5FDdrvr_module_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_INIT YES
#define H5_PKG_SINGLE_SOURCE
-#endif /* _H5FDdrvr_module_H */
+#endif /* H5FDdrvr_module_H */
diff --git a/src/H5FDhdfs.h b/src/H5FDhdfs.h
index 5fbc54b..9e46954 100644
--- a/src/H5FDhdfs.h
+++ b/src/H5FDhdfs.h
@@ -25,7 +25,7 @@
#ifdef H5_HAVE_LIBHDFS
#define H5FD_HDFS (H5FD_hdfs_init())
#else /* H5_HAVE_LIBHDFS */
-#define H5FD_HDFS (-1)
+#define H5FD_HDFS (H5I_INVALID_HID)
#endif /* H5_HAVE_LIBHDFS */
/****************************************************************************
diff --git a/src/H5FDmodule.h b/src/H5FDmodule.h
index f603f82..0b92b27 100644
--- a/src/H5FDmodule.h
+++ b/src/H5FDmodule.h
@@ -18,8 +18,8 @@
* H5FD package. Including this header means that the source file
* is part of the H5FD package.
*/
-#ifndef _H5FDmodule_H
-#define _H5FDmodule_H
+#ifndef H5FDmodule_H
+#define H5FDmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_VFL
#define H5_MY_PKG_INIT YES
-#endif /* _H5FDmodule_H */
+#endif /* H5FDmodule_H */
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index b32b80b..79b52c7 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -25,7 +25,7 @@
#ifdef H5_HAVE_PARALLEL
#define H5FD_MPIO (H5FD_mpio_init())
#else
-#define H5FD_MPIO (-1)
+#define H5FD_MPIO (H5I_INVALID_HID)
#endif /* H5_HAVE_PARALLEL */
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index cc9f51d..c96b595 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1195,7 +1195,7 @@ static herr_t
H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
{
/* Shut compiler up */
- _f = _f;
+ (void)_f;
/* Set the VFL feature flags that this driver supports */
if (flags) {
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
index d9f2946..acbaf88 100644
--- a/src/H5FDpkg.h
+++ b/src/H5FDpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5FD package!"
#endif
-#ifndef _H5FDpkg_H
-#define _H5FDpkg_H
+#ifndef H5FDpkg_H
+#define H5FDpkg_H
/* Get package's private header */
#include "H5FDprivate.h" /* File drivers */
@@ -55,4 +55,4 @@ H5_DLL herr_t H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsiz
H5_DLL hbool_t H5FD__supports_swmr_test(const char *vfd_name);
#endif /* H5FD_TESTING */
-#endif /* _H5FDpkg_H */
+#endif /* H5FDpkg_H */
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index df9bd31..bba78a1 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -15,8 +15,8 @@
* Programmer: Robb Matzke
* Monday, July 26, 1999
*/
-#ifndef _H5FDprivate_H
-#define _H5FDprivate_H
+#ifndef H5FDprivate_H
+#define H5FDprivate_H
/* Include package's public header */
#include "H5FDpublic.h"
@@ -169,4 +169,4 @@ H5_DLL int H5FD_mpi_get_size(const H5FD_t *file);
H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
#endif /* H5_HAVE_PARALLEL */
-#endif /* !_H5FDprivate_H */
+#endif /* H5FDprivate_H */
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index caefd80..edcea52 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -15,8 +15,8 @@
* Programmer: Robb Matzke
* Monday, July 26, 1999
*/
-#ifndef _H5FDpublic_H
-#define _H5FDpublic_H
+#ifndef H5FDpublic_H
+#define H5FDpublic_H
#include "H5public.h"
#include "H5Fpublic.h" /*for H5F_close_degree_t */
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index b9d018a..efc1802 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -346,7 +346,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
assert(sizeof(file_offset_t) >= sizeof(size_t));
/* Quiet compiler */
- fapl_id = fapl_id;
+ (void)fapl_id;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -587,7 +587,7 @@ static herr_t
H5FD_stdio_query(const H5FD_t *_f, unsigned long /*OUT*/ *flags)
{
/* Quiet the compiler */
- _f = _f;
+ (void)_f;
/* Set the VFL feature flags that this driver supports.
*
@@ -632,8 +632,8 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
haddr_t addr;
/* Quiet compiler */
- type = type;
- dxpl_id = dxpl_id;
+ (void)type;
+ (void)dxpl_id;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -671,7 +671,7 @@ H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type)
H5Eclear2(H5E_DEFAULT);
/* Quiet compiler */
- type = type;
+ (void)type;
return file->eoa;
} /* end H5FD_stdio_get_eoa() */
@@ -701,7 +701,7 @@ H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, haddr_t addr)
H5Eclear2(H5E_DEFAULT);
/* Quiet the compiler */
- type = type;
+ (void)type;
file->eoa = addr;
@@ -732,13 +732,13 @@ H5FD_stdio_get_eof(const H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type)
const H5FD_stdio_t *file = (const H5FD_stdio_t *)_file;
/* Quiet the compiler */
- type = type;
+ (void)type;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Quiet the compiler */
- type = type;
+ (void)type;
return (file->eof);
} /* end H5FD_stdio_get_eof() */
@@ -762,7 +762,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t /*UNUSED*/ fapl, void **file_handle)
static const char *func = "H5FD_stdio_get_handle"; /* Function Name for error reporting */
/* Quiet the compiler */
- fapl = fapl;
+ (void)fapl;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -800,8 +800,8 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
static const char *func = "H5FD_stdio_read"; /* Function Name for error reporting */
/* Quiet the compiler */
- type = type;
- dxpl_id = dxpl_id;
+ (void)type;
+ (void)dxpl_id;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -902,8 +902,8 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
static const char *func = "H5FD_stdio_write"; /* Function Name for error reporting */
/* Quiet the compiler */
- dxpl_id = dxpl_id;
- type = type;
+ (void)dxpl_id;
+ (void)type;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -990,7 +990,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t closing)
static const char *func = "H5FD_stdio_flush"; /* Function Name for error reporting */
/* Quiet the compiler */
- dxpl_id = dxpl_id;
+ (void)dxpl_id;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -1034,8 +1034,8 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, hbool_t /*UNUSED*/
static const char *func = "H5FD_stdio_truncate"; /* Function Name for error reporting */
/* Quiet the compiler */
- dxpl_id = dxpl_id;
- closing = closing;
+ (void)dxpl_id;
+ (void)closing;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
diff --git a/src/H5FLmodule.h b/src/H5FLmodule.h
index dc7f4cc..95c0b49 100644
--- a/src/H5FLmodule.h
+++ b/src/H5FLmodule.h
@@ -18,8 +18,8 @@
* H5FL package. Including this header means that the source file
* is part of the H5FL package.
*/
-#ifndef _H5FLmodule_H
-#define _H5FLmodule_H
+#ifndef H5FLmodule_H
+#define H5FLmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG_INIT NO
-#endif /* _H5FLmodule_H */
+#endif /* H5FLmodule_H */
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 55613dd..42581ac 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5FLprivate_H
-#define _H5FLprivate_H
+#ifndef H5FLprivate_H
+#define H5FLprivate_H
/* Public headers needed by this file */
#ifdef LATER
diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h
index b4b18aa..7b51266 100644
--- a/src/H5FOprivate.h
+++ b/src/H5FOprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains library private information about the H5FO module
*/
-#ifndef _H5FOprivate_H
-#define _H5FOprivate_H
+#ifndef H5FOprivate_H
+#define H5FOprivate_H
#ifdef LATER
#include "H5FOpublic.h"
@@ -47,4 +47,4 @@ H5_DLL herr_t H5FO_top_decr(const H5F_t *f, haddr_t addr);
H5_DLL hsize_t H5FO_top_count(const H5F_t *f, haddr_t addr);
H5_DLL herr_t H5FO_top_dest(H5F_t *f);
-#endif /* _H5FOprivate_H */
+#endif /* H5FOprivate_H */
diff --git a/src/H5FSmodule.h b/src/H5FSmodule.h
index 360eb7d..a40c103 100644
--- a/src/H5FSmodule.h
+++ b/src/H5FSmodule.h
@@ -18,8 +18,8 @@
* H5FS package. Including this header means that the source file
* is part of the H5FS package.
*/
-#ifndef _H5FSmodule_H
-#define _H5FSmodule_H
+#ifndef H5FSmodule_H
+#define H5FSmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_FSPACE
#define H5_MY_PKG_INIT NO
-#endif /* _H5FSmodule_H */
+#endif /* H5FSmodule_H */
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index 46ebdaf..ba2cf03 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5FS package!"
#endif
-#ifndef _H5FSpkg_H
-#define _H5FSpkg_H
+#ifndef H5FSpkg_H
+#define H5FSpkg_H
/* Uncomment this macro to enable debugging output for free space manager */
/* #define H5FS_DEBUG */
@@ -240,4 +240,4 @@ H5_DLL herr_t H5FS__get_cparam_test(const H5FS_t *fh, H5FS_create_t *cparam);
H5_DLL int H5FS__cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2);
#endif /* H5FS_TESTING */
-#endif /* _H5FSpkg_H */
+#endif /* H5FSpkg_H */
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h
index 05a466a..fdc5c91 100644
--- a/src/H5FSprivate.h
+++ b/src/H5FSprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5FSprivate_H
-#define _H5FSprivate_H
+#ifndef H5FSprivate_H
+#define H5FSprivate_H
/* Private headers needed by this file */
#include "H5Fprivate.h" /* File access */
@@ -230,4 +230,4 @@ H5_DLL herr_t H5FS_sects_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent,
H5_DLL herr_t H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *stream, int indent,
int fwidth);
-#endif /* _H5FSprivate_H */
+#endif /* H5FSprivate_H */
diff --git a/src/H5Fdeprec.c b/src/H5Fdeprec.c
index 7e6c4a5..c505f2c 100644
--- a/src/H5Fdeprec.c
+++ b/src/H5Fdeprec.c
@@ -34,12 +34,12 @@
/***********/
/* Headers */
/***********/
-#include "H5private.h" /* Generic Functions */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fpkg.h" /* File access */
-#include "H5Iprivate.h" /* IDs */
-#include "H5SMprivate.h" /* Shared object header messages */
+#include "H5private.h" /* Generic Functions */
+#include "H5CXprivate.h" /* API Contexts */
+#include "H5Eprivate.h" /* Error handling */
+#include "H5Fpkg.h" /* File access */
+#include "H5Iprivate.h" /* IDs */
+#include "H5SMprivate.h" /* Shared object header messages */
/****************/
/* Local Macros */
@@ -75,16 +75,12 @@
* Function: H5Fget_info1
*
* Purpose: Gets general information about the file, including:
- * 1. Get storage size for superblock extension if there is one.
+ * 1. Get storage size for superblock extension if there is one.
* 2. Get the amount of btree and heap storage for entries
* in the SOHM table if there is one.
- * 3. The amount of free space tracked in the file.
+ * 3. The amount of free space tracked in the file.
*
- * Return: Success: non-negative on success
- * Failure: Negative
- *
- * Programmer: Vailin Choi
- * July 11, 2007
+ * Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
diff --git a/src/H5Fmodule.h b/src/H5Fmodule.h
index 24477b4..a4bd67c 100644
--- a/src/H5Fmodule.h
+++ b/src/H5Fmodule.h
@@ -18,8 +18,8 @@
* H5F package. Including this header means that the source file
* is part of the H5F package.
*/
-#ifndef _H5Fmodule_H
-#define _H5Fmodule_H
+#ifndef H5Fmodule_H
+#define H5Fmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_FILE
#define H5_MY_PKG_INIT YES
-#endif /* _H5Fmodule_H */
+#endif /* H5Fmodule_H */
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index f5424ec..63c22a1 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5F package!"
#endif
-#ifndef _H5Fpkg_H
-#define _H5Fpkg_H
+#ifndef H5Fpkg_H
+#define H5Fpkg_H
/* Get package's private header */
#include "H5Fprivate.h"
@@ -476,4 +476,4 @@ H5_DLL herr_t H5F__get_sbe_addr_test(hid_t file_id, haddr_t *sbe_addr);
H5_DLL herr_t H5F__reparse_file_lock_variable_test(void);
#endif /* H5F_TESTING */
-#endif /* _H5Fpkg_H */
+#endif /* H5Fpkg_H */
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 728b736..6498cc3 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -15,8 +15,8 @@
* This file contains macros & information for file access
*/
-#ifndef _H5Fprivate_H
-#define _H5Fprivate_H
+#ifndef H5Fprivate_H
+#define H5Fprivate_H
/* Early typedefs to avoid circular dependencies */
typedef struct H5F_t H5F_t;
@@ -647,11 +647,11 @@ typedef struct H5F_t H5F_t;
#define HDF5_BTREE_SNODE_IK_DEF 16
#define HDF5_BTREE_CHUNK_IK_DEF \
32 /* Note! this value is assumed \
- to be 32 for version 0 \
- of the superblock and \
- if it is changed, the code \
- must compensate. -QAK \
- */
+ to be 32 for version 0 \
+ of the superblock and \
+ if it is changed, the code \
+ must compensate. -QAK \
+ */
#define HDF5_BTREE_IK_MAX_ENTRIES 65536 /* 2^16 - 2 bytes for storing entries (children) */
/* See format specification on version 1 B-trees */
@@ -970,4 +970,4 @@ H5_DLL herr_t H5F_cwfs_remove_heap(H5F_shared_t *shared, struct H5HG_heap_t *hea
/* Debugging functions */
H5_DLL herr_t H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth);
-#endif /* _H5Fprivate_H */
+#endif /* H5Fprivate_H */
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index fc86c6a..28ba17d 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5F module.
*/
-#ifndef _H5Fpublic_H
-#define _H5Fpublic_H
+#ifndef H5Fpublic_H
+#define H5Fpublic_H
/* Public header files needed by this file */
#include "H5public.h"
@@ -24,19 +24,19 @@
/* When this header is included from a private header, don't make calls to H5check() */
#undef H5CHECK
-#ifndef _H5private_H
+#ifndef H5private_H
#define H5CHECK H5check(),
-#else /* _H5private_H */
+#else /* H5private_H */
#define H5CHECK
-#endif /* _H5private_H */
+#endif /* H5private_H */
/* When this header is included from a private HDF5 header, don't make calls to H5open() */
#undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
#define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
#define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
/*
* These are the bits that can be passed to the `flags' argument of
@@ -75,7 +75,7 @@
/* Value passed to H5Pset_elink_acc_flags to cause flags to be taken from the
* parent file. */
-#define H5F_ACC_DEFAULT (H5CHECK H5OPEN 0xffffu) /*ignore setting on lapl */
+#define H5F_ACC_DEFAULT (H5CHECK H5OPEN 0xffffu) /* ignore setting on lapl */
/* Flags for H5Fget_obj_count() & H5Fget_obj_ids() calls */
#define H5F_OBJ_FILE (0x0001u) /* File objects */
@@ -309,4 +309,4 @@ H5_DLL herr_t H5Fset_latest_format(hid_t file_id, hbool_t latest_format);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Fpublic_H */
+#endif /* H5Fpublic_H */
diff --git a/src/H5Gmodule.h b/src/H5Gmodule.h
index a344379..5a87917 100644
--- a/src/H5Gmodule.h
+++ b/src/H5Gmodule.h
@@ -18,8 +18,8 @@
* H5G package. Including this header means that the source file
* is part of the H5G package.
*/
-#ifndef _H5Gmodule_H
-#define _H5Gmodule_H
+#ifndef H5Gmodule_H
+#define H5Gmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_SYM
#define H5_MY_PKG_INIT YES
-#endif /* _H5Gmodule_H */
+#endif /* H5Gmodule_H */
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index e6aee14..484715e 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5G package!"
#endif
-#ifndef _H5Gpkg_H
-#define _H5Gpkg_H
+#ifndef H5Gpkg_H
+#define H5Gpkg_H
/* Get package's private header */
#include "H5Gprivate.h"
@@ -486,4 +486,4 @@ H5_DLL herr_t H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent
H5_DLL herr_t H5G__verify_cached_stabs_test(hid_t gid);
#endif /* H5G_TESTING */
-#endif /* _H5Gpkg_H */
+#endif /* H5Gpkg_H */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 3cb2466..1616e71 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5Gprivate_H
-#define _H5Gprivate_H
+#ifndef H5Gprivate_H
+#define H5Gprivate_H
/* Include package's public header */
#include "H5Gpublic.h"
@@ -286,4 +286,4 @@ H5_DLL herr_t H5G_root_loc(H5F_t *f, H5G_loc_t *loc);
H5_DLL herr_t H5G_root_free(H5G_t *grp);
H5_DLL H5G_t *H5G_rootof(H5F_t *f);
-#endif /* _H5Gprivate_H */
+#endif /* H5Gprivate_H */
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index f94a791..99134f8 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5Gpublic_H
-#define _H5Gpublic_H
+#ifndef H5Gpublic_H
+#define H5Gpublic_H
/* System headers needed by this file */
#include <sys/types.h>
@@ -161,4 +161,4 @@ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Gpublic_H */
+#endif /* H5Gpublic_H */
diff --git a/src/H5HFmodule.h b/src/H5HFmodule.h
index 2b2c1c2..7fab611 100644
--- a/src/H5HFmodule.h
+++ b/src/H5HFmodule.h
@@ -18,8 +18,8 @@
* H5HF package. Including this header means that the source file
* is part of the H5HF package.
*/
-#ifndef _H5HFmodule_H
-#define _H5HFmodule_H
+#ifndef H5HFmodule_H
+#define H5HFmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_HEAP
#define H5_MY_PKG_INIT NO
-#endif /* _H5HFmodule_H */
+#endif /* H5HFmodule_H */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 31ccfe7..a18d101 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5HF package!"
#endif
-#ifndef _H5HFpkg_H
-#define _H5HFpkg_H
+#ifndef H5HFpkg_H
+#define H5HFpkg_H
/* Get package's private header */
#include "H5HFprivate.h"
@@ -794,4 +794,4 @@ H5_DLL herr_t H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len, hbool
H5_DLL herr_t H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id, hbool_t *ids_direct);
#endif /* H5HF_TESTING */
-#endif /* _H5HFpkg_H */
+#endif /* H5HFpkg_H */
diff --git a/src/H5HFprivate.h b/src/H5HFprivate.h
index 791672e..ed7cddd 100644
--- a/src/H5HFprivate.h
+++ b/src/H5HFprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5HFprivate_H
-#define _H5HFprivate_H
+#ifndef H5HFprivate_H
+#define H5HFprivate_H
/* Private headers needed by this file */
#include "H5Fprivate.h" /* File access */
@@ -125,4 +125,4 @@ H5_DLL herr_t H5HF_id_print(H5HF_t *fh, const void *id, FILE *stream, int indent
H5_DLL herr_t H5HF_sects_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth);
#endif /* H5HF_DEBUGGING */
-#endif /* _H5HFprivate_H */
+#endif /* H5HFprivate_H */
diff --git a/src/H5HGmodule.h b/src/H5HGmodule.h
index 5184236..a75dea5 100644
--- a/src/H5HGmodule.h
+++ b/src/H5HGmodule.h
@@ -18,8 +18,8 @@
* H5HG package. Including this header means that the source file
* is part of the H5HG package.
*/
-#ifndef _H5HGmodule_H
-#define _H5HGmodule_H
+#ifndef H5HGmodule_H
+#define H5HGmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_HEAP
#define H5_MY_PKG_INIT NO
-#endif /* _H5HGmodule_H */
+#endif /* H5HGmodule_H */
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 0ceb0d9..5c0fbe8 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5HG package!"
#endif
-#ifndef _H5HGpkg_H
-#define _H5HGpkg_H
+#ifndef H5HGpkg_H
+#define H5HGpkg_H
/* Get package's private header */
#include "H5HGprivate.h"
@@ -136,4 +136,4 @@ struct H5HG_heap_t {
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 */
+#endif /* H5HGpkg_H */
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index b1b4625..4db1ce3 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -15,8 +15,8 @@
* Programmer: Robb Matzke
* Friday, March 27, 1998
*/
-#ifndef _H5HGprivate_H
-#define _H5HGprivate_H
+#ifndef H5HGprivate_H
+#define H5HGprivate_H
/* Private headers needed by this file. */
#include "H5Fprivate.h" /* File access */
@@ -66,4 +66,4 @@ H5_DLL size_t H5HG_get_free_size(const H5HG_heap_t *h);
/* Debugging functions */
H5_DLL herr_t H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth);
-#endif /* _H5HGprivate_H */
+#endif /* H5HGprivate_H */
diff --git a/src/H5HLmodule.h b/src/H5HLmodule.h
index afc609a..3004809 100644
--- a/src/H5HLmodule.h
+++ b/src/H5HLmodule.h
@@ -18,8 +18,8 @@
* H5HL package. Including this header means that the source file
* is part of the H5HL package.
*/
-#ifndef _H5HLmodule_H
-#define _H5HLmodule_H
+#ifndef H5HLmodule_H
+#define H5HLmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_HEAP
#define H5_MY_PKG_INIT NO
-#endif /* _H5HLmodule_H */
+#endif /* H5HLmodule_H */
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index 42e8649..dbac1b9 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5HL package!"
#endif
-#ifndef _H5HLpkg_H
-#define _H5HLpkg_H
+#ifndef H5HLpkg_H
+#define H5HLpkg_H
/* Get package's private header */
#include "H5HLprivate.h"
@@ -145,4 +145,4 @@ H5_DLL H5HL_dblk_t *H5HL__dblk_new(H5HL_t *heap);
H5_DLL herr_t H5HL__dblk_dest(H5HL_dblk_t *dblk);
H5_DLL herr_t H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size);
-#endif /* _H5HLpkg_H */
+#endif /* H5HLpkg_H */
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 74f3c49..739e761 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5HLprivate_H
-#define _H5HLprivate_H
+#ifndef H5HLprivate_H
+#define H5HLprivate_H
/* Private headers needed by this file. */
#include "H5private.h" /* Generic Functions */
diff --git a/src/H5HPprivate.h b/src/H5HPprivate.h
index 3b68400..50020bc 100644
--- a/src/H5HPprivate.h
+++ b/src/H5HPprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5HP module
*/
-#ifndef _H5HPprivate_H
-#define _H5HPprivate_H
+#ifndef H5HPprivate_H
+#define H5HPprivate_H
/**************************************/
/* Public headers needed by this file */
@@ -65,4 +65,4 @@ H5_DLL herr_t H5HP_incr(H5HP_t *heap, unsigned amt, void *obj);
H5_DLL herr_t H5HP_decr(H5HP_t *heap, unsigned amt, void *obj);
H5_DLL herr_t H5HP_close(H5HP_t *heap);
-#endif /* _H5HPprivate_H */
+#endif /* H5HPprivate_H */
diff --git a/src/H5Imodule.h b/src/H5Imodule.h
index b83d8a4..1ba8f11 100644
--- a/src/H5Imodule.h
+++ b/src/H5Imodule.h
@@ -11,22 +11,22 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
- * Programmer: Quincey Koziol
- * Saturday, September 12, 2015
+ * Programmer: Quincey Koziol
+ * Saturday, September 12, 2015
*
- * Purpose: This file contains declarations which define macros for the
- * H5I package. Including this header means that the source file
- * is part of the H5I package.
+ * Purpose: This file contains declarations which define macros for the
+ * H5I package. Including this header means that the source file
+ * is part of the H5I package.
*/
-#ifndef _H5Imodule_H
-#define _H5Imodule_H
+#ifndef H5Imodule_H
+#define H5Imodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
- * reporting macros.
+ * reporting macros.
*/
#define H5I_MODULE
#define H5_MY_PKG H5I
#define H5_MY_PKG_ERR H5E_ATOM
#define H5_MY_PKG_INIT NO
-#endif /* _H5Imodule_H */
+#endif /* H5Imodule_H */
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index 27fe271..425308f 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5I package!"
#endif
-#ifndef _H5Ipkg_H
-#define _H5Ipkg_H
+#ifndef H5Ipkg_H
+#define H5Ipkg_H
/* Get package's private header */
#include "H5Iprivate.h"
@@ -69,4 +69,4 @@
H5_DLL ssize_t H5I__get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached);
#endif /* H5I_TESTING */
-#endif /*_H5Ipkg_H*/
+#endif /*H5Ipkg_H*/
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index c380142..6e8bacd 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -17,8 +17,8 @@
*---------------------------------------------------------------------------*/
/* avoid re-inclusion */
-#ifndef _H5Iprivate_H
-#define _H5Iprivate_H
+#ifndef H5Iprivate_H
+#define H5Iprivate_H
/* Include package's public header */
#include "H5Ipublic.h"
@@ -87,4 +87,4 @@ H5_DLL herr_t H5I_register_using_existing_id(H5I_type_t type, void *object, hboo
/* Debugging functions */
H5_DLL herr_t H5I_dump_ids_for_type(H5I_type_t type);
-#endif /* _H5Iprivate_H */
+#endif /* H5Iprivate_H */
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index df30840..3b9f1f5 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -15,8 +15,8 @@
* This file contains function prototypes for each exported function in
* the H5I module.
*/
-#ifndef _H5Ipublic_H
-#define _H5Ipublic_H
+#ifndef H5Ipublic_H
+#define H5Ipublic_H
/* Public headers needed by this file */
#include "H5public.h"
@@ -100,4 +100,4 @@ H5_DLL htri_t H5Iis_valid(hid_t id);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Ipublic_H */
+#endif /* H5Ipublic_H */
diff --git a/src/H5Lmodule.h b/src/H5Lmodule.h
index 7dc746f..fad9c1f 100644
--- a/src/H5Lmodule.h
+++ b/src/H5Lmodule.h
@@ -18,8 +18,8 @@
* H5L package. Including this header means that the source file
* is part of the H5L package.
*/
-#ifndef _H5Lmodule_H
-#define _H5Lmodule_H
+#ifndef H5Lmodule_H
+#define H5Lmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_LINK
#define H5_MY_PKG_INIT YES
-#endif /* _H5Lmodule_H */
+#endif /* H5Lmodule_H */
diff --git a/src/H5Lpkg.h b/src/H5Lpkg.h
index 1d915a0..c97bbf3 100644
--- a/src/H5Lpkg.h
+++ b/src/H5Lpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5L package!"
#endif
-#ifndef _H5Lpkg_H
-#define _H5Lpkg_H
+#ifndef H5Lpkg_H
+#define H5Lpkg_H
/* Get package's private header */
#include "H5Lprivate.h"
@@ -52,4 +52,4 @@ H5_DLL herr_t H5L__create_ud(const H5G_loc_t *link_loc, const char *link_name, c
H5_DLL herr_t H5L__link_copy_file(H5F_t *dst_file, const H5O_link_t *_src_lnk, const H5O_loc_t *src_oloc,
H5O_link_t *dst_lnk, H5O_copy_t *cpy_info);
-#endif /* _H5Lpkg_H */
+#endif /* H5Lpkg_H */
diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h
index 14c53f0..fe7ee68 100644
--- a/src/H5Lprivate.h
+++ b/src/H5Lprivate.h
@@ -15,8 +15,8 @@
* This file contains private information about the H5L module
* for dealing with links in an HDF5 file.
*/
-#ifndef _H5Lprivate_H
-#define _H5Lprivate_H
+#ifndef H5Lprivate_H
+#define H5Lprivate_H
/* Include package's public header */
#include "H5Lpublic.h"
@@ -131,4 +131,4 @@ H5_DLL herr_t H5L_register(const H5L_class_t *cls);
H5_DLL herr_t H5L_unregister(H5L_type_t id);
H5_DLL const H5L_class_t *H5L_find_class(H5L_type_t id);
-#endif /* _H5Lprivate_H */
+#endif /* H5Lprivate_H */
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 5bf529b..0cf198c 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5Lpublic_H
-#define _H5Lpublic_H
+#ifndef H5Lpublic_H
+#define H5Lpublic_H
/* Public headers needed by this file */
#include "H5public.h" /* Generic Functions */
@@ -206,4 +206,4 @@ H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hi
#ifdef __cplusplus
}
#endif
-#endif /* _H5Lpublic_H */
+#endif /* H5Lpublic_H */
diff --git a/src/H5MFmodule.h b/src/H5MFmodule.h
index 9c40042..9726cec 100644
--- a/src/H5MFmodule.h
+++ b/src/H5MFmodule.h
@@ -18,8 +18,8 @@
* H5MF package. Including this header means that the source file
* is part of the H5MF package.
*/
-#ifndef _H5MFmodule_H
-#define _H5MFmodule_H
+#ifndef H5MFmodule_H
+#define H5MFmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG_INIT NO
-#endif /* _H5MFmodule_H */
+#endif /* H5MFmodule_H */
diff --git a/src/H5MFpkg.h b/src/H5MFpkg.h
index 811d817..54ae1bc 100644
--- a/src/H5MFpkg.h
+++ b/src/H5MFpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5MF package!"
#endif
-#ifndef _H5MFpkg_H
-#define _H5MFpkg_H
+#ifndef H5MFpkg_H
+#define H5MFpkg_H
/* Get package's private header */
#include "H5MFprivate.h"
@@ -201,4 +201,4 @@ H5_DLL herr_t H5MF__aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr
#ifdef H5MF_TESTING
#endif /* H5MF_TESTING */
-#endif /* _H5MFpkg_H */
+#endif /* H5MFpkg_H */
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index ddbcb4d..5f2c670 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5MFprivate_H
-#define _H5MFprivate_H
+#ifndef H5MFprivate_H
+#define H5MFprivate_H
/* Private headers needed by this file */
#include "H5Fprivate.h" /* File access */
@@ -82,4 +82,4 @@ H5_DLL herr_t H5MF_tidy_self_referential_fsm_hack(H5F_t *f);
H5_DLL herr_t H5MF_sects_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth);
#endif /* H5MF_DEBUGGING */
-#endif /* end _H5MFprivate_H */
+#endif /* end H5MFprivate_H */
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index c101285..bb846f4 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5MMprivate_H
-#define _H5MMprivate_H
+#ifndef H5MMprivate_H
+#define H5MMprivate_H
#include "H5MMpublic.h"
@@ -53,4 +53,4 @@ H5_DLL void H5MM_sanity_check_all(void);
H5_DLL void H5MM_final_sanity_check(void);
#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */
-#endif /* _H5MMprivate_H */
+#endif /* H5MMprivate_H */
diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h
index 9ddd377..ebfb377 100644
--- a/src/H5MMpublic.h
+++ b/src/H5MMpublic.h
@@ -22,8 +22,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5MMpublic_H
-#define _H5MMpublic_H
+#ifndef H5MMpublic_H
+#define H5MMpublic_H
/* Public headers needed by this file */
#include "H5public.h"
@@ -39,4 +39,4 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-#endif /* _H5MMpublic_H */
+#endif /* H5MMpublic_H */
diff --git a/src/H5MPmodule.h b/src/H5MPmodule.h
index 7f9d7b4..8e34598 100644
--- a/src/H5MPmodule.h
+++ b/src/H5MPmodule.h
@@ -18,8 +18,8 @@
* H5MP package. Including this header means that the source file
* is part of the H5MP package.
*/
-#ifndef _H5MPmodule_H
-#define _H5MPmodule_H
+#ifndef H5MPmodule_H
+#define H5MPmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG_INIT NO
-#endif /* _H5MPmodule_H */
+#endif /* H5MPmodule_H */
diff --git a/src/H5MPpkg.h b/src/H5MPpkg.h
index 8ab5c79..64c5293 100644
--- a/src/H5MPpkg.h
+++ b/src/H5MPpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5MP package!"
#endif
-#ifndef _H5MPpkg_H
-#define _H5MPpkg_H
+#ifndef H5MPpkg_H
+#define H5MPpkg_H
/* Get package's private header */
#include "H5MPprivate.h" /* Memory Pools */
@@ -96,4 +96,4 @@ H5_DLL herr_t H5MP_get_page_free_size(const H5MP_page_t *mp, size_t *page);
H5_DLL herr_t H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page);
#endif /* H5MP_TESTING */
-#endif /* _H5MPpkg_H */
+#endif /* H5MPpkg_H */
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index 87d1f1b..2b06650 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5MPprivate_H
-#define _H5MPprivate_H
+#ifndef H5MPprivate_H
+#define H5MPprivate_H
/* Include package's public header (not yet) */
/* #include "H5MPpublic.h" */
@@ -54,4 +54,4 @@ H5_DLL void * H5MP_malloc(H5MP_pool_t *mp, size_t request);
H5_DLL void * H5MP_free(H5MP_pool_t *mp, void *spc);
H5_DLL herr_t H5MP_close(H5MP_pool_t *mp);
-#endif /* _H5MPprivate_H */
+#endif /* H5MPprivate_H */
diff --git a/src/H5Omodule.h b/src/H5Omodule.h
index 8edec06..9ba6c61 100644
--- a/src/H5Omodule.h
+++ b/src/H5Omodule.h
@@ -18,8 +18,8 @@
* H5O package. Including this header means that the source file
* is part of the H5O package.
*/
-#ifndef _H5Omodule_H
-#define _H5Omodule_H
+#ifndef H5Omodule_H
+#define H5Omodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_OHDR
#define H5_MY_PKG_INIT YES
-#endif /* _H5Omodule_H */
+#endif /* H5Omodule_H */
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 4a8cb9f..4972825 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -15,8 +15,8 @@
#error "Do not include this file outside the H5O package!"
#endif
-#ifndef _H5Opkg_H
-#define _H5Opkg_H
+#ifndef H5Opkg_H
+#define H5Opkg_H
/* Get package's private header */
#include "H5Oprivate.h" /* Object headers */
@@ -647,4 +647,4 @@ H5_DLL herr_t H5O_assert(const H5O_t *oh);
#endif /* H5O_DEBUG */
H5_DLL herr_t H5O_debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int fwidth);
-#endif /* _H5Opkg_H */
+#endif /* H5Opkg_H */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index d38cdd7..a0b7763 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -21,8 +21,8 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5Oprivate_H
-#define _H5Oprivate_H
+#ifndef H5Oprivate_H
+#define H5Oprivate_H
/* Early typedefs to avoid circular dependencies */
typedef struct H5O_t H5O_t;
@@ -1016,4 +1016,4 @@ H5_DLL herr_t H5O_pline_set_version(H5F_t *f, H5O_pline_t *pline);
/* Shared message operators */
H5_DLL herr_t H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src);
-#endif /* _H5Oprivate_H */
+#endif /* H5Oprivate_H */
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index 5c3d99a..249479b 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -22,13 +22,13 @@
*
*-------------------------------------------------------------------------
*/
-#ifndef _H5Opublic_H
-#define _H5Opublic_H
+#ifndef H5Opublic_H
+#define H5Opublic_H
/* Public headers needed by this file */
-#include "H5public.h" /* Generic Functions */
-#include "H5Ipublic.h" /* IDs */
-#include "H5Lpublic.h" /* Links */
+#include "H5public.h" /* Generic Functions */
+#include "H5Ipublic.h" /* IDs */
+#include "H5Lpublic.h" /* Links */
/*****************/
/* Public Macros */
@@ -245,4 +245,4 @@ typedef struct H5O_stat_t {
#ifdef __cplusplus
}
#endif
-#endif /* _H5Opublic_H */
+#endif /* H5Opublic_H */
diff --git a/src/H5PBmodule.h b/src/H5PBmodule.h
index 9c07a0c..21294c8 100644
--- a/src/H5PBmodule.h
+++ b/src/H5PBmodule.h
@@ -18,8 +18,8 @@
* H5PB package. Including this header means that the source file
* is part of the H5PB package.
*/
-#ifndef _H5PBmodule_H
-#define _H5PBmodule_H
+#ifndef H5PBmodule_H
+#define H5PBmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG_INIT NO
-#endif /* _H5PBmodule_H */
+#endif /* H5PBmodule_H */
diff --git a/src/H5PBpkg.h b/src/H5PBpkg.h
index b54bcdc..2656588 100644
--- a/src/H5PBpkg.h
+++ b/src/H5PBpkg.h
@@ -15,8 +15,8 @@
#error "Do not include this file outside the H5PB package!"
#endif
-#ifndef _H5PBpkg_H
-#define _H5PBpkg_H
+#ifndef H5PBpkg_H
+#define H5PBpkg_H
/* Get package's private header */
#include "H5PBprivate.h"
@@ -50,4 +50,4 @@ typedef struct H5PB_entry_t {
/* Package Private Prototypes */
/******************************/
-#endif /* _H5PBpkg_H */
+#endif /* H5PBpkg_H */
diff --git a/src/H5PBprivate.h b/src/H5PBprivate.h
index d1e9c1c..e0197bf 100644
--- a/src/H5PBprivate.h
+++ b/src/H5PBprivate.h
@@ -20,8 +20,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5PBprivate_H
-#define _H5PBprivate_H
+#ifndef H5PBprivate_H
+#define H5PBprivate_H
/* Include package's public header */
#ifdef NOT_YET
@@ -98,4 +98,4 @@ H5_DLL herr_t H5PB_get_stats(const H5PB_t *page_buf, unsigned accesses[2], unsig
unsigned misses[2], unsigned evictions[2], unsigned bypasses[2]);
H5_DLL herr_t H5PB_print_stats(const H5PB_t *page_buf);
-#endif /* !_H5PBprivate_H */
+#endif /* H5PBprivate_H */
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index dbf1058..7f3df5e 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -14,8 +14,8 @@
* Purpose: Header file for writing external HDF5 plugins.
*/
-#ifndef _H5PLextern_H
-#define _H5PLextern_H
+#ifndef H5PLextern_H
+#define H5PLextern_H
/* Include HDF5 header */
#include "hdf5.h"
@@ -40,4 +40,4 @@ H5PLUGIN_DLL const void *H5PLget_plugin_info(void);
}
#endif
-#endif /* _H5PLextern_H */
+#endif /* H5PLextern_H */
diff --git a/src/H5PLmodule.h b/src/H5PLmodule.h
index 6ee1468..0a08cca 100644
--- a/src/H5PLmodule.h
+++ b/src/H5PLmodule.h
@@ -16,8 +16,8 @@
* is part of the H5PL package.
*/
-#ifndef _H5PLmodule_H
-#define _H5PLmodule_H
+#ifndef H5PLmodule_H
+#define H5PLmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -27,4 +27,4 @@
#define H5_MY_PKG_ERR H5E_PLUGIN
#define H5_MY_PKG_INIT YES
-#endif /* _H5PLmodule_H */
+#endif /* H5PLmodule_H */
diff --git a/src/H5PLpkg.h b/src/H5PLpkg.h
index c7e4bbf..cb5ee5e 100644
--- a/src/H5PLpkg.h
+++ b/src/H5PLpkg.h
@@ -21,8 +21,8 @@
#error "Do not include this file outside the H5PL package!"
#endif
-#ifndef _H5PLpkg_H
-#define _H5PLpkg_H
+#ifndef H5PLpkg_H
+#define H5PLpkg_H
/* Include private header file */
#include "H5PLprivate.h" /* Filter functions */
@@ -154,4 +154,4 @@ H5_DLL const char *H5PL__get_path(unsigned int index);
H5_DLL herr_t H5PL__find_plugin_in_path_table(const H5PL_search_params_t *search_params,
hbool_t *found /*out*/, const void **plugin_info /*out*/);
-#endif /* _H5PLpkg_H */
+#endif /* H5PLpkg_H */
diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h
index 2dd9c13..5406ad7 100644
--- a/src/H5PLprivate.h
+++ b/src/H5PLprivate.h
@@ -14,8 +14,8 @@
* This file contains private information about the H5PL module
*/
-#ifndef _H5PLprivate_H
-#define _H5PLprivate_H
+#ifndef H5PLprivate_H
+#define H5PLprivate_H
/* Include package's public header */
#include "H5PLpublic.h"
@@ -47,4 +47,4 @@ typedef union H5PL_key_t {
/* Internal API routines */
H5_DLL const void *H5PL_load(H5PL_type_t plugin_type, H5PL_key_t key);
-#endif /* _H5PLprivate_H */
+#endif /* H5PLprivate_H */
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 2805b85..ded2dc5 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -14,8 +14,8 @@
* This file contains public declarations for the H5PL module.
*/
-#ifndef _H5PLpublic_H
-#define _H5PLpublic_H
+#ifndef H5PLpublic_H
+#define H5PLpublic_H
/* Public headers needed by this file */
#include "H5public.h" /* Generic Functions */
@@ -58,4 +58,4 @@ H5_DLL herr_t H5PLsize(unsigned int *num_paths /*out*/);
}
#endif
-#endif /* _H5PLpublic_H */
+#endif /* H5PLpublic_H */
diff --git a/src/H5Pmodule.h b/src/H5Pmodule.h
index 5a249b1..73f6009 100644
--- a/src/H5Pmodule.h
+++ b/src/H5Pmodule.h
@@ -18,8 +18,8 @@
* H5P package. Including this header means that the source file
* is part of the H5P package.
*/
-#ifndef _H5Pmodule_H
-#define _H5Pmodule_H
+#ifndef H5Pmodule_H
+#define H5Pmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_PLIST
#define H5_MY_PKG_INIT YES
-#endif /* _H5Pmodule_H */
+#endif /* H5Pmodule_H */
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index f23b193..5818fec 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5P package!"
#endif
-#ifndef _H5Ppkg_H
-#define _H5Ppkg_H
+#ifndef H5Ppkg_H
+#define H5Ppkg_H
/* Get package's private header */
#include "H5Pprivate.h"
@@ -196,4 +196,4 @@ H5_DLL char *H5P__get_class_path_test(hid_t pclass_id);
H5_DLL hid_t H5P__open_class_path_test(const char *path);
#endif /* H5P_TESTING */
-#endif /* _H5Ppkg_H */
+#endif /* H5Ppkg_H */
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 84b7cc3..300eb7c 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5P module
*/
-#ifndef _H5Pprivate_H
-#define _H5Pprivate_H
+#ifndef H5Pprivate_H
+#define H5Pprivate_H
/* Early typedefs to avoid circular dependencies */
typedef struct H5P_genplist_t H5P_genplist_t;
@@ -203,4 +203,4 @@ H5_DLL H5P_genplist_t *H5P_object_verify(hid_t plist_id, hid_t pclass_id);
H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status);
H5_DLL herr_t H5P_get_fill_value(H5P_genplist_t *plist, const struct H5T_t *type, void *value);
-#endif /* _H5Pprivate_H */
+#endif /* H5Pprivate_H */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 118a023..3ece6c3 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -15,8 +15,8 @@
* This file contains function prototypes for each exported function in the
* H5P module.
*/
-#ifndef _H5Ppublic_H
-#define _H5Ppublic_H
+#ifndef H5Ppublic_H
+#define H5Ppublic_H
/* System headers needed by this file */
@@ -39,11 +39,11 @@
/* When this header is included from a private HDF5 header, don't make calls to H5open() */
#undef H5OPEN
-#ifndef _H5private_H
+#ifndef H5private_H
#define H5OPEN H5open(),
-#else /* _H5private_H */
+#else /* H5private_H */
#define H5OPEN
-#endif /* _H5private_H */
+#endif /* H5private_H */
/*
* The library's property list classes
@@ -510,4 +510,4 @@ H5_DLL herr_t H5Pget_file_space(hid_t plist_id, H5F_file_space_type_t *str
#ifdef __cplusplus
}
#endif
-#endif /* _H5Ppublic_H */
+#endif /* H5Ppublic_H */
diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h
index c1f044a..32e1dc6 100644
--- a/src/H5RSprivate.h
+++ b/src/H5RSprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5RS module
*/
-#ifndef _H5RSprivate_H
-#define _H5RSprivate_H
+#ifndef H5RSprivate_H
+#define H5RSprivate_H
/**************************************/
/* Public headers needed by this file */
@@ -55,4 +55,4 @@ H5_DLL ssize_t H5RS_len(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 */
+#endif /* H5RSprivate_H */
diff --git a/src/H5Rmodule.h b/src/H5Rmodule.h
index 0f09b30..9a3bf33 100644
--- a/src/H5Rmodule.h
+++ b/src/H5Rmodule.h
@@ -14,8 +14,8 @@
* H5R package. Including this header means that the source file
* is part of the H5R package.
*/
-#ifndef _H5Rmodule_H
-#define _H5Rmodule_H
+#ifndef H5Rmodule_H
+#define H5Rmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -25,4 +25,4 @@
#define H5_MY_PKG_ERR H5E_REFERENCE
#define H5_MY_PKG_INIT YES
-#endif /* _H5Rmodule_H */
+#endif /* H5Rmodule_H */
diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h
index 3940277..3fa2cb5 100644
--- a/src/H5Rpkg.h
+++ b/src/H5Rpkg.h
@@ -19,8 +19,8 @@
#error "Do not include this file outside the H5R package!"
#endif
-#ifndef _H5Rpkg_H
-#define _H5Rpkg_H
+#ifndef H5Rpkg_H
+#define H5Rpkg_H
/* Get package's private header */
#include "H5Rprivate.h"
@@ -53,4 +53,4 @@ H5_DLL herr_t H5R__get_obj_type(H5F_t *file, H5R_type_t ref_type, const void *_
H5_DLL ssize_t H5R__get_name(H5F_t *file, hid_t id, H5R_type_t ref_type, const void *_ref, char *name,
size_t size);
-#endif /* _H5Rpkg_H */
+#endif /* H5Rpkg_H */
diff --git a/src/H5Rprivate.h b/src/H5Rprivate.h
index d4edd03..720061c 100644
--- a/src/H5Rprivate.h
+++ b/src/H5Rprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5R module
*/
-#ifndef _H5Rprivate_H
-#define _H5Rprivate_H
+#ifndef H5Rprivate_H
+#define H5Rprivate_H
#include "H5Rpublic.h"
@@ -41,4 +41,4 @@
/* Library Private Prototypes */
/******************************/
-#endif /* _H5Rprivate_H */
+#endif /* H5Rprivate_H */
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index 3a305ce..1fc41ec 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5R module.
*/
-#ifndef _H5Rpublic_H
-#define _H5Rpublic_H
+#ifndef H5Rpublic_H
+#define H5Rpublic_H
/* Public headers needed by this file */
#include "H5public.h"
@@ -98,4 +98,4 @@ H5_DLL hid_t H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *
}
#endif
-#endif /* _H5Rpublic_H */
+#endif /* H5Rpublic_H */
diff --git a/src/H5SLmodule.h b/src/H5SLmodule.h
index 3ce2fcd..2614f92 100644
--- a/src/H5SLmodule.h
+++ b/src/H5SLmodule.h
@@ -18,8 +18,8 @@
* H5SL package. Including this header means that the source file
* is part of the H5SL package.
*/
-#ifndef _H5SLmodule_H
-#define _H5SLmodule_H
+#ifndef H5SLmodule_H
+#define H5SLmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_SLIST
#define H5_MY_PKG_INIT YES
-#endif /* _H5SLmodule_H */
+#endif /* H5SLmodule_H */
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index ba23507..c9e1147 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5SL module
*/
-#ifndef _H5SLprivate_H
-#define _H5SLprivate_H
+#ifndef H5SLprivate_H
+#define H5SLprivate_H
/**************************************/
/* Public headers needed by this file */
@@ -91,4 +91,4 @@ H5_DLL herr_t H5SL_close(H5SL_t *slist);
H5_DLL herr_t H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
H5_DLL int H5SL_term_interface(void);
-#endif /* _H5SLprivate_H */
+#endif /* H5SLprivate_H */
diff --git a/src/H5SMmodule.h b/src/H5SMmodule.h
index 57945ce..6d2abf1 100644
--- a/src/H5SMmodule.h
+++ b/src/H5SMmodule.h
@@ -18,8 +18,8 @@
* H5SM package. Including this header means that the source file
* is part of the H5SM package.
*/
-#ifndef _H5SMmodule_H
-#define _H5SMmodule_H
+#ifndef H5SMmodule_H
+#define H5SMmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_SOHM
#define H5_MY_PKG_INIT NO
-#endif /* _H5SMmodule_H */
+#endif /* H5SMmodule_H */
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 3c7e2f2..abf9a70 100644
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5SM package!"
#endif
-#ifndef _H5SMpkg_H
-#define _H5SMpkg_H
+#ifndef H5SMpkg_H
+#define H5SMpkg_H
/* Get package's private header */
#include "H5SMprivate.h" /* Shared Object Header Messages */
@@ -277,4 +277,4 @@ herr_t H5SM_list_free(H5SM_list_t *list);
H5_DLL herr_t H5SM__get_mesg_count_test(H5F_t *f, unsigned type_id, size_t *mesg_count);
#endif /* H5SM_TESTING */
-#endif /* _H5SMpkg_H */
+#endif /* H5SMpkg_H */
diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h
index fb47e46..efe9355 100644
--- a/src/H5SMprivate.h
+++ b/src/H5SMprivate.h
@@ -18,8 +18,8 @@
* Purpose: This file contains private declarations for the H5SM
* shared object header messages module.
*/
-#ifndef _H5SMprivate_H
-#define _H5SMprivate_H
+#ifndef H5SMprivate_H
+#define H5SMprivate_H
#include "H5Oprivate.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
@@ -66,4 +66,4 @@ H5_DLL herr_t H5SM_table_debug(H5F_t *f, haddr_t table_addr, FILE *stream, int i
H5_DLL herr_t H5SM_list_debug(H5F_t *f, haddr_t list_addr, FILE *stream, int indent, int fwidth,
haddr_t table_addr);
-#endif /*_H5SMprivate_H*/
+#endif /*H5SMprivate_H*/
diff --git a/src/H5STprivate.h b/src/H5STprivate.h
index c9d643e..2d009fa 100644
--- a/src/H5STprivate.h
+++ b/src/H5STprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5ST module
*/
-#ifndef _H5STprivate_H
-#define _H5STprivate_H
+#ifndef H5STprivate_H
+#define H5STprivate_H
#ifdef LATER
#include "H5STpublic.h"
@@ -60,4 +60,4 @@ H5_DLL herr_t H5ST_delete(H5ST_tree_t *root, H5ST_ptr_t p);
H5_DLL herr_t H5ST_dump(H5ST_tree_t *tree);
#endif /* H5ST_DEBUG */
-#endif /* _H5STprivate_H */
+#endif /* H5STprivate_H */
diff --git a/src/H5Smodule.h b/src/H5Smodule.h
index 9d5e0ef..a7b035e 100644
--- a/src/H5Smodule.h
+++ b/src/H5Smodule.h
@@ -18,8 +18,8 @@
* H5S package. Including this header means that the source file
* is part of the H5S package.
*/
-#ifndef _H5Smodule_H
-#define _H5Smodule_H
+#ifndef H5Smodule_H
+#define H5Smodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_DATASPACE
#define H5_MY_PKG_INIT YES
-#endif /* _H5Smodule_H */
+#endif /* H5Smodule_H */
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index e9186fb..dfb0c1e 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -12,19 +12,19 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
- * Programmer: Quincey Koziol
- * Thursday, September 28, 2000
+ * Programmer: Quincey Koziol
+ * Thursday, September 28, 2000
*
- * Purpose: This file contains declarations which are visible only within
- * the H5S package. Source files outside the H5S package should
- * include H5Sprivate.h instead.
+ * Purpose: This file contains declarations which are visible only within
+ * the H5S package. Source files outside the H5S package should
+ * include H5Sprivate.h instead.
*/
#if !(defined H5S_FRIEND || defined H5S_MODULE)
#error "Do not include this file outside the H5S package!"
#endif
-#ifndef _H5Spkg_H
-#define _H5Spkg_H
+#ifndef H5Spkg_H
+#define H5Spkg_H
/* Get package's private header */
#include "H5Sprivate.h"
@@ -412,4 +412,4 @@ H5_DLL herr_t H5S__get_diminfo_status_test(hid_t space_id, H5S_diminfo_valid_t *
H5_DLL htri_t H5S__internal_consistency_test(hid_t space_id);
#endif /* H5S_TESTING */
-#endif /*_H5Spkg_H*/
+#endif /*H5Spkg_H*/
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 73a03bc..af76f8b 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5S module
*/
-#ifndef _H5Sprivate_H
-#define _H5Sprivate_H
+#ifndef H5Sprivate_H
+#define H5Sprivate_H
/* Include package's public header */
#include "H5Spublic.h"
@@ -337,4 +337,4 @@ H5_DLL herr_t H5S_mpio_space_type(const H5S_t *space, size_t elmt_size,
hbool_t do_permute, hsize_t **permute_map, hbool_t *is_permuted);
#endif /* H5_HAVE_PARALLEL */
-#endif /* _H5Sprivate_H */
+#endif /* H5Sprivate_H */
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index c1b431b..8a7f1a3 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5S module.
*/
-#ifndef _H5Spublic_H
-#define _H5Spublic_H
+#ifndef H5Spublic_H
+#define H5Spublic_H
/* Public headers needed by this file */
#include "H5public.h"
@@ -140,4 +140,4 @@ H5_DLL hid_t H5Sselect_project_intersection(hid_t src_space_id, hid_t dst_spa
#ifdef __cplusplus
}
#endif
-#endif /* _H5Spublic_H */
+#endif /* H5Spublic_H */
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index a0cb353..3c81f26 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -27,7 +27,7 @@
#ifdef H5_HAVE_THREADSAFE
/* Public headers needed by this file */
#ifdef LATER
-#include "H5TSpublic.h" /*Public API prototypes */
+#include "H5TSpublic.h" /* Public API prototypes */
#endif /* LATER */
#ifdef H5_HAVE_WIN_THREADS
@@ -38,6 +38,8 @@
typedef struct H5TS_mutex_struct {
CRITICAL_SECTION CriticalSection;
} H5TS_mutex_t;
+
+/* Portability wrappers around Windows Threads types */
typedef CRITICAL_SECTION H5TS_mutex_simple_t;
typedef HANDLE H5TS_thread_t;
typedef HANDLE H5TS_attr_t;
@@ -50,7 +52,7 @@ typedef INIT_ONCE H5TS_once_t;
#define H5TS_SCOPE_PROCESS 0
#define H5TS_CALL_CONV WINAPI
-/* Functions */
+/* Portability function aliases */
#define H5TS_get_thread_local_value(key) TlsGetValue(key)
#define H5TS_set_thread_local_value(key, value) TlsSetValue(key, value)
#define H5TS_attr_init(attr_ptr) 0
@@ -80,6 +82,8 @@ typedef struct H5TS_mutex_struct {
pthread_cond_t cond_var; /* condition variable */
unsigned int lock_count;
} H5TS_mutex_t;
+
+/* Portability wrappers around pthread types */
typedef pthread_t H5TS_thread_t;
typedef pthread_attr_t H5TS_attr_t;
typedef pthread_mutex_t H5TS_mutex_simple_t;
@@ -91,7 +95,7 @@ typedef pthread_once_t H5TS_once_t;
#define H5TS_SCOPE_PROCESS PTHREAD_SCOPE_PROCESS
#define H5TS_CALL_CONV /* unused - Windows only */
-/* Functions */
+/* Portability function aliases */
#define H5TS_get_thread_local_value(key) pthread_getspecific(key)
#define H5TS_set_thread_local_value(key, value) pthread_setspecific(key, value)
#define H5TS_attr_init(attr_ptr) pthread_attr_init((attr_ptr))
@@ -101,6 +105,8 @@ typedef pthread_once_t H5TS_once_t;
#define H5TS_mutex_init(mutex) pthread_mutex_init(mutex, NULL)
#define H5TS_mutex_lock_simple(mutex) pthread_mutex_lock(mutex)
#define H5TS_mutex_unlock_simple(mutex) pthread_mutex_unlock(mutex)
+
+/* Pthread-only routines */
H5_DLL uint64_t H5TS_thread_id(void);
#endif /* H5_HAVE_WIN_THREADS */
diff --git a/src/H5Tmodule.h b/src/H5Tmodule.h
index ba38be2..9d585d8 100644
--- a/src/H5Tmodule.h
+++ b/src/H5Tmodule.h
@@ -18,8 +18,8 @@
* H5T package. Including this header means that the source file
* is part of the H5T package.
*/
-#ifndef _H5Tmodule_H
-#define _H5Tmodule_H
+#ifndef H5Tmodule_H
+#define H5Tmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_DATATYPE
#define H5_MY_PKG_INIT YES
-#endif /* _H5Tmodule_H */
+#endif /* H5Tmodule_H */
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index f725bff..0dd078b 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -23,8 +23,8 @@
#error "Do not include this file outside the H5T package!"
#endif
-#ifndef _H5Tpkg_H
-#define _H5Tpkg_H
+#ifndef H5Tpkg_H
+#define H5Tpkg_H
/*
* Define this to enable debugging.
@@ -841,4 +841,4 @@ H5_DLL herr_t H5T__sort_name(const H5T_t *dt, int *map);
/* Debugging functions */
H5_DLL herr_t H5T__print_stats(H5T_path_t *path, int *nprint /*in,out*/);
-#endif /* _H5Tpkg_H */
+#endif /* H5Tpkg_H */
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 8217a46..858abcd 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -14,8 +14,8 @@
/*
* This file contains private information about the H5T module
*/
-#ifndef _H5Tprivate_H
-#define _H5Tprivate_H
+#ifndef H5Tprivate_H
+#define H5Tprivate_H
/* Early typedefs to avoid circular dependencies */
typedef struct H5T_t H5T_t;
@@ -160,4 +160,4 @@ H5_DLL int H5T_get_offset(const H5T_t *dt);
/* Fixed-point functions */
H5_DLL H5T_sign_t H5T_get_sign(H5T_t const *dt);
-#endif /* _H5Tprivate_H */
+#endif /* H5Tprivate_H */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 3a4c192..822c26f 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5T module.
*/
-#ifndef _H5Tpublic_H
-#define _H5Tpublic_H
+#ifndef H5Tpublic_H
+#define H5Tpublic_H
/* Public headers needed by this file */
#include "H5public.h"
@@ -606,4 +606,4 @@ H5_DLL int H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Tpublic_H */
+#endif /* H5Tpublic_H */
diff --git a/src/H5UCprivate.h b/src/H5UCprivate.h
index a46db5d..9f4f15a 100644
--- a/src/H5UCprivate.h
+++ b/src/H5UCprivate.h
@@ -17,8 +17,8 @@
* conflicting requirement for the use of H5RC.
*/
-#ifndef _H5UCprivate_H
-#define _H5UCprivate_H
+#ifndef H5UCprivate_H
+#define H5UCprivate_H
/**************************************/
/* Public headers needed by this file */
@@ -59,4 +59,4 @@ typedef struct H5UC_t {
H5_DLL H5UC_t *H5UC_create(void *s, H5UC_free_func_t free_func);
H5_DLL herr_t H5UC_decr(H5UC_t *rc);
-#endif /* _H5RSprivate_H */
+#endif /* H5UCprivate_H */
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index 224d03ac..e24ce83 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -298,7 +298,7 @@ done:
*
* Failure: 0 if N is zero
*
- * Programmer: Robb Matzke
+ * Programmer: Robb Matzke
* Wednesday, April 8, 1998
*
*-------------------------------------------------------------------------
diff --git a/src/H5WBprivate.h b/src/H5WBprivate.h
index 416e125..1092365 100644
--- a/src/H5WBprivate.h
+++ b/src/H5WBprivate.h
@@ -22,8 +22,8 @@
*-------------------------------------------------------------------------
*/
-#ifndef _H5WBprivate_H
-#define _H5WBprivate_H
+#ifndef H5WBprivate_H
+#define H5WBprivate_H
/* Include package's public header */
/* #include "H5WBpublic.h" */
@@ -55,4 +55,4 @@ 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 */
+#endif /* H5WBprivate_H */
diff --git a/src/H5Zmodule.h b/src/H5Zmodule.h
index ba93bdb..7dc687a 100644
--- a/src/H5Zmodule.h
+++ b/src/H5Zmodule.h
@@ -18,8 +18,8 @@
* H5Z package. Including this header means that the source file
* is part of the H5Z package.
*/
-#ifndef _H5Zmodule_H
-#define _H5Zmodule_H
+#ifndef H5Zmodule_H
+#define H5Zmodule_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
@@ -29,4 +29,4 @@
#define H5_MY_PKG_ERR H5E_PLINE
#define H5_MY_PKG_INIT YES
-#endif /* _H5Zmodule_H */
+#endif /* H5Zmodule_H */
diff --git a/src/H5Zpkg.h b/src/H5Zpkg.h
index 41c7ba1..726478a 100644
--- a/src/H5Zpkg.h
+++ b/src/H5Zpkg.h
@@ -15,8 +15,8 @@
#error "Do not include this file outside the H5Z package!"
#endif
-#ifndef _H5Zpkg_H
-#define _H5Zpkg_H
+#ifndef H5Zpkg_H
+#define H5Zpkg_H
/* Include private header file */
#include "H5Zprivate.h" /* Filter functions */
@@ -54,4 +54,4 @@ H5_DLLVAR H5Z_class2_t H5Z_SZIP[1];
/* Package internal routines */
H5_DLL herr_t H5Z__unregister(H5Z_filter_t filter_id);
-#endif /* _H5Zpkg_H */
+#endif /* H5Zpkg_H */
diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h
index dc374c9..5ec12e1 100644
--- a/src/H5Zprivate.h
+++ b/src/H5Zprivate.h
@@ -15,8 +15,8 @@
* Thursday, April 16, 1998
*/
-#ifndef _H5Zprivate_H
-#define _H5Zprivate_H
+#ifndef H5Zprivate_H
+#define H5Zprivate_H
/* Early typedefs to avoid circular dependencies */
typedef struct H5Z_filter_info_t H5Z_filter_info_t;
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index fb6a13f..66099f0 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -15,8 +15,8 @@
* Thursday, April 16, 1998
*/
-#ifndef _H5Zpublic_H
-#define _H5Zpublic_H
+#ifndef H5Zpublic_H
+#define H5Zpublic_H
/* Public headers needed by this file */
#include "H5public.h"
diff --git a/src/H5private.h b/src/H5private.h
index 27741ce..93f150d 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef _H5private_H
-#define _H5private_H
+#ifndef H5private_H
+#define H5private_H
#include "H5public.h" /* Include Public Definitions */
@@ -295,23 +295,14 @@
* Note that Solaris Studio supports attribute, but does not support the
* attributes we use.
*
+ * When using H5_ATTR_FALLTHROUGH, you should also include a comment that
+ * says FALLTHROUGH to reduce warnings on compilers that don't use
+ * attributes but do respect fall-through comments.
+ *
* H5_ATTR_CONST is redefined in tools/h5repack/dynlib_rpk.c to quiet
* gcc warnings (it has to use the public API and can't include this
* file). Be sure to update that file if the #ifdefs change here.
*/
-#ifdef __cplusplus
-#define H5_ATTR_FORMAT(X, Y, Z) /*void*/
-#define H5_ATTR_UNUSED /*void*/
-#define H5_ATTR_DEPRECATED_USED /*void*/
-#define H5_ATTR_NDEBUG_UNUSED /*void*/
-#define H5_ATTR_DEBUG_API_USED /*void*/
-#define H5_ATTR_PARALLEL_UNUSED /*void*/
-#define H5_ATTR_PARALLEL_USED /*void*/
-#define H5_ATTR_NORETURN /*void*/
-#define H5_ATTR_CONST /*void*/
-#define H5_ATTR_PURE /*void*/
-#define H5_ATTR_FALLTHROUGH /*void*/
-#else /* __cplusplus */
#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
#define H5_ATTR_FORMAT(X, Y, Z) __attribute__((format(X, Y, Z)))
#define H5_ATTR_UNUSED __attribute__((unused))
@@ -358,7 +349,6 @@
#define H5_ATTR_PURE /*void*/
#define H5_ATTR_FALLTHROUGH /*void*/
#endif
-#endif /* __cplusplus */
/*
* Networking headers used by the mirror VFD and related tests and utilities.
@@ -2830,4 +2820,4 @@ H5_DLL herr_t H5_mpio_create_large_type(hsize_t num_elements, MPI_Aint stride_b
H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *marker,
size_t buf_offset, size_t buf_size);
-#endif /* _H5private_H */
+#endif /* H5private_H */
diff --git a/src/H5public.h b/src/H5public.h
index de48627..4661ee8 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -14,16 +14,16 @@
/*
* This file contains public declarations for the HDF5 module.
*/
-#ifndef _H5public_H
-#define _H5public_H
+#ifndef H5public_H
+#define H5public_H
/* Include files for public use... */
/*
* Since H5pubconf.h is a generated header file, it is messy to try
- * to put a #ifndef _H5pubconf_H ... #endif guard in it.
+ * to put a #ifndef H5pubconf_H ... #endif guard in it.
* HDF5 has set an internal rule that it is being included here.
* Source files should NOT include H5pubconf.h directly but include
- * it via H5public.h. The #ifndef _H5public_H guard above would
+ * it via H5public.h. The #ifndef H5public_H guard above would
* prevent repeated include.
*/
#include "H5pubconf.h" /* From configure */
@@ -171,59 +171,118 @@ typedef long long ssize_t;
#endif
#endif
+/* int64_t type is used for creation order field for links. It may be
+ * defined in Posix.1g, otherwise it is defined here.
+ */
+#if H5_SIZEOF_INT64_T >= 8
+#elif H5_SIZEOF_INT >= 8
+typedef int int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 8
+typedef long int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_LONG_LONG >= 8
+typedef long long int64_t;
+#undef H5_SIZEOF_INT64_T
+#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
+#else
+#error "nothing appropriate for int64_t"
+#endif
+
+/* uint64_t type is used for fields for H5O_info_t. It may be
+ * defined in Posix.1g, otherwise it is defined here.
+ */
+#if H5_SIZEOF_UINT64_T >= 8
+#ifndef UINT64_MAX
+#define UINT64_MAX ((uint64_t)-1)
+#endif
+#elif H5_SIZEOF_INT >= 8
+typedef unsigned uint64_t;
+#define UINT64_MAX UINT_MAX
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
+#elif H5_SIZEOF_LONG >= 8
+typedef unsigned long uint64_t;
+#define UINT64_MAX ULONG_MAX
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
+#elif H5_SIZEOF_LONG_LONG >= 8
+typedef unsigned long long uint64_t;
+#define UINT64_MAX ULLONG_MAX
+#undef H5_SIZEOF_UINT64_T
+#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
+#else
+#error "nothing appropriate for uint64_t"
+#endif
+
/*
- * The sizes of file objects have their own types defined here, use a 64-bit
- * type.
+ * The sizes of file objects have their own types defined here, use a minimum
+ * 64-bit type.
*/
#if H5_SIZEOF_LONG_LONG >= 8
H5_GCC_DIAG_OFF("long-long")
typedef unsigned long long hsize_t;
typedef signed long long hssize_t;
H5_GCC_DIAG_ON("long-long")
+#define PRIdHSIZE H5_PRINTF_LL_WIDTH "d"
+#define PRIiHSIZE H5_PRINTF_LL_WIDTH "i"
+#define PRIoHSIZE H5_PRINTF_LL_WIDTH "o"
+#define PRIuHSIZE H5_PRINTF_LL_WIDTH "u"
+#define PRIxHSIZE H5_PRINTF_LL_WIDTH "x"
+#define PRIXHSIZE H5_PRINTF_LL_WIDTH "X"
#define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
#define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
+#define HSIZE_UNDEF ULLONG_MAX
#else
#error "nothing appropriate for hsize_t"
#endif
-#define HSIZE_UNDEF ((hsize_t)(hssize_t)(-1))
/*
* File addresses have their own types.
*/
#if H5_SIZEOF_INT >= 8
typedef unsigned haddr_t;
-#define HADDR_UNDEF ((haddr_t)(-1))
+#define HADDR_UNDEF UINT_MAX
#define H5_SIZEOF_HADDR_T H5_SIZEOF_INT
#ifdef H5_HAVE_PARALLEL
#define HADDR_AS_MPI_TYPE MPI_UNSIGNED
#endif /* H5_HAVE_PARALLEL */
+#define PRIdHADDR "d"
+#define PRIoHADDR "o"
+#define PRIuHADDR "u"
+#define PRIxHADDR "x"
+#define PRIXHADDR "X"
#elif H5_SIZEOF_LONG >= 8
typedef unsigned long haddr_t;
-#define HADDR_UNDEF ((haddr_t)(long)(-1))
+#define HADDR_UNDEF ULONG_MAX
#define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG
#ifdef H5_HAVE_PARALLEL
#define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG
#endif /* H5_HAVE_PARALLEL */
+#define PRIdHADDR "ld"
+#define PRIoHADDR "lo"
+#define PRIuHADDR "lu"
+#define PRIxHADDR "lx"
+#define PRIXHADDR "lX"
#elif H5_SIZEOF_LONG_LONG >= 8
typedef unsigned long long haddr_t;
-#define HADDR_UNDEF ((haddr_t)(long long)(-1))
+#define HADDR_UNDEF ULLONG_MAX
#define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG_LONG
#ifdef H5_HAVE_PARALLEL
#define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
#endif /* H5_HAVE_PARALLEL */
+#define PRIdHADDR H5_PRINTF_LL_WIDTH "d"
+#define PRIoHADDR H5_PRINTF_LL_WIDTH "o"
+#define PRIuHADDR H5_PRINTF_LL_WIDTH "u"
+#define PRIxHADDR H5_PRINTF_LL_WIDTH "x"
+#define PRIXHADDR H5_PRINTF_LL_WIDTH "X"
#else
#error "nothing appropriate for haddr_t"
#endif
-#if H5_SIZEOF_HADDR_T == H5_SIZEOF_INT
-#define H5_PRINTF_HADDR_FMT "%u"
-#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG
-#define H5_PRINTF_HADDR_FMT "%lu"
-#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG_LONG
-#define H5_PRINTF_HADDR_FMT "%" H5_PRINTF_LL_WIDTH "u"
-#else
-#error "nothing appropriate for H5_PRINTF_HADDR_FMT"
-#endif
-#define HADDR_MAX (HADDR_UNDEF - 1)
+#define H5_PRINTF_HADDR_FMT "%" PRIuHADDR
+#define HADDR_MAX (HADDR_UNDEF - 1)
/* uint32_t type is used for creation order field for messages. It may be
* defined in Posix.1g, otherwise it is defined here.
@@ -245,46 +304,6 @@ typedef unsigned long uint32_t;
#error "nothing appropriate for uint32_t"
#endif
-/* int64_t type is used for creation order field for links. It may be
- * defined in Posix.1g, otherwise it is defined here.
- */
-#if H5_SIZEOF_INT64_T >= 8
-#elif H5_SIZEOF_INT >= 8
-typedef int int64_t;
-#undef H5_SIZEOF_INT64_T
-#define H5_SIZEOF_INT64_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG >= 8
-typedef long int64_t;
-#undef H5_SIZEOF_INT64_T
-#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_LONG_LONG >= 8
-typedef long long int64_t;
-#undef H5_SIZEOF_INT64_T
-#define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
-#else
-#error "nothing appropriate for int64_t"
-#endif
-
-/* uint64_t type is used for fields for H5O_info_t. It may be
- * defined in Posix.1g, otherwise it is defined here.
- */
-#if H5_SIZEOF_UINT64_T >= 8
-#elif H5_SIZEOF_INT >= 8
-typedef unsigned uint64_t;
-#undef H5_SIZEOF_UINT64_T
-#define H5_SIZEOF_UINT64_T H5_SIZEOF_INT
-#elif H5_SIZEOF_LONG >= 8
-typedef unsigned long uint64_t;
-#undef H5_SIZEOF_UINT64_T
-#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
-#elif H5_SIZEOF_LONG_LONG >= 8
-typedef unsigned long long uint64_t;
-#undef H5_SIZEOF_UINT64_T
-#define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
-#else
-#error "nothing appropriate for uint64_t"
-#endif
-
/* Common iteration orders */
typedef enum {
H5_ITER_UNKNOWN = -1, /* Unknown order */
@@ -354,4 +373,4 @@ H5_DLL void * H5resize_memory(void *mem, size_t size);
#ifdef __cplusplus
}
#endif
-#endif /* _H5public_H */
+#endif /* H5public_H */
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 7c088aa..b4b253f 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -31,33 +31,40 @@
#define PRIoPTR "llo"
#define PRIuPTR "llu"
#define PRIxPTR "llx"
+#define PRIXPTR "llX"
#else /* _WIN64 */
#define PRIdPTR "ld"
#define PRIoPTR "lo"
#define PRIuPTR "lu"
#define PRIxPTR "lx"
+#define PRIXPTR "lX"
#endif /* _WIN64 */
#define PRId8 "d"
#define PRIo8 "o"
#define PRIu8 "u"
#define PRIx8 "x"
+#define PRIX8 "X"
#define PRId16 "d"
#define PRIo16 "o"
#define PRIu16 "u"
#define PRIx16 "x"
+#define PRIX16 "X"
#define PRId32 "d"
#define PRIo32 "o"
#define PRIu32 "u"
#define PRIx32 "x"
+#define PRIX32 "X"
#define PRId64 "lld"
#define PRIo64 "llo"
#define PRIu64 "llu"
#define PRIx64 "llx"
+#define PRIX64 "llX"
#define PRIdMAX "lld"
#define PRIoMAX "llo"
#define PRIuMAX "llu"
#define PRIxMAX "llx"
+#define PRIXMAX "llX"
#endif
/*
diff --git a/src/hdf5.h b/src/hdf5.h
index 4314050..919d506 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -16,8 +16,8 @@
* a particular header file and include that here, don't fill this file with
* lots of gunk...
*/
-#ifndef _HDF5_H
-#define _HDF5_H
+#ifndef HDF5_H
+#define HDF5_H
#include "H5public.h"
#include "H5Apublic.h" /* Attributes */
diff --git a/test/H5srcdir.h b/test/H5srcdir.h
index b2fd341..8cc91d1 100644
--- a/test/H5srcdir.h
+++ b/test/H5srcdir.h
@@ -17,8 +17,8 @@
*
* Purpose: srcdir querying support.
*/
-#ifndef _H5SRCDIR_H
-#define _H5SRCDIR_H
+#ifndef H5SRCDIR_H
+#define H5SRCDIR_H
#ifdef __cplusplus
extern "C" {
@@ -33,4 +33,4 @@ H5TEST_DLL const char *H5_get_srcdir_filename(const char *filename);
}
#endif
-#endif /* _H5SRCDIR_H */
+#endif /* H5SRCDIR_H */
diff --git a/test/h5test.h b/test/h5test.h
index 5b0ab34..73dd1b5 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -17,8 +17,8 @@
*
* Purpose: Test support stuff.
*/
-#ifndef _H5TEST_H
-#define _H5TEST_H
+#ifndef H5TEST_H
+#define H5TEST_H
/*
* Include required headers. This file tests internal library functions,
diff --git a/test/stab.c b/test/stab.c
index 8672546..7c94a56 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -1273,7 +1273,7 @@ old_api(hid_t fapl)
PASSED();
#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Shut compiler up */
- fapl = fapl;
+ (void)fapl;
SKIPPED();
HDputs(" Deprecated API symbols not enabled");
diff --git a/test/tattr.c b/test/tattr.c
index a9d059b..bc8fae1 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -4195,8 +4195,8 @@ test_attr_deprec(hid_t fcpl, hid_t fapl)
CHECK(ret, FAIL, "H5Fclose");
#else /* H5_NO_DEPRECATED_SYMBOLS */
/* Shut compiler up */
- fcpl = fcpl;
- fapl = fapl;
+ (void)fcpl;
+ (void)fapl;
/* Output message about test being skipped */
MESSAGE(5, ("Skipping Test On Deprecated Attribute Routines\n"));
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 719dff3..9db045f 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -472,9 +472,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
size_t size = 0;
hbool_t iszero1;
hbool_t iszero2;
- hsize_t nfound = 0; /* differences found */
- double per;
- hbool_t both_zero;
+ hsize_t nfound = 0; /* differences found */
diff_err_t ret_value = opts->err_stat;
H5TOOLS_START_DEBUG("ph:%d elemtno:%d - errstat:%d", opts->print_header, elemtno, opts->err_stat);
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index b2edbc0..9b647b2 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -448,6 +448,9 @@ done:
if (H5Tclose(atype) < 0)
H5TOOLS_ERROR(dimension_break, "H5Tclose failed");
+ if (H5Sclose(region_space) < 0)
+ H5TOOLS_ERROR(dimension_break, "H5Sclose failed");
+
ctx->indent_level--;
ctx->need_prefix = TRUE;
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 25e0033..3a68abe 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -208,8 +208,6 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
arg[arg_len] = 0;
for (i = 0; l_opts && l_opts[i].name; i++) {
- size_t len = HDstrlen(l_opts[i].name);
-
if (HDstrcmp(arg, l_opts[i].name) == 0) {
/* we've found a matching long command line flag */
opt_opt = l_opts[i].shortval;