summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-22 19:56:03 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-22 19:56:03 (GMT)
commitedf124f40bc52044ba7f020225029d05190ffd39 (patch)
tree81bf09fb5119841275312c0d19523e6eef517f8c /src
parent249acc03550e9cb2ed3cfaa56737215910a7a194 (diff)
downloadhdf5-edf124f40bc52044ba7f020225029d05190ffd39.zip
hdf5-edf124f40bc52044ba7f020225029d05190ffd39.tar.gz
hdf5-edf124f40bc52044ba7f020225029d05190ffd39.tar.bz2
[svn-r18616] Description:
Clean up compiler warnings. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug (too minor to require h5committest)
Diffstat (limited to 'src')
-rw-r--r--src/H5B2cache.c2
-rw-r--r--src/H5Dbtree.c2
-rw-r--r--src/H5Dlayout.c6
-rw-r--r--src/H5EAcache.c2
-rw-r--r--src/H5Eint.c6
-rw-r--r--src/H5FAcache.c2
-rw-r--r--src/H5FLprivate.h14
-rw-r--r--src/H5FScache.c6
-rw-r--r--src/H5FSdbg.c1
-rw-r--r--src/H5FSsection.c2
-rw-r--r--src/H5FSstat.c2
-rw-r--r--src/H5Fsuper.c5
-rw-r--r--src/H5Fsuper_cache.c12
-rw-r--r--src/H5Gcache.c1
-rw-r--r--src/H5Gdeprec.c2
-rw-r--r--src/H5Gent.c9
-rw-r--r--src/H5Glink.c3
-rw-r--r--src/H5Gloc.c10
-rw-r--r--src/H5Gname.c19
-rw-r--r--src/H5Gnode.c4
-rw-r--r--src/H5Gstab.c4
-rw-r--r--src/H5Gtest.c13
-rw-r--r--src/H5Gtraverse.c12
-rw-r--r--src/H5HFcache.c2
-rw-r--r--src/H5system.c35
25 files changed, 124 insertions, 52 deletions
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index af329c7..09d4ee2 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -204,7 +204,7 @@ H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *ud
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree header version")
/* B-tree class */
- id = *p++;
+ id = (H5B2_subid_t)*p++;
if(id >= H5B2_NUM_BTREE_ID)
HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, NULL, "invalid B-tree type")
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index bed3d4c..a7e61ce 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -190,9 +190,9 @@ H5B_class_t H5B_BTREE[1] = {{
H5D_btree_cmp3, /*cmp3 */
H5D_btree_found, /*found */
H5D_btree_insert, /*insert */
- H5B_LEFT, /*critical key */
FALSE, /*follow min branch? */
FALSE, /*follow max branch? */
+ H5B_LEFT, /*critical key */
H5D_btree_remove, /*remove */
H5D_btree_decode_key, /*decode */
H5D_btree_encode_key, /*encode */
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c
index b6382df..0245bec 100644
--- a/src/H5Dlayout.c
+++ b/src/H5Dlayout.c
@@ -104,6 +104,8 @@ H5D_layout_set_io_ops(const H5D_t *dataset)
dataset->shared->layout.ops = H5D_LOPS_COMPACT;
break;
+ case H5D_LAYOUT_ERROR:
+ case H5D_NLAYOUTS:
default:
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unknown storage method")
} /* end switch */ /*lint !e788 All appropriate cases are covered */
@@ -167,6 +169,8 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include
ret_value += H5F_SIZEOF_ADDR(f); /* Address of data */
break;
+ case H5D_LAYOUT_ERROR:
+ case H5D_NLAYOUTS:
default:
HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, 0, "Invalid layout class")
} /* end switch */
@@ -423,6 +427,8 @@ H5D_layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
case H5D_COMPACT:
break;
+ case H5D_LAYOUT_ERROR:
+ case H5D_NLAYOUTS:
default:
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unknown storage method")
} /* end switch */ /*lint !e788 All appropriate cases are covered */
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 646f376..fd286d5 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -251,7 +251,7 @@ H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *u
H5E_THROW(H5E_VERSION, "wrong extensible array header version")
/* Extensible array class */
- id = *p++;
+ id = (H5EA_cls_id_t)*p++;
if(id >= H5EA_NUM_CLS_ID)
H5E_THROW(H5E_BADTYPE, "incorrect extensible array class")
hdr->cparam.cls = H5EA_client_class_g[id];
diff --git a/src/H5Eint.c b/src/H5Eint.c
index d64fcbd..0bf9083 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -227,7 +227,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5E_walk1_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk1_cb)
/* Check arguments */
HDassert(err_desc);
@@ -274,7 +274,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
MPI_Initialized(&mpi_initialized);
if(mpi_initialized) {
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
- fprintf (stream, "MPI-process %d", mpi_rank);
+ fprintf(stream, "MPI-process %d", mpi_rank);
} /* end if */
else
fprintf(stream, "thread 0");
@@ -349,7 +349,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5E_walk2_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk2_cb)
/* Check arguments */
HDassert(err_desc);
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index f9bf595..9caa0f3 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -211,7 +211,7 @@ H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *u
H5E_THROW(H5E_VERSION, "wrong fixed array header version")
/* Fixed array class */
- id = *p++;
+ id = (H5FA_cls_id_t)*p++;
if(id >= H5FA_NUM_CLS_ID)
H5E_THROW(H5E_BADTYPE, "incorrect fixed array class")
hdr->cparam.cls = H5FA_client_class_g[id];
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index e270068..6951e98 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -344,7 +344,7 @@ typedef struct H5FL_seq_head_t {
#define H5FL_SEQ_DEFINE_STATIC(t) static H5FL_SEQ_DEFINE_COMMON(t)
#define H5FL_SEQ_MALLOC(t,elem) (t *)H5MM_malloc((elem)*sizeof(t))
#define H5FL_SEQ_CALLOC(t,elem) (t *)H5MM_calloc((elem)*sizeof(t))
-#define H5FL_SEQ_FREE(t,obj) H5MM_xfree(obj)
+#define H5FL_SEQ_FREE(t,obj) (t *)H5MM_xfree(obj)
#define H5FL_SEQ_REALLOC(t,obj,new_elem) (t *)H5MM_realloc(obj,(new_elem)*sizeof(t))
#endif /* H5_NO_SEQ_FREE_LISTS */
@@ -372,18 +372,18 @@ typedef struct H5FL_fac_head_t {
*/
#ifndef H5_NO_FAC_FREE_LISTS
/* Allocate a block from a factory */
-#define H5FL_FAC_MALLOC(t) H5FL_fac_malloc(t H5FL_TRACK_INFO)
+#define H5FL_FAC_MALLOC(f) H5FL_fac_malloc(f H5FL_TRACK_INFO)
/* Allocate a block from a factory and clear it to all zeros */
-#define H5FL_FAC_CALLOC(t) H5FL_fac_calloc(t H5FL_TRACK_INFO)
+#define H5FL_FAC_CALLOC(f) H5FL_fac_calloc(f H5FL_TRACK_INFO)
/* Return a block to a factory */
-#define H5FL_FAC_FREE(t,obj) H5FL_fac_free(t,obj)
+#define H5FL_FAC_FREE(f, obj) H5FL_fac_free(f, obj)
#else /* H5_NO_FAC_FREE_LISTS */
-#define H5FL_FAC_MALLOC(t) H5MM_malloc(t->size)
-#define H5FL_FAC_CALLOC(t) H5MM_calloc(t->size)
-#define H5FL_FAC_FREE(t,obj) H5MM_xfree(obj)
+#define H5FL_FAC_MALLOC(f) H5MM_malloc(f->size)
+#define H5FL_FAC_CALLOC(f) H5MM_calloc(f->size)
+#define H5FL_FAC_FREE(f, obj) H5MM_xfree(obj)
#endif /* H5_NO_FAC_FREE_LISTS */
/*
diff --git a/src/H5FScache.c b/src/H5FScache.c
index b17a7f1..145d664 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -179,7 +179,7 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_fs_prot,
HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't wrap buffer")
/* Compute the size of the free space header on disk */
- size = H5FS_HEADER_SIZE(f);
+ size = (size_t)H5FS_HEADER_SIZE(f);
/* Get a pointer to a buffer that's large enough for header */
if(NULL == (hdr = (uint8_t *)H5WB_actual(wb, size)))
@@ -348,7 +348,7 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, FAIL, "can't wrap buffer")
/* Compute the size of the free space header on disk */
- size = H5FS_HEADER_SIZE(f);
+ size = (size_t)H5FS_HEADER_SIZE(f);
/* Get a pointer to a buffer that's large enough for header */
if(NULL == (hdr = (uint8_t *)H5WB_actual(wb, size)))
@@ -542,7 +542,7 @@ H5FS_cache_hdr_size(const H5F_t *f, const H5FS_t UNUSED *fspace, size_t *size_pt
HDassert(size_ptr);
/* Set size value */
- *size_ptr = H5FS_HEADER_SIZE(f);
+ *size_ptr = (size_t)H5FS_HEADER_SIZE(f);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FS_cache_hdr_size() */
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index 8cf64ef..9e7e40d 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -290,6 +290,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, FILE *stream, int
HGOTO_ERROR(H5E_FSPACE, H5E_SYSTEM, FAIL, "unable to dump file free space sections")
break;
+ case H5FS_NUM_CLIENT_ID:
default:
HDfprintf(stream, "Unknown client!\n");
break;
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index ad622f0..bd31b63 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -144,7 +144,7 @@ HDfprintf(stderr, "%s: fspace->addr = %a\n", FUNC, fspace->addr);
/* Set non-zero values */
sinfo->nbins = H5V_log2_gen(fspace->max_sect_size);
- sinfo->sect_prefix_size = H5FS_SINFO_PREFIX_SIZE(f);
+ sinfo->sect_prefix_size = (size_t)H5FS_SINFO_PREFIX_SIZE(f);
sinfo->sect_off_size = (fspace->max_sect_addr + 7) / 8;
sinfo->sect_len_size = H5V_limit_enc_size((uint64_t)fspace->max_sect_size);
#ifdef H5FS_SINFO_DEBUG
diff --git a/src/H5FSstat.c b/src/H5FSstat.c
index 18635c1..cc4822a 100644
--- a/src/H5FSstat.c
+++ b/src/H5FSstat.c
@@ -96,7 +96,7 @@ H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
stats->serial_sect_count = frsp->serial_sect_count;
stats->ghost_sect_count = frsp->ghost_sect_count;
stats->addr = frsp->addr;
- stats->hdr_size = H5FS_HEADER_SIZE(f);
+ stats->hdr_size = (size_t)H5FS_HEADER_SIZE(f);
stats->sect_addr = frsp->sect_addr;
stats->alloc_sect_size = frsp->alloc_sect_size;
stats->sect_size = frsp->sect_size;
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 7ee21f3..7698654 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -32,6 +32,7 @@
#include "H5Fpkg.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5Iprivate.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#include "H5SMprivate.h" /* Shared Object Header Messages */
@@ -458,7 +459,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
sblock->super_vers = super_vers;
/* Compute the size of the superblock */
- superblock_size = H5F_SUPERBLOCK_SIZE(super_vers, f);
+ superblock_size = (size_t)H5F_SUPERBLOCK_SIZE(super_vers, f);
/* Compute the size of the driver information block */
H5_ASSIGN_OVERFLOW(driver_size, H5FD_sb_size(f->shared->lf), hsize_t, size_t);
@@ -722,7 +723,7 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
/* Set the superblock size */
if(super_size)
- *super_size = H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
+ *super_size = (size_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
/* Set the superblock extension size */
if(super_ext_size) {
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index c341c6c..d58d1b5 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -178,7 +178,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, const void UNUSED
HDassert(((size_t)(p - sbuf)) == fixed_size);
/* Determine the size of the variable-length part of the superblock */
- variable_size = H5F_SUPERBLOCK_VARLEN_SIZE(super_vers, f);
+ variable_size = (size_t)H5F_SUPERBLOCK_VARLEN_SIZE(super_vers, f);
HDassert(variable_size > 0);
HDassert(fixed_size + variable_size <= sizeof(sbuf));
@@ -667,9 +667,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr,
*p++ = 0; /* reserved*/
*p++ = (uint8_t)HDF5_SHAREDHEADER_VERSION; /* (hard-wired) */
- HDassert(H5F_SIZEOF_ADDR(f) <= 255);
*p++ = (uint8_t)H5F_SIZEOF_ADDR(f);
- HDassert(H5F_SIZEOF_SIZE(f) <= 255);
*p++ = (uint8_t)H5F_SIZEOF_SIZE(f);
*p++ = 0; /* reserved */
@@ -737,9 +735,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr,
H5O_loc_t *root_oloc; /* Pointer to root group's object location */
/* Size of file addresses & offsets, and status flags */
- HDassert(H5F_SIZEOF_ADDR(f) <= 255);
*p++ = (uint8_t)H5F_SIZEOF_ADDR(f);
- HDassert(H5F_SIZEOF_SIZE(f) <= 255);
*p++ = (uint8_t)H5F_SIZEOF_SIZE(f);
*p++ = sblock->status_flags;
@@ -757,13 +753,13 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr,
H5F_addr_encode(f, &p, root_oloc->addr);
/* Compute superblock checksum */
- chksum = H5_checksum_metadata(buf, (H5F_SUPERBLOCK_SIZE(sblock->super_vers, f) - H5F_SIZEOF_CHKSUM), 0);
+ chksum = H5_checksum_metadata(buf, ((size_t)H5F_SUPERBLOCK_SIZE(sblock->super_vers, f) - H5F_SIZEOF_CHKSUM), 0);
/* Superblock checksum */
UINT32ENCODE(p, chksum);
/* Sanity check */
- HDassert((size_t)(p - buf) == H5F_SUPERBLOCK_SIZE(sblock->super_vers, f));
+ HDassert((size_t)(p - buf) == (size_t)H5F_SUPERBLOCK_SIZE(sblock->super_vers, f));
} /* end else */
/* Retrieve the total size of the superblock info */
@@ -915,7 +911,7 @@ H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr)
HDassert(size_ptr);
/* Set size value */
- *size_ptr = H5F_SUPERBLOCK_SIZE(sblock->super_vers, f);
+ *size_ptr = (size_t)H5F_SUPERBLOCK_SIZE(sblock->super_vers, f);
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5F_sblock_size() */
diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index 52d14fe..0739b40 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -223,7 +223,6 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
{
H5WB_t *wb = NULL; /* Wrapped buffer for node data */
uint8_t node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
- unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_flush)
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 0eb4764..61432b6 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -162,6 +162,8 @@ H5G_map_obj_type(H5O_type_t obj_type)
ret_value = H5G_TYPE;
break;
+ case H5O_TYPE_UNKNOWN:
+ case H5O_TYPE_NTYPES:
default:
ret_value = H5G_UNKNOWN;
} /* end switch */
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 8e87995..69037d4 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -129,6 +129,8 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
UINT32DECODE(*pp, ent->cache.slink.lval_offset);
break;
+ case H5G_CACHED_ERROR:
+ case H5G_NCACHED:
default:
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown symbol table entry cache type")
} /* end switch */
@@ -232,6 +234,8 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
UINT32ENCODE(*pp, ent->cache.slink.lval_offset);
break;
+ case H5G_CACHED_ERROR:
+ case H5G_NCACHED:
default:
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unknown symbol table entry cache type")
} /* end switch */
@@ -393,6 +397,9 @@ H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
} /* end case */
break;
+ case H5L_TYPE_ERROR:
+ case H5L_TYPE_EXTERNAL:
+ case H5L_TYPE_MAX:
default:
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
} /* end switch */
@@ -471,6 +478,8 @@ H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth, "Warning: Invalid heap address given, name not displayed!");
break;
+ case H5G_CACHED_ERROR:
+ case H5G_NCACHED:
default:
HDfprintf(stream, "*** Unknown symbol type %d\n", ent->type);
break;
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 05df268..d8e87b3 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -299,6 +299,9 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
info->u.val_size = HDstrlen(lnk->u.soft.name) + 1; /*count the null terminator*/
break;
+ case H5L_TYPE_ERROR:
+ case H5L_TYPE_EXTERNAL:
+ case H5L_TYPE_MAX:
default:
{
const H5L_class_t *link_class; /* User-defined link class */
diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 6145839..d95d705 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -61,7 +61,7 @@ typedef struct {
/* User data for checking if an object exists */
typedef struct {
/* upward */
- hbool_t exists; /* Whether the object exists */
+ htri_t exists; /* Whether the object exists */
} H5G_loc_exists_t;
/* User data for looking up an object in a group by index */
@@ -69,7 +69,7 @@ typedef struct {
/* downward */
hid_t lapl_id; /* LAPL to use for operation */
hid_t dxpl_id; /* DXPL to use for operation */
- H5_index_t idx_type; /* Index to use */
+ H5_index_t idx_type; /* Index to use */
H5_iter_order_t order; /* Iteration order within index */
hsize_t n; /* Offset within index */
@@ -245,6 +245,10 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
case H5I_REFERENCE:
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of reference")
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_VFL:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid object ID")
} /* end switch */
@@ -710,7 +714,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't check if object exists")
/* Set return value */
- ret_value = (htri_t)udata.exists;
+ ret_value = udata.exists;
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 581b649..b298ccf 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -687,6 +687,19 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
obj_path = H5T_nameof((H5T_t *)obj_ptr);
break;
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_FILE:
+ case H5I_DATASPACE:
+ case H5I_ATTR:
+ case H5I_REFERENCE:
+ case H5I_VFL:
+ case H5I_GENPROP_CLS:
+ case H5I_GENPROP_LST:
+ case H5I_ERROR_CLASS:
+ case H5I_ERROR_MSG:
+ case H5I_ERROR_STACK:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object")
} /* end switch */
@@ -962,6 +975,9 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
search_datatype = TRUE;
break;
+ case H5O_TYPE_UNKNOWN:
+ case H5O_TYPE_NTYPES:
+ /* Search and replace names through datatype IDs */
default:
HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "not valid object type")
} /* end switch */
@@ -973,6 +989,9 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
search_group = search_dataset = search_datatype = TRUE;
break;
+ case H5L_TYPE_ERROR:
+ case H5L_TYPE_EXTERNAL:
+ case H5L_TYPE_MAX:
default: /* User-defined link */
/* Check for unknown library-defined link type */
if(lnk->type < H5L_TYPE_UD_MIN)
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 3c07313..6661058 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -91,9 +91,9 @@ H5B_class_t H5B_SNODE[1] = {{
H5G_node_cmp3, /*cmp3 */
H5G_node_found, /*found */
H5G_node_insert, /*insert */
- H5B_RIGHT, /*critical key */
TRUE, /*follow min branch? */
TRUE, /*follow max branch? */
+ H5B_RIGHT, /*critical key */
H5G_node_remove, /*remove */
H5G_node_decode_key, /*decode */
H5G_node_encode_key, /*encode */
@@ -1404,7 +1404,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
/* Iterate over the symbol table node entries, adding to link table */
for(u = 0; u < sn->nsyms; u++) {
const char *name; /* Pointer to link name in heap */
- unsigned linkno; /* Link allocated */
+ size_t linkno; /* Link allocated */
/* Get pointer to link's name in the heap */
name = (const char *)H5HL_offset_into(udata->heap, sn->entry[u].name_off);
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index cba725f..74ef829 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -1089,6 +1089,10 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
udata->type = H5G_LINK;
break;
+ case H5G_CACHED_ERROR:
+ case H5G_NOTHING_CACHED:
+ case H5G_CACHED_STAB:
+ case H5G_NCACHED:
default:
{
H5O_loc_t tmp_oloc; /* Temporary object location */
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index 62c6bab..9e6fca0 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -538,6 +538,19 @@ H5G_user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigne
obj_path = H5T_nameof((H5T_t *)obj_ptr);
break;
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_FILE:
+ case H5I_DATASPACE:
+ case H5I_ATTR:
+ case H5I_REFERENCE:
+ case H5I_VFL:
+ case H5I_GENPROP_CLS:
+ case H5I_GENPROP_LST:
+ case H5I_ERROR_CLASS:
+ case H5I_ERROR_MSG:
+ case H5I_ERROR_STACK:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object type")
} /* end switch */
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index e9f3010..0779c89 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -280,6 +280,18 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get root group location from file ID")
break;
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_DATASPACE:
+ case H5I_ATTR:
+ case H5I_REFERENCE:
+ case H5I_VFL:
+ case H5I_GENPROP_CLS:
+ case H5I_GENPROP_LST:
+ case H5I_ERROR_CLASS:
+ case H5I_ERROR_MSG:
+ case H5I_ERROR_STACK:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ATOM, H5E_BADTYPE, FAIL, "not a valid location or object ID")
} /* end switch */
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 9c17ef6..2da0375 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -715,7 +715,7 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_nrows
haddr_t heap_addr; /* Address of heap header in the file */
uint32_t stored_chksum; /* Stored metadata checksum value */
uint32_t computed_chksum; /* Computed metadata checksum value */
- size_t u; /* Local index variable */
+ unsigned u; /* Local index variable */
H5HF_indirect_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_load)
diff --git a/src/H5system.c b/src/H5system.c
index 5725218..7776cbb 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -138,23 +138,26 @@ HDfprintf(FILE *stream, const char *fmt, ...)
s = fmt + 1;
/* Flags */
- while (HDstrchr ("-+ #", *s)) {
- switch (*s) {
- case '-':
- leftjust = 1;
- break;
- case '+':
- plussign = 1;
- break;
- case ' ':
- ldspace = 1;
- break;
- case '#':
- prefix = 1;
- break;
- } /*lint !e744 Switch statement doesn't _need_ default */
+ while(HDstrchr ("-+ #", *s)) {
+ switch(*s) {
+ case '-':
+ leftjust = 1;
+ break;
+
+ case '+':
+ plussign = 1;
+ break;
+
+ case ' ':
+ ldspace = 1;
+ break;
+
+ case '#':
+ prefix = 1;
+ break;
+ } /* end switch */ /*lint !e744 Switch statement doesn't _need_ default */
s++;
- }
+ } /* end while */
/* Field width */
if (HDisdigit (*s)) {