diff options
Diffstat (limited to 'tools/src')
-rw-r--r-- | tools/src/h5perf/sio_engine.c | 16 | ||||
-rw-r--r-- | tools/src/h5perf/sio_perf.c | 2 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_copy.c | 6 | ||||
-rw-r--r-- | tools/src/h5stat/h5stat.c | 10 | ||||
-rw-r--r-- | tools/src/misc/h5debug.c | 18 |
5 files changed, 26 insertions, 26 deletions
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index b80189b..ca7d4ae 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -263,7 +263,7 @@ done: break; default: /* unknown request */ - HDassert(0 && "Unknown IO type"); + assert(0 && "Unknown IO type"); break; } @@ -311,7 +311,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si default: /* unknown request */ HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); - HDassert(0 && "Unknown IO type"); + assert(0 && "Unknown IO type"); break; } @@ -660,7 +660,7 @@ dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer) for (k = 0; k < parms->rank; k++) { - HDassert(h5offset[k] >= 0); + assert(h5offset[k] >= 0); if (dims[k] <= (hsize_t)h5offset[k]) { dims[k] = dims[k] + h5count[k]; hrc = H5Sset_extent_simple(h5dset_space_id, parms->rank, dims, maxdims); @@ -684,7 +684,7 @@ dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer) default: /* unknown request */ HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); - HDassert(0 && "Unknown IO type"); + assert(0 && "Unknown IO type"); break; } /* switch (parms->io_type) */ } @@ -982,7 +982,7 @@ dset_read(int local_dim, file_descr *fd, parameters *parms, void *buffer, const default: /* unknown request */ HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); - HDassert(0 && "Unknown IO type"); + assert(0 && "Unknown IO type"); break; } /* switch (parms->io_type) */ } @@ -1167,7 +1167,7 @@ set_vfd(parameters *param) HDmemset(memb_name, 0, sizeof memb_name); HDmemset(memb_addr, 0, sizeof memb_addr); - HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); + assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); if (NULL == (sv = HDcalloc(1, sizeof(*sv)))) return -1; @@ -1310,7 +1310,7 @@ do_cleanupfile(iotype iot, char *filename) } else if (driver == H5FD_MULTI) { H5FD_mem_t mt; - HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); + assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { HDsnprintf(temp, temp_sz, "%s-%c.h5", filename, multi_letters[mt]); @@ -1326,7 +1326,7 @@ do_cleanupfile(iotype iot, char *filename) default: /* unknown request */ HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); - HDassert(0 && "Unknown IO type"); + assert(0 && "Unknown IO type"); break; } } diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index bf70fc3..870318e 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -328,7 +328,7 @@ run_test(iotype iot, parameters parms, struct options *opts) default: /* unknown request */ HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); - HDassert(0 && "Unknown IO tpe"); + assert(0 && "Unknown IO tpe"); break; } diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c index 5275481..59dc59e 100644 --- a/tools/src/h5repack/h5repack_copy.c +++ b/tools/src/h5repack/h5repack_copy.c @@ -1654,13 +1654,13 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size) } while (-1 == nwritten && EINTR == errno); if (-1 == nwritten) /* error */ H5TOOLS_GOTO_ERROR((-1), "HDwrite failed"); - HDassert(nwritten > 0); - HDassert(nwritten <= nbytes); + assert(nwritten > 0); + assert(nwritten <= nbytes); /* Update # of bytes left & offset in buffer */ nbytes -= nwritten; wbuf += nwritten; - HDassert(nbytes == 0 || wbuf < (rbuf + USERBLOCK_XFER_SIZE)); + assert(nbytes == 0 || wbuf < (rbuf + USERBLOCK_XFER_SIZE)); } /* end while */ /* Update size of userblock left to transfer */ diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index 495954e..021529e 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -308,7 +308,7 @@ attribute_stats(iter_t *iter, const H5O_info2_t *oi, const H5O_native_info_t *na bin = ceil_log10((unsigned long)oi->num_attrs); if ((bin + 1) > iter->attr_nbins) { iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long)); - HDassert(iter->attr_bins); + assert(iter->attr_bins); /* Initialize counts for intermediate bins */ while (iter->attr_nbins < bin) @@ -742,7 +742,7 @@ freespace_stats(hid_t fid, iter_t *iter) if (NULL == (sect_info = (H5F_sect_info_t *)HDcalloc((size_t)nsects, sizeof(H5F_sect_info_t)))) return (FAIL); nsects = H5Fget_free_sections(fid, H5FD_MEM_DEFAULT, (size_t)nsects, sect_info); - HDassert(nsects); + assert(nsects); } /* end else-if */ for (u = 0; u < (size_t)nsects; u++) { @@ -756,7 +756,7 @@ freespace_stats(hid_t fid, iter_t *iter) if (bin >= iter->sect_nbins) { /* Allocate more storage for section info */ iter->sect_bins = (unsigned long *)HDrealloc(iter->sect_bins, (bin + 1) * sizeof(unsigned long)); - HDassert(iter->sect_bins); + assert(iter->sect_bins); /* Initialize counts for intermediate bins */ while (iter->sect_nbins < bin) @@ -1720,7 +1720,7 @@ main(int argc, char *argv[]) if (H5Fget_filesize(fid, &iter.filesize) < 0) warn_msg("Unable to retrieve file size\n"); - HDassert(iter.filesize != 0); + assert(iter.filesize != 0); /* Get storage info for file-level structures */ if (H5Fget_info2(fid, &finfo) < 0) @@ -1754,7 +1754,7 @@ main(int argc, char *argv[]) if (H5Pget_file_space_strategy(fcpl, &iter.fs_strategy, &iter.fs_persist, &iter.fs_threshold) < 0) warn_msg("Unable to retrieve file space information\n"); - HDassert(iter.fs_strategy >= 0 && iter.fs_strategy < H5F_FSPACE_STRATEGY_NTYPES); + assert(iter.fs_strategy >= 0 && iter.fs_strategy < H5F_FSPACE_STRATEGY_NTYPES); if (H5Pget_file_space_page_size(fcpl, &iter.fsp_size) < 0) warn_msg("Unable to retrieve file space page size\n"); diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c index b15ae09..0d268c6 100644 --- a/tools/src/misc/h5debug.c +++ b/tools/src/misc/h5debug.c @@ -468,7 +468,7 @@ main(int argc, char *argv[]) * Debug a v2 B-tree header. */ const H5B2_class_t *cls = get_H5B2_class(sig); - HDassert(cls); + assert(cls); if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0)) { HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the " @@ -486,7 +486,7 @@ main(int argc, char *argv[]) * Debug a v2 B-tree internal node. */ const H5B2_class_t *cls = get_H5B2_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && @@ -522,7 +522,7 @@ main(int argc, char *argv[]) * Debug a v2 B-tree leaf node. */ const H5B2_class_t *cls = get_H5B2_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && @@ -649,7 +649,7 @@ main(int argc, char *argv[]) * Debug an extensible array header. */ const H5EA_class_t *cls = get_H5EA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0) { @@ -670,7 +670,7 @@ main(int argc, char *argv[]) * Debug an extensible array index block. */ const H5EA_class_t *cls = get_H5EA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { @@ -691,7 +691,7 @@ main(int argc, char *argv[]) * Debug an extensible array super block. */ const H5EA_class_t *cls = get_H5EA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) { @@ -711,7 +711,7 @@ main(int argc, char *argv[]) * Debug an extensible array data block. */ const H5EA_class_t *cls = get_H5EA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) { @@ -732,7 +732,7 @@ main(int argc, char *argv[]) * Debug a fixed array header. */ const H5FA_class_t *cls = get_H5FA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0) { @@ -752,7 +752,7 @@ main(int argc, char *argv[]) * Debug a fixed array data block. */ const H5FA_class_t *cls = get_H5FA_class(sig); - HDassert(cls); + assert(cls); /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { |