summaryrefslogtreecommitdiffstats
path: root/src/H5S.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
commite87fc517b8fc391cf18c268ce0b195eb7398a4a7 (patch)
tree494d1d87f71f87f320707989b7f12eec0f1d3805 /src/H5S.c
parenteef2829d1655e42225b2400c6e3d123be26e08a8 (diff)
downloadhdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.zip
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.gz
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.bz2
[svn-r4355] Purpose:
Code cleanup (sorta) Description: When the first versions of the HDF5 library were designed, I remembered vividly the difficulties of porting code from a 32-bit platform to a 16-bit platform and asked that people use intn & uintn instead of int & unsigned int, respectively. However, in hindsight, this was overkill and unnecessary since we weren't going to be porting the HDF5 library to 16-bit architectures. Currently, the extra uintn & intn typedefs are causing problems for users who'd like to include both the HDF5 and HDF4 header files in one source module (like Kent's h4toh5 library). Solution: Changed the uintn & intn's to unsigned and int's respectively. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'src/H5S.c')
-rw-r--r--src/H5S.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/H5S.c b/src/H5S.c
index a8ecad6..5e644ef 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -24,13 +24,13 @@
#include "H5Spkg.h" /* Data-space functions */
/* Local static function prototypes */
-herr_t H5S_set_extent_simple (H5S_t *space, uintn rank, const hsize_t *dims,
+herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
const hsize_t *max);
/* Interface initialization */
#define PABLO_MASK H5S_mask
#define INTERFACE_INIT H5S_init_interface
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
static herr_t H5S_init_interface(void);
/* Tables of file and memory conversion information */
@@ -123,11 +123,11 @@ H5S_init_interface(void)
EXAMPLES
REVISION LOG
--------------------------------------------------------------------------*/
-intn
+int
H5S_term_interface(void)
{
size_t i;
- intn n=0;
+ int n=0;
#ifdef H5S_DEBUG
int j, nprints=0;
@@ -654,7 +654,7 @@ H5Sextent_copy(hid_t dst_id,hid_t src_id)
herr_t
H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src)
{
- uintn u;
+ unsigned u;
FUNC_ENTER(H5S_extent_copy, FAIL);
@@ -755,7 +755,7 @@ hssize_t
H5S_get_simple_extent_npoints(const H5S_t *ds)
{
hssize_t ret_value = -1;
- uintn u;
+ unsigned u;
FUNC_ENTER(H5S_get_simple_extent_npoints, -1);
@@ -847,7 +847,7 @@ hsize_t
H5S_get_npoints_max(const H5S_t *ds)
{
hsize_t ret_value = 0;
- uintn u;
+ unsigned u;
FUNC_ENTER(H5S_get_npoints_max, 0);
@@ -910,7 +910,7 @@ int
H5Sget_simple_extent_ndims(hid_t space_id)
{
H5S_t *ds = NULL;
- intn ret_value = 0;
+ int ret_value = 0;
FUNC_ENTER(H5Sget_simple_extent_ndims, FAIL);
H5TRACE1("Is","i",space_id);
@@ -942,10 +942,10 @@ H5Sget_simple_extent_ndims(hid_t space_id)
*
*-------------------------------------------------------------------------
*/
-intn
+int
H5S_get_simple_extent_ndims(const H5S_t *ds)
{
- intn ret_value = FAIL;
+ int ret_value = FAIL;
FUNC_ENTER(H5S_get_simple_extent_ndims, FAIL);
@@ -1001,7 +1001,7 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
hsize_t maxdims[]/*out*/)
{
H5S_t *ds = NULL;
- intn ret_value = 0;
+ int ret_value = 0;
FUNC_ENTER(H5Sget_simple_extent_dims, FAIL);
H5TRACE3("Is","ixx",space_id,dims,maxdims);
@@ -1033,11 +1033,11 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
*
*-------------------------------------------------------------------------
*/
-intn
+int
H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
{
- intn ret_value = FAIL;
- intn i;
+ int ret_value = FAIL;
+ int i;
FUNC_ENTER(H5S_get_simple_extent_dims, FAIL);
@@ -1190,10 +1190,10 @@ H5S_read(H5G_entry_t *ent)
*
*-------------------------------------------------------------------------
*/
-intn
+int
H5S_cmp(const H5S_t *ds1, const H5S_t *ds2)
{
- uintn u;
+ unsigned u;
FUNC_ENTER(H5S_cmp, 0);
@@ -1315,7 +1315,7 @@ H5Sis_simple(hid_t space_id)
USAGE
herr_t H5Sset_extent_simple(space_id, rank, dims, max)
hid_t space_id; IN: Dataspace object to query
- intn rank; IN: # of dimensions for the dataspace
+ int rank; IN: # of dimensions for the dataspace
const size_t *dims; IN: Size of each dimension for the dataspace
const size_t *max; IN: Maximum size of each dimension for the
dataspace
@@ -1337,7 +1337,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
const hsize_t max[/*rank*/])
{
H5S_t *space = NULL; /* dataspace to modify */
- intn u; /* local counting variable */
+ int u; /* local counting variable */
FUNC_ENTER(H5Sset_extent_simple, FAIL);
H5TRACE4("e","iIs*[a1]h*[a1]h",space_id,rank,dims,max);
@@ -1376,7 +1376,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
}
/* Do it */
- if (H5S_set_extent_simple(space, (uintn)rank, dims, max)<0) {
+ if (H5S_set_extent_simple(space, (unsigned)rank, dims, max)<0) {
HRETURN_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL,
"unable to set simple extent");
}
@@ -1401,7 +1401,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
*-------------------------------------------------------------------------
*/
herr_t
-H5S_set_extent_simple (H5S_t *space, uintn rank, const hsize_t *dims,
+H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
const hsize_t *max)
{
FUNC_ENTER(H5S_set_extent_simple, FAIL);
@@ -1619,11 +1619,11 @@ H5S_find (const H5S_t *mem_space, const H5S_t *file_space)
*
*-------------------------------------------------------------------------
*/
-intn
+int
H5S_extend (H5S_t *space, const hsize_t *size)
{
- intn ret_value=0;
- uintn u;
+ int ret_value=0;
+ unsigned u;
FUNC_ENTER (H5S_extend, FAIL);
@@ -1729,7 +1729,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
HGOTO_ERROR (H5E_DATASPACE, H5E_CANTCREATE, FAIL,
"can't create simple dataspace");
}
- if(H5S_set_extent_simple(space,(uintn)rank,dims,maxdims)<0) {
+ if(H5S_set_extent_simple(space,(unsigned)rank,dims,maxdims)<0) {
HGOTO_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL,
"can't set dimensions");
}
@@ -1915,7 +1915,7 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset)
*-------------------------------------------------------------------------
*/
herr_t
-H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent, intn fwidth)
+H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth)
{
const H5S_t *mesg = (const H5S_t*)_mesg;