Merge of recent develop work to 1.10 branch:

* H5FD_FEAT_DEFAULT_VFD_COMPATIBLE VFD feature flag (HDFFV-10214)
* H5FDdriver_query() API call (HDFFV-10215)
* Fix to skip SWMR tests that when the current VFD is not compatible
  with the default VFD (HDFFV-10197)
* Removed obsolete compiler versions from config/gnu-flags (HDFFV-9937)
* Many warning fixes

3 files changed, 11 insertions, 10 deletions

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 499d5eb..0b1a96e 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -140,7 +140,7 @@ typedef struct mcomp_t
 static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
 static hbool_t all_zero(const void *_mem, size_t size);
 static int     ull2float(unsigned long long ull_value, float *f_value);
-static hsize_t character_compare(char *mem1,char *mem2,hsize_t i,unsigned u,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
+static hsize_t character_compare(char *mem1,char *mem2,hsize_t i,size_t u,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hbool_t equal_float(float value, float expected, diff_opt_t *options);
 static hbool_t equal_double(double value, double expected, diff_opt_t *options);
@@ -149,7 +149,7 @@ static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t
 #endif
 static int print_data(diff_opt_t *options);
 static void print_pos(int *ph,int pp,hsize_t curr_pos,hsize_t *acc,hsize_t *pos,int rank,hsize_t *dims,const char *obj1,const char *obj2 );
-static void print_char_pos(int *ph,int pp,hsize_t curr_pos,unsigned u,hsize_t *acc,hsize_t *pos,int rank,hsize_t *dims,const char *obj1,const char *obj2 );
+static void print_char_pos(int *ph,int pp,hsize_t curr_pos,size_t u,hsize_t *acc,hsize_t *pos,int rank,hsize_t *dims,const char *obj1,const char *obj2 );
 static void h5diff_print_char(char ch);
 static hsize_t diff_datum(void       *_mem1,
                    void       *_mem2,
@@ -575,7 +575,7 @@ static hsize_t diff_datum(void       *_mem1,
 {
     unsigned char *mem1 = (unsigned char*)_mem1;
     unsigned char *mem2 = (unsigned char*)_mem2;
-    unsigned      u;
+    size_t        u;
     hid_t         memb_type;
     size_t        type_size;
     H5T_sign_t    type_sign;
@@ -2813,7 +2813,7 @@ static
 hsize_t character_compare(char *mem1,
                   char *mem2,
                   hsize_t       i,
-                  unsigned      u,
+                  size_t        u,
                   int           rank,
                   hsize_t       *dims,
                   hsize_t       *acc,
@@ -5906,7 +5906,7 @@ static
 void print_char_pos( int        *ph,       /* print header */
                      int        pp,        /* print percentage */
                      hsize_t    curr_pos,
-                     unsigned   u,
+                     size_t     u,
                      hsize_t    *acc,
                      hsize_t    *pos,
                      int        rank,
@@ -5944,7 +5944,7 @@ void print_char_pos( int        *ph,       /* print header */
     }
     else
     {
-        parallel_print("%u", (unsigned)u);
+        parallel_print("%zu", u);
     }
     parallel_print("]" );
 }
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 3d38dd0..6383df5 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -522,7 +522,7 @@ typedef struct h5tools_context_t {
     hsize_t acc[H5S_MAX_RANK];        /* accumulator position */
     hsize_t pos[H5S_MAX_RANK];        /* matrix position */
     hsize_t sm_pos;                   /* current stripmine element position */
-    struct H5LD_memb_t **cmpd_listv;  /* h5watch: vector containing info about the list of compound fields to be printed */
+    const struct H5LD_memb_t * const *cmpd_listv;  /* h5watch: vector containing info about the list of compound fields to be printed */
 } h5tools_context_t;
 
 typedef struct subset_d {
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index b7a2c1e..fa15785 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -1000,10 +1000,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
             case H5T_COMPOUND:
                 if(ctx->cmpd_listv) { /* there is <list_of_fields> */
-                    int    save_indent_level;      /* The indentation level */
+                    unsigned    save_indent_level;      /* The indentation level */
                     size_t curr_field;             /* Current field to display */
-                    int    i = 0, x = 0;           /* Local index variable */
-                    H5LD_memb_t **listv;           /* Vector of information for <list_of_fields> */
+                    int    i = 0;                  /* Local index variable */
+                    unsigned x = 0;                /* Local index variable */
+                    const H5LD_memb_t * const *listv;           /* Vector of information for <list_of_fields> */
 
                     listv = ctx->cmpd_listv;
                     ctx->cmpd_listv = NULL;