summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/H5AC.c24
-rw-r--r--src/H5Dcontig.c2
-rw-r--r--src/H5Dio.c12
-rw-r--r--src/H5Distore.c2
-rw-r--r--src/H5Dseq.c6
-rw-r--r--src/H5FDmpio.c9
-rw-r--r--src/H5Fcontig.c2
-rw-r--r--src/H5Fistore.c2
-rw-r--r--src/H5Fpkg.h2
-rw-r--r--src/H5Fseq.c6
-rw-r--r--src/H5G.c12
-rw-r--r--src/H5HP.c3
-rw-r--r--src/H5O.c2
-rw-r--r--src/H5Pdxpl.c8
-rw-r--r--src/H5R.c4
-rw-r--r--src/H5RS.c2
-rw-r--r--src/H5Smpio.c4
-rw-r--r--src/H5Spkg.h11
-rw-r--r--src/H5Sprivate.h9
-rw-r--r--test/tselect.c4
-rw-r--r--test/tvlstr.c1
21 files changed, 73 insertions, 54 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index ffdad6e..cc30073 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -793,7 +793,9 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsi
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
#ifndef NDEBUG
H5P_genplist_t *dxpl; /* Dataset transfer property list */
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
@@ -824,7 +826,9 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsi
assert((*info)!=NULL);
assert((*info)->dirty==0);
+#ifdef H5AC_DEBUG
type_id=(*info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Destroy 'current' information */
dest = (*info)->type->dest;
@@ -916,7 +920,9 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsi
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
#ifndef NDEBUG
H5P_genplist_t *dxpl; /* Dataset transfer property list */
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
@@ -944,7 +950,9 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsi
assert((*info)!=NULL);
assert((*info)->dirty==0);
+#ifdef H5AC_DEBUG
type_id=(*info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Destroy 'current' information */
dest = (*info)->type->dest;
@@ -1061,7 +1069,9 @@ H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
H5P_genplist_t *dxpl; /* Dataset transfer property list */
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
@@ -1087,7 +1097,9 @@ H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *
assert((*info)!=NULL);
assert((*info)->dirty==0);
+#ifdef H5AC_DEBUG
type_id=(*info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Destroy 'current' information */
dest = (*info)->type->dest;
@@ -1230,7 +1242,9 @@ H5AC_rename(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t old_addr,
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **new_dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
H5P_genplist_t *dxpl; /* Dataset transfer property list */
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
@@ -1256,7 +1270,9 @@ H5AC_rename(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t old_addr,
assert((*new_info)!=NULL);
assert((*new_info)->dirty==0);
+#ifdef H5AC_DEBUG
type_id=(*new_info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Destroy 'current' information */
dest = (*new_info)->type->dest;
@@ -1324,7 +1340,9 @@ H5AC_rename(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t old_addr,
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **old_dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
/* Get pointer to new 'held' information */
old_dinfo = cache->dslot + old_idx;
@@ -1334,7 +1352,9 @@ H5AC_rename(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t old_addr,
/* Sanity check */
assert((*old_dinfo)->dirty);
+#ifdef H5AC_DEBUG
type_id=(*old_info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Restore 'held' information back to 'current' information */
(*old_info)=(*old_dinfo);
@@ -1654,7 +1674,9 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
/* If MPIO, MPIPOSIX, or FPHDF5 is used, do special parallel I/O actions */
if(IS_H5FD_MPIO(f) || IS_H5FD_MPIPOSIX(f) || IS_H5FD_FPHDF5(f)) {
H5AC_info_t **dinfo;
+#ifdef H5AC_DEBUG
H5AC_subid_t type_id;
+#endif /* H5AC_DEBUG */
H5P_genplist_t *dxpl; /* Dataset transfer property list */
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
@@ -1680,7 +1702,9 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
assert((*info)!=NULL);
assert((*info)->dirty==0);
+#ifdef H5AC_DEBUG
type_id=(*info)->type->id; /* Remember this for later */
+#endif /* H5AC_DEBUG */
/* Destroy 'current' information */
dest = (*info)->type->dest;
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 3a14175..42ed109 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -420,7 +420,7 @@ done:
*
*-------------------------------------------------------------------------
*/
-herr_t
+ssize_t
H5F_contig_readvv(H5F_t *f, hsize_t _max_data, haddr_t _addr,
size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
diff --git a/src/H5Dio.c b/src/H5Dio.c
index f07666d..2053139 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -62,11 +62,6 @@ typedef struct fm_map {
static int interface_initialize_g = 0;
#define INTERFACE_INIT NULL
-#ifdef H5_HAVE_PARALLEL
-/* Global vars whose value can be set from environment variable also */
-extern hbool_t H5S_mpi_opt_types_g;
-#endif /* H5_HAVE_PARALLEL */
-
/* Local functions */
static herr_t H5D_read(H5D_t *dataset, const H5T_t *mem_type,
const H5S_t *mem_space, const H5S_t *file_space,
@@ -538,7 +533,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* Collect Parallel I/O information for possible later use */
if (H5FD_MPIO==H5P_peek_hid_t(dx_plist,H5D_XFER_VFL_ID_NAME)) {
doing_mpio++;
- xfer_mode=H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/* Collective access is not permissible without the MPIO or MPIPOSIX driver */
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE &&
@@ -777,7 +772,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* Collect Parallel I/O information for possible later use */
if (H5FD_MPIO==H5P_peek_hid_t(dx_plist,H5D_XFER_VFL_ID_NAME)) {
doing_mpio++;
- xfer_mode=H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/* Collective access is not permissible without the MPIO or MPIPOSIX driver */
@@ -2100,7 +2095,6 @@ H5D_chunk_mem_file_map(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *file_
hbool_t iter_init=0; /* Selection iteration info has been initialized */
unsigned f_ndims; /* The number of dimensions of the file's dataspace */
int sm_ndims; /* The number of dimensions of the memory buffer's dataspace (signed) */
- unsigned m_ndims; /* The number of dimensions of the memory buffer's dataspace */
hsize_t f_dims[H5O_LAYOUT_NDIMS]; /* Dimensionality of file dataspace */
char bogus; /* "bogus" buffer to pass to selection iterator */
unsigned u; /* Local index variable */
@@ -2127,7 +2121,7 @@ H5D_chunk_mem_file_map(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *file_
f_ndims=dataset->layout.ndims-1;
if((sm_ndims = H5S_get_simple_extent_ndims(tmp_mspace))<0)
HGOTO_ERROR (H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimension number");
- fm->m_ndims=m_ndims=sm_ndims;
+ fm->m_ndims=sm_ndims;
if(H5S_get_simple_extent_dims(file_space, f_dims, NULL)<0)
HGOTO_ERROR (H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality");
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 3209814..098e007 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -2621,7 +2621,7 @@ H5F_istore_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out
/* Check for overlap with the sieve buffer and reset it */
if (H5F_sieve_overlap_clear(f, addr, (hsize_t)lt_key->nbytes)<0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to clear sieve buffer");
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, H5B_INS_ERROR, "unable to clear sieve buffer");
/* Remove raw data chunk from file */
H5FD_free(f->shared->lf, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes);
diff --git a/src/H5Dseq.c b/src/H5Dseq.c
index 5248b0a..0e29978 100644
--- a/src/H5Dseq.c
+++ b/src/H5Dseq.c
@@ -193,7 +193,7 @@ H5F_seq_readvv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
#ifdef H5_HAVE_PARALLEL
H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT;
#endif /* H5_HAVE_PARALLEL */
- herr_t ret_value = SUCCEED; /* Return value */
+ ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5F_seq_readvv, FAIL);
@@ -229,7 +229,7 @@ H5F_seq_readvv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
/* Check if we are using the MPIO driver (for the DXPL) */
if(H5FD_MPIO==driver_id) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
} /* end if */
@@ -373,7 +373,7 @@ H5F_seq_writevv(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
/* Check if we are using the MPIO driver (for the DXPL) */
if(H5FD_MPIO==driver_id) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
} /* end if */
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 32f6a1c..59e2c83 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -1065,10 +1065,9 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
/* Check for debug commands in the info parameter */
{
char debug_str[128];
- int infoerr, flag, i;
+ int flag, i;
if (MPI_INFO_NULL != info_dup) {
- infoerr = MPI_Info_get(fa->info, H5F_MPIO_DEBUG_KEY, 127,
- debug_str, &flag);
+ MPI_Info_get(fa->info, H5F_MPIO_DEBUG_KEY, 127, debug_str, &flag);
if (flag) {
fprintf(stdout, "H5FD_mpio debug flags=%s\n", debug_str );
for (i=0;
@@ -1514,7 +1513,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
if (H5FD_MPIO==H5P_get_driver(plist)) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/*
@@ -1821,7 +1820,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
if (H5FD_MPIO==H5P_get_driver(plist)) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/*
diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c
index 3a14175..42ed109 100644
--- a/src/H5Fcontig.c
+++ b/src/H5Fcontig.c
@@ -420,7 +420,7 @@ done:
*
*-------------------------------------------------------------------------
*/
-herr_t
+ssize_t
H5F_contig_readvv(H5F_t *f, hsize_t _max_data, haddr_t _addr,
size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 3209814..098e007 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -2621,7 +2621,7 @@ H5F_istore_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out
/* Check for overlap with the sieve buffer and reset it */
if (H5F_sieve_overlap_clear(f, addr, (hsize_t)lt_key->nbytes)<0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to clear sieve buffer");
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, H5B_INS_ERROR, "unable to clear sieve buffer");
/* Remove raw data chunk from file */
H5FD_free(f->shared->lf, H5FD_MEM_DRAW, dxpl_id, addr, (hsize_t)lt_key->nbytes);
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 0b875b7..93d26a9 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -213,7 +213,7 @@ H5_DLL herr_t H5F_istore_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * str
int indent, int fwidth, int ndims);
/* Functions that operate on contiguous storage wrt boot block */
-H5_DLL herr_t H5F_contig_readvv(H5F_t *f, hsize_t _max_data, haddr_t _addr,
+H5_DLL ssize_t H5F_contig_readvv(H5F_t *f, hsize_t _max_data, haddr_t _addr,
size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[],
hid_t dxpl_id, void *buf);
diff --git a/src/H5Fseq.c b/src/H5Fseq.c
index 5248b0a..0e29978 100644
--- a/src/H5Fseq.c
+++ b/src/H5Fseq.c
@@ -193,7 +193,7 @@ H5F_seq_readvv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
#ifdef H5_HAVE_PARALLEL
H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT;
#endif /* H5_HAVE_PARALLEL */
- herr_t ret_value = SUCCEED; /* Return value */
+ ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5F_seq_readvv, FAIL);
@@ -229,7 +229,7 @@ H5F_seq_readvv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout,
/* Check if we are using the MPIO driver (for the DXPL) */
if(H5FD_MPIO==driver_id) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
} /* end if */
@@ -373,7 +373,7 @@ H5F_seq_writevv(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
/* Check if we are using the MPIO driver (for the DXPL) */
if(H5FD_MPIO==driver_id) {
/* Get the transfer mode */
- xfer_mode=H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+ xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
} /* end if */
diff --git a/src/H5G.c b/src/H5G.c
index d04b611..1f758ec 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -546,19 +546,19 @@ H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
{
H5G_t *group = NULL;
hsize_t num_objs;
- H5G_obj_t ret_value = H5G_UNKNOWN;
+ H5G_obj_t ret_value;
- FUNC_ENTER_API(H5Gget_objtype_by_idx, FAIL);
+ FUNC_ENTER_API(H5Gget_objtype_by_idx, H5G_UNKNOWN);
H5TRACE2("Is","ih",group_id,idx);
/* Check args */
if (NULL==(group = H5I_object_verify(group_id,H5I_GROUP)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a group");
if (H5G_get_num_objs(group, &num_objs, H5AC_ind_dxpl_id)<0)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to retrieve number of members");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "unable to retrieve number of members");
if(idx >= num_objs)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "index out of bound");
/*call private function*/
ret_value = H5G_get_objtype_by_idx(group, idx, H5AC_ind_dxpl_id);
@@ -2520,7 +2520,7 @@ H5G_get_objname_by_idx(H5G_t *grp, hsize_t idx, char* name, size_t size, hid_t d
H5G_node_name, grp->ent.cache.stab.btree_addr, &udata))<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed");
- ret_value = HDstrlen(udata.name);
+ ret_value = (ssize_t)HDstrlen(udata.name);
if(name && size>0) {
HDstrncpy(name, udata.name, MIN((size_t)(ret_value+1),size-1));
if((size_t)ret_value >= size)
diff --git a/src/H5HP.c b/src/H5HP.c
index 325392a..d62bd4e 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -432,7 +432,8 @@ H5HP_count(const H5HP_t *heap)
assert(heap->heap[0].obj==NULL);
/* Return the number of objects in the heap */
- ret_value=heap->nobjs;
+ H5_CHECK_OVERFLOW(heap->nobjs,size_t,ssize_t);
+ ret_value=(ssize_t)heap->nobjs;
done:
/* No post-condition check necessary, since heap is constant */
diff --git a/src/H5O.c b/src/H5O.c
index 573222a..21a9b36 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -3250,7 +3250,7 @@ H5O_debug_id(hid_t type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *str
/* Call the debug method in the class */
if ((ret_value = (type->debug)(f, dxpl_id, mesg, stream, indent, fwidth))<0)
- HGOTO_ERROR (H5E_OHDR, H5E_INTERNAL, FAIL, "unable to debug message");
+ HGOTO_ERROR (H5E_OHDR, H5E_BADTYPE, FAIL, "unable to debug message");
done:
FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 23e3758..6c042c8 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -484,20 +484,20 @@ H5Pget_edc_check(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
H5Z_EDC_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_edc_check, FAIL);
+ FUNC_ENTER_API(H5Pget_edc_check, H5Z_ERROR_EDC);
H5TRACE1("Ze","i",plist_id);
/* Get the plist structure */
if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
- HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
+ HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5Z_ERROR_EDC, "can't find object for ID");
/* Update property list */
if (H5P_get(plist,H5D_XFER_EDC_NAME,&ret_value)<0)
- HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
+ HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, H5Z_ERROR_EDC, "unable to set value");
/* check valid value */
if (ret_value != H5Z_ENABLE_EDC && ret_value != H5Z_DISABLE_EDC)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid value");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5Z_ERROR_EDC, "not a valid value");
done:
FUNC_LEAVE_API(ret_value);
diff --git a/src/H5R.c b/src/H5R.c
index c9a28c1..2ac57e0 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -870,9 +870,9 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
/* Check args */
if (NULL == (loc = H5G_loc(id)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location");
if(ref_type<=H5R_BADTYPE || ref_type>=H5R_MAXTYPE)
- HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type");
+ HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference type");
if(_ref==NULL)
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer");
diff --git a/src/H5RS.c b/src/H5RS.c
index 93ef3aa..f65244e 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -392,7 +392,7 @@ H5RS_len(const H5RS_str_t *rs)
assert(rs);
assert(rs->s);
- ret_value=HDstrlen(rs->s);
+ ret_value=(ssize_t)HDstrlen(rs->s);
done:
FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 03f3f4c..224f15a 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -961,7 +961,7 @@ done:
*/
herr_t
H5S_mpio_spaces_read(H5F_t *f, const H5O_layout_t *layout,
- H5P_genplist_t UNUSED *dc_plist, const H5O_efl_t UNUSED *efl, size_t elmt_size,
+ H5P_genplist_t UNUSED *dc_plist, const H5D_storage_t UNUSED *store, size_t elmt_size,
const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
void *buf/*out*/)
{
@@ -1000,7 +1000,7 @@ done:
*/
herr_t
H5S_mpio_spaces_write(H5F_t *f, H5O_layout_t *layout,
- H5P_genplist_t UNUSED *dc_plist, const H5O_efl_t UNUSED *efl, size_t elmt_size,
+ H5P_genplist_t UNUSED *dc_plist, const H5D_storage_t UNUSED *store, size_t elmt_size,
const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
const void *buf)
{
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 61f291f..9d10460 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -282,7 +282,7 @@ H5_DLL herr_t H5S_none_get_seq_list(const H5S_t *space, unsigned flags,
H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f,
const struct H5O_layout_t *layout,
H5P_genplist_t *dc_plist,
- const H5O_efl_t *efl,
+ const H5D_storage_t *store,
size_t elmt_size, const H5S_t *file_space,
const H5S_t *mem_space, hid_t dxpl_id,
void *buf/*out*/);
@@ -291,7 +291,7 @@ H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f,
H5_DLL herr_t H5S_mpio_spaces_write(H5F_t *f,
struct H5O_layout_t *layout,
H5P_genplist_t *dc_plist,
- const H5O_efl_t *efl,
+ const H5D_storage_t *store,
size_t elmt_size, const H5S_t *file_space,
const H5S_t *mem_space, hid_t dxpl_id,
const void *buf);
@@ -301,13 +301,6 @@ H5_DLL herr_t H5S_mpio_spaces_write(H5F_t *f,
H5_DLL htri_t H5S_mpio_opt_possible(const H5S_t *mem_space,
const H5S_t *file_space, const unsigned flags);
-#ifndef _H5S_IN_H5S_C
-/* Global vars whose value comes from environment variable */
-/* (Defined in H5S.c) */
-H5_DLLVAR hbool_t H5S_mpi_opt_types_g;
-H5_DLLVAR hbool_t H5S_mpi_prefer_derived_types_g;
-#endif /* _H5S_IN_H5S_C */
-
#endif /* H5_HAVE_PARALLEL */
#endif /*_H5Spkg_H*/
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 36675ea..5792e67 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -220,4 +220,13 @@ H5_DLL hsize_t H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter);
H5_DLL herr_t H5S_select_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem);
H5_DLL herr_t H5S_select_iter_release(H5S_sel_iter_t *sel_iter);
+#ifdef H5_HAVE_PARALLEL
+#ifndef _H5S_IN_H5S_C
+/* Global vars whose value comes from environment variable */
+/* (Defined in H5S.c) */
+H5_DLLVAR hbool_t H5S_mpi_opt_types_g;
+H5_DLLVAR hbool_t H5S_mpi_prefer_derived_types_g;
+#endif /* _H5S_IN_H5S_C */
+#endif /* H5_HAVE_PARALLEL */
+
#endif /* _H5Sprivate_H */
diff --git a/test/tselect.c b/test/tselect.c
index c53191e..528d15e 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -5249,11 +5249,11 @@ test_scalar_select2(void)
} H5E_END_TRY;
VERIFY(ret, FAIL, "H5Sselect_hyperslab");
- /* Select no elements in memory & file with "none" selections */
+ /* Select no elements in memory & file with "none" selection */
ret = H5Sselect_none(sid);
CHECK(ret, FAIL, "H5Sselect_none");
- /* Select no elements in memory & file with "none" selections */
+ /* Select all elements in memory & file with "all" selection */
ret = H5Sselect_all(sid);
CHECK(ret, FAIL, "H5Sselect_none");
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 3c34781..8a4ac99 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -440,7 +440,6 @@ static void
test_compact_vlstring(void)
{
const char *wdata[SPACE1_DIM1] = {"one", "two", "three", "four"};
- const char *wdata2[SPACE1_DIM1] = {NULL, NULL, NULL, NULL};
char *rdata[SPACE1_DIM1]; /* Information read in */
hid_t fid1; /* HDF5 File IDs */
hid_t dataset; /* Dataset ID */
generated by cgit v0.12 at 2024-11-06 00:21:02 (GMT)