Cherry-pick 3 merge commits from develop to hdf5_1_12

MANIFEST

@@ -983,8 +983,6 @@
 ./src/H5SMpkg.h
 ./src/H5SMprivate.h
 ./src/H5SMtest.c
-./src/H5ST.c
-./src/H5STprivate.h
 ./src/H5T.c
 ./src/H5Tarray.c
 ./src/H5Tbit.c
@@ -1297,7 +1295,6 @@
 ./test/ttsafe_cancel.c
 ./test/ttsafe_dcreate.c
 ./test/ttsafe_error.c
-./test/ttst.c
 ./test/tunicode.c
 ./test/tvlstr.c
 ./test/tvltypes.c

config/gnu-warnings/error-general

@@ -3,7 +3,6 @@
 # circumstances, so ask the compiler to treat them as errors:
 #
 -Werror=bad-function-cast
--Werror=declaration-after-statement
 -Werror=implicit-function-declaration
 -Werror=missing-declarations
 -Werror=missing-prototypes

config/gnu-warnings/noerror-general

@@ -3,7 +3,6 @@
 # circumstances, so ask the compiler to treat them as errors:
 #
 -Wbad-function-cast
--Wdeclaration-after-statement
 -Wimplicit-function-declaration
 -Wmissing-declarations
 -Wmissing-prototypes

fortran/src/Makefile.am

@@ -155,7 +155,7 @@ H5Pff.lo:            $(srcdir)/H5Pff.F90 H5f90global.lo H5fortkit.lo
 H5Rff.lo:            $(srcdir)/H5Rff.F90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.F90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.F90 H5f90global.lo
-H5VLff.lo:           $(srcdir)/H5VLff.F90 H5f90global.lo
+H5VLff.lo:           $(srcdir)/H5VLff.F90 H5f90global.lo H5fortkit.lo
 H5Zff.lo:            $(srcdir)/H5Zff.F90 H5f90global.lo
 H5_gen.lo:           H5_gen.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo
 HDF5.lo:             $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo  \

hl/c++/src/H5PacketTable.h

@@ -35,7 +35,7 @@ class H5_HLCPPDLL PacketTable {
      */
     PacketTable()
     {
-        table_id = H5I_BADID;
+        table_id = H5I_INVALID_HID;
     }
 
     /* "Open" Constructor

hl/src/H5LTanalyze.c

@@ -916,7 +916,7 @@ char *yytext;
 #include "H5LTparse.h"
 
 static char *trim_quotes(const char *);
-int my_yyinput(char *, int);
+static int my_yyinput(char *, int);
 #undef YY_INPUT
 #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms))
 #define token(x)        (int)x
@@ -2554,7 +2554,7 @@ trim_quotes(const char *quoted)
     return trimmed;
 }
 
-int my_yyinput(char *buf, int max_size)
+static int my_yyinput(char *buf, int max_size)
 {
    int ret;
 

hl/src/H5LTanalyze.l

@@ -27,7 +27,7 @@
 #include "H5LTparse.h"
 
 static char *trim_quotes(const char *);
-int my_yyinput(char *, int);
+static int my_yyinput(char *, int);
 #undef YY_INPUT
 #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms))
 #define token(x)        (int)x
@@ -144,7 +144,7 @@ trim_quotes(const char *quoted)
     return trimmed;
 }
 
-int my_yyinput(char *buf, int max_size)
+static int my_yyinput(char *buf, int max_size)
 {
    int ret;
 

hl/src/H5PT.c

@@ -29,7 +29,7 @@ static H5I_type_t H5PT_ptable_id_type = H5I_UNINIT;
 #define H5PT_HASH_TABLE_SIZE 64
 
 /* Packet Table private functions */
-static herr_t H5PT_free_id(void *id);
+static herr_t H5PT_free_id(void *id, void **_ctx);
 static herr_t H5PT_close(htbl_t *table);
 static herr_t H5PT_create_index(htbl_t *table_id);
 static herr_t H5PT_set_index(htbl_t *table_id, hsize_t pt_index);
@@ -402,7 +402,7 @@ H5PTopen(hid_t loc_id, const char *dset_name)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5PT_free_id(void *id)
+H5PT_free_id(void *id, void H5_ATTR_UNUSED **_ctx)
 {
     HDfree(id);
     return SUCCEED;