summaryrefslogtreecommitdiffstats
path: root/hl
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 /hl
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
Diffstat (limited to 'hl')
-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
22 files changed, 56 insertions, 65 deletions
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];