From 1d038e08c18dd40e5157d8d91c56437abbf45413 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 15 Jan 2008 16:29:27 -0500 Subject: [svn-r14421] Description: Minor cleanups and clarifications to prototype information. Tested on: Mac OS X/32 10.5.1 (amazon) --- src/H5D.c | 2 +- src/H5Ddeprec.c | 2 +- src/H5Dpublic.h | 4 ++-- src/H5Ppublic.h | 2 +- src/H5Shyper.c | 5 +++-- src/H5Spoint.c | 5 +++-- src/H5Spublic.h | 9 ++++++--- src/H5Sselect.c | 6 +++--- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/H5D.c b/src/H5D.c index 49dc4a5..7153ea5 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -988,7 +988,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Dset_extent(hid_t dset_id, const hsize_t *size) +H5Dset_extent(hid_t dset_id, const hsize_t size[]) { H5D_t *dset; /* Dataset for this operation */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index eaa9057..8f8aa50 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -278,7 +278,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Dextend(hid_t dset_id, const hsize_t *size) +H5Dextend(hid_t dset_id, const hsize_t size[]) { H5D_t *dset; herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index d7f6574..0d8b63f 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -113,7 +113,7 @@ H5_DLL herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, voi H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *size); H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type, void *buf, hid_t buf_type, hid_t space); -H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t *size); +H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); H5_DLL herr_t H5Ddebug(hid_t dset_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. @@ -132,7 +132,7 @@ H5_DLL herr_t H5Ddebug(hid_t dset_id); H5_DLL hid_t H5Dcreate1(hid_t file_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id); H5_DLL hid_t H5Dopen1(hid_t file_id, const char *name); -H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t *size); +H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t size[]); #endif /* H5_NO_DEPRECATED_SYMBOLS */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index f102c80..c5b4b8b 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -273,7 +273,7 @@ H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low, /* Dataset creation property list (DCPL) routines */ H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout); H5_DLL H5D_layout_t H5Pget_layout(hid_t plist_id); -H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[]); +H5_DLL herr_t H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]); H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/); H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 56bb552..a947b2b 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -2558,7 +2558,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc hid_t dsid; IN: Dataspace ID of selection to query hsize_t startblock; IN: Hyperslab block to start with hsize_t numblocks; IN: Number of hyperslab blocks to get - hsize_t *buf; OUT: List of hyperslab blocks selected + hsize_t buf[]; OUT: List of hyperslab blocks selected RETURNS Non-negative on success, negative on failure DESCRIPTION @@ -2579,7 +2579,8 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf) +H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, + hsize_t numblocks, hsize_t buf[/*numblocks*/]) { H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value; /* return value */ diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 6a3c122..9690eb4 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -964,7 +964,7 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint hid_t dsid; IN: Dataspace ID of selection to query hsize_t startpoint; IN: Element point to start with hsize_t numpoints; IN: Number of element points to get - hsize_t *buf; OUT: List of element points selected + hsize_t buf[]; OUT: List of element points selected RETURNS Non-negative on success, negative on failure DESCRIPTION @@ -984,7 +984,8 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf) +H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, + hsize_t numpoints, hsize_t buf[/*numpoints*/]) { H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value; /* return value */ diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 4b26cc8..43f79b9 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -137,9 +137,12 @@ H5_DLL herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset); H5_DLL htri_t H5Sselect_valid(hid_t spaceid); H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid); -H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf); -H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf); -H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end); +H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, + hsize_t numblocks, hsize_t buf[/*numblocks*/]); +H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, + hsize_t numpoints, hsize_t buf[/*numpoints*/]); +H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[], + hsize_t end[]); H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid); #ifdef __cplusplus diff --git a/src/H5Sselect.c b/src/H5Sselect.c index fa413a5..ed3c740 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -491,8 +491,8 @@ done: USAGE herr_t H5S_get_select_bounds(space, start, end) hid_t dsid; IN: Dataspace ID of selection to query - hsize_t *start; OUT: Starting coordinate of bounding box - hsize_t *end; OUT: Opposite coordinate of bounding box + hsize_t start[]; OUT: Starting coordinate of bounding box + hsize_t end[]; OUT: Opposite coordinate of bounding box RETURNS Non-negative on success, negative on failure DESCRIPTION @@ -514,7 +514,7 @@ done: REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end) +H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[]) { H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value; /* return value */ -- cgit v0.12