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

4 files changed, 17 insertions, 20 deletions

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 */