diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-14 22:09:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-14 22:09:56 (GMT) |
| commit | e87fc517b8fc391cf18c268ce0b195eb7398a4a7 (patch) | |
| tree | 494d1d87f71f87f320707989b7f12eec0f1d3805 /src | |
| parent | eef2829d1655e42225b2400c6e3d123be26e08a8 (diff) | |
| download | hdf5-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')
89 files changed, 1082 insertions, 1089 deletions
@@ -51,7 +51,7 @@ H5_debug_t H5_debug_g; /*debugging info */ static void H5_debug_mask(const char*); /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /*-------------------------------------------------------------------------- @@ -159,8 +159,8 @@ H5_init_library(void) void H5_term_library(void) { - intn pending, ntries=0, n; - uintn at=0; + int pending, ntries=0, n; + unsigned at=0; char loop[1024]; H5E_auto_t func; @@ -1332,7 +1332,7 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...) va_list ap; char buf[64], *rest; const char *argname; - intn argno=0, ptr, asize_idx; + int argno=0, ptr, asize_idx; hssize_t asize[16]; hssize_t i; void *vp = NULL; @@ -32,7 +32,7 @@ #define PABLO_MASK H5A_mask /* Is the interface initialized? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5A_init_interface static herr_t H5A_init_interface(void); @@ -91,10 +91,10 @@ H5A_init_interface(void) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -intn +int H5A_term_interface(void) { - intn n=0; + int n=0; if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_ATTR))) { @@ -223,7 +223,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type, { H5A_t *attr = NULL; H5A_t found_attr; - intn seq=0; + int seq=0; hid_t ret_value = FAIL; FUNC_ENTER(H5A_create, FAIL); @@ -388,7 +388,7 @@ hid_t H5Aopen_name(hid_t loc_id, const char *name) { H5G_entry_t *ent = NULL; /*Symtab entry of object to attribute*/ - intn idx=0; + int idx=0; hid_t ret_value = FAIL; FUNC_ENTER(H5Aopen_name, FAIL); @@ -1158,7 +1158,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) H5G_entry_t *ent = NULL; /*symtab ent of object to attribute */ H5A_t found_attr; herr_t ret_value = 0; - intn idx; + int idx; FUNC_ENTER(H5Aiterate, FAIL); H5TRACE4("e","i*Iuxx",loc_id,attr_num,op,op_data); @@ -1177,7 +1177,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) * Look up the attribute for the object. Make certain the start point is * reasonable. */ - idx = attr_num ? (intn)*attr_num : 0; + idx = attr_num ? (int)*attr_num : 0; if(idx<H5O_count(ent, H5O_ATTR)) { while(H5O_read(ent, H5O_ATTR, idx++, &found_attr)!=NULL) { /* @@ -1228,7 +1228,7 @@ H5Adelete(hid_t loc_id, const char *name) { H5A_t found_attr; H5G_entry_t *ent = NULL; /*symtab ent of object to attribute */ - intn idx=0, found=-1; + int idx=0, found=-1; herr_t ret_value = FAIL; FUNC_ENTER(H5Aopen_name, FAIL); @@ -44,7 +44,7 @@ */ #define PABLO_MASK H5AC_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #ifdef H5AC_SORT_BY_ADDR static H5AC_t *current_cache_g = NULL; /*for sorting */ @@ -54,7 +54,7 @@ static H5AC_t *current_cache_g = NULL; /*for sorting */ H5FL_DEFINE_STATIC(H5AC_t); /* Declare a PQ free list to manage the cache mapping array information */ -H5FL_ARR_DEFINE_STATIC(intn,-1); +H5FL_ARR_DEFINE_STATIC(int,-1); /* Declare a PQ free list to manage the cache slot array information */ H5FL_ARR_DEFINE_STATIC(H5AC_info_ptr_t,-1); @@ -85,8 +85,8 @@ H5FL_ARR_DEFINE_STATIC(H5AC_prot_t,-1); * *------------------------------------------------------------------------- */ -intn -H5AC_create(H5F_t *f, intn size_hint) +int +H5AC_create(H5F_t *f, int size_hint) { H5AC_t *cache = NULL; FUNC_ENTER(H5AC_create, FAIL); @@ -149,7 +149,7 @@ H5AC_dest(H5F_t *f) } #ifdef H5AC_DEBUG { - uintn i; + unsigned i; for (i=0; i<cache->nslots; i++) { cache->prot[i].slot = H5MM_xfree(cache->prot[i].slot); cache->prot[i].aprots = 0; @@ -258,7 +258,7 @@ H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, */ { H5AC_prot_t *prot = NULL; - intn i; + int i; prot = cache->prot + idx; for (i = 0; i < prot->nprots; i++) { @@ -328,8 +328,8 @@ H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, static int H5AC_compare(const void *_a, const void *_b) { - intn a = *((const intn *) _a); - intn b = *((const intn *) _b); + int a = *((const int *) _a); + int b = *((const int *) _b); assert(current_cache_g); @@ -391,14 +391,14 @@ H5AC_compare(const void *_a, const void *_b) herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) { - uintn i; + unsigned i; herr_t status; H5AC_flush_func_t flush=NULL; H5AC_info_t **info; #ifdef H5AC_SORT_BY_ADDR - intn *map = NULL; + int *map = NULL; #endif /* H5AC_SORT_BY_ADDR */ - uintn nslots; + unsigned nslots; H5AC_t *cache = NULL; FUNC_ENTER(H5AC_flush, FAIL); @@ -414,7 +414,7 @@ H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) * Sort the cache entries by address since flushing them in * ascending order by address may be much more efficient. */ - if (NULL==(map=H5FL_ARR_ALLOC(intn,cache->nslots,0))) { + if (NULL==(map=H5FL_ARR_ALLOC(int,cache->nslots,0))) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); } @@ -424,7 +424,7 @@ H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) } assert(NULL == current_cache_g); current_cache_g = cache; - HDqsort(map, nslots, sizeof(intn), H5AC_compare); + HDqsort(map, nslots, sizeof(int), H5AC_compare); current_cache_g = NULL; #ifdef NDEBUG for (i = 1; i < nslots; i++) { @@ -455,7 +455,7 @@ H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) status = (flush)(f, destroy, (*info)->addr, (*info)); if (status < 0) { #ifdef H5AC_SORT_BY_ADDR - map = H5FL_ARR_FREE(intn,map); + map = H5FL_ARR_FREE(int,map); #endif /* H5AC_SORT_BY_ADDR */ HRETURN_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache"); @@ -466,7 +466,7 @@ H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) } } #ifdef H5AC_SORT_BY_ADDR - map = H5FL_ARR_FREE(intn,map); + map = H5FL_ARR_FREE(int,map); #endif /* H5AC_SORT_BY_ADDR */ /* @@ -528,7 +528,7 @@ herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing) { herr_t status; - uintn idx; + unsigned idx; H5AC_flush_func_t flush=NULL; H5AC_info_t **info = NULL; H5AC_t *cache = NULL; @@ -548,7 +548,7 @@ H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing) #ifdef H5AC_DEBUG { H5AC_prot_t *prot = NULL; - intn i; + int i; prot = cache->prot + idx; for (i = 0; i < prot->nprots; i++) { @@ -602,7 +602,7 @@ herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr) { - uintn old_idx, new_idx; + unsigned old_idx, new_idx; H5AC_flush_func_t flush=NULL; herr_t status; H5AC_t *cache = NULL; @@ -757,7 +757,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, * can only be modified through the pointer already handed out by the * H5AC_protect() function. */ - intn i; + int i; for (i = 0; i < prot->nprots; i++) { assert(H5F_addr_ne(addr, prot->slot[i]->addr)); @@ -788,7 +788,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); } - prot->aprots = (intn)na; + prot->aprots = (int)na; prot->slot = x; } prot->slot[prot->nprots]= thing; @@ -828,7 +828,7 @@ herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing) { herr_t status; - uintn idx; + unsigned idx; H5AC_flush_func_t flush=NULL; H5AC_t *cache = NULL; H5AC_info_t **info = NULL; diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 84fcb8a..d96fb5e 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -86,24 +86,24 @@ typedef H5AC_info_t *H5AC_info_ptr_t; /* Typedef for free lists */ #ifdef H5AC_DEBUG typedef struct H5AC_prot_t { - intn nprots; /*number of things protected */ - intn aprots; /*nelmts of `prot' array */ + int nprots; /*number of things protected */ + int aprots; /*nelmts of `prot' array */ H5AC_info_t **slot; /*array of pointers to protected things */ } H5AC_prot_t; #endif /* H5AC_DEBUG */ typedef struct H5AC_t { - uintn nslots; /*number of cache slots */ + unsigned nslots; /*number of cache slots */ H5AC_info_t **slot; /*the cache slots, an array of pointers to the cached objects */ #ifdef H5AC_DEBUG H5AC_prot_t *prot; /*the protected slots */ #endif /* H5AC_DEBUG */ - intn nprots; /*number of protected objects */ + int nprots; /*number of protected objects */ struct { - uintn nhits; /*number of cache hits */ - uintn nmisses; /*number of cache misses */ - uintn ninits; /*number of cache inits */ - uintn nflushes; /*number of flushes to disk */ + unsigned nhits; /*number of cache hits */ + unsigned nmisses; /*number of cache misses */ + unsigned ninits; /*number of cache inits */ + unsigned nflushes; /*number of flushes to disk */ } diagnostics[H5AC_NTYPES]; /*diagnostics for each type of object*/ } H5AC_t; @@ -119,7 +119,7 @@ __DLL__ herr_t H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing); __DLL__ herr_t H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy); -__DLL__ herr_t H5AC_create(H5F_t *f, intn size_hint); +__DLL__ herr_t H5AC_create(H5F_t *f, int size_hint); __DLL__ herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr); __DLL__ herr_t H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, diff --git a/src/H5Apkg.h b/src/H5Apkg.h index da36b4b..ef57c76 100644 --- a/src/H5Apkg.h +++ b/src/H5Apkg.h @@ -28,8 +28,8 @@ #include "H5Sprivate.h" struct H5A_t { - uintn initialized;/* Indicate whether the attribute has been modified */ - uintn ent_opened; /* Object header entry opened? */ + unsigned initialized;/* Indicate whether the attribute has been modified */ + unsigned ent_opened; /* Object header entry opened? */ H5G_entry_t ent; /* Object Header entry (for both datasets & groups) */ char *name; /* Attribute's name */ H5T_t *dt; /* Attribute's datatype */ @@ -117,16 +117,16 @@ static H5B_ins_t H5B_insert_helper(H5F_t *f, haddr_t addr, hbool_t *rt_key_changed, haddr_t *retval); static herr_t H5B_insert_child(H5F_t *f, const H5B_class_t *type, - H5B_t *bt, intn idx, haddr_t child, + H5B_t *bt, int idx, haddr_t child, H5B_ins_t anchor, void *md_key); static herr_t H5B_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5B_t *b); static H5B_t *H5B_load(H5F_t *f, haddr_t addr, const void *_type, void *udata); -static herr_t H5B_decode_key(H5F_t *f, H5B_t *bt, intn idx); -static herr_t H5B_decode_keys(H5F_t *f, H5B_t *bt, intn idx); +static herr_t H5B_decode_key(H5F_t *f, H5B_t *bt, int idx); +static herr_t H5B_decode_keys(H5F_t *f, H5B_t *bt, int idx); static size_t H5B_nodesize(H5F_t *f, const H5B_class_t *type, size_t *total_nkey_size, size_t sizeof_rkey); static herr_t H5B_split(H5F_t *f, const H5B_class_t *type, H5B_t *old_bt, - haddr_t old_addr, intn idx, + haddr_t old_addr, int idx, const double split_ratios[], void *udata, haddr_t *new_addr/*out*/); static H5B_t * H5B_copy(H5F_t *f, const H5B_t *old_bt); @@ -144,7 +144,7 @@ static const H5AC_class_t H5AC_BT[1] = {{ /* Interface initialization? */ #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /* Declare a free list to manage the page information */ H5FL_BLK_DEFINE_STATIC(page); @@ -194,7 +194,7 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata, size_t size; size_t total_native_keysize; size_t offset; - intn i; + int i; herr_t ret_value = FAIL; FUNC_ENTER(H5B_create, FAIL); @@ -310,7 +310,7 @@ H5B_load(H5F_t *f, haddr_t addr, const void *_type, void *udata) size_t total_nkey_size; size_t size; H5B_t *bt = NULL; - intn i; + int i; uint8_t *p; H5B_t *ret_value = NULL; @@ -419,7 +419,7 @@ H5B_load(H5F_t *f, haddr_t addr, const void *_type, void *udata) static herr_t H5B_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5B_t *bt) { - intn i; + int i; size_t size = 0; uint8_t *p = bt->page; @@ -535,7 +535,7 @@ herr_t H5B_find(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) { H5B_t *bt = NULL; - intn idx = -1, lt = 0, rt, cmp = 1; + int idx = -1, lt = 0, rt, cmp = 1; int ret_value = FAIL; FUNC_ENTER(H5B_find, FAIL); @@ -633,12 +633,12 @@ H5B_find(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) */ static herr_t H5B_split(H5F_t *f, const H5B_class_t *type, H5B_t *old_bt, haddr_t old_addr, - intn idx, const double split_ratios[], void *udata, + int idx, const double split_ratios[], void *udata, haddr_t *new_addr_p/*out*/) { H5B_t *new_bt = NULL, *tmp_bt = NULL; herr_t ret_value = FAIL; - intn i, k, nleft, nright; + int i, k, nleft, nright; size_t recsize = 0; FUNC_ENTER(H5B_split, FAIL); @@ -794,7 +794,7 @@ H5B_split(H5F_t *f, const H5B_class_t *type, H5B_t *old_bt, haddr_t old_addr, *------------------------------------------------------------------------- */ static herr_t -H5B_decode_key(H5F_t *f, H5B_t *bt, intn idx) +H5B_decode_key(H5F_t *f, H5B_t *bt, int idx) { FUNC_ENTER(H5B_decode_key, FAIL); @@ -822,7 +822,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, intn idx) *------------------------------------------------------------------------- */ static herr_t -H5B_decode_keys(H5F_t *f, H5B_t *bt, intn idx) +H5B_decode_keys(H5F_t *f, H5B_t *bt, int idx) { FUNC_ENTER(H5B_decode_keys, FAIL); @@ -882,7 +882,7 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr, hbool_t lt_key_changed = FALSE, rt_key_changed = FALSE; haddr_t child, old_root; - intn level; + int level; H5B_t *bt; hsize_t size; H5B_ins_t my_ins = H5B_INS_ERROR; @@ -1041,10 +1041,10 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr, */ static herr_t H5B_insert_child(H5F_t *f, const H5B_class_t *type, H5B_t *bt, - intn idx, haddr_t child, H5B_ins_t anchor, void *md_key) + int idx, haddr_t child, H5B_ins_t anchor, void *md_key) { size_t recsize; - intn i; + int i; FUNC_ENTER(H5B_insert_child, FAIL); assert(bt); @@ -1171,7 +1171,7 @@ H5B_insert_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, haddr_t *new_node_p/*out*/) { H5B_t *bt = NULL, *twin = NULL, *tmp_bt = NULL; - intn lt = 0, idx = -1, rt, cmp = -1; + int lt = 0, idx = -1, rt, cmp = -1; haddr_t child_addr; H5B_ins_t my_ins = H5B_INS_ERROR; H5B_ins_t ret_value = H5B_INS_ERROR; @@ -1534,7 +1534,7 @@ H5B_iterate (H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) haddr_t cur_addr = HADDR_UNDEF; haddr_t *child = NULL; uint8_t *key = NULL; - intn i, nchildren; + int i, nchildren; herr_t ret_value = FAIL; FUNC_ENTER(H5B_iterate, FAIL); @@ -1646,13 +1646,13 @@ done: */ static H5B_ins_t H5B_remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, - intn level, uint8_t *lt_key/*out*/, + int level, uint8_t *lt_key/*out*/, hbool_t *lt_key_changed/*out*/, void *udata, uint8_t *rt_key/*out*/, hbool_t *rt_key_changed/*out*/) { H5B_t *bt = NULL, *sibling = NULL; H5B_ins_t ret_value = H5B_INS_ERROR; - intn idx=-1, lt=0, rt, cmp=1, i; + int idx=-1, lt=0, rt, cmp=1, i; size_t sizeof_rkey, sizeof_rec; hsize_t sizeof_node; @@ -2125,7 +2125,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent, intn fwidth, +H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5B_class_t *type, void *udata) { H5B_t *bt = NULL; @@ -2227,7 +2227,7 @@ static herr_t H5B_assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata) { H5B_t *bt = NULL; - intn i, ncell, cmp; + int i, ncell, cmp; static int ncalls = 0; herr_t status; diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h index a8d0139..b4283a5 100644 --- a/src/H5Bprivate.h +++ b/src/H5Bprivate.h @@ -72,8 +72,8 @@ typedef struct H5B_class_t { size_t sizeof_nkey; /*size of native (memory) key*/ size_t (*get_sizeof_rkey)(H5F_t*, const void*); /*raw key size */ herr_t (*new_node)(H5F_t*, H5B_ins_t, void*, void*, void*, haddr_t*); - intn (*cmp2)(H5F_t*, void*, void*, void*); /*compare 2 keys */ - intn (*cmp3)(H5F_t*, void*, void*, void*); /*compare 3 keys */ + int (*cmp2)(H5F_t*, void*, void*, void*); /*compare 2 keys */ + int (*cmp3)(H5F_t*, void*, void*, void*); /*compare 3 keys */ herr_t (*found)(H5F_t*, haddr_t, const void*, void*, const void*); /* insert new data */ @@ -94,7 +94,7 @@ typedef struct H5B_class_t { /* encode, decode, debug key values */ herr_t (*decode)(H5F_t*, struct H5B_t*, uint8_t*, void*); herr_t (*encode)(H5F_t*, struct H5B_t*, uint8_t*, void*); - herr_t (*debug_key)(FILE*, intn, intn, const void*, const void*); + herr_t (*debug_key)(FILE*, int, int, const void*, const void*); } H5B_class_t; /* @@ -112,11 +112,11 @@ typedef struct H5B_t { const H5B_class_t *type; /*type of tree */ size_t sizeof_rkey; /*size of raw (disk) key */ hbool_t dirty; /*something in the tree is dirty */ - intn ndirty; /*num child ptrs to emit */ - intn level; /*node level */ + int ndirty; /*num child ptrs to emit */ + int level; /*node level */ haddr_t left; /*address of left sibling */ haddr_t right; /*address of right sibling */ - intn nchildren; /*number of child pointers */ + int nchildren; /*number of child pointers */ uint8_t *page; /*disk page */ uint8_t *native; /*array of keys in native format */ H5B_key_t *key; /*2k+1 key entries */ @@ -127,7 +127,7 @@ typedef struct H5B_t { * Library prototypes. */ __DLL__ herr_t H5B_debug (H5F_t *f, haddr_t addr, FILE * stream, - intn indent, intn fwidth, const H5B_class_t *type, + int indent, int fwidth, const H5B_class_t *type, void *udata); __DLL__ herr_t H5B_create (H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *addr_p/*out*/); @@ -74,7 +74,7 @@ const H5D_create_t H5D_create_dflt = { }; /* Interface initialization? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5D_init_interface static herr_t H5D_init_interface(void); static herr_t H5D_init_storage(H5D_t *dataset, const H5S_t *space); @@ -145,8 +145,8 @@ H5D_init_interface(void) void *def_bkgr_buf=H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ H5T_bkg_t def_bkgr_buf_type=H5D_XFER_BKGR_BUF_TYPE_DEF; /* Default value for background buffer type */ double def_btree_split_ratio[3]=H5D_XFER_BTREE_SPLIT_RATIO_DEF; /* Default value for B-tree node split ratios */ - uintn def_hyper_cache=H5D_XFER_HYPER_CACHE_DEF; /* Default value for hyperslab caching */ - uintn def_hyper_cache_lim=H5D_XFER_HYPER_CACHE_LIM_DEF; /* Default value for hyperslab cache limit */ + unsigned def_hyper_cache=H5D_XFER_HYPER_CACHE_DEF; /* Default value for hyperslab caching */ + unsigned def_hyper_cache_lim=H5D_XFER_HYPER_CACHE_LIM_DEF; /* Default value for hyperslab cache limit */ H5MM_allocate_t def_vlen_alloc=H5D_XFER_VLEN_ALLOC_DEF; /* Default value for vlen allocation function */ void *def_vlen_alloc_info=H5D_XFER_VLEN_ALLOC_INFO_DEF; /* Default value for vlen allocation information */ H5MM_free_t def_vlen_free=H5D_XFER_VLEN_FREE_DEF; /* Default value for vlen free function */ @@ -154,7 +154,7 @@ H5D_init_interface(void) hid_t def_vfl_id=H5D_XFER_VFL_ID_DEF; /* Default value for file driver ID */ void *def_vfl_info=H5D_XFER_VFL_INFO_DEF; /* Default value for file driver info */ #ifdef COALESCE_READS - uintn def_gather_reads=H5D_XFER_GATHER_READS_DEF; /* Default value for 'gather reads' property */ + unsigned def_gather_reads=H5D_XFER_GATHER_READS_DEF; /* Default value for 'gather reads' property */ #endif /* COALESCE_READS */ size_t def_hyp_vec_size=H5D_XFER_HYPER_VECTOR_SIZE_DEF; /* Default value for vector size */ herr_t ret_value=SUCCEED; /* Return value */ @@ -263,7 +263,7 @@ done: * *------------------------------------------------------------------------- */ -intn +int H5D_term_interface(void) { int n=0; @@ -1118,8 +1118,8 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type, { H5D_t *new_dset = NULL; H5D_t *ret_value = NULL; - intn i, ndims; - uintn u; + int i, ndims; + unsigned u; hsize_t max_dim[H5O_LAYOUT_NDIMS]={0}; H5O_efl_t *efl = NULL; H5F_t *f = NULL; @@ -1517,7 +1517,7 @@ H5D_open_oid(H5G_entry_t *ent) H5D_t *dataset = NULL; /*new dataset struct */ H5D_t *ret_value = NULL; /*return value */ H5S_t *space = NULL; /*data space */ - uintn u; + unsigned u; FUNC_ENTER(H5D_open_oid, NULL); @@ -1672,7 +1672,7 @@ done: herr_t H5D_close(H5D_t *dataset) { - uintn free_failed; + unsigned free_failed; FUNC_ENTER(H5D_close, FAIL); @@ -2901,7 +2901,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space) */ if (IS_H5FD_MPIO(dset->ent.file)) { /* We only handle simple data spaces so far */ - intn ndims; + int ndims; hsize_t dim[H5O_LAYOUT_NDIMS]; if ((ndims=H5S_get_simple_extent_dims(space, dim, NULL))<0) { @@ -2991,7 +2991,7 @@ hsize_t H5D_get_storage_size(H5D_t *dset) { hsize_t size; - uintn u; + unsigned u; FUNC_ENTER(H5D_get_storage_size, 0); diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 8c3055f..b879c78 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -22,7 +22,7 @@ /* Interface initialization */ #define PABLO_MASK H5Fcontig_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -134,7 +134,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, haddr_t temp_end; /* Temporary end of buffer variable */ size_t max_search; /* Maximum number of sequences to search */ size_t mask; /* Bit mask */ - intn bit_loc; /* Bit location of the leftmost '1' in max_search */ + int bit_loc; /* Bit location of the leftmost '1' in max_search */ size_t *size_arr_p; /* Pointer into the size array */ hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ @@ -245,7 +245,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, } /* end if */ else { size_t lo,hi; /* Low and high bounds for binary search */ - uintn found=0; /* Flag to indicate bounds have been found */ + unsigned found=0; /* Flag to indicate bounds have been found */ /* Binary search is faster */ @@ -574,7 +574,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, haddr_t temp_end; /* Temporary end of buffer variable */ size_t max_search; /* Maximum number of sequences to search */ size_t mask; /* Bit mask */ - intn bit_loc; /* Bit location of the leftmost '1' in max_search */ + int bit_loc; /* Bit location of the leftmost '1' in max_search */ size_t *size_arr_p; /* Pointer into the size array */ hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ @@ -685,7 +685,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, } /* end if */ else { size_t lo,hi; /* Low and high bounds for binary search */ - uintn found=0; /* Flag to indicate bounds have been found */ + unsigned found=0; /* Flag to indicate bounds have been found */ /* Binary search is faster */ diff --git a/src/H5Distore.c b/src/H5Distore.c index ebdeda9..fc89a8d 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -74,14 +74,14 @@ /* Interface initialization */ #define PABLO_MASK H5Fistore_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* * Given a B-tree node return the dimensionality of the chunks pointed to by * that node. */ -#define H5F_ISTORE_NDIMS(X) ((intn)(((X)->sizeof_rkey-8)/8)) +#define H5F_ISTORE_NDIMS(X) ((int)(((X)->sizeof_rkey-8)/8)) /* Raw data chunks are cached. Each entry in the cache is: */ typedef struct H5F_rdcc_ent_t { @@ -96,7 +96,7 @@ typedef struct H5F_rdcc_ent_t { size_t chunk_size; /*size of a chunk */ size_t alloc_size; /*amount allocated for the chunk */ uint8_t *chunk; /*the unfiltered chunk data */ - uintn idx; /*index in hash table */ + unsigned idx; /*index in hash table */ struct H5F_rdcc_ent_t *next;/*next item in doubly-linked list */ struct H5F_rdcc_ent_t *prev;/*previous item in doubly-linked list */ } H5F_rdcc_ent_t; @@ -107,9 +107,9 @@ static size_t H5F_istore_sizeof_rkey(H5F_t *f, const void *_udata); static herr_t H5F_istore_new_node(H5F_t *f, H5B_ins_t, void *_lt_key, void *_udata, void *_rt_key, haddr_t*/*out*/); -static intn H5F_istore_cmp2(H5F_t *f, void *_lt_key, void *_udata, +static int H5F_istore_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); -static intn H5F_istore_cmp3(H5F_t *f, void *_lt_key, void *_udata, +static int H5F_istore_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); static herr_t H5F_istore_found(H5F_t *f, haddr_t addr, const void *_lt_key, void *_udata, const void *_rt_key); @@ -124,7 +124,7 @@ static herr_t H5F_istore_decode_key(H5F_t *f, H5B_t *bt, uint8_t *raw, void *_key); static herr_t H5F_istore_encode_key(H5F_t *f, H5B_t *bt, uint8_t *raw, void *_key); -static herr_t H5F_istore_debug_key(FILE *stream, intn indent, intn fwidth, +static herr_t H5F_istore_debug_key(FILE *stream, int indent, int fwidth, const void *key, const void *udata); #ifdef H5_HAVE_PARALLEL static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, @@ -149,7 +149,7 @@ static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, typedef struct H5F_istore_key_t { size_t nbytes; /*size of stored data */ hssize_t offset[H5O_LAYOUT_NDIMS]; /*logical offset to start*/ - uintn filter_mask; /*excluded filters */ + unsigned filter_mask; /*excluded filters */ } H5F_istore_key_t; typedef struct H5F_istore_ud1_t { @@ -340,8 +340,8 @@ static herr_t H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) { H5F_istore_key_t *key = (H5F_istore_key_t *) _key; - intn i; - intn ndims = H5F_ISTORE_NDIMS(bt); + int i; + int ndims = H5F_ISTORE_NDIMS(bt); FUNC_ENTER(H5F_istore_decode_key, FAIL); @@ -381,8 +381,8 @@ static herr_t H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) { H5F_istore_key_t *key = (H5F_istore_key_t *) _key; - intn ndims = H5F_ISTORE_NDIMS(bt); - intn i; + int ndims = H5F_ISTORE_NDIMS(bt); + int i; FUNC_ENTER(H5F_istore_encode_key, FAIL); @@ -419,12 +419,12 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) *------------------------------------------------------------------------- */ static herr_t -H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth, +H5F_istore_debug_key (FILE *stream, int indent, int fwidth, const void *_key, const void *_udata) { const H5F_istore_key_t *key = (const H5F_istore_key_t *)_key; const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *)_udata; - uintn u; + unsigned u; FUNC_ENTER (H5F_istore_debug_key, FAIL); assert (key); @@ -465,14 +465,14 @@ H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth, * *------------------------------------------------------------------------- */ -static intn +static int H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, void *_rt_key) { H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp; + int cmp; FUNC_ENTER(H5F_istore_cmp2, FAIL); @@ -517,14 +517,14 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, * *------------------------------------------------------------------------- */ -static intn +static int H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata, void *_rt_key) { H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp = 0; + int cmp = 0; FUNC_ENTER(H5F_istore_cmp3, FAIL); @@ -572,7 +572,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op, H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_new_node, FAIL); #ifdef AKC @@ -660,7 +660,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key, { H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_found, FAIL); @@ -733,8 +733,8 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key, H5F_istore_key_t *md_key = (H5F_istore_key_t *) _md_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp; - uintn u; + int cmp; + unsigned u; H5B_ins_t ret_value = H5B_INS_ERROR; FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR); @@ -855,7 +855,7 @@ H5F_istore_iterate (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr, { H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata; H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_iterate, FAIL); @@ -939,7 +939,7 @@ H5F_istore_flush_entry(H5F_t *f, H5F_rdcc_ent_t *ent, hbool_t reset) { herr_t ret_value=FAIL; /*return value */ H5F_istore_ud1_t udata; /*pass through B-tree */ - uintn u; /*counters */ + unsigned u; /*counters */ void *buf=NULL; /*temporary buffer */ size_t alloc; /*bytes allocated for BUF */ hbool_t point_of_no_return = FALSE; @@ -1122,7 +1122,7 @@ herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - intn nerrors=0; + int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; FUNC_ENTER (H5F_istore_flush, FAIL); @@ -1167,7 +1167,7 @@ herr_t H5F_istore_dest (H5F_t *f) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - intn nerrors=0; + int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; FUNC_ENTER (H5F_istore_dest, FAIL); @@ -1212,11 +1212,11 @@ H5F_istore_dest (H5F_t *f) static herr_t H5F_istore_prune (H5F_t *f, size_t size) { - intn i, j, nerrors=0; + int i, j, nerrors=0; H5F_rdcc_t *rdcc = &(f->shared->rdcc); size_t total = f->shared->rdcc_nbytes; const int nmeth=2; /*number of methods */ - intn w[1]; /*weighting as an interval */ + int w[1]; /*weighting as an interval */ H5F_rdcc_ent_t *p[2], *cur; /*list pointers */ H5F_rdcc_ent_t *n[2]; /*list next pointers */ @@ -1334,14 +1334,14 @@ static void * H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_pline_t *pline, const H5O_fill_t *fill, const hssize_t offset[], hbool_t relax, - uintn *idx_hint/*in,out*/) + unsigned *idx_hint/*in,out*/) { - intn idx=0; /*hash index number */ - uintn temp_idx=0; /* temporary index number */ + int idx=0; /*hash index number */ + unsigned temp_idx=0; /* temporary index number */ hbool_t found = FALSE; /*already in cache? */ H5F_rdcc_t *rdcc = &(f->shared->rdcc);/*raw data chunk cache*/ H5F_rdcc_ent_t *ent = NULL; /*cache entry */ - uintn u; /*counters */ + unsigned u; /*counters */ H5F_istore_ud1_t udata; /*B-tree pass-through */ size_t chunk_size=0; /*size of a chunk */ size_t chunk_alloc=0; /*allocated chunk size */ @@ -1357,7 +1357,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, temp_idx *= layout->dim[u]; temp_idx += offset[u]; } - temp_idx += (uintn)(layout->addr); + temp_idx += (unsigned)(layout->addr); idx=H5F_HASH(f,temp_idx); ent = rdcc->slot[idx]; @@ -1603,13 +1603,13 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, static herr_t H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_pline_t *pline, hbool_t dirty, - const hssize_t offset[], uintn *idx_hint, + const hssize_t offset[], unsigned *idx_hint, uint8_t *chunk, size_t naccessed) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); H5F_rdcc_ent_t *ent = NULL; - intn found = -1; - uintn u; + int found = -1; + unsigned u; FUNC_ENTER (H5F_istore_unlock, FAIL); @@ -1702,11 +1702,11 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, hssize_t offset_wrt_chunk[H5O_LAYOUT_NDIMS]; hssize_t sub_offset_m[H5O_LAYOUT_NDIMS]; hssize_t chunk_offset[H5O_LAYOUT_NDIMS]; - intn i, carry; - uintn u; + int i, carry; + unsigned u; size_t naccessed; /*bytes accessed in chnk*/ uint8_t *chunk=NULL; /*ptr to a chunk buffer */ - uintn idx_hint=0; /*cache index hint */ + unsigned idx_hint=0; /*cache index hint */ FUNC_ENTER(H5F_istore_read, FAIL); @@ -1830,7 +1830,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif /* Increment indices */ - for (i=(intn)(layout->ndims-1), carry=1; i>=0 && carry; --i) { + for (i=(int)(layout->ndims-1), carry=1; i>=0 && carry; --i) { if (++idx_cur[i]>=idx_max[i]) idx_cur[i] = idx_min[i]; else @@ -1868,8 +1868,8 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, { hssize_t offset_m[H5O_LAYOUT_NDIMS]; hsize_t size_m[H5O_LAYOUT_NDIMS]; - intn i, carry; - uintn u; + int i, carry; + unsigned u; hsize_t idx_cur[H5O_LAYOUT_NDIMS]; hsize_t idx_min[H5O_LAYOUT_NDIMS]; hsize_t idx_max[H5O_LAYOUT_NDIMS]; @@ -1878,7 +1878,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, hssize_t offset_wrt_chunk[H5O_LAYOUT_NDIMS]; hssize_t sub_offset_m[H5O_LAYOUT_NDIMS]; uint8_t *chunk=NULL; - uintn idx_hint=0; + unsigned idx_hint=0; size_t chunk_size, naccessed; FUNC_ENTER(H5F_istore_write, FAIL); @@ -2047,7 +2047,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) { H5F_istore_ud1_t udata; #ifndef NDEBUG - uintn u; + unsigned u; #endif FUNC_ENTER(H5F_istore_create, FAIL); @@ -2091,7 +2091,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) *------------------------------------------------------------------------- */ hsize_t -H5F_istore_allocated(H5F_t *f, uintn ndims, haddr_t addr) +H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; @@ -2126,7 +2126,7 @@ H5F_istore_allocated(H5F_t *f, uintn ndims, haddr_t addr) *------------------------------------------------------------------------- */ herr_t -H5F_istore_dump_btree(H5F_t *f, FILE *stream, uintn ndims, haddr_t addr) +H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; @@ -2220,8 +2220,8 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) *------------------------------------------------------------------------- */ herr_t -H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, - intn fwidth, int ndims) +H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, + int fwidth, int ndims) { H5F_istore_ud1_t udata; @@ -2258,7 +2258,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, const hssize_t offset[], void *_udata/*out*/) { H5F_istore_ud1_t *udata = _udata; - intn i; + int i; herr_t status; /*func return status */ FUNC_ENTER (H5F_istore_get_addr, FAIL); @@ -2321,11 +2321,11 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_fill_t *fill) { - intn i, carry; - uintn u; + int i, carry; + unsigned u; hssize_t chunk_offset[H5O_LAYOUT_NDIMS]; uint8_t *chunk=NULL; - uintn idx_hint=0; + unsigned idx_hint=0; size_t chunk_size; #ifdef AKC H5F_istore_ud1_t udata; diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 288de47..dbe045c 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -44,7 +44,7 @@ /* Dataset creation property list */ typedef struct H5D_create_t { H5D_layout_t layout; /*storage layout */ - intn chunk_ndims; /*chunk dimensionality */ + int chunk_ndims; /*chunk dimensionality */ hsize_t chunk_size[32]; /*chunk size if chunked storage */ H5O_fill_t fill; /*fill value */ H5O_efl_t efl; /*external file list */ @@ -74,7 +74,7 @@ typedef struct H5D_create_t { #define H5D_XFER_BTREE_SPLIT_RATIO_DEF {0.1, 0.5, 0.9} /* Definitions for hyperslab caching property */ #define H5D_XFER_HYPER_CACHE_NAME "hyper_cache" -#define H5D_XFER_HYPER_CACHE_SIZE sizeof(uintn) +#define H5D_XFER_HYPER_CACHE_SIZE sizeof(unsigned) #ifndef H5_HAVE_PARALLEL #define H5D_XFER_HYPER_CACHE_DEF 1 #else @@ -82,11 +82,11 @@ typedef struct H5D_create_t { #endif /* Definitions for hyperslab cache limit property */ #define H5D_XFER_HYPER_CACHE_LIM_NAME "hyper_cache_limit" -#define H5D_XFER_HYPER_CACHE_LIM_SIZE sizeof(uintn) +#define H5D_XFER_HYPER_CACHE_LIM_SIZE sizeof(unsigned) #define H5D_XFER_HYPER_CACHE_LIM_DEF 0 /* Definitions for hyperslab cache limit property */ #define H5D_XFER_HYPER_CACHE_LIM_NAME "hyper_cache_limit" -#define H5D_XFER_HYPER_CACHE_LIM_SIZE sizeof(uintn) +#define H5D_XFER_HYPER_CACHE_LIM_SIZE sizeof(unsigned) #define H5D_XFER_HYPER_CACHE_LIM_DEF 0 /* Definitions for vlen allocation function property */ #define H5D_XFER_VLEN_ALLOC_NAME "vlen_alloc" @@ -115,7 +115,7 @@ typedef struct H5D_create_t { #ifdef COALESCE_READS /* Definitions for 'gather reads' property */ #define H5D_XFER_GATHER_READS_NAME "gather_reads" -#define H5D_XFER_GATHER_READS_SIZE sizeof(uintn) +#define H5D_XFER_GATHER_READS_SIZE sizeof(unsigned) #define H5D_XFER_GATHER_READS_DEF 0 #endif /* COALESCE_READS */ /* Definitions for hyperslab vector size property */ diff --git a/src/H5Dseq.c b/src/H5Dseq.c index 2cb1b17..b1c7c3b 100644 --- a/src/H5Dseq.c +++ b/src/H5Dseq.c @@ -32,7 +32,7 @@ /* Interface initialization */ #define PABLO_MASK H5Fseq_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- @@ -156,12 +156,12 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t hslab_size[H5O_LAYOUT_NDIMS]; /* hyperslab size in dataspace*/ hsize_t down_size[H5O_LAYOUT_NDIMS]; /* Cumulative yperslab sizes (in elements) */ hsize_t acc; /* Accumulator for hyperslab sizes (in elements) */ - intn ndims; + int ndims; hsize_t max_data; /*bytes in dataset */ haddr_t addr=0; /*address in file */ - uintn u; /*counters */ + unsigned u; /*counters */ size_t v; /*counters */ - intn i,j; /*counters */ + int i,j; /*counters */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -530,12 +530,12 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t hslab_size[H5O_LAYOUT_NDIMS]; /* hyperslab size in dataspace*/ hsize_t down_size[H5O_LAYOUT_NDIMS]; /* Cumulative hyperslab sizes (in elements) */ hsize_t acc; /* Accumulator for hyperslab sizes (in elements) */ - intn ndims; + int ndims; hsize_t max_data; /*bytes in dataset */ haddr_t addr; /*address in file */ - uintn u; /*counters */ + unsigned u; /*counters */ size_t v; /*counters */ - intn i,j; /*counters */ + int i,j; /*counters */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -146,7 +146,7 @@ static const H5E_minor_mesg_t H5E_minor_mesg_g[] = { }; /* Interface initialization? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5E_init_interface static herr_t H5E_init_interface (void); const hbool_t H5E_clearable_g = TRUE; /* DO NOT CHANGE */ @@ -502,7 +502,7 @@ H5Ewalk_cb(int n, H5E_error_t *err_desc, void *client_data) const char * H5Eget_major (H5E_major_t n) { - uintn i; + unsigned i; /* * WARNING: Do not call the FUNC_ENTER() or FUNC_LEAVE() macros since @@ -541,7 +541,7 @@ H5Eget_major (H5E_major_t n) const char * H5Eget_minor (H5E_minor_t n) { - uintn i; + unsigned i; /* * WARNING: Do not call the FUNC_ENTER() or FUNC_LEAVE() macros since diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 6aba456..8003730 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -105,7 +105,7 @@ typedef struct H5E_minor_mesg_t { /* An error stack */ typedef struct H5E_t { - intn nused; /*num slots currently used in stack */ + int nused; /*num slots currently used in stack */ H5E_error_t slot[H5E_NSLOTS]; /*array of error records */ } H5E_t; @@ -86,7 +86,7 @@ const H5F_mprop_t H5F_mount_dflt = { }; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5F_init_interface static herr_t H5F_init_interface(void); @@ -96,7 +96,7 @@ static herr_t H5F_dest(H5F_t *f); static herr_t H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate, hbool_t alloc_only); static haddr_t H5F_locate_signature(H5FD_t *file); -static intn H5F_flush_all_cb(H5F_t *f, const void *_invalidate); +static int H5F_flush_all_cb(H5F_t *f, const void *_invalidate); /* Declare a free list to manage the H5F_t struct */ H5FL_DEFINE_STATIC(H5F_t); @@ -264,10 +264,10 @@ H5F_init_interface(void) * *------------------------------------------------------------------------- */ -intn +int H5F_term_interface(void) { - intn n = 0; + int n = 0; if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_FILE))) { @@ -297,7 +297,7 @@ H5F_term_interface(void) * *------------------------------------------------------------------------- */ -static intn +static int H5F_flush_all_cb(H5F_t *f, const void *_invalidate) { hbool_t invalidate = *((const hbool_t*)_invalidate); @@ -382,7 +382,7 @@ H5F_close_all(void) void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l) { - intn i = (intn)H5F_SIZEOF_SIZE(f)-1; + int i = (int)H5F_SIZEOF_SIZE(f)-1; #ifdef WORDS_BIGENDIAN /* @@ -536,12 +536,12 @@ H5Fget_access_plist(hid_t file_id) * *------------------------------------------------------------------------- */ -static intn +static int H5F_equal(void *_haystack, const void *_needle) { H5F_t *haystack = (H5F_t*)_haystack; const H5FD_t *needle = (const H5FD_t*)_needle; - intn retval; + int retval; FUNC_ENTER(H5F_equal, FAIL); retval = (0==H5FD_cmp(haystack->shared->lf, needle)); @@ -573,7 +573,7 @@ H5F_locate_signature(H5FD_t *file) { haddr_t addr, eoa; uint8_t buf[H5F_SIGNATURE_LEN]; - uintn n, maxpow; + unsigned n, maxpow; FUNC_ENTER(H5F_locate_signature, HADDR_UNDEF); @@ -696,7 +696,7 @@ static H5F_t * H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id) { H5F_t *f=NULL, *ret_value=NULL; - intn n; + int n; const H5F_create_t *fcpl=NULL; const H5F_access_t *fapl=NULL; @@ -948,7 +948,7 @@ H5F_dest(H5F_t *f) *------------------------------------------------------------------------- */ H5F_t * -H5F_open(const char *name, uintn flags, hid_t fcpl_id, hid_t fapl_id) +H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) { H5F_t *file=NULL; /*the success return value */ H5F_t *ret_value=NULL;/*actual return value */ @@ -962,7 +962,7 @@ H5F_open(const char *name, uintn flags, hid_t fcpl_id, hid_t fapl_id) H5G_entry_t root_ent; /*root symbol table entry */ haddr_t eof; /*end of file address */ haddr_t stored_eoa; /*relative end-of-addr in file */ - uintn tent_flags; /*tentative flags */ + unsigned tent_flags; /*tentative flags */ char driver_name[9]; /*file driver name/version */ hbool_t driver_has_cmp; /*`cmp' callback defined? */ @@ -1628,7 +1628,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate, hbool_t alloc_only) { uint8_t sbuf[2048], dbuf[2048], *p=NULL; - uintn nerrors=0, i; + unsigned nerrors=0, i; size_t superblock_size, driver_size; char driver_name[9]; @@ -1836,7 +1836,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate, herr_t H5F_close(H5F_t *f) { - uintn i; + unsigned i; FUNC_ENTER(H5F_close, FAIL); assert(f->nrefs>0); @@ -2016,7 +2016,7 @@ H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child, H5G_entry_t *mp_ent = NULL; /*mount point symbol table entry*/ H5F_t *ancestor = NULL; /*ancestor files */ H5F_t *parent = NULL; /*file containing mount point */ - intn lt, rt, md, cmp; /*binary search indices */ + int lt, rt, md, cmp; /*binary search indices */ H5G_entry_t *ent = NULL; /*temporary symbol table entry */ herr_t ret_value = FAIL; /*return value */ @@ -2071,7 +2071,7 @@ H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child, /* Make room in the table */ if (parent->mtab.nmounts>=parent->mtab.nalloc) { - uintn n = MAX(16, 2*parent->mtab.nalloc); + unsigned n = MAX(16, 2*parent->mtab.nalloc); H5F_mount_t *x = H5MM_realloc(parent->mtab.child, n*sizeof(parent->mtab.child[0])); if (!x) { @@ -2133,8 +2133,8 @@ H5F_unmount(H5G_entry_t *loc, const char *name) H5F_t *parent = NULL; /*file where mounted */ H5G_entry_t *ent = NULL; /*temporary symbol table entry */ herr_t ret_value = FAIL; /*return value */ - uintn i; /*coutners */ - intn lt, rt, md=(-1), cmp; /*binary search indices */ + unsigned i; /*coutners */ + int lt, rt, md=(-1), cmp; /*binary search indices */ FUNC_ENTER(H5F_unmount, FAIL); assert(loc); @@ -2234,7 +2234,7 @@ herr_t H5F_mountpoint(H5G_entry_t *find/*in,out*/) { H5F_t *parent = find->file; - intn lt, rt, md=(-1), cmp; + int lt, rt, md=(-1), cmp; H5G_entry_t *ent = NULL; FUNC_ENTER(H5F_mountpoint, FAIL); @@ -2443,7 +2443,7 @@ H5Freopen(hid_t file_id) * *------------------------------------------------------------------------- */ -uintn +unsigned H5F_get_intent(H5F_t *f) { FUNC_ENTER(H5F_get_intent, 0); @@ -2661,7 +2661,7 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void H5F_addr_encode(H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr) { - uintn i; + unsigned i; haddr_t tmp; assert(f); @@ -2705,7 +2705,7 @@ H5F_addr_encode(H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr) void H5F_addr_decode(H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*out*/) { - uintn i; + unsigned i; haddr_t tmp; uint8_t c; hbool_t all_zero = TRUE; @@ -2787,8 +2787,8 @@ H5F_addr_pack(H5F_t UNUSED *f, haddr_t *addr_p/*out*/, *------------------------------------------------------------------------- */ herr_t -H5F_debug(H5F_t *f, haddr_t UNUSED addr, FILE * stream, intn indent, - intn fwidth) +H5F_debug(H5F_t *f, haddr_t UNUSED addr, FILE * stream, int indent, + int fwidth) { FUNC_ENTER(H5F_debug, FAIL); @@ -27,7 +27,7 @@ /* Interface initialization */ #define PABLO_MASK H5FD_mask #define INTERFACE_INIT H5FD_init_interface -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /* static prototypes */ static herr_t H5FD_init_interface(void); @@ -89,10 +89,10 @@ H5FD_init_interface(void) * *------------------------------------------------------------------------- */ -intn +int H5FD_term_interface(void) { - intn n = 0; + int n = 0; if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_VFL))) { @@ -860,7 +860,7 @@ H5FD_close(H5FD_t *file) H5FD_free_t *cur, *next; H5FD_mem_t i; #ifdef H5F_DEBUG - uintn nblocks=0; + unsigned nblocks=0; hsize_t nbytes=0; #endif @@ -944,7 +944,7 @@ H5FD_close(H5FD_t *file) int H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) { - intn ret_value; + int ret_value; FUNC_ENTER(H5FDcmp, -1); /*return value is arbitrary*/ H5TRACE2("Is","xx",f1,f2); @@ -973,7 +973,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) int H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2) { - intn ret_value; + int ret_value; FUNC_ENTER(H5FD_cmp, -1); /*return value is arbitrary*/ @@ -1015,7 +1015,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2) int H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/) { - intn ret_value; + int ret_value; FUNC_ENTER(H5FDquery, FAIL); H5TRACE2("Is","xx",f,flags); @@ -1048,7 +1048,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/) int H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/) { - intn ret_value=0; + int ret_value=0; FUNC_ENTER(H5FD_query, FAIL); diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 4d8a77d..2631d43 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -119,7 +119,7 @@ static const H5FD_class_t H5FD_core_g = { /* Interface initialization */ #define PABLO_MASK H5FD_core_mask #define INTERFACE_INIT H5FD_core_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDdpss.c b/src/H5FDdpss.c index 81e3115..d9a7270 100644 --- a/src/H5FDdpss.c +++ b/src/H5FDdpss.c @@ -135,7 +135,7 @@ static const H5FD_class_t H5FD_dpss_g = { /* Interface initialization */ #define PABLO_MASK H5FD_dpss_mask #define INTERFACE_INIT H5FD_dpss_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 89828c6..43f4793 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -114,7 +114,7 @@ static const H5FD_class_t H5FD_family_g = { /* Interface initialization */ #define PABLO_MASK H5FD_family_mask #define INTERFACE_INIT H5FD_family_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDgass.c b/src/H5FDgass.c index 5b6b79c..3f139b1 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -130,7 +130,7 @@ static const H5FD_class_t H5FD_gass_g = { /* Interface initialization */ #define PABLO_MASK H5FD_gass_mask #define INTERFACE_INIT H5FD_gass_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDlog.c b/src/H5FDlog.c index c9f075e..95f200a 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -43,7 +43,7 @@ static hid_t H5FD_LOG_g = 0; /* Driver-specific file access properties */ typedef struct H5FD_log_fapl_t { char *logfile; /* Allocated log file name */ - intn verbosity; /* Verbosity of logging information */ + int verbosity; /* Verbosity of logging information */ } H5FD_log_fapl_t; /* Define strings for the different file memory types */ @@ -223,7 +223,7 @@ static const H5FD_class_t H5FD_log_g = { /* Interface initialization */ #define PABLO_MASK H5FD_log_mask #define INTERFACE_INIT H5FD_log_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index db1a6ba..ab1fbd8 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -149,7 +149,7 @@ hbool_t H5_mpi_1_metawrite_g = FALSE; /* Interface initialization */ #define PABLO_MASK H5FD_mpio_mask #define INTERFACE_INIT H5FD_mpio_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h index 5ea6a8e..bd633d0 100644 --- a/src/H5FDprivate.h +++ b/src/H5FDprivate.h @@ -12,7 +12,7 @@ #define H5FD_has_cmp(id) (NULL!=H5FD_get_class(id)->cmp) -__DLL__ intn H5FD_term_interface(void); +__DLL__ int H5FD_term_interface(void); __DLL__ H5FD_class_t *H5FD_get_class(hid_t id); __DLL__ hsize_t H5FD_sb_size(H5FD_t *file); __DLL__ herr_t H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf); diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index fda1e81..9c87161 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -176,7 +176,7 @@ static const H5FD_class_t H5FD_sec2_g = { /* Interface initialization */ #define PABLO_MASK H5FD_sec2_mask #define INTERFACE_INIT H5FD_sec2_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /* Declare a free list to manage the H5FD_sec2_t struct */ H5FL_DEFINE_STATIC(H5FD_sec2_t); diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index 64a3aa5..d8cffc8 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -110,7 +110,7 @@ static const H5FD_class_t H5FD_srb_g = { /* Interface initialization */ #define PABLO_MASK H5FD_srb_mask #define INTERFACE_INIT H5FD_srb_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- * Function: H5FD_srb_init diff --git a/src/H5FDstream.c b/src/H5FDstream.c index b0ee868..b85e731 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -198,7 +198,7 @@ static const H5FD_class_t H5FD_stream_g = /* Interface initialization */ #define INTERFACE_INIT H5FD_stream_init -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- @@ -23,7 +23,7 @@ #include "H5FLprivate.h" /*Priority queues */ #define PABLO_MASK H5FL_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* @@ -274,7 +274,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj) *------------------------------------------------------------------------- */ void * -H5FL_reg_alloc(H5FL_reg_head_t *head, uintn clear) +H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear) { H5FL_reg_node_t *new_obj; /* Pointer to the new free list node allocated */ void *ret_value; /* Pointer to object to return */ @@ -448,7 +448,7 @@ H5FL_reg_gc(void) PURPOSE Terminate various H5FL object free lists USAGE - intn H5FL_term() + int H5FL_term() RETURNS Success: Positive if any action might have caused a change in some other interface; zero otherwise. @@ -467,7 +467,7 @@ H5FL_reg_gc(void) it will return non-zero, which will cause this function to get called again to reclaim this layer's memory. --------------------------------------------------------------------------*/ -static intn +static int H5FL_reg_term(void) { H5FL_reg_gc_node_t *left; /* pointer to garbage collection lists with work left */ @@ -681,7 +681,7 @@ H5FL_blk_init(H5FL_blk_head_t *head) *------------------------------------------------------------------------- */ void * -H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, uintn clear) +H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear) { H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */ H5FL_blk_list_t *temp; /* Temp. ptr to the new native list allocated */ @@ -1003,7 +1003,7 @@ H5FL_blk_gc(void) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn +static int H5FL_blk_term(void) { H5FL_blk_gc_node_t *left; /* pointer to garbage collection lists with work left */ @@ -1082,7 +1082,7 @@ H5FL_arr_init(H5FL_arr_head_t *head) if(head->maxelem>0) { if (NULL==(head->u.list_arr = H5MM_calloc(head->maxelem*sizeof(H5FL_arr_node_t *)))) HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); - if (NULL==(head->onlist = H5MM_calloc(head->maxelem*sizeof(uintn)))) + if (NULL==(head->onlist = H5MM_calloc(head->maxelem*sizeof(unsigned)))) HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); } /* end if */ else { @@ -1143,7 +1143,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) temp=(H5FL_arr_node_t *)((unsigned char *)obj-sizeof(H5FL_arr_node_t)); /* Double-check that there is enough room for arrays of this size */ - assert((intn)temp->nelem<=head->maxelem); + assert((int)temp->nelem<=head->maxelem); /* Link into the free list */ temp->next=head->u.list_arr[temp->nelem]; @@ -1197,7 +1197,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) *------------------------------------------------------------------------- */ void * -H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, uintn clear) +H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear) { H5FL_arr_node_t *new_obj; /* Pointer to the new free list node allocated */ void *ret_value; /* Pointer to object to return */ @@ -1356,7 +1356,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head) { H5FL_arr_node_t *arr_free_list; /* Pointer to nodes in free list being garbage collected */ void *tmp; /* Temporary node pointer */ - intn i; /* Counter for array of free lists */ + int i; /* Counter for array of free lists */ size_t total_mem; /* Total memory used on list */ /* FUNC_ENTER_INIT() should not be called, it causes an infinite loop at library termination */ @@ -1452,7 +1452,7 @@ H5FL_arr_gc(void) PURPOSE Terminate various H5FL array object free lists USAGE - intn H5FL_arr_term() + int H5FL_arr_term() RETURNS Success: Positive if any action might have caused a change in some other interface; zero otherwise. @@ -1465,7 +1465,7 @@ H5FL_arr_gc(void) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn +static int H5FL_arr_term(void) { H5FL_gc_arr_node_t *left; /* pointer to garbage collection lists with work left */ @@ -1640,10 +1640,10 @@ H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_l EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -intn +int H5FL_term_interface(void) { - intn ret_value=0; + int ret_value=0; /* Garbage collect any nodes on the free lists */ H5FL_garbage_coll(); diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index 4457682..1fbd599 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -32,7 +32,7 @@ typedef struct H5FL_reg_node_t { struct H5FL_reg_node_t *next; /* Pointer to next block in free list */ #ifdef H5FL_DEBUG - uintn inuse; /* Indicate when object is in use */ + unsigned inuse; /* Indicate when object is in use */ #endif /* H5FL_DEBUG */ union { double unused1; /* Unused normally, just here for aligment */ @@ -42,9 +42,9 @@ typedef struct H5FL_reg_node_t { /* Data structure for free list of blocks */ typedef struct H5FL_reg_head_t { - uintn init; /* Whether the free list has been initialized */ - uintn allocated; /* Number of blocks allocated */ - uintn onlist; /* Number of blocks on free list */ + unsigned init; /* Whether the free list has been initialized */ + unsigned allocated; /* Number of blocks allocated */ + unsigned onlist; /* Number of blocks on free list */ size_t list_mem; /* Amount of memory on free list */ const char *name; /* Name of the type */ size_t size; /* Size of the blocks in the list */ @@ -93,9 +93,9 @@ typedef struct H5FL_blk_node_t { /* Data structure for priority queue of native block free lists */ typedef struct H5FL_blk_head_t { - uintn init; /* Whether the free list has been initialized */ - uintn allocated; /* Number of blocks allocated */ - uintn onlist; /* Number of blocks on free list */ + unsigned init; /* Whether the free list has been initialized */ + unsigned allocated; /* Number of blocks allocated */ + unsigned onlist; /* Number of blocks on free list */ size_t list_mem; /* Amount of memory in block on free list */ const char *name; /* Name of the type */ H5FL_blk_node_t *head; /* Pointer to first free list in queue */ @@ -134,12 +134,12 @@ typedef struct H5FL_arr_node_t { /* Data structure for free list of array blocks */ typedef struct H5FL_arr_head_t { - uintn init; /* Whether the free list has been initialized */ - uintn allocated; /* Number of blocks allocated */ - uintn *onlist; /* Number of blocks on free list */ + unsigned init; /* Whether the free list has been initialized */ + unsigned allocated; /* Number of blocks allocated */ + unsigned *onlist; /* Number of blocks on free list */ size_t list_mem; /* Amount of memory in block on free list */ const char *name; /* Name of the type */ - intn maxelem; /* Maximum number of elements in an array */ + int maxelem; /* Maximum number of elements in an array */ size_t size; /* Size of the array elements in the list */ union { H5FL_arr_node_t **list_arr; /* Array of lists of free blocks */ @@ -171,17 +171,17 @@ typedef struct H5FL_arr_head_t { /* * Library prototypes. */ -__DLL__ void * H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, uintn clear); +__DLL__ void * H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear); __DLL__ void * H5FL_blk_free(H5FL_blk_head_t *head, void *block); __DLL__ void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size); -__DLL__ void * H5FL_reg_alloc(H5FL_reg_head_t *head, uintn clear); +__DLL__ void * H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear); __DLL__ void * H5FL_reg_free(H5FL_reg_head_t *head, void *obj); -__DLL__ void * H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, uintn clear); +__DLL__ void * H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear); __DLL__ void * H5FL_arr_free(H5FL_arr_head_t *head, void *obj); __DLL__ void * H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem); __DLL__ herr_t H5FL_garbage_coll(void); __DLL__ herr_t H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, int arr_list_lim, int blk_global_lim, int blk_list_lim); -__DLL__ intn H5FL_term_interface(void); +__DLL__ int H5FL_term_interface(void); #endif diff --git a/src/H5Farray.c b/src/H5Farray.c index 6b178aa..ff69cfa 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -32,7 +32,7 @@ /* Interface initialization */ #define PABLO_MASK H5Farray_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; @@ -53,7 +53,7 @@ static intn interface_initialize_g = 0; herr_t H5F_arr_create (H5F_t *f, struct H5O_layout_t *layout/*in,out*/) { - uintn u; + unsigned u; hsize_t nbytes; FUNC_ENTER (H5F_arr_create, FAIL); @@ -143,16 +143,16 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t max_data = 0; /*bytes in dataset */ hsize_t elmt_size = 1; /*bytes per element */ size_t nelmts, z; /*number of elements */ - uintn ndims; /*stride dimensionality */ + unsigned ndims; /*stride dimensionality */ haddr_t addr; /*address in file */ - intn j; /*counters */ - uintn u; /*counters */ + int j; /*counters */ + unsigned u; /*counters */ hbool_t carray; /*carry for subtraction */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif #ifdef COALESCE_READS - uintn gather_reads; /* # of MPIO reads to gather */ + unsigned gather_reads; /* # of MPIO reads to gather */ #endif FUNC_ENTER(H5F_arr_read, FAIL); @@ -433,10 +433,10 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t max_data = 0; /*bytes in dataset */ hsize_t elmt_size = 1; /*bytes per element */ size_t nelmts, z; /*number of elements */ - uintn ndims; /*dimensionality */ + unsigned ndims; /*dimensionality */ haddr_t addr; /*address in file */ - intn j; /*counters */ - uintn u; /*counters */ + int j; /*counters */ + unsigned u; /*counters */ hbool_t carray; /*carry for subtraction */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index 8c3055f..b879c78 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -22,7 +22,7 @@ /* Interface initialization */ #define PABLO_MASK H5Fcontig_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -134,7 +134,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, haddr_t temp_end; /* Temporary end of buffer variable */ size_t max_search; /* Maximum number of sequences to search */ size_t mask; /* Bit mask */ - intn bit_loc; /* Bit location of the leftmost '1' in max_search */ + int bit_loc; /* Bit location of the leftmost '1' in max_search */ size_t *size_arr_p; /* Pointer into the size array */ hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ @@ -245,7 +245,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, } /* end if */ else { size_t lo,hi; /* Low and high bounds for binary search */ - uintn found=0; /* Flag to indicate bounds have been found */ + unsigned found=0; /* Flag to indicate bounds have been found */ /* Binary search is faster */ @@ -574,7 +574,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, haddr_t temp_end; /* Temporary end of buffer variable */ size_t max_search; /* Maximum number of sequences to search */ size_t mask; /* Bit mask */ - intn bit_loc; /* Bit location of the leftmost '1' in max_search */ + int bit_loc; /* Bit location of the leftmost '1' in max_search */ size_t *size_arr_p; /* Pointer into the size array */ hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ @@ -685,7 +685,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, } /* end if */ else { size_t lo,hi; /* Low and high bounds for binary search */ - uintn found=0; /* Flag to indicate bounds have been found */ + unsigned found=0; /* Flag to indicate bounds have been found */ /* Binary search is faster */ diff --git a/src/H5Fistore.c b/src/H5Fistore.c index ebdeda9..fc89a8d 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -74,14 +74,14 @@ /* Interface initialization */ #define PABLO_MASK H5Fistore_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* * Given a B-tree node return the dimensionality of the chunks pointed to by * that node. */ -#define H5F_ISTORE_NDIMS(X) ((intn)(((X)->sizeof_rkey-8)/8)) +#define H5F_ISTORE_NDIMS(X) ((int)(((X)->sizeof_rkey-8)/8)) /* Raw data chunks are cached. Each entry in the cache is: */ typedef struct H5F_rdcc_ent_t { @@ -96,7 +96,7 @@ typedef struct H5F_rdcc_ent_t { size_t chunk_size; /*size of a chunk */ size_t alloc_size; /*amount allocated for the chunk */ uint8_t *chunk; /*the unfiltered chunk data */ - uintn idx; /*index in hash table */ + unsigned idx; /*index in hash table */ struct H5F_rdcc_ent_t *next;/*next item in doubly-linked list */ struct H5F_rdcc_ent_t *prev;/*previous item in doubly-linked list */ } H5F_rdcc_ent_t; @@ -107,9 +107,9 @@ static size_t H5F_istore_sizeof_rkey(H5F_t *f, const void *_udata); static herr_t H5F_istore_new_node(H5F_t *f, H5B_ins_t, void *_lt_key, void *_udata, void *_rt_key, haddr_t*/*out*/); -static intn H5F_istore_cmp2(H5F_t *f, void *_lt_key, void *_udata, +static int H5F_istore_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); -static intn H5F_istore_cmp3(H5F_t *f, void *_lt_key, void *_udata, +static int H5F_istore_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); static herr_t H5F_istore_found(H5F_t *f, haddr_t addr, const void *_lt_key, void *_udata, const void *_rt_key); @@ -124,7 +124,7 @@ static herr_t H5F_istore_decode_key(H5F_t *f, H5B_t *bt, uint8_t *raw, void *_key); static herr_t H5F_istore_encode_key(H5F_t *f, H5B_t *bt, uint8_t *raw, void *_key); -static herr_t H5F_istore_debug_key(FILE *stream, intn indent, intn fwidth, +static herr_t H5F_istore_debug_key(FILE *stream, int indent, int fwidth, const void *key, const void *udata); #ifdef H5_HAVE_PARALLEL static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, @@ -149,7 +149,7 @@ static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, typedef struct H5F_istore_key_t { size_t nbytes; /*size of stored data */ hssize_t offset[H5O_LAYOUT_NDIMS]; /*logical offset to start*/ - uintn filter_mask; /*excluded filters */ + unsigned filter_mask; /*excluded filters */ } H5F_istore_key_t; typedef struct H5F_istore_ud1_t { @@ -340,8 +340,8 @@ static herr_t H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) { H5F_istore_key_t *key = (H5F_istore_key_t *) _key; - intn i; - intn ndims = H5F_ISTORE_NDIMS(bt); + int i; + int ndims = H5F_ISTORE_NDIMS(bt); FUNC_ENTER(H5F_istore_decode_key, FAIL); @@ -381,8 +381,8 @@ static herr_t H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) { H5F_istore_key_t *key = (H5F_istore_key_t *) _key; - intn ndims = H5F_ISTORE_NDIMS(bt); - intn i; + int ndims = H5F_ISTORE_NDIMS(bt); + int i; FUNC_ENTER(H5F_istore_encode_key, FAIL); @@ -419,12 +419,12 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) *------------------------------------------------------------------------- */ static herr_t -H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth, +H5F_istore_debug_key (FILE *stream, int indent, int fwidth, const void *_key, const void *_udata) { const H5F_istore_key_t *key = (const H5F_istore_key_t *)_key; const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *)_udata; - uintn u; + unsigned u; FUNC_ENTER (H5F_istore_debug_key, FAIL); assert (key); @@ -465,14 +465,14 @@ H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth, * *------------------------------------------------------------------------- */ -static intn +static int H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, void *_rt_key) { H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp; + int cmp; FUNC_ENTER(H5F_istore_cmp2, FAIL); @@ -517,14 +517,14 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, * *------------------------------------------------------------------------- */ -static intn +static int H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata, void *_rt_key) { H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp = 0; + int cmp = 0; FUNC_ENTER(H5F_istore_cmp3, FAIL); @@ -572,7 +572,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op, H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_new_node, FAIL); #ifdef AKC @@ -660,7 +660,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key, { H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_found, FAIL); @@ -733,8 +733,8 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key, H5F_istore_key_t *md_key = (H5F_istore_key_t *) _md_key; H5F_istore_key_t *rt_key = (H5F_istore_key_t *) _rt_key; H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; - intn cmp; - uintn u; + int cmp; + unsigned u; H5B_ins_t ret_value = H5B_INS_ERROR; FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR); @@ -855,7 +855,7 @@ H5F_istore_iterate (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr, { H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata; H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - uintn u; + unsigned u; FUNC_ENTER(H5F_istore_iterate, FAIL); @@ -939,7 +939,7 @@ H5F_istore_flush_entry(H5F_t *f, H5F_rdcc_ent_t *ent, hbool_t reset) { herr_t ret_value=FAIL; /*return value */ H5F_istore_ud1_t udata; /*pass through B-tree */ - uintn u; /*counters */ + unsigned u; /*counters */ void *buf=NULL; /*temporary buffer */ size_t alloc; /*bytes allocated for BUF */ hbool_t point_of_no_return = FALSE; @@ -1122,7 +1122,7 @@ herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - intn nerrors=0; + int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; FUNC_ENTER (H5F_istore_flush, FAIL); @@ -1167,7 +1167,7 @@ herr_t H5F_istore_dest (H5F_t *f) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - intn nerrors=0; + int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; FUNC_ENTER (H5F_istore_dest, FAIL); @@ -1212,11 +1212,11 @@ H5F_istore_dest (H5F_t *f) static herr_t H5F_istore_prune (H5F_t *f, size_t size) { - intn i, j, nerrors=0; + int i, j, nerrors=0; H5F_rdcc_t *rdcc = &(f->shared->rdcc); size_t total = f->shared->rdcc_nbytes; const int nmeth=2; /*number of methods */ - intn w[1]; /*weighting as an interval */ + int w[1]; /*weighting as an interval */ H5F_rdcc_ent_t *p[2], *cur; /*list pointers */ H5F_rdcc_ent_t *n[2]; /*list next pointers */ @@ -1334,14 +1334,14 @@ static void * H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_pline_t *pline, const H5O_fill_t *fill, const hssize_t offset[], hbool_t relax, - uintn *idx_hint/*in,out*/) + unsigned *idx_hint/*in,out*/) { - intn idx=0; /*hash index number */ - uintn temp_idx=0; /* temporary index number */ + int idx=0; /*hash index number */ + unsigned temp_idx=0; /* temporary index number */ hbool_t found = FALSE; /*already in cache? */ H5F_rdcc_t *rdcc = &(f->shared->rdcc);/*raw data chunk cache*/ H5F_rdcc_ent_t *ent = NULL; /*cache entry */ - uintn u; /*counters */ + unsigned u; /*counters */ H5F_istore_ud1_t udata; /*B-tree pass-through */ size_t chunk_size=0; /*size of a chunk */ size_t chunk_alloc=0; /*allocated chunk size */ @@ -1357,7 +1357,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, temp_idx *= layout->dim[u]; temp_idx += offset[u]; } - temp_idx += (uintn)(layout->addr); + temp_idx += (unsigned)(layout->addr); idx=H5F_HASH(f,temp_idx); ent = rdcc->slot[idx]; @@ -1603,13 +1603,13 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, static herr_t H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_pline_t *pline, hbool_t dirty, - const hssize_t offset[], uintn *idx_hint, + const hssize_t offset[], unsigned *idx_hint, uint8_t *chunk, size_t naccessed) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); H5F_rdcc_ent_t *ent = NULL; - intn found = -1; - uintn u; + int found = -1; + unsigned u; FUNC_ENTER (H5F_istore_unlock, FAIL); @@ -1702,11 +1702,11 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, hssize_t offset_wrt_chunk[H5O_LAYOUT_NDIMS]; hssize_t sub_offset_m[H5O_LAYOUT_NDIMS]; hssize_t chunk_offset[H5O_LAYOUT_NDIMS]; - intn i, carry; - uintn u; + int i, carry; + unsigned u; size_t naccessed; /*bytes accessed in chnk*/ uint8_t *chunk=NULL; /*ptr to a chunk buffer */ - uintn idx_hint=0; /*cache index hint */ + unsigned idx_hint=0; /*cache index hint */ FUNC_ENTER(H5F_istore_read, FAIL); @@ -1830,7 +1830,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif /* Increment indices */ - for (i=(intn)(layout->ndims-1), carry=1; i>=0 && carry; --i) { + for (i=(int)(layout->ndims-1), carry=1; i>=0 && carry; --i) { if (++idx_cur[i]>=idx_max[i]) idx_cur[i] = idx_min[i]; else @@ -1868,8 +1868,8 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, { hssize_t offset_m[H5O_LAYOUT_NDIMS]; hsize_t size_m[H5O_LAYOUT_NDIMS]; - intn i, carry; - uintn u; + int i, carry; + unsigned u; hsize_t idx_cur[H5O_LAYOUT_NDIMS]; hsize_t idx_min[H5O_LAYOUT_NDIMS]; hsize_t idx_max[H5O_LAYOUT_NDIMS]; @@ -1878,7 +1878,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, hssize_t offset_wrt_chunk[H5O_LAYOUT_NDIMS]; hssize_t sub_offset_m[H5O_LAYOUT_NDIMS]; uint8_t *chunk=NULL; - uintn idx_hint=0; + unsigned idx_hint=0; size_t chunk_size, naccessed; FUNC_ENTER(H5F_istore_write, FAIL); @@ -2047,7 +2047,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) { H5F_istore_ud1_t udata; #ifndef NDEBUG - uintn u; + unsigned u; #endif FUNC_ENTER(H5F_istore_create, FAIL); @@ -2091,7 +2091,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) *------------------------------------------------------------------------- */ hsize_t -H5F_istore_allocated(H5F_t *f, uintn ndims, haddr_t addr) +H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; @@ -2126,7 +2126,7 @@ H5F_istore_allocated(H5F_t *f, uintn ndims, haddr_t addr) *------------------------------------------------------------------------- */ herr_t -H5F_istore_dump_btree(H5F_t *f, FILE *stream, uintn ndims, haddr_t addr) +H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; @@ -2220,8 +2220,8 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) *------------------------------------------------------------------------- */ herr_t -H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, - intn fwidth, int ndims) +H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, + int fwidth, int ndims) { H5F_istore_ud1_t udata; @@ -2258,7 +2258,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, const hssize_t offset[], void *_udata/*out*/) { H5F_istore_ud1_t *udata = _udata; - intn i; + int i; herr_t status; /*func return status */ FUNC_ENTER (H5F_istore_get_addr, FAIL); @@ -2321,11 +2321,11 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5O_fill_t *fill) { - intn i, carry; - uintn u; + int i, carry; + unsigned u; hssize_t chunk_offset[H5O_LAYOUT_NDIMS]; uint8_t *chunk=NULL; - uintn idx_hint=0; + unsigned idx_hint=0; size_t chunk_size; #ifdef AKC H5F_istore_ud1_t udata; diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index ebb667c..2043df5 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -64,15 +64,15 @@ /* The raw data chunk cache */ typedef struct H5F_rdcc_t { - uintn ninits; /* Number of chunk creations */ - uintn nhits; /* Number of cache hits */ - uintn nmisses;/* Number of cache misses */ - uintn nflushes;/* Number of cache flushes */ + unsigned ninits; /* Number of chunk creations */ + unsigned nhits; /* Number of cache hits */ + unsigned nmisses;/* Number of cache misses */ + unsigned nflushes;/* Number of cache flushes */ size_t nbytes; /* Current cached raw data in bytes */ size_t nslots; /* Number of chunk slots allocated */ struct H5F_rdcc_ent_t *head; /* Head of doubly linked list */ struct H5F_rdcc_ent_t *tail; /* Tail of doubly linked list */ - intn nused; /* Number of chunk slots in use */ + int nused; /* Number of chunk slots in use */ struct H5F_rdcc_ent_t **slot; /* Chunk slots, each points to a chunk*/ } H5F_rdcc_t; @@ -84,9 +84,9 @@ typedef struct H5F_rdcc_t { * pointing to this struct. */ typedef struct H5F_file_t { - uintn flags; /* Access Permissions for file */ + unsigned flags; /* Access Permissions for file */ H5FD_t *lf; /* Lower level file handle for I/O */ - uintn nrefs; /* Ref count for times file is opened */ + unsigned nrefs; /* Ref count for times file is opened */ uint32_t consist_flags; /* File Consistency Flags */ haddr_t boot_addr; /* Absolute address of boot block */ haddr_t base_addr; /* Absolute base address for rel.addrs. */ @@ -99,15 +99,15 @@ typedef struct H5F_file_t { /* But that's ok because we only access it like */ /* a H5F_create_t until we pass it back to */ /* H5P_close to release it - QAK */ - intn mdc_nelmts; /* Size of meta data cache (elements) */ + int mdc_nelmts; /* Size of meta data cache (elements) */ size_t rdcc_nelmts; /* Size of raw data chunk cache (elmts) */ size_t rdcc_nbytes; /* Size of raw data chunk cache (bytes) */ double rdcc_w0; /* Preempt read chunks first? [0.0..1.0]*/ hsize_t threshold; /* Threshold for alignment */ hsize_t alignment; /* Alignment */ - uintn gc_ref; /* Garbage-collect references? */ + unsigned gc_ref; /* Garbage-collect references? */ struct H5G_t *root_grp; /* Open root group */ - intn ncwfs; /* Num entries on cwfs list */ + int ncwfs; /* Num entries on cwfs list */ struct H5HG_heap_t **cwfs; /* Global heap cache */ /* Data Sieve Buffering fields */ @@ -132,8 +132,8 @@ typedef struct H5F_mount_t { */ typedef struct H5F_mtab_t { struct H5F_t *parent;/* Parent file */ - uintn nmounts;/* Number of children which are mounted */ - uintn nalloc; /* Number of mount slots allocated */ + unsigned nmounts;/* Number of children which are mounted */ + unsigned nalloc; /* Number of mount slots allocated */ H5F_mount_t *child; /* An array of mount records */ } H5F_mtab_t; @@ -146,11 +146,11 @@ typedef struct H5F_mtab_t { * indicate that the file is mounted on some other file). */ struct H5F_t { - uintn nrefs; /* Reference count */ - uintn intent; /* The flags passed to H5F_open()*/ + unsigned nrefs; /* Reference count */ + unsigned intent; /* The flags passed to H5F_open()*/ char *name; /* Name used to open file */ H5F_file_t *shared; /* The shared file info */ - uintn nopen_objs; /* Number of open object headers*/ + unsigned nopen_objs; /* Number of open object headers*/ hid_t closing; /* H5I_FILE_CLOSING ID or zero */ H5F_mtab_t mtab; /* File mount table */ }; @@ -162,15 +162,15 @@ __DLLVAR__ hbool_t H5_mpi_1_metawrite_g; /* Private functions, not part of the publicly documented API */ __DLL__ void H5F_encode_length_unusual(const H5F_t *f, uint8_t **p, uint8_t *l); -__DLL__ H5F_t *H5F_open(const char *name, uintn flags, hid_t fcpl_id, +__DLL__ H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); __DLL__ herr_t H5F_close(H5F_t *f); __DLL__ herr_t H5F_close_all(void); __DLL__ herr_t H5F_flush_all(hbool_t invalidate); __DLL__ herr_t H5F_debug(H5F_t *f, haddr_t addr, FILE * stream, - intn indent, intn fwidth); + int indent, int fwidth); __DLL__ herr_t H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, - intn indent, intn fwidth, int ndims); + int indent, int fwidth, int ndims); __DLL__ herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); /* Functions that operate on indexed storage */ diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 7d618996..46cc34e 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -34,13 +34,13 @@ typedef struct H5F_t H5F_t; /* For non-little-endian platforms, encode each byte by itself */ #ifdef WORDS_BIGENDIAN # define INT16ENCODE(p, i) { \ - *(p) = (uint8_t)( (uintn)(i) & 0xff); (p)++; \ - *(p) = (uint8_t)(((uintn)(i) >> 8) & 0xff); (p)++; \ + *(p) = (uint8_t)( (unsigned)(i) & 0xff); (p)++; \ + *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++; \ } # define UINT16ENCODE(p, i) { \ *(p) = (uint8_t)( (i) & 0xff); (p)++; \ - *(p) = (uint8_t)(((uintn)(i) >> 8) & 0xff); (p)++; \ + *(p) = (uint8_t)(((unsigned)(i) >> 8) & 0xff); (p)++; \ } # define INT32ENCODE(p, i) { \ @@ -259,21 +259,21 @@ __DLL__ size_t H5F_sizeof_size(H5F_t *f); */ typedef struct H5F_create_t { hsize_t userblock_size; /* Size of the file user block in bytes */ - intn sym_leaf_k; /* 1/2 rank for symbol table leaf nodes */ - intn btree_k[8]; /* 1/2 rank for btree internal nodes */ + int sym_leaf_k; /* 1/2 rank for symbol table leaf nodes */ + int btree_k[8]; /* 1/2 rank for btree internal nodes */ size_t sizeof_addr; /* Number of bytes in an address */ size_t sizeof_size; /* Number of bytes for obj sizes */ - intn bootblock_ver; /* Version # of the bootblock */ - intn freespace_ver; /* Version # of the free-space information*/ - intn objectdir_ver; /* Version # of the object directory format*/ - intn sharedheader_ver;/* Version # of the shared header format */ + int bootblock_ver; /* Version # of the bootblock */ + int freespace_ver; /* Version # of the free-space information*/ + int objectdir_ver; /* Version # of the object directory format*/ + int sharedheader_ver;/* Version # of the shared header format */ } H5F_create_t; /* * File-access property list. */ typedef struct H5F_access_t { - intn mdc_nelmts; /* Size of meta data cache (elements) */ + int mdc_nelmts; /* Size of meta data cache (elements) */ size_t rdcc_nelmts; /* Size of raw data chunk cache (elmts) */ size_t rdcc_nbytes; /* Size of raw data chunk cache (bytes) */ double rdcc_w0; /* Preempt read chunks first? [0.0..1.0]*/ @@ -281,7 +281,7 @@ typedef struct H5F_access_t { hsize_t alignment; /* Alignment */ size_t meta_block_size; /* Minimum metadata allocation block size (when aggregating metadata allocations) */ size_t sieve_buf_size; /* Maximum sieve buffer size (when data sieving is allowed by file driver) */ - uintn gc_ref; /* Garbage-collect references? */ + unsigned gc_ref; /* Garbage-collect references? */ hid_t driver_id; /* File driver ID */ void *driver_info; /* File driver specific information */ } H5F_access_t; @@ -306,7 +306,7 @@ struct H5S_t; /* Private functions, not part of the publicly documented API */ __DLL__ herr_t H5F_init(void); -__DLL__ uintn H5F_get_intent(H5F_t *f); +__DLL__ unsigned H5F_get_intent(H5F_t *f); __DLL__ hid_t H5F_get_driver_id(H5F_t *f); /* Functions that operate on array storage */ @@ -363,8 +363,8 @@ __DLL__ herr_t H5F_seq_writev(H5F_t *f, hid_t dxpl_id, /* Functions that operate on indexed storage */ -__DLL__ hsize_t H5F_istore_allocated(H5F_t *f, uintn ndims, haddr_t addr); -__DLL__ herr_t H5F_istore_dump_btree(H5F_t *f, FILE *stream, uintn ndims, +__DLL__ hsize_t H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr); +__DLL__ herr_t H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr); /* Functions for allocation/releasing chunks */ diff --git a/src/H5Fseq.c b/src/H5Fseq.c index 2cb1b17..b1c7c3b 100644 --- a/src/H5Fseq.c +++ b/src/H5Fseq.c @@ -32,7 +32,7 @@ /* Interface initialization */ #define PABLO_MASK H5Fseq_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- @@ -156,12 +156,12 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t hslab_size[H5O_LAYOUT_NDIMS]; /* hyperslab size in dataspace*/ hsize_t down_size[H5O_LAYOUT_NDIMS]; /* Cumulative yperslab sizes (in elements) */ hsize_t acc; /* Accumulator for hyperslab sizes (in elements) */ - intn ndims; + int ndims; hsize_t max_data; /*bytes in dataset */ haddr_t addr=0; /*address in file */ - uintn u; /*counters */ + unsigned u; /*counters */ size_t v; /*counters */ - intn i,j; /*counters */ + int i,j; /*counters */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -530,12 +530,12 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, hsize_t hslab_size[H5O_LAYOUT_NDIMS]; /* hyperslab size in dataspace*/ hsize_t down_size[H5O_LAYOUT_NDIMS]; /* Cumulative hyperslab sizes (in elements) */ hsize_t acc; /* Accumulator for hyperslab sizes (in elements) */ - intn ndims; + int ndims; hsize_t max_data; /*bytes in dataset */ haddr_t addr; /*address in file */ - uintn u; /*counters */ + unsigned u; /*counters */ size_t v; /*counters */ - intn i,j; /*counters */ + int i,j; /*counters */ #ifdef H5_HAVE_PARALLEL H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif @@ -95,7 +95,7 @@ #define PABLO_MASK H5G_mask /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5G_init_interface static herr_t H5G_init_interface(void); static H5G_typeinfo_t *H5G_type_g = NULL; /*object typing info */ @@ -643,7 +643,7 @@ int H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf) { H5G_entry_t *loc = NULL; - intn retval = FAIL; + int retval = FAIL; FUNC_ENTER(H5Gget_comment, FAIL); H5TRACE4("Is","iszs",loc_id,name,bufsize,buf); @@ -730,11 +730,11 @@ H5G_init_interface(void) * *------------------------------------------------------------------------- */ -intn +int H5G_term_interface(void) { size_t i; - intn n=0; + int n=0; if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_GROUP))) { @@ -781,7 +781,7 @@ H5G_term_interface(void) *------------------------------------------------------------------------- */ herr_t -H5G_register_type(intn type, htri_t(*isa)(H5G_entry_t*), const char *_desc) +H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), const char *_desc) { char *desc = NULL; size_t i; @@ -991,7 +991,7 @@ H5G_basename(const char *name, size_t *size_p) static herr_t H5G_namei(H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/, H5G_entry_t *grp_ent/*out*/, H5G_entry_t *obj_ent/*out*/, - uintn target, intn *nlinks) + unsigned target, int *nlinks) { H5G_entry_t _grp_ent; /*entry for current group */ H5G_entry_t _obj_ent; /*entry found */ @@ -1122,7 +1122,7 @@ H5G_namei(H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/, herr_t H5G_traverse_slink (H5G_entry_t *grp_ent/*in,out*/, H5G_entry_t *obj_ent/*in,out*/, - intn *nlinks/*in,out*/) + int *nlinks/*in,out*/) { H5O_stab_t stab_mesg; /*info about local heap */ const char *clv = NULL; /*cached link value */ @@ -1857,7 +1857,7 @@ H5G_loc (hid_t loc_id) */ herr_t H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name, - const char *new_name, uintn namei_flags) + const char *new_name, unsigned namei_flags) { H5G_entry_t cur_obj; /*entry for the link tail */ H5G_entry_t grp_ent; /*ent for grp containing link hd*/ @@ -1982,7 +1982,7 @@ H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name, * *------------------------------------------------------------------------- */ -intn +int H5G_get_type(H5G_entry_t *ent) { htri_t isa; @@ -2041,7 +2041,7 @@ H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link, /* Find the object's symbol table entry */ if (H5G_namei (loc, name, NULL, &grp_ent/*out*/, &obj_ent/*out*/, - (uintn)(follow_link?H5G_TARGET_NORMAL:H5G_TARGET_SLINK), NULL)<0) { + (unsigned)(follow_link?H5G_TARGET_NORMAL:H5G_TARGET_SLINK), NULL)<0) { HRETURN_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to stat object"); } @@ -2218,12 +2218,12 @@ H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf) * *------------------------------------------------------------------------- */ -intn +int H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf) { H5O_name_t comment; H5G_entry_t obj_ent; - intn retval = FAIL; + int retval = FAIL; FUNC_ENTER(H5G_get_comment, FAIL); @@ -2240,7 +2240,7 @@ H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf) retval = 0; } else { HDstrncpy(buf, comment.s, bufsize); - retval = (intn)HDstrlen(comment.s); + retval = (int)HDstrlen(comment.s); H5O_reset(H5O_NAME, &comment); } diff --git a/src/H5Gent.c b/src/H5Gent.c index a5d1bca..565ae47 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -16,7 +16,7 @@ #include "H5MMprivate.h" #define PABLO_MASK H5G_ent_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -103,9 +103,9 @@ H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type) *------------------------------------------------------------------------- */ herr_t -H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, intn n) +H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, int n) { - intn i; + int i; FUNC_ENTER(H5G_ent_decode_vec, FAIL); @@ -215,9 +215,9 @@ H5G_ent_decode(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent) *------------------------------------------------------------------------- */ herr_t -H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, intn n) +H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, int n) { - intn i; + int i; FUNC_ENTER(H5G_ent_encode_vec, FAIL); @@ -332,7 +332,7 @@ H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent) */ herr_t H5G_ent_debug(H5F_t UNUSED *f, const H5G_entry_t *ent, FILE * stream, - intn indent, intn fwidth, haddr_t heap) + int indent, int fwidth, haddr_t heap) { const char *lval = NULL; diff --git a/src/H5Gnode.c b/src/H5Gnode.c index cf090da..6caff3f 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -51,9 +51,9 @@ static herr_t H5G_node_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5G_node_t *sym); static H5G_node_t *H5G_node_load(H5F_t *f, haddr_t addr, const void *_udata1, void *_udata2); -static intn H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, +static int H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); -static intn H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, +static int H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key); static herr_t H5G_node_found(H5F_t *f, haddr_t addr, const void *_lt_key, void *_udata, const void *_rt_key); @@ -96,7 +96,7 @@ H5B_class_t H5B_SNODE[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the H5G_node_t struct */ @@ -509,14 +509,14 @@ H5G_node_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1, * *------------------------------------------------------------------------- */ -static intn +static int H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) { H5G_bt_ud1_t *udata = (H5G_bt_ud1_t *) _udata; H5G_node_key_t *lt_key = (H5G_node_key_t *) _lt_key; H5G_node_key_t *rt_key = (H5G_node_key_t *) _rt_key; const char *s1, *s2; - intn cmp; + int cmp; FUNC_ENTER(H5G_node_cmp2, FAIL); @@ -565,7 +565,7 @@ H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) * *------------------------------------------------------------------------- */ -static intn +static int H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) { H5G_bt_ud1_t *udata = (H5G_bt_ud1_t *) _udata; @@ -630,7 +630,7 @@ H5G_node_found(H5F_t *f, haddr_t addr, const void UNUSED *_lt_key, { H5G_bt_ud1_t *bt_udata = (H5G_bt_ud1_t *) _udata; H5G_node_t *sn = NULL; - intn lt = 0, idx = 0, rt, cmp = 1; + int lt = 0, idx = 0, rt, cmp = 1; const char *s; herr_t ret_value = FAIL; @@ -746,8 +746,8 @@ H5G_node_insert(H5F_t *f, haddr_t addr, void UNUSED *_lt_key, H5G_node_t *sn = NULL, *snrt = NULL; size_t offset; /*offset of name in heap */ const char *s; - intn idx = -1, cmp = 1; - intn lt = 0, rt; /*binary search cntrs */ + int idx = -1, cmp = 1; + int lt = 0, rt; /*binary search cntrs */ H5B_ins_t ret_value = H5B_INS_ERROR; H5G_node_t *insert_into = NULL; /*node that gets new entry*/ @@ -838,14 +838,14 @@ H5G_node_insert(H5F_t *f, haddr_t addr, void UNUSED *_lt_key, md_key->offset = sn->entry[sn->nsyms - 1].name_off; /* Where to insert the new entry? */ - if (idx <= (intn)H5G_NODE_K(f)) { + if (idx <= (int)H5G_NODE_K(f)) { insert_into = sn; - if (idx == (intn)H5G_NODE_K(f)) + if (idx == (int)H5G_NODE_K(f)) md_key->offset = offset; } else { idx -= H5G_NODE_K(f); insert_into = snrt; - if (idx == (intn)H5G_NODE_K (f)) { + if (idx == (int)H5G_NODE_K (f)) { rt_key->offset = offset; *rt_key_changed = TRUE; } @@ -913,7 +913,7 @@ H5G_node_remove(H5F_t *f, haddr_t addr, void *_lt_key/*in,out*/, H5G_bt_ud1_t *bt_udata = (H5G_bt_ud1_t*)_udata; H5G_node_t *sn = NULL; H5B_ins_t ret_value = H5B_INS_ERROR; - intn lt=0, rt, idx=0, cmp=1; + int lt=0, rt, idx=0, cmp=1; const char *s = NULL; FUNC_ENTER(H5G_node_remove, H5B_INS_ERROR); @@ -1064,7 +1064,7 @@ H5G_node_iterate (H5F_t *f, void UNUSED *_lt_key, haddr_t addr, { H5G_bt_ud2_t *bt_udata = (H5G_bt_ud2_t *)_udata; H5G_node_t *sn = NULL; - intn i, nsyms; + int i, nsyms; size_t n, *name_off=NULL; const char *name; char buf[1024], *s; @@ -1154,8 +1154,8 @@ done: *------------------------------------------------------------------------- */ herr_t -H5G_node_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, - intn fwidth, haddr_t heap) +H5G_node_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, + int fwidth, haddr_t heap) { int i; H5G_node_t *sn = NULL; diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 8a2c305..7e5ffa9 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -135,7 +135,7 @@ __DLL__ herr_t H5G_stab_remove(H5G_entry_t *grp_ent, const char *name); * Functions that understand symbol table entries. */ __DLL__ herr_t H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, - H5G_entry_t *ent, intn n); + H5G_entry_t *ent, int n); __DLL__ herr_t H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, - const H5G_entry_t *ent, intn n); + const H5G_entry_t *ent, int n); #endif diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index 5996be6..2bc158c 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -101,7 +101,7 @@ typedef struct H5G_t H5G_t; * is allocated dynamically. */ typedef struct H5G_typeinfo_t { - intn type; /*one of the public H5G_* types */ + int type; /*one of the public H5G_* types */ htri_t (*isa)(H5G_entry_t*); /*function to determine type */ char *desc; /*description of object type */ } H5G_typeinfo_t; @@ -110,7 +110,7 @@ typedef struct H5G_typeinfo_t { * Library prototypes... These are the ones that other packages routinely * call. */ -__DLL__ herr_t H5G_register_type(intn type, htri_t(*isa)(H5G_entry_t*), +__DLL__ herr_t H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), const char *desc); __DLL__ H5G_entry_t *H5G_loc(hid_t loc_id); __DLL__ herr_t H5G_mkroot(H5F_t *f, H5G_entry_t *root_entry); @@ -126,8 +126,8 @@ __DLL__ H5G_t *H5G_rootof(H5F_t *f); __DLL__ htri_t H5G_isa(H5G_entry_t *ent); __DLL__ herr_t H5G_link(H5G_entry_t *loc, H5G_link_t type, const char *cur_name, const char *new_name, - uintn namei_flags); -__DLL__ intn H5G_get_type(H5G_entry_t *ent); + unsigned namei_flags); +__DLL__ int H5G_get_type(H5G_entry_t *ent); __DLL__ herr_t H5G_get_objinfo(H5G_entry_t *loc, const char *name, hbool_t follow_link, H5G_stat_t *statbuf/*out*/); @@ -135,7 +135,7 @@ __DLL__ herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size, char *buf/*out*/); __DLL__ herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf); -__DLL__ intn H5G_get_comment(H5G_entry_t *loc, const char *name, +__DLL__ int H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf); __DLL__ herr_t H5G_insert(H5G_entry_t *loc, const char *name, H5G_entry_t *ent); @@ -147,7 +147,7 @@ __DLL__ herr_t H5G_find(H5G_entry_t *loc, const char *name, __DLL__ H5F_t *H5G_insertion_file(H5G_entry_t *loc, const char *name); __DLL__ herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/, H5G_entry_t *obj_ent/*in,out*/, - intn *nlinks/*in,out*/); + int *nlinks/*in,out*/); __DLL__ herr_t H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent); __DLL__ herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent/*out*/); @@ -156,7 +156,7 @@ __DLL__ herr_t H5G_ent_decode(H5F_t *f, const uint8_t **pp, * These functions operate on symbol table nodes. */ __DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, - intn indent, intn fwidth, haddr_t heap); + int indent, int fwidth, haddr_t heap); /* * These functions operate on symbol table entries. They're used primarily @@ -166,5 +166,5 @@ __DLL__ herr_t H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, __DLL__ H5G_cache_t *H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type); __DLL__ herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type); __DLL__ herr_t H5G_ent_debug(H5F_t *f, const H5G_entry_t *ent, FILE * stream, - intn indent, intn fwidth, haddr_t heap); + int indent, int fwidth, haddr_t heap); #endif diff --git a/src/H5Gstab.c b/src/H5Gstab.c index b402737..d0b1cd9 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -18,7 +18,7 @@ #include "H5Oprivate.h" #define PABLO_MASK H5G_stab_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /*------------------------------------------------------------------------- @@ -39,7 +39,7 @@ #define PABLO_MASK H5HG_mask typedef struct H5HG_obj_t { - intn nrefs; /*reference count */ + int nrefs; /*reference count */ size_t size; /*total size of object */ uint8_t *begin; /*ptr to object into heap->chunk*/ } H5HG_obj_t; @@ -71,7 +71,7 @@ static const H5AC_class_t H5AC_GHEAP[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the H5HG_t struct */ @@ -236,7 +236,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1, H5HG_heap_t *heap = NULL; H5HG_heap_t *ret_value = NULL; uint8_t *p = NULL; - intn i; + int i; size_t nalloc, need; FUNC_ENTER (H5HG_load, NULL); @@ -319,7 +319,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1, heap->obj[0].begin = p; p += heap->obj[0].size; } else { - uintn idx; + unsigned idx; uint8_t *begin = p; UINT16DECODE (p, idx); @@ -465,10 +465,10 @@ H5HG_flush (H5F_t *f, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap) * *------------------------------------------------------------------------- */ -static uintn +static unsigned H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, int cwfsno, size_t size) { - uintn idx; + unsigned idx; uint8_t *p = NULL; size_t need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size); @@ -569,8 +569,8 @@ herr_t H5HG_insert (H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/) { size_t need; /*total space needed for object */ - intn cwfsno; - uintn idx; + int cwfsno; + unsigned idx; H5HG_heap_t *heap = NULL; FUNC_ENTER (H5HG_insert, FAIL); @@ -668,7 +668,7 @@ H5HG_peek (H5F_t *f, H5HG_t *hobj) { H5HG_heap_t *heap = NULL; void *retval = NULL; - intn i; + int i; FUNC_ENTER (H5HG_peek, NULL); @@ -727,7 +727,7 @@ void * H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/) { H5HG_heap_t *heap = NULL; - intn i; + int i; size_t size; uint8_t *p = NULL; @@ -791,8 +791,8 @@ H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/) * *------------------------------------------------------------------------- */ -intn -H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust) +int +H5HG_link (H5F_t *f, H5HG_t *hobj, int adjust) { H5HG_heap_t *heap = NULL; @@ -847,8 +847,8 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj) uint8_t *p=NULL, *obj_start=NULL; H5HG_heap_t *heap = NULL; size_t need; - intn i; - uintn u; + int i; + unsigned u; FUNC_ENTER (H5HG_remove, FAIL); @@ -947,11 +947,11 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj) *------------------------------------------------------------------------- */ herr_t -H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent, - intn fwidth) +H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, + int fwidth) { - uintn u, nused, maxobj; - uintn j, k; + unsigned u, nused, maxobj; + unsigned j, k; H5HG_heap_t *h = NULL; char buf[64]; size_t size; diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h index 785c060..e255afe 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -91,7 +91,7 @@ typedef struct H5HG_t { haddr_t addr; /*address of collection */ - uintn idx; /*object ID within collection */ + unsigned idx; /*object ID within collection */ } H5HG_t; typedef struct H5HG_heap_t H5HG_heap_t; @@ -101,9 +101,9 @@ __DLL__ herr_t H5HG_insert(H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/); __DLL__ void *H5HG_peek(H5F_t *f, H5HG_t *hobj); __DLL__ void *H5HG_read(H5F_t *f, H5HG_t *hobj, void *object); -__DLL__ intn H5HG_link(H5F_t *f, H5HG_t *hobj, intn adjust); +__DLL__ int H5HG_link(H5F_t *f, H5HG_t *hobj, int adjust); __DLL__ herr_t H5HG_remove(H5F_t *f, H5HG_t *hobj); -__DLL__ herr_t H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent, - intn fwidth); +__DLL__ herr_t H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, + int fwidth); #endif @@ -45,7 +45,7 @@ typedef struct H5HL_free_t { typedef struct H5HL_t { H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */ /* first field in structure */ - intn dirty; + int dirty; haddr_t addr; /*address of data */ size_t disk_alloc; /*data bytes allocated on disk */ size_t mem_alloc; /*data bytes allocated in mem */ @@ -68,7 +68,7 @@ static const H5AC_class_t H5AC_LHEAP[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the H5HL_free_t struct */ @@ -939,7 +939,7 @@ H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size) *------------------------------------------------------------------------- */ herr_t -H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, intn fwidth) +H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth) { H5HL_t *h = NULL; int i, j, overlap; @@ -995,7 +995,7 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, intn fwidth) if (freelist->offset + freelist->size > h->mem_alloc) { fprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n"); } else { - for (i=overlap=0; i<(intn)(freelist->size); i++) { + for (i=overlap=0; i<(int)(freelist->size); i++) { if (marker[freelist->offset + i]) overlap++; marker[freelist->offset + i] = 1; @@ -1020,10 +1020,10 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, intn fwidth) */ fprintf(stream, "%*sData follows (`__' indicates free region)...\n", indent, ""); - for (i=0; i<(intn)(h->disk_alloc); i+=16) { + for (i=0; i<(int)(h->disk_alloc); i+=16) { fprintf(stream, "%*s %8d: ", indent, "", i); for (j = 0; j < 16; j++) { - if (i+j<(intn)(h->disk_alloc)) { + if (i+j<(int)(h->disk_alloc)) { if (marker[i + j]) { fprintf(stream, "__ "); } else { @@ -1038,7 +1038,7 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, intn fwidth) } for (j = 0; j < 16; j++) { - if (i+j < (intn)(h->disk_alloc)) { + if (i+j < (int)(h->disk_alloc)) { if (marker[i + j]) { HDfputc(' ', stream); } else { diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index 3385aed..ba659ba 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -59,6 +59,6 @@ __DLL__ size_t H5HL_insert(H5F_t *f, haddr_t addr, size_t size, __DLL__ herr_t H5HL_write(H5F_t *f, haddr_t addr, size_t offset, size_t size, const void *buf); __DLL__ herr_t H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size); -__DLL__ herr_t H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, - intn fwidth); +__DLL__ herr_t H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, + int fwidth); #endif @@ -39,7 +39,7 @@ /* Interface initialialization? */ #define PABLO_MASK H5I_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5I_init_interface static herr_t H5I_init_interface(void); @@ -163,12 +163,12 @@ H5I_init_interface(void) * *------------------------------------------------------------------------- */ -intn +int H5I_term_interface(void) { H5I_id_group_t *grp_ptr; H5I_type_t grp; - intn n=0; + int n=0; if (interface_initialize_g) { /* How many groups are still being used? */ @@ -227,12 +227,12 @@ H5I_term_interface(void) * *------------------------------------------------------------------------- */ -intn -H5I_init_group(H5I_type_t grp, size_t hash_size, uintn reserved, +int +H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved, H5I_free_t free_func) { H5I_id_group_t *grp_ptr = NULL; /*ptr to the atomic group*/ - intn ret_value = SUCCEED; /*return value */ + int ret_value = SUCCEED; /*return value */ FUNC_ENTER(H5I_init_group, FAIL); @@ -305,13 +305,13 @@ H5I_init_group(H5I_type_t grp, size_t hash_size, uintn reserved, * *------------------------------------------------------------------------- */ -intn +int H5I_nmembers(H5I_type_t grp) { H5I_id_group_t *grp_ptr = NULL; H5I_id_info_t *cur=NULL; - intn n=0; - uintn i; + int n=0; + unsigned i; FUNC_ENTER(H5I_nmembers, FAIL); @@ -364,9 +364,9 @@ H5I_clear_group(H5I_type_t grp, hbool_t force) { H5I_id_group_t *grp_ptr = NULL; /* ptr to the atomic group */ H5I_id_info_t *cur=NULL, *next=NULL, *prev=NULL; - intn ret_value = SUCCEED; - uintn deleted; /* Flag to indicate objects have been removed from a linked list */ - uintn i; + int ret_value = SUCCEED; + unsigned deleted; /* Flag to indicate objects have been removed from a linked list */ + unsigned i; FUNC_ENTER(H5I_clear_group, FAIL); @@ -477,7 +477,7 @@ herr_t H5I_destroy_group(H5I_type_t grp) { H5I_id_group_t *grp_ptr = NULL; /* ptr to the atomic group */ - intn ret_value = SUCCEED; + int ret_value = SUCCEED; FUNC_ENTER(H5I_destroy_group, FAIL); @@ -536,11 +536,11 @@ H5I_register(H5I_type_t grp, void *object) H5I_id_group_t *grp_ptr=NULL; /*ptr to the group */ H5I_id_info_t *id_ptr=NULL; /*ptr to the new ID information */ hid_t new_id; /*new ID */ - uintn hash_loc; /*new item's hash table location*/ + unsigned hash_loc; /*new item's hash table location*/ hid_t next_id; /*next ID to check */ hid_t ret_value=SUCCEED; /*return value */ H5I_id_info_t *curr_id; /*ptr to the current atom */ - uintn i; /*counter */ + unsigned i; /*counter */ FUNC_ENTER(H5I_register, FAIL); @@ -564,7 +564,7 @@ H5I_register(H5I_type_t grp, void *object) id_ptr->next = NULL; /* hash bucket already full, prepend to front of chain */ - hash_loc = grp_ptr->nextid % (uintn) grp_ptr->hash_size; + hash_loc = grp_ptr->nextid % (unsigned) grp_ptr->hash_size; if (grp_ptr->id_list[hash_loc] != NULL) { id_ptr->next = grp_ptr->id_list[hash_loc]; } @@ -579,7 +579,7 @@ H5I_register(H5I_type_t grp, void *object) * wrapping around, thus necessitating checking for duplicate IDs being * handed out. */ - if (grp_ptr->nextid > (uintn)ID_MASK) { + if (grp_ptr->nextid > (unsigned)ID_MASK) { grp_ptr->wrapped = 1; grp_ptr->nextid = grp_ptr->reserved; } @@ -597,7 +597,7 @@ H5I_register(H5I_type_t grp, void *object) */ for (i=grp_ptr->reserved; i<ID_MASK; i++) { /* Handle end of range by wrapping to beginning */ - if (grp_ptr->nextid>(uintn)ID_MASK) { + if (grp_ptr->nextid>(unsigned)ID_MASK) { grp_ptr->nextid = grp_ptr->reserved; } @@ -615,7 +615,7 @@ H5I_register(H5I_type_t grp, void *object) grp_ptr->nextid++; } - if (i>=(uintn)ID_MASK) { + if (i>=(unsigned)ID_MASK) { /* All the IDs are gone! */ HGOTO_DONE(FAIL); } @@ -759,9 +759,9 @@ H5I_remove(hid_t id) H5I_id_info_t *curr_id; /*ptr to the current atom */ H5I_id_info_t *last_id; /*ptr to the last atom */ H5I_type_t grp; /*atom's atomic group */ - uintn hash_loc; /*atom's hash table location */ + unsigned hash_loc; /*atom's hash table location */ #ifdef IDS_ARE_CACHED - uintn i; /*local counting variable */ + unsigned i; /*local counting variable */ #endif void * ret_value = NULL; /*return value */ @@ -776,7 +776,7 @@ H5I_remove(hid_t id) HGOTO_DONE(NULL); /* Get the bucket in which the ID is located */ - hash_loc = (uintn) H5I_LOC(id, grp_ptr->hash_size); + hash_loc = (unsigned) H5I_LOC(id, grp_ptr->hash_size); curr_id = grp_ptr->id_list[hash_loc]; if (curr_id == NULL) HGOTO_DONE(NULL); @@ -853,13 +853,13 @@ H5I_remove(hid_t id) * *------------------------------------------------------------------------- */ -intn +int H5I_dec_ref(hid_t id) { H5I_type_t grp = H5I_GROUP(id); /*group the object is in*/ H5I_id_group_t *grp_ptr = NULL; /*ptr to the group */ H5I_id_info_t *id_ptr = NULL; /*ptr to the new ID */ - intn ret_value = FAIL; /*return value */ + int ret_value = FAIL; /*return value */ FUNC_ENTER(H5I_dec_ref, FAIL); @@ -913,7 +913,7 @@ H5I_dec_ref(hid_t id) * *------------------------------------------------------------------------- */ -intn +int H5I_inc_ref(hid_t id) { H5I_type_t grp = H5I_GROUP(id); /*group the object is in*/ @@ -965,7 +965,7 @@ H5I_search(H5I_type_t grp, H5I_search_func_t func, const void *key) { H5I_id_group_t *grp_ptr = NULL; /*ptr to the group */ H5I_id_info_t *id_ptr = NULL; /*ptr to the new ID */ - uintn i; /*counter */ + unsigned i; /*counter */ void *ret_value = NULL; /*return value */ FUNC_ENTER(H5I_search, NULL); @@ -1017,10 +1017,10 @@ H5I_find_id(hid_t id) H5I_id_group_t *grp_ptr = NULL; /*ptr to the group */ H5I_id_info_t *id_ptr = NULL; /*ptr to the new ID */ H5I_type_t grp; /*ID's group */ - uintn hash_loc; /*bucket pointer */ + unsigned hash_loc; /*bucket pointer */ H5I_id_info_t *ret_value = NULL; /*return value */ #ifdef IDS_ARE_CACHED - intn i; + int i; #endif FUNC_ENTER(H5I_find_id, NULL); @@ -1060,7 +1060,7 @@ H5I_find_id(hid_t id) #endif /* IDS_ARE_CACHED */ /* Get the bucket in which the ID is located */ - hash_loc = (uintn)H5I_LOC(id, grp_ptr->hash_size); + hash_loc = (unsigned)H5I_LOC(id, grp_ptr->hash_size); id_ptr = grp_ptr->id_list[hash_loc]; if (id_ptr == NULL) { HGOTO_DONE(NULL); diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index e0e7176..abf2a4e 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -50,32 +50,32 @@ typedef herr_t (*H5I_free_t)(void*); /* Type of the function to compare objects & keys */ -typedef intn (*H5I_search_func_t)(void *obj, const void *key); +typedef int (*H5I_search_func_t)(void *obj, const void *key); /* Atom information structure used */ typedef struct H5I_id_info_t { hid_t id; /* ID for this info */ - uintn count; /* ref. count for this atom */ + unsigned count; /* ref. count for this atom */ void *obj_ptr; /* pointer associated with the atom */ struct H5I_id_info_t *next; /* link to next atom (in case of hash-clash)*/ } H5I_id_info_t; /* ID group structure used */ typedef struct { - uintn count; /*# of times this group has been initialized*/ - uintn reserved; /*# of IDs to reserve for constant IDs */ - uintn wrapped; /*whether the id count has wrapped around */ + unsigned count; /*# of times this group has been initialized*/ + unsigned reserved; /*# of IDs to reserve for constant IDs */ + unsigned wrapped; /*whether the id count has wrapped around */ size_t hash_size; /*sizeof the hash table to store the IDs in */ - uintn ids; /*current number of IDs held */ - uintn nextid; /*ID to use for the next atom */ + unsigned ids; /*current number of IDs held */ + unsigned nextid; /*ID to use for the next atom */ H5I_free_t free_func; /*release object method */ H5I_id_info_t **id_list; /*pointer to an array of ptrs to IDs */ } H5I_id_group_t; /* Private Functions in H5I.c */ -__DLL__ intn H5I_init_group(H5I_type_t grp, size_t hash_size, uintn reserved, +__DLL__ int H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved, H5I_free_t func); -__DLL__ intn H5I_nmembers(H5I_type_t grp); +__DLL__ int H5I_nmembers(H5I_type_t grp); __DLL__ herr_t H5I_clear_group(H5I_type_t grp, hbool_t force); __DLL__ herr_t H5I_destroy_group(H5I_type_t grp); __DLL__ hid_t H5I_register(H5I_type_t grp, void *object); @@ -84,6 +84,6 @@ __DLL__ H5I_type_t H5I_get_type(hid_t id); __DLL__ void *H5I_remove(hid_t id); __DLL__ void *H5I_search(H5I_type_t grp, H5I_search_func_t func, const void *key); -__DLL__ intn H5I_inc_ref(hid_t id); -__DLL__ intn H5I_dec_ref(hid_t id); +__DLL__ int H5I_inc_ref(hid_t id); +__DLL__ int H5I_dec_ref(hid_t id); #endif @@ -31,7 +31,7 @@ #define PABLO_MASK H5MF_mask /* Is the interface initialized? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -20,7 +20,7 @@ /* Interface initialization? */ #define PABLO_MASK H5MM_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -37,12 +37,12 @@ static herr_t H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh); static H5O_t *H5O_load(H5F_t *f, haddr_t addr, const void *_udata1, void *_udata2); -static uintn H5O_find_in_ohdr(H5F_t *f, haddr_t addr, - const H5O_class_t **type_p, intn sequence); -static uintn H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, +static unsigned H5O_find_in_ohdr(H5F_t *f, haddr_t addr, + const H5O_class_t **type_p, int sequence); +static unsigned H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size); -static uintn H5O_alloc_extend_chunk(H5O_t *oh, uintn chunkno, size_t size); -static uintn H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size); +static unsigned H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size); +static unsigned H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size); static herr_t H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force); /* H5O inherits cache-like properties from H5AC */ @@ -53,7 +53,7 @@ static const H5AC_class_t H5AC_OHDR[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5O_init_interface static herr_t H5O_init_interface(void); @@ -354,10 +354,10 @@ H5O_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1, uint8_t buf[16], *p; size_t mesg_size; size_t hdr_size; - uintn id; - intn mesgno; - uintn curmesg = 0, nmesgs; - uintn chunkno; + unsigned id; + int mesgno; + unsigned curmesg = 0, nmesgs; + unsigned chunkno; haddr_t chunk_addr; size_t chunk_size; H5O_cont_t *cont = NULL; @@ -417,7 +417,7 @@ H5O_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1, /* increase chunk array size */ if (oh->nchunks >= oh->alloc_nchunks) { - uintn na = oh->alloc_nchunks + H5O_NCHUNKS; + unsigned na = oh->alloc_nchunks + H5O_NCHUNKS; H5O_chunk_t *x = H5FL_ARR_REALLOC (H5O_chunk_t, oh->chunk, na); if (!x) { @@ -507,7 +507,7 @@ done: /* * Free resources. */ - uintn u; + unsigned u; for (u = 0; u < oh->nchunks; u++) oh->chunk[u].image = H5FL_BLK_FREE(chunk_image,oh->chunk[u].image); @@ -546,11 +546,11 @@ static herr_t H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh) { uint8_t buf[16], *p; - intn id; - uintn u; + int id; + unsigned u; H5O_cont_t *cont = NULL; herr_t (*encode)(H5F_t*, uint8_t*, const void*) = NULL; - uintn combine=0; /* Whether to combine the object header prefix & the first chunk */ + unsigned combine=0; /* Whether to combine the object header prefix & the first chunk */ FUNC_ENTER(H5O_flush, FAIL); @@ -868,11 +868,11 @@ H5O_copy (const H5O_class_t *type, const void *mesg, void *dst) * *------------------------------------------------------------------------- */ -intn -H5O_link(H5G_entry_t *ent, intn adjust) +int +H5O_link(H5G_entry_t *ent, int adjust) { H5O_t *oh = NULL; - intn ret_value = FAIL; + int ret_value = FAIL; FUNC_ENTER(H5O_link, FAIL); @@ -932,12 +932,12 @@ H5O_link(H5G_entry_t *ent, intn adjust) * *------------------------------------------------------------------------- */ -intn +int H5O_count (H5G_entry_t *ent, const H5O_class_t *type) { H5O_t *oh = NULL; - intn acc; - uintn u; + int acc; + unsigned u; FUNC_ENTER (H5O_count, FAIL); @@ -983,10 +983,10 @@ H5O_count (H5G_entry_t *ent, const H5O_class_t *type) *------------------------------------------------------------------------- */ htri_t -H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence) +H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, int sequence) { H5O_t *oh=NULL; - uintn u; + unsigned u; FUNC_ENTER(H5O_exists, FAIL); assert(ent); @@ -1038,11 +1038,11 @@ H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence) *------------------------------------------------------------------------- */ void * -H5O_read(H5G_entry_t *ent, const H5O_class_t *type, intn sequence, void *mesg) +H5O_read(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mesg) { H5O_t *oh = NULL; void *ret_value = NULL; - intn idx; + int idx; H5G_cache_t *cache = NULL; H5G_type_t cache_type; @@ -1155,12 +1155,12 @@ H5O_read(H5G_entry_t *ent, const H5O_class_t *type, intn sequence, void *mesg) * The ADDR argument is passed by value. *------------------------------------------------------------------------- */ -static uintn +static unsigned H5O_find_in_ohdr(H5F_t *f, haddr_t addr, const H5O_class_t **type_p, - intn sequence) + int sequence) { H5O_t *oh = NULL; - uintn u; + unsigned u; const H5O_class_t *type = NULL; FUNC_ENTER(H5O_find_in_ohdr, UFAIL); @@ -1252,14 +1252,14 @@ H5O_find_in_ohdr(H5F_t *f, haddr_t addr, const H5O_class_t **type_p, * *------------------------------------------------------------------------- */ -intn -H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, intn overwrite, - uintn flags, const void *mesg) +int +H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, int overwrite, + unsigned flags, const void *mesg) { H5O_t *oh = NULL; - intn sequence; - uintn idx; - intn ret_value = FAIL; + int sequence; + unsigned idx; + int ret_value = FAIL; size_t size = 0; H5O_shared_t sh_mesg = {0,{{0,0}}}; @@ -1422,7 +1422,7 @@ H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, intn overwrite, static herr_t H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force) { - uintn idx; + unsigned idx; time_t now = HDtime(NULL); size_t size; @@ -1545,11 +1545,11 @@ H5O_touch(H5G_entry_t *ent, hbool_t force) *------------------------------------------------------------------------- */ herr_t -H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, intn sequence) +H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, int sequence) { H5O_t *oh = NULL; - intn seq, nfailed = 0; - uintn u; + int seq, nfailed = 0; + unsigned u; herr_t ret_value = FAIL; H5O_shared_t *sh_mesg = NULL; @@ -1663,11 +1663,11 @@ H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, intn sequence) * memory. *------------------------------------------------------------------------- */ -static uintn -H5O_alloc_extend_chunk(H5O_t *oh, uintn chunkno, size_t size) +static unsigned +H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size) { - uintn u; - uintn idx; + unsigned u; + unsigned idx; size_t delta, old_size; size_t aligned_size = H5O_ALIGN(size); uint8_t *old_addr; @@ -1722,7 +1722,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, uintn chunkno, size_t size) /* create a new null message */ if (oh->nmesgs >= oh->alloc_nmesgs) { - uintn na = oh->alloc_nmesgs + H5O_NMESGS; + unsigned na = oh->alloc_nmesgs + H5O_NMESGS; H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na); if (NULL==x) { @@ -1796,17 +1796,17 @@ H5O_alloc_extend_chunk(H5O_t *oh, uintn chunkno, size_t size) * *------------------------------------------------------------------------- */ -static uintn +static unsigned H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size) { size_t cont_size; /*continuation message size */ - intn found_null = (-1); /*best fit null message */ - intn found_other = (-1); /*best fit other message */ - uintn idx; /*message number return value */ + int found_null = (-1); /*best fit null message */ + int found_other = (-1); /*best fit other message */ + unsigned idx; /*message number return value */ uint8_t *p = NULL; /*ptr into new chunk */ H5O_cont_t *cont = NULL; /*native continuation message */ - intn chunkno; - uintn u; + int chunkno; + unsigned u; FUNC_ENTER(H5O_alloc_new_chunk, UFAIL); @@ -1863,7 +1863,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size) * Create the new chunk without giving it a file address. */ if (oh->nchunks >= oh->alloc_nchunks) { - uintn na = oh->alloc_nchunks + H5O_NCHUNKS; + unsigned na = oh->alloc_nchunks + H5O_NCHUNKS; H5O_chunk_t *x = H5FL_ARR_REALLOC (H5O_chunk_t, oh->chunk, na); if (!x) { @@ -1888,7 +1888,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size) */ if (oh->nmesgs + 3 > oh->alloc_nmesgs) { int old_alloc=oh->alloc_nmesgs; - uintn na = oh->alloc_nmesgs + MAX (H5O_NMESGS, 3); + unsigned na = oh->alloc_nmesgs + MAX (H5O_NMESGS, 3); H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na); if (!x) { @@ -1985,12 +1985,12 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size) * *------------------------------------------------------------------------- */ -static uintn +static unsigned H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size) { - uintn chunkno; - uintn idx; - uintn null_idx; + unsigned chunkno; + unsigned idx; + unsigned null_idx; size_t aligned_size = H5O_ALIGN(size); FUNC_ENTER(H5O_alloc, UFAIL); @@ -2046,7 +2046,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size) if (oh->nmesgs >= oh->alloc_nmesgs) { int old_alloc=oh->alloc_nmesgs; - uintn na = oh->alloc_nmesgs + H5O_NMESGS; + unsigned na = oh->alloc_nmesgs + H5O_NMESGS; H5O_mesg_t *x = H5FL_ARR_REALLOC (H5O_mesg_t, oh->mesg, na); if (!x) { @@ -2156,16 +2156,16 @@ H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg, *------------------------------------------------------------------------- */ herr_t -H5O_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent, intn fwidth) +H5O_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth) { H5O_t *oh = NULL; - uintn i, chunkno; + unsigned i, chunkno; size_t mesg_total = 0, chunk_total = 0; int *sequence; haddr_t tmp_addr; herr_t ret_value = FAIL; void *(*decode)(H5F_t*, const uint8_t*, H5O_shared_t*); - herr_t (*debug)(H5F_t*, const void*, FILE*, intn, intn)=NULL; + herr_t (*debug)(H5F_t*, const void*, FILE*, int, int)=NULL; FUNC_ENTER(H5O_debug, FAIL); @@ -2235,7 +2235,7 @@ H5O_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent, intn fwidth) /* check for bad message id */ if (oh->mesg[i].type->id < 0 || - oh->mesg[i].type->id >= (intn)NELMTS(message_type_g)) { + oh->mesg[i].type->id >= (int)NELMTS(message_type_g)) { HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n", oh->mesg[i].type->id); continue; diff --git a/src/H5Oattr.c b/src/H5Oattr.c index f0e73d9..fb4ec17 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -33,7 +33,7 @@ static void *H5O_attr_copy (const void *_mesg, void *_dest); static size_t H5O_attr_size (H5F_t *f, const void *_mesg); static herr_t H5O_attr_reset (void *_mesg); static herr_t H5O_attr_debug (H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); + FILE * stream, int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_ATTR[1] = {{ @@ -54,7 +54,7 @@ const H5O_class_t H5O_ATTR[1] = {{ #define H5O_ATTR_VERSION 1 /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare external the free list for H5S_t's */ @@ -94,7 +94,7 @@ H5O_attr_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) H5A_t *attr = NULL; H5S_simple_t *simple; /*simple dimensionality information */ size_t name_len; /*attribute name length */ - intn version; /*message version number*/ + int version; /*message version number*/ FUNC_ENTER(H5O_attr_decode, NULL); @@ -389,8 +389,8 @@ H5O_attr_reset(void *_mesg) H5F_t *f; IN: pointer to the HDF5 file struct const void *mesg; IN: Pointer to the source attribute struct FILE *stream; IN: Pointer to the stream for output data - intn indent; IN: Amount to indent information by - intn fwidth; IN: Field width (?) + int indent; IN: Amount to indent information by + int fwidth; IN: Field width (?) RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -398,8 +398,8 @@ H5O_attr_reset(void *_mesg) parameter. --------------------------------------------------------------------------*/ static herr_t -H5O_attr_debug(H5F_t *f, const void *_mesg, FILE * stream, intn indent, - intn fwidth) +H5O_attr_debug(H5F_t *f, const void *_mesg, FILE * stream, int indent, + int fwidth) { const H5A_t *mesg = (const H5A_t *)_mesg; diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c index 5cb6455..1caea0c 100644 --- a/src/H5Ocomp.c +++ b/src/H5Ocomp.c @@ -15,7 +15,7 @@ /* Interface initialization */ #define PABLO_MASK H5O_pline_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL #define H5O_PLINE_VERSION 1 @@ -27,7 +27,7 @@ static size_t H5O_pline_size (H5F_t *f, const void *_mesg); static herr_t H5O_pline_reset (void *_mesg); static herr_t H5O_pline_free (void *_mesg); static herr_t H5O_pline_debug (H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); + FILE * stream, int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_PLINE[1] = {{ @@ -72,7 +72,7 @@ H5O_pline_decode(H5F_t UNUSED *f, const uint8_t *p, { H5O_pline_t *pline = NULL; void *ret_value = NULL; - uintn version; + unsigned version; size_t i, j, n, name_length; FUNC_ENTER(H5O_pline_decode, NULL); @@ -126,7 +126,7 @@ H5O_pline_decode(H5F_t UNUSED *f, const uint8_t *p, /* * Read the client data values and the padding */ - pline->filter[i].cd_values = H5MM_malloc(n*sizeof(uintn)); + pline->filter[i].cd_values = H5MM_malloc(n*sizeof(unsigned)); if (NULL==pline->filter[i].cd_values) { HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for client data"); @@ -279,13 +279,13 @@ H5O_pline_copy (const void *_src, void *_dst/*out*/) } if (src->filter[i].cd_nelmts>0) { dst->filter[i].cd_values = H5MM_malloc(src->filter[i].cd_nelmts* - sizeof(uintn)); + sizeof(unsigned)); if (NULL==dst->filter[i].cd_values) { HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); } HDmemcpy (dst->filter[i].cd_values, src->filter[i].cd_values, - src->filter[i].cd_nelmts * sizeof(uintn)); + src->filter[i].cd_nelmts * sizeof(unsigned)); } } ret_value = dst; @@ -440,7 +440,7 @@ H5O_pline_free (void *mesg) */ static herr_t H5O_pline_debug (H5F_t UNUSED *f, const void *mesg, FILE *stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_pline_t *pline = (const H5O_pline_t *)mesg; size_t i, j; diff --git a/src/H5Ocont.c b/src/H5Ocont.c index 7cda46b..969a7c4 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -29,7 +29,7 @@ static void *H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t *sh); static herr_t H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg); static herr_t H5O_cont_debug(H5F_t *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_CONT[1] = {{ @@ -48,7 +48,7 @@ const H5O_class_t H5O_CONT[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /*------------------------------------------------------------------------- @@ -142,7 +142,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg) */ static herr_t H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_cont_t *cont = (const H5O_cont_t *) _mesg; diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 8e43762..545531f 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -36,7 +36,7 @@ static herr_t H5O_dtype_get_share (H5F_t *f, const void *_mesg, static herr_t H5O_dtype_set_share (H5F_t *f, void *_mesg, const H5O_shared_t *sh); static herr_t H5O_dtype_debug (H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); + FILE * stream, int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_DTYPE[1] = {{ @@ -64,7 +64,7 @@ const H5O_class_t H5O_DTYPE[1] = {{ #define H5O_DTYPE_VERSION_UPDATED 2 /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare external the free list for H5T_t's */ @@ -89,8 +89,8 @@ H5FL_EXTERN(H5T_t); static herr_t H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) { - uintn flags, version; - intn i, j; + unsigned flags, version; + int i, j; size_t z; FUNC_ENTER(H5O_dtype_decode_helper, FAIL); @@ -197,10 +197,10 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) "memory allocation failed"); } for (i = 0; i < dt->u.compnd.nmembs; i++) { - intn ndims=0; /* Number of dimensions of the array field */ + int ndims=0; /* Number of dimensions of the array field */ hsize_t dim[H5O_LAYOUT_NDIMS]; /* Dimensions of the array */ int perm[H5O_LAYOUT_NDIMS]; /* Dimension permutations */ - uintn perm_word=0; /* Dimension permutation information */ + unsigned perm_word=0; /* Dimension permutation information */ H5T_t *array_dt; /* Temporary pointer to the array datatype */ H5T_t *temp_type; /* Temporary pointer to the field's datatype */ @@ -436,9 +436,9 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt) static herr_t H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt) { - uintn flags = 0; + unsigned flags = 0; char *hdr = (char *)*pp; - intn i, j; + int i, j; size_t n, z, aligned; FUNC_ENTER(H5O_dtype_encode_helper, FAIL); @@ -781,7 +781,7 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt) break; } - *hdr++ = ((uintn)(dt->type) & 0x0f) | (((dt->type==H5T_COMPOUND && dt->u.compnd.has_array) ? H5O_DTYPE_VERSION_UPDATED : H5O_DTYPE_VERSION_COMPAT )<<4); + *hdr++ = ((unsigned)(dt->type) & 0x0f) | (((dt->type==H5T_COMPOUND && dt->u.compnd.has_array) ? H5O_DTYPE_VERSION_UPDATED : H5O_DTYPE_VERSION_COMPAT )<<4); *hdr++ = (flags >> 0) & 0xff; *hdr++ = (flags >> 8) & 0xff; *hdr++ = (flags >> 16) & 0xff; @@ -929,7 +929,7 @@ H5O_dtype_copy(const void *_src, void *_dst) static size_t H5O_dtype_size(H5F_t *f, const void *mesg) { - intn i; + int i; size_t ret_value = 8; const H5T_t *dt = (const H5T_t *) mesg; @@ -1141,8 +1141,8 @@ H5O_dtype_set_share (H5F_t UNUSED *f, void *_mesg/*in,out*/, const void *mesg; IN: Pointer to the source simple datatype struct FILE *stream; IN: Pointer to the stream for output data - intn indent; IN: Amount to indent information by - intn fwidth; IN: Field width (?) + int indent; IN: Amount to indent information by + int fwidth; IN: Field width (?) RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -1151,12 +1151,12 @@ H5O_dtype_set_share (H5F_t UNUSED *f, void *_mesg/*in,out*/, --------------------------------------------------------------------------*/ static herr_t H5O_dtype_debug(H5F_t *f, const void *mesg, FILE *stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5T_t *dt = (const H5T_t*)mesg; const char *s; char buf[256]; - intn i; + int i; size_t k; diff --git a/src/H5Oefl.c b/src/H5Oefl.c index f26e276..26cb732 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -23,7 +23,7 @@ static void *H5O_efl_copy(const void *_mesg, void *_dest); static size_t H5O_efl_size(H5F_t *f, const void *_mesg); static herr_t H5O_efl_reset(void *_mesg); static herr_t H5O_efl_debug(H5F_t *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_EFL[1] = {{ @@ -44,7 +44,7 @@ const H5O_class_t H5O_EFL[1] = {{ #define H5O_EFL_VERSION 1 /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -71,7 +71,7 @@ static void * H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5O_efl_t *mesg = NULL; - intn i, version; + int i, version; const char *s = NULL; FUNC_ENTER(H5O_efl_decode, NULL); @@ -572,11 +572,11 @@ H5O_efl_write (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t addr, */ static herr_t H5O_efl_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg; char buf[64]; - intn i; + int i; FUNC_ENTER(H5O_efl_debug, FAIL); diff --git a/src/H5Ofill.c b/src/H5Ofill.c index e8ccd79..1d8ef69 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -23,7 +23,7 @@ static void *H5O_fill_copy(const void *_mesg, void *_dest); static size_t H5O_fill_size(H5F_t *f, const void *_mesg); static herr_t H5O_fill_reset(void *_mesg); static herr_t H5O_fill_debug(H5F_t *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_FILL[1] = {{ @@ -42,7 +42,7 @@ const H5O_class_t H5O_FILL[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -265,7 +265,7 @@ H5O_fill_reset(void *_mesg) */ static herr_t H5O_fill_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg; diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 6f918f7..5603258 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -21,7 +21,7 @@ static void *H5O_layout_copy(const void *_mesg, void *_dest); static size_t H5O_layout_size(H5F_t *f, const void *_mesg); static herr_t H5O_layout_free (void *_mesg); static herr_t H5O_layout_debug(H5F_t *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_LAYOUT[1] = {{ @@ -43,7 +43,7 @@ const H5O_class_t H5O_LAYOUT[1] = {{ /* Interface initialization */ #define PABLO_MASK H5O_layout_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the H5O_layout_t struct */ @@ -73,8 +73,8 @@ static void * H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5O_layout_t *mesg = NULL; - intn version; - uintn u; + int version; + unsigned u; FUNC_ENTER(H5O_layout_decode, NULL); @@ -142,7 +142,7 @@ static herr_t H5O_layout_encode(H5F_t *f, uint8_t *p, const void *_mesg) { const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; - uintn u; + unsigned u; FUNC_ENTER(H5O_layout_encode, FAIL); @@ -298,10 +298,10 @@ H5O_layout_free (void *mesg) */ static herr_t H5O_layout_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; - uintn u; + unsigned u; FUNC_ENTER(H5O_layout_debug, FAIL); diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 2069a59..b44dd98 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -26,7 +26,7 @@ static void *H5O_mtime_copy(const void *_mesg, void *_dest); static size_t H5O_mtime_size(H5F_t *f, const void *_mesg); static herr_t H5O_mtime_free (void *_mesg); static herr_t H5O_mtime_debug(H5F_t *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_MTIME[1] = {{ @@ -45,7 +45,7 @@ const H5O_class_t H5O_MTIME[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the time_t struct */ @@ -75,7 +75,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { time_t *mesg, the_time; - intn i; + int i; struct tm tm; static int ncalls=0; @@ -336,7 +336,7 @@ H5O_mtime_free (void *mesg) */ static herr_t H5O_mtime_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth) + int indent, int fwidth) { const time_t *mesg = (const time_t *)_mesg; struct tm *tm; diff --git a/src/H5Oname.c b/src/H5Oname.c index c75cdd7..916b0a9 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -28,7 +28,7 @@ static void *H5O_name_copy(const void *_mesg, void *_dest); static size_t H5O_name_size(H5F_t *f, const void *_mesg); static herr_t H5O_name_reset(void *_mesg); static herr_t H5O_name_debug(H5F_t *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth); + int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_NAME[1] = {{ @@ -47,7 +47,7 @@ const H5O_class_t H5O_NAME[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -251,7 +251,7 @@ H5O_name_reset(void *_mesg) */ static herr_t H5O_name_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_name_t *mesg = (const H5O_name_t *)_mesg; diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 9a92bb3..d727e58 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -68,7 +68,7 @@ struct H5O_shared_t; typedef struct H5O_class_t { - intn id; /*message type ID on disk */ + int id; /*message type ID on disk */ const char *name; /*for debugging */ size_t native_size; /*size of native message */ void *(*decode)(H5F_t*, const uint8_t*, struct H5O_shared_t*); @@ -79,7 +79,7 @@ typedef struct H5O_class_t { herr_t (*free)(void *); /*free main data struct */ herr_t (*get_share)(H5F_t*, const void*, struct H5O_shared_t*); herr_t (*set_share)(H5F_t*, void*, const struct H5O_shared_t*); - herr_t (*debug)(H5F_t*, const void*, FILE*, intn, intn); + herr_t (*debug)(H5F_t*, const void*, FILE*, int, int); } H5O_class_t; typedef struct H5O_mesg_t { @@ -89,7 +89,7 @@ typedef struct H5O_mesg_t { void *native; /*native format message */ uint8_t *raw; /*ptr to raw data */ size_t raw_size; /*size with alignment */ - uintn chunkno; /*chunk number for this mesg */ + unsigned chunkno; /*chunk number for this mesg */ } H5O_mesg_t; typedef struct H5O_chunk_t { @@ -103,13 +103,13 @@ typedef struct H5O_t { H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */ /* first field in structure */ hbool_t dirty; /*out of data wrt disk */ - intn version; /*version number */ - intn nlink; /*link count */ - uintn nmesgs; /*number of messages */ - uintn alloc_nmesgs; /*number of message slots */ + int version; /*version number */ + int nlink; /*link count */ + unsigned nmesgs; /*number of messages */ + unsigned alloc_nmesgs; /*number of message slots */ H5O_mesg_t *mesg; /*array of messages */ - uintn nchunks; /*number of chunks */ - uintn alloc_nchunks; /*chunks allocated */ + unsigned nchunks; /*number of chunks */ + unsigned alloc_nchunks; /*chunks allocated */ H5O_chunk_t *chunk; /*array of chunks */ } H5O_t; @@ -165,8 +165,8 @@ typedef struct H5O_efl_entry_t { typedef struct H5O_efl_t { haddr_t heap_addr; /*address of name heap */ - intn nalloc; /*number of slots allocated */ - intn nused; /*number of slots used */ + int nalloc; /*number of slots allocated */ + int nused; /*number of slots used */ H5O_efl_entry_t *slot; /*array of external file entries */ } H5O_efl_t; @@ -180,7 +180,7 @@ __DLLVAR__ const H5O_class_t H5O_LAYOUT[1]; typedef struct H5O_layout_t { int type; /*type of layout, H5D_layout_t */ haddr_t addr; /*file address of data or B-tree */ - uintn ndims; /*num dimensions in stored data */ + unsigned ndims; /*num dimensions in stored data */ hsize_t dim[H5O_LAYOUT_NDIMS]; /*size of data or chunk */ } H5O_layout_t; @@ -195,10 +195,10 @@ typedef struct H5O_pline_t { size_t nalloc; /*num elements in `filter' array */ struct { H5Z_filter_t id; /*filter identification number */ - uintn flags; /*defn and invocation flags */ + unsigned flags; /*defn and invocation flags */ char *name; /*optional filter name */ size_t cd_nelmts; /*number of elements in cd_values[] */ - uintn *cd_values; /*client data values */ + unsigned *cd_values; /*client data values */ } *filter; /*array of filters */ } H5O_pline_t; @@ -253,7 +253,7 @@ typedef struct H5O_cont_t { size_t size; /*size of continuation block */ /* the following field(s) do not appear on disk */ - uintn chunkno; /*chunk this mesg refers to */ + unsigned chunkno; /*chunk this mesg refers to */ } H5O_cont_t; /* @@ -275,24 +275,24 @@ __DLL__ herr_t H5O_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); __DLL__ herr_t H5O_open(H5G_entry_t *ent); __DLL__ herr_t H5O_close(H5G_entry_t *ent); -__DLL__ intn H5O_link(H5G_entry_t *ent, intn adjust); -__DLL__ intn H5O_count(H5G_entry_t *ent, const H5O_class_t *type); +__DLL__ int H5O_link(H5G_entry_t *ent, int adjust); +__DLL__ int H5O_count(H5G_entry_t *ent, const H5O_class_t *type); __DLL__ htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, - intn sequence); + int sequence); __DLL__ void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type, - intn sequence, void *mesg); -__DLL__ intn H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, - intn overwrite, uintn flags, const void *mesg); + int sequence, void *mesg); +__DLL__ int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, + int overwrite, unsigned flags, const void *mesg); __DLL__ herr_t H5O_touch(H5G_entry_t *ent, hbool_t force); __DLL__ herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, - intn sequence); + int sequence); __DLL__ herr_t H5O_reset(const H5O_class_t *type, void *native); __DLL__ void *H5O_free(const H5O_class_t *type, void *mesg); __DLL__ void *H5O_copy(const H5O_class_t *type, const void *mesg, void *dst); __DLL__ herr_t H5O_share(H5F_t *f, const H5O_class_t *type, const void *mesg, H5HG_t *hobj/*out*/); -__DLL__ herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, - intn fwidth); +__DLL__ herr_t H5O_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, + int fwidth); /* EFL operators */ __DLL__ hsize_t H5O_efl_total_size(H5O_efl_t *efl); diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 8d84b2c..10ed482 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -32,7 +32,7 @@ static size_t H5O_sdspace_size(H5F_t *f, const void *_mesg); static herr_t H5O_sdspace_reset(void *_mesg); static herr_t H5O_sdspace_free (void *_mesg); static herr_t H5O_sdspace_debug(H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); + FILE * stream, int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_SDSPACE[1] = {{ @@ -53,7 +53,7 @@ const H5O_class_t H5O_SDSPACE[1] = {{ #define H5O_SDSPACE_VERSION 1 /* Is the interface initialized? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare external the free list for H5S_simple_t's */ @@ -93,8 +93,8 @@ H5O_sdspace_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5S_simple_t *sdim = NULL;/* New simple dimensionality structure */ void *ret_value = NULL; - uintn u; /* local counting variable */ - uintn flags, version; + unsigned u; /* local counting variable */ + unsigned flags, version; FUNC_ENTER(H5O_sdspace_decode, NULL); @@ -183,8 +183,8 @@ static herr_t H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *mesg) { const H5S_simple_t *sdim = (const H5S_simple_t *) mesg; - uintn u; /* Local counting variable */ - uintn flags = 0; + unsigned u; /* Local counting variable */ + unsigned flags = 0; FUNC_ENTER(H5O_sdspace_encode, FAIL); @@ -400,8 +400,8 @@ H5O_sdspace_free (void *mesg) H5F_t *f; IN: pointer to the HDF5 file struct const void *mesg; IN: Pointer to the source simple dimensionality struct FILE *stream; IN: Pointer to the stream for output data - intn indent; IN: Amount to indent information by - intn fwidth; IN: Field width (?) + int indent; IN: Amount to indent information by + int fwidth; IN: Field width (?) RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -410,10 +410,10 @@ H5O_sdspace_free (void *mesg) --------------------------------------------------------------------------*/ static herr_t H5O_sdspace_debug(H5F_t UNUSED *f, const void *mesg, - FILE * stream, intn indent, intn fwidth) + FILE * stream, int indent, int fwidth) { const H5S_simple_t *sdim = (const H5S_simple_t *) mesg; - uintn u; /* local counting variable */ + unsigned u; /* local counting variable */ FUNC_ENTER(H5O_sdspace_debug, FAIL); diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 04be059..1b8b423 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -22,7 +22,7 @@ static void *H5O_shared_decode (H5F_t*, const uint8_t*, H5O_shared_t *sh); static herr_t H5O_shared_encode (H5F_t*, uint8_t*, const void*); static size_t H5O_shared_size (H5F_t*, const void*); -static herr_t H5O_shared_debug (H5F_t*, const void*, FILE*, intn, intn); +static herr_t H5O_shared_debug (H5F_t*, const void*, FILE*, int, int); /* This message derives from H5O */ const H5O_class_t H5O_SHARED[1] = {{ @@ -44,7 +44,7 @@ const H5O_class_t H5O_SHARED[1] = {{ /* Interface initialization */ #define PABLO_MASK H5O_shared_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -69,7 +69,7 @@ static void * H5O_shared_decode (H5F_t *f, const uint8_t *buf, H5O_shared_t UNUSED *sh) { H5O_shared_t *mesg; - uintn flags, version; + unsigned flags, version; FUNC_ENTER (H5O_shared_decode, NULL); @@ -130,7 +130,7 @@ static herr_t H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg) { const H5O_shared_t *mesg = (const H5O_shared_t *)_mesg; - uintn flags; + unsigned flags; FUNC_ENTER (H5O_shared_encode, FAIL); @@ -209,7 +209,7 @@ H5O_shared_size (H5F_t *f, const void UNUSED *_mesg) */ static herr_t H5O_shared_debug (H5F_t UNUSED *f, const void *_mesg, - FILE *stream, intn indent, intn fwidth) + FILE *stream, int indent, int fwidth) { const H5O_shared_t *mesg = (const H5O_shared_t *)_mesg; diff --git a/src/H5Ostab.c b/src/H5Ostab.c index 59034a6..cec6c6f 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -30,7 +30,7 @@ static void *H5O_stab_copy(const void *_mesg, void *_dest); static size_t H5O_stab_size(H5F_t *f, const void *_mesg); static herr_t H5O_stab_free (void *_mesg); static herr_t H5O_stab_debug(H5F_t *f, const void *_mesg, - FILE * stream, intn indent, intn fwidth); + FILE * stream, int indent, int fwidth); /* This message derives from H5O */ const H5O_class_t H5O_STAB[1] = {{ @@ -49,7 +49,7 @@ const H5O_class_t H5O_STAB[1] = {{ }}; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage the H5O_stab_t struct */ @@ -284,7 +284,7 @@ H5O_stab_free (void *mesg) */ static herr_t H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, - intn indent, intn fwidth) + int indent, int fwidth) { const H5O_stab_t *stab = (const H5O_stab_t *) _mesg; @@ -30,7 +30,7 @@ #define PABLO_MASK H5P_mask /* Is the interface initialized? */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5P_init_interface static herr_t H5P_init_interface(void); @@ -58,7 +58,7 @@ hid_t H5P_LST_MOUNT_g = FAIL; /* Local static functions */ static H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class, - const char *name, uintn hashsize, uintn internal, + const char *name, unsigned hashsize, unsigned internal, H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data, H5P_cls_close_func_t cls_close, void *close_data); @@ -66,7 +66,7 @@ static herr_t H5P_close_list(void *_plist); static herr_t H5P_close_class(void *_pclass); static H5P_genprop_t *H5P_copy_prop(H5P_genprop_t *oprop); static herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod); -static herr_t H5P_add_prop(H5P_genprop_t *hash[], uintn hashsize, H5P_genprop_t *prop); +static herr_t H5P_add_prop(H5P_genprop_t *hash[], unsigned hashsize, H5P_genprop_t *prop); static herr_t H5P_free_prop(H5P_genprop_t *prop); /* Declare a free list to manage the H5P_t struct */ @@ -101,17 +101,17 @@ H5P_init(void) NAME H5P_xor_name -- Generate an xor'ed value for a string USAGE - uintn H5P_xor_name(s) + unsigned H5P_xor_name(s) const char *s; IN: String to operate over RETURNS Always returns valid value DESCRIPTION Generates an xor'ed value for a string --------------------------------------------------------------------------*/ -static uintn +static unsigned H5P_xor_name(const char *s) { - uintn ret=0; + unsigned ret=0; unsigned char temp; if(s!=NULL) @@ -129,16 +129,16 @@ H5P_xor_name(const char *s) NAME H5P_hash_name -- Generate a hash value for a string USAGE - uintn H5P_hash_name(s, hashsize) + unsigned H5P_hash_name(s, hashsize) const char *s; IN: String to operate over - uintn; IN: Size of hash table to clip against + unsigned; IN: Size of hash table to clip against RETURNS Always returns valid value DESCRIPTION Generates a hash location based on an xor'ed value for a string --------------------------------------------------------------------------*/ -static uintn -H5P_hash_name(const char *s, uintn hashsize) +static unsigned +H5P_hash_name(const char *s, unsigned hashsize) { return(H5P_xor_name(s)%hashsize); } /* end H5P_hash_name() */ @@ -161,7 +161,7 @@ H5P_init_interface(void) H5P_genclass_t *root_class; /* Pointer to root property list class created */ H5P_genclass_t *pclass; /* Pointer to property list class to create */ herr_t ret_value = SUCCEED; - intn i; + int i; herr_t status; FUNC_ENTER(H5P_init_interface, FAIL); @@ -259,10 +259,10 @@ H5P_init_interface(void) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -intn +int H5P_term_interface(void) { - intn i, n=0; + int i, n=0; if (interface_initialize_g) { /* Destroy HDF5 library property classes & lists */ @@ -592,7 +592,7 @@ static hid_t H5P_copy_pclass(H5P_genclass_t *pclass) H5P_genclass_t *new_pclass = NULL; /* Property list class copied */ H5P_genprop_t *tmp; /* Temporary pointer to parent class properties */ H5P_genprop_t *pcopy; /* Copy of property to insert into class */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ hid_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5P_copy_pclass, FAIL); @@ -676,7 +676,7 @@ static hid_t H5P_copy_plist(H5P_genplist_t *plist) H5P_genprop_t *tprop; /* Temporary pointer to properties */ H5P_genprop_t *new_prop; /* New property created for copy */ hid_t plist_id; /* Property list ID of new list created */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ hid_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5P_copy_plist, FAIL); @@ -1069,7 +1069,7 @@ H5Pget_version(hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, herr_t H5Pset_userblock(hid_t plist_id, hsize_t size) { - uintn i; + unsigned i; H5F_create_t *plist = NULL; FUNC_ENTER(H5Pset_userblock, FAIL); @@ -1754,7 +1754,7 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size) /* Add to the list */ if (plist->efl.nused>=plist->efl.nalloc) { - intn na = plist->efl.nalloc + H5O_EFL_ALLOC; + int na = plist->efl.nalloc + H5O_EFL_ALLOC; H5O_efl_entry_t *x = H5MM_realloc (plist->efl.slot, na*sizeof(H5O_efl_entry_t)); @@ -3649,7 +3649,7 @@ done: USAGE herr_t H5P_add_prop(hash, hashsize, prop) H5P_gen_prop_t *hash[]; IN/OUT: Pointer to array of properties for hash table - uintn hashsize; IN: Size of hash table + unsigned hashsize; IN: Size of hash table H5P_genprop_t *prop; IN: Pointer to property to insert RETURNS Returns non-negative on success, negative on failure. @@ -3662,9 +3662,9 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5P_add_prop(H5P_genprop_t *hash[], uintn hashsize, H5P_genprop_t *prop) +H5P_add_prop(H5P_genprop_t *hash[], unsigned hashsize, H5P_genprop_t *prop) { - uintn loc; /* Hash table location */ + unsigned loc; /* Hash table location */ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER (H5P_add_prop, FAIL); @@ -3695,7 +3695,7 @@ done: USAGE H5P_genprop_t *H5P_find_prop(hash, hashsize, name) H5P_genprop_t *hash[]; IN: Pointer to array of properties for hash table - uintn hashsize; IN: Size of hash table + unsigned hashsize; IN: Size of hash table const char *name; IN: Name of property to check for RETURNS Returns pointer to property on success, NULL on failure. @@ -3707,11 +3707,11 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static H5P_genprop_t * -H5P_find_prop(H5P_genprop_t *hash[], uintn hashsize, const char *name) +H5P_find_prop(H5P_genprop_t *hash[], unsigned hashsize, const char *name) { H5P_genprop_t *ret_value; /* Property pointer return value */ - uintn loc; /* Hash table location */ - uintn xor_val; /* XOR'ed value of the name to look for */ + unsigned loc; /* Hash table location */ + unsigned xor_val; /* XOR'ed value of the name to look for */ FUNC_ENTER (H5P_find_prop, NULL); @@ -3792,8 +3792,8 @@ done: USAGE herr_t H5P_free_all_prop(hash, hashsize, make_cb) H5P_gen_prop_t *hash[]; IN/OUT: Pointer to array of properties for hash table - uintn hashsize; IN: Size of hash table - uintn make_cb; IN: Whether to make property callbacks or not + unsigned hashsize; IN: Size of hash table + unsigned make_cb; IN: Whether to make property callbacks or not RETURNS Returns non-negative on success, negative on failure. DESCRIPTION @@ -3805,10 +3805,10 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5P_free_all_prop(H5P_genprop_t *hash[], uintn hashsize, uintn make_cb) +H5P_free_all_prop(H5P_genprop_t *hash[], unsigned hashsize, unsigned make_cb) { H5P_genprop_t *tprop, *next;/* Temporary pointer to properties */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER (H5P_free_all_prop, FAIL); @@ -3934,8 +3934,8 @@ done: cls_create, create_data, cls_close, close_data) H5P_genclass_t *par_class; IN: Pointer to parent class const char *name; IN: Name of class we are creating - uintn hashsize; IN: Number of buckets in hash table - uintn internal; IN: Whether this is an internal class or not + unsigned hashsize; IN: Number of buckets in hash table + unsigned internal; IN: Whether this is an internal class or not H5P_cls_create_func_t; IN: The callback function to call when each property list in this class is created. void *create_data; IN: Pointer to user data to pass along to class @@ -3959,7 +3959,7 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static H5P_genclass_t * -H5P_create_class(H5P_genclass_t *par_class, const char *name, uintn hashsize, uintn internal, +H5P_create_class(H5P_genclass_t *par_class, const char *name, unsigned hashsize, unsigned internal, H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data, H5P_cls_close_func_t cls_close, void *close_data @@ -4030,7 +4030,7 @@ done: cls_close, close_data) hid_t parent; IN: Property list class ID of parent class const char *name; IN: Name of class we are creating - uintn hashsize; IN: Number of buckets in hash table + unsigned hashsize; IN: Number of buckets in hash table H5P_cls_create_func_t cls_create; IN: The callback function to call when each property list in this class is created. @@ -4134,7 +4134,7 @@ static H5P_genplist_t *H5P_create_list(H5P_genclass_t *pclass) H5P_genplist_t *ret_value=NULL; /* return value */ H5P_genprop_t *tmp; /* Temporary pointer to parent class properties */ H5P_genprop_t *pcopy; /* Copy of property to insert into class */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ FUNC_ENTER (H5P_create_list, NULL); @@ -4439,7 +4439,7 @@ herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size, H5P_genprop_t *tmp_prop; /* Temporary property pointer */ H5P_genprop_t *new_prop=NULL; /* Temporary property pointer */ H5P_genprop_t *pcopy; /* Property copy */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5P_register, FAIL); @@ -4457,7 +4457,7 @@ herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size, */ if(pclass->plists>0 || pclass->classes>0) { if((new_class=H5P_create_class(pclass->parent,pclass->name,pclass->hashsize, - (uintn)pclass->internal,pclass->create_func,pclass->create_data, + (unsigned)pclass->internal,pclass->create_func,pclass->create_data, pclass->copy_func,pclass->copy_data, pclass->close_func,pclass->close_data))==NULL) HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "can't copy class"); @@ -5610,7 +5610,7 @@ done: PURPOSE Internal routine to compare two generic properties USAGE - intn H5P_cmp_prop(prop1, prop2) + int H5P_cmp_prop(prop1, prop2) H5P_genprop_t *prop1; IN: 1st property to compare H5P_genprop_t *prop1; IN: 2nd property to compare RETURNS @@ -5626,10 +5626,10 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn H5P_cmp_prop(H5P_genprop_t *prop1, H5P_genprop_t *prop2) +static int H5P_cmp_prop(H5P_genprop_t *prop1, H5P_genprop_t *prop2) { - intn cmp_value; /* Value from comparison */ - intn ret_value=0; /* return value */ + int cmp_value; /* Value from comparison */ + int ret_value=0; /* return value */ FUNC_ENTER (H5P_cmp_prop, FAIL); @@ -5701,7 +5701,7 @@ done: PURPOSE Internal routine to compare two generic property classes USAGE - intn H5P_cmp_class(pclass1, pclass2) + int H5P_cmp_class(pclass1, pclass2) H5P_genclass_t *pclass1; IN: 1st property class to compare H5P_genclass_t *pclass2; IN: 2nd property class to compare RETURNS @@ -5717,12 +5717,12 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn H5P_cmp_class(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2) +static int H5P_cmp_class(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2) { H5P_genprop_t *tprop1, *tprop2;/* Temporary pointer to properties */ - uintn u; /* Local index variable */ - intn cmp_value; /* Value from comparison */ - intn ret_value=0; /* return value */ + unsigned u; /* Local index variable */ + int cmp_value; /* Value from comparison */ + int ret_value=0; /* return value */ FUNC_ENTER (H5P_cmp_class, FAIL); @@ -5811,7 +5811,7 @@ done: PURPOSE Internal routine to compare two generic property lists USAGE - intn H5P_cmp_plist(plist1, plist2) + int H5P_cmp_plist(plist1, plist2) H5P_genplist_t *plist1; IN: 1st property list to compare H5P_genplist_t *plist2; IN: 2nd property list to compare RETURNS @@ -5827,12 +5827,12 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn H5P_cmp_plist(H5P_genplist_t *plist1, H5P_genplist_t *plist2) +static int H5P_cmp_plist(H5P_genplist_t *plist1, H5P_genplist_t *plist2) { H5P_genprop_t *tprop1, *tprop2;/* Temporary pointer to properties */ - uintn u; /* Local index variable */ - intn cmp_value; /* Value from comparison */ - intn ret_value=0; /* return value */ + unsigned u; /* Local index variable */ + int cmp_value; /* Value from comparison */ + int ret_value=0; /* return value */ FUNC_ENTER (H5P_cmp_plist, FAIL); @@ -6032,7 +6032,7 @@ done: herr_t H5P_iterate_props(id, hash, hashsize, idx, iter_func, iter_data) hid_t id; IN: ID of property object iterating over H5P_gen_prop_t *hash[]; IN: Pointer to array of properties for hash table - uintn hashsize; IN: Size of hash table + unsigned hashsize; IN: Size of hash table int *idx; IN/OUT: Index of the property to begin with H5P_iterate_t iter_func; IN: Function pointer to function to be called with each property iterated over. @@ -6076,10 +6076,10 @@ iteration, the function's behavior is undefined. EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static int H5P_iterate_props(hid_t id, H5P_genprop_t *hash[], uintn hashsize, int *idx, H5P_iterate_t iter_func, void *iter_data) +static int H5P_iterate_props(hid_t id, H5P_genprop_t *hash[], unsigned hashsize, int *idx, H5P_iterate_t iter_func, void *iter_data) { H5P_genprop_t *prop; /* Temporary property pointer */ - uintn u; /* Local index variable */ + unsigned u; /* Local index variable */ int curr_idx=0; /* Current iteration index */ int ret_value=0; /* Return value */ @@ -6348,11 +6348,11 @@ done: /*-------------------------------------------------------------------------- NAME - H5P_peek_uintn + H5P_peek_unsigned PURPOSE Internal routine to quickly retrieve the value of a property in a property list. USAGE - intn H5P_peek_uintn(plist_id, name) + int H5P_peek_unsigned(plist_id, name) hid_t plist_id; IN: Property list to check const char *name; IN: Name of property to query RETURNS @@ -6373,11 +6373,11 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -uintn H5P_peek_uintn(hid_t plist_id, const char *name) +unsigned H5P_peek_unsigned(hid_t plist_id, const char *name) { - uintn ret_value; /* return value */ + unsigned ret_value; /* return value */ - FUNC_ENTER (H5P_peek_uintn, UFAIL); + FUNC_ENTER (H5P_peek_unsigned, UFAIL); assert(name); @@ -6385,7 +6385,7 @@ uintn H5P_peek_uintn(hid_t plist_id, const char *name) H5P_get(plist_id,name,&ret_value); FUNC_LEAVE (ret_value); -} /* H5P_peek_uintn() */ +} /* H5P_peek_unsigned() */ /*-------------------------------------------------------------------------- @@ -6719,7 +6719,7 @@ static herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name { H5P_genprop_t *prop; /* Temporary property pointer */ H5P_genprop_t *tprop, *prev;/* Temporary pointer to properties */ - uintn loc; /* Hash table location */ + unsigned loc; /* Hash table location */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5P_remove, FAIL); @@ -6851,7 +6851,7 @@ static herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name) { H5P_genprop_t *prop; /* Temporary property pointer */ H5P_genprop_t *tprop, *prev;/* Temporary pointer to properties */ - uintn loc; /* Hash table location */ + unsigned loc; /* Hash table location */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5P_unregister, FAIL); diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index c11b14b..4f79406 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -39,7 +39,7 @@ typedef enum { /* Define structure to hold property information */ typedef struct H5P_genprop_tag { /* Values for this property */ - uintn xor_val; /* XOR'ed version of the name, for faster comparisons */ + unsigned xor_val; /* XOR'ed version of the name, for faster comparisons */ char *name; /* Name of property */ size_t size; /* Size of property value */ void *value; /* Pointer to property value */ @@ -61,12 +61,12 @@ typedef struct H5P_genclass_tag { struct H5P_genclass_tag *parent; /* Pointer to parent class */ char *name; /* Name of property list class */ size_t nprops; /* Number of properties in class */ - uintn hashsize; /* Hash table size */ - uintn plists; /* Number of property lists that have been created since the last modification to the class */ - uintn classes; /* Number of classes that have been derived since the last modification to the class */ - uintn ref_count; /* Number of oustanding ID's open on this class object */ - uintn internal:1; /* Whether this class is internal to the library or not */ - uintn deleted:1; /* Whether this class has been deleted and is waiting for dependent classes & proplists to close */ + unsigned hashsize; /* Hash table size */ + unsigned plists; /* Number of property lists that have been created since the last modification to the class */ + unsigned classes; /* Number of classes that have been derived since the last modification to the class */ + unsigned ref_count; /* Number of oustanding ID's open on this class object */ + unsigned internal:1; /* Whether this class is internal to the library or not */ + unsigned deleted:1; /* Whether this class has been deleted and is waiting for dependent classes & proplists to close */ /* Callback function pointers & info */ H5P_cls_create_func_t create_func; /* Function to call when a property list is created */ @@ -83,7 +83,7 @@ typedef struct H5P_genclass_tag { typedef struct H5P_genplist_tag { H5P_genclass_t *pclass; /* Pointer to class info */ size_t nprops; /* Number of properties in class */ - uintn class_init:1; /* Whether the class initialization callback finished successfully */ + unsigned class_init:1; /* Whether the class initialization callback finished successfully */ /* Hash size for a property list is same as class */ H5P_genprop_t *props[1]; /* Hash table of pointers to properties in the list */ @@ -116,7 +116,7 @@ __DLL__ H5P_class_t H5P_get_class(hid_t tid); __DLL__ hid_t H5P_get_driver(hid_t plist_id); /* Private functions to "peek" at properties of a certain type */ -__DLL__ uintn H5P_peek_uintn(hid_t plist_id, const char *name); +__DLL__ unsigned H5P_peek_unsigned(hid_t plist_id, const char *name); __DLL__ hid_t H5P_peek_hid_t(hid_t plist_id, const char *name); __DLL__ void *H5P_peek_voidp(hid_t plist_id, const char *name); __DLL__ hsize_t H5P_peek_hsize_t(hid_t plist_id, const char *name); @@ -29,7 +29,7 @@ /* Interface initialization */ #define PABLO_MASK H5R_mask #define INTERFACE_INIT H5R_init_interface -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5R_init_interface(void); /* Static functions */ @@ -37,7 +37,7 @@ static herr_t H5R_create(void *ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, H5S_t *space); static hid_t H5R_dereference(H5F_t *file, H5R_type_t ref_type, void *_ref); static H5S_t * H5R_get_region(H5F_t *file, H5R_type_t ref_type, void *_ref); -static intn H5R_get_object_type(H5F_t *file, void *_ref); +static int H5R_get_object_type(H5F_t *file, void *_ref); /*-------------------------------------------------------------------------- @@ -85,10 +85,10 @@ H5R_init_interface(void) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -intn +int H5R_term_interface(void) { - intn n=0; + int n=0; if (interface_initialize_g) { if ((n=H5I_nmembers(H5I_REFERENCE))) { @@ -169,8 +169,8 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type, hssize_t buf_size; /* Size of buffer needed to serialize selection */ uint8_t *p; /* Pointer to OID to store */ uint8_t *buf; /* Buffer to store serialized selection in */ - uintn heapid_found; /* Flag for non-zero heap ID found */ - uintn u; /* local index */ + unsigned heapid_found; /* Flag for non-zero heap ID found */ + unsigned u; /* local index */ /* Set up information for dataset region */ @@ -342,7 +342,7 @@ H5R_dereference(H5F_t *file, H5R_type_t ref_type, void *_ref) H5T_t *datatype; /* Pointer to datatype to open */ H5G_entry_t ent; /* Symbol table entry */ uint8_t *p; /* Pointer to OID to store */ - intn oid_type; /* type of object being dereferenced */ + int oid_type; /* type of object being dereferenced */ hid_t ret_value = FAIL; FUNC_ENTER(H5R_dereference, FAIL); @@ -665,7 +665,7 @@ done: PURPOSE Retrieves the type of object that an object reference points to USAGE - intn H5R_get_object_type(file, ref) + int H5R_get_object_type(file, ref) H5F_t *file; IN: File the object being dereferenced is within void *ref; IN: Reference to query. @@ -680,13 +680,13 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static intn +static int H5R_get_object_type(H5F_t *file, void *_ref) { H5G_entry_t ent; /* Symbol table entry */ hobj_ref_t *ref=(hobj_ref_t *)_ref; /* Only object references currently supported */ uint8_t *p; /* Pointer to OID to store */ - intn ret_value = H5G_UNKNOWN; + int ret_value = H5G_UNKNOWN; FUNC_ENTER(H5R_get_object_type, H5G_UNKNOWN); @@ -717,7 +717,7 @@ done: PURPOSE Retrieves the type of object that an object reference points to USAGE - intn H5Rget_object_type(id, ref) + int H5Rget_object_type(id, ref) hid_t id; IN: Dataset reference object is in or location ID of object that the dataset is located within. void *ref; IN: Reference to query. @@ -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; diff --git a/src/H5Sall.c b/src/H5Sall.c index 5c8eea8..e0ad8b2 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -20,7 +20,7 @@ /* Interface initialization */ #define PABLO_MASK H5Sall_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5S_all_init (const H5S_t *space, H5S_sel_iter_t *iter); static hsize_t H5S_all_favail (const H5S_t *space, const H5S_sel_iter_t *iter, @@ -399,7 +399,7 @@ H5S_all_read(H5F_t *f, const H5O_layout_t *layout, const H5O_pline_t *pline, hsize_t size[H5O_LAYOUT_NDIMS]; hssize_t file_offset[H5O_LAYOUT_NDIMS]; hssize_t mem_offset[H5O_LAYOUT_NDIMS]; - uintn u; + unsigned u; FUNC_ENTER(H5S_all_read, FAIL); *must_convert = TRUE; @@ -563,7 +563,7 @@ H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout, hsize_t size[H5O_LAYOUT_NDIMS]; hssize_t file_offset[H5O_LAYOUT_NDIMS]; hssize_t mem_offset[H5O_LAYOUT_NDIMS]; - uintn u; + unsigned u; FUNC_ENTER(H5S_all_write, FAIL); *must_convert = TRUE; @@ -734,7 +734,7 @@ H5S_all_release (H5S_t UNUSED *space) hsize_t H5S_all_npoints (const H5S_t *space) { - uintn u; /* Counters */ + unsigned u; /* Counters */ hsize_t ret_value; FUNC_ENTER (H5S_all_npoints, 0); @@ -856,8 +856,8 @@ done: herr_t H5S_all_bounds(H5S_t *space, hsize_t *start, hsize_t *end) { - intn rank; /* Dataspace rank */ - intn i; /* index variable */ + int rank; /* Dataspace rank */ + int i; /* index variable */ herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER (H5S_all_bounds, FAIL); @@ -999,8 +999,8 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op hsize_t offset; /* offset of region in buffer */ hsize_t nelemts; /* Number of elements to iterate through */ void *tmp_buf; /* temporary location of the element in the buffer */ - uintn rank; /* Dataspace rank */ - intn indx; /* Index to increment */ + unsigned rank; /* Dataspace rank */ + int indx; /* Index to increment */ herr_t ret_value=0; /* return value */ FUNC_ENTER (H5S_all_select_iterate, 0); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 06c7f08..e150938 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -24,7 +24,7 @@ /* Interface initialization */ #define PABLO_MASK H5Shyper_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /* Local datatypes */ /* Parameter block for H5S_hyper_fread, H5S_hyper_fwrite, H5S_hyper_mread & H5S_hyper_mwrite */ @@ -61,15 +61,15 @@ typedef struct { /* Static function prototypes */ static H5S_hyper_region_t * H5S_hyper_get_regions (size_t *num_regions, - uintn rank, uintn dim, size_t bound_count, + unsigned rank, unsigned dim, size_t bound_count, H5S_hyper_bound_t **lo_bounds, hssize_t *pos, hssize_t *offset); -static hsize_t H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info); +static hsize_t H5S_hyper_fread (int dim, H5S_hyper_io_info_t *io_info); static hsize_t H5S_hyper_fread_opt (H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, const struct H5O_efl_t *efl, size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id, void *_buf/*out*/); -static hsize_t H5S_hyper_fwrite (intn dim, +static hsize_t H5S_hyper_fwrite (int dim, H5S_hyper_io_info_t *io_info); static hsize_t H5S_hyper_fwrite_opt (H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, @@ -93,7 +93,7 @@ static herr_t H5S_hyper_fscat (H5F_t *f, const struct H5O_layout_t *layout, const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id, const void *buf); -static hsize_t H5S_hyper_mread (intn dim, H5S_hyper_io_info_t *io_info); +static hsize_t H5S_hyper_mread (int dim, H5S_hyper_io_info_t *io_info); static hsize_t H5S_hyper_mread_opt (const void *_buf, size_t elmt_size, const H5S_t *mem_space, H5S_sel_iter_t *mem_iter, hsize_t nelmts, void *_tconv_buf/*out*/); @@ -101,7 +101,7 @@ static hsize_t H5S_hyper_mgath (const void *_buf, size_t elmt_size, const H5S_t *mem_space, H5S_sel_iter_t *mem_iter, hsize_t nelmts, void *_tconv_buf/*out*/); -static size_t H5S_hyper_mwrite (intn dim, H5S_hyper_io_info_t *io_info); +static size_t H5S_hyper_mwrite (int dim, H5S_hyper_io_info_t *io_info); static hsize_t H5S_hyper_mwrite_opt (const void *_tconv_buf, size_t elmt_size, const H5S_t *mem_space, H5S_sel_iter_t *mem_iter, hsize_t nelmts, void *_buf/*out*/); @@ -269,7 +269,7 @@ H5S_hyper_compare_regions (const void *r1, const void *r2) *------------------------------------------------------------------------- */ static H5S_hyper_region_t * -H5S_hyper_get_regions (size_t *num_regions, uintn rank, uintn dim, +H5S_hyper_get_regions (size_t *num_regions, unsigned rank, unsigned dim, size_t bound_count, H5S_hyper_bound_t **lo_bounds, hssize_t *pos, hssize_t *offset) { @@ -281,8 +281,8 @@ H5S_hyper_get_regions (size_t *num_regions, uintn rank, uintn dim, hssize_t *tmp_pos,*tmp_off; /* Extra pointers into the position and offset arrays */ hssize_t pos_dim,off_dim; /* The position & offset in the dimension passed in */ size_t num_reg=0; /* Number of regions in array */ - intn curr_reg=-1; /* The current region we are working with */ - intn temp_dim; /* Temporary dim. holder */ + int curr_reg=-1; /* The current region we are working with */ + int temp_dim; /* Temporary dim. holder */ size_t i; /* Counters */ FUNC_ENTER (H5S_hyper_get_regions, NULL); @@ -411,11 +411,11 @@ H5S_hyper_get_regions (size_t *num_regions, uintn rank, uintn dim, */ static herr_t H5S_hyper_block_cache (H5S_hyper_node_t *node, - H5S_hyper_io_info_t *io_info, uintn block_read) + H5S_hyper_io_info_t *io_info, unsigned block_read) { hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/ hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */ - uintn u; /* Counters */ + unsigned u; /* Counters */ FUNC_ENTER (H5S_hyper_block_cache, SUCCEED); @@ -449,7 +449,7 @@ H5S_hyper_block_cache (H5S_hyper_node_t *node, } /* end else */ /* Set up parameters for accessing block (starting the read and write information at the same point) */ - node->cinfo.wleft=node->cinfo.rleft=(uintn)node->cinfo.size; + node->cinfo.wleft=node->cinfo.rleft=(unsigned)node->cinfo.size; node->cinfo.wpos=node->cinfo.rpos=node->cinfo.block; /* Set cached flag */ @@ -530,7 +530,7 @@ H5S_hyper_block_write (H5S_hyper_node_t *node, { hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/ hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */ - uintn u; /* Counters */ + unsigned u; /* Counters */ FUNC_ENTER (H5S_hyper_block_write, SUCCEED); @@ -597,20 +597,20 @@ H5S_hyper_block_write (H5S_hyper_node_t *node, *------------------------------------------------------------------------- */ static hsize_t -H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info) +H5S_hyper_fread (int dim, H5S_hyper_io_info_t *io_info) { hsize_t region_size; /* Size of lowest region */ - uintn parm_init=0; /* Whether one-shot parameters set up */ + unsigned parm_init=0; /* Whether one-shot parameters set up */ H5S_hyper_region_t *regions; /* Pointer to array of hyperslab nodes overlapped */ size_t num_regions; /* number of regions overlapped */ size_t i; /* Counters */ - intn j; + int j; #ifdef QAK - uintn u; + unsigned u; #endif /* QAK */ hsize_t num_read=0; /* Number of elements read */ - uintn cache_hyper; /* Hyperslab caching turned on? */ - uintn block_limit; /* Hyperslab cache limit */ + unsigned cache_hyper; /* Hyperslab caching turned on? */ + unsigned block_limit; /* Hyperslab cache limit */ FUNC_ENTER (H5S_hyper_fread, 0); @@ -629,7 +629,7 @@ H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info) /* Get a sorted list (in the next dimension down) of the regions which */ /* overlap the current index in this dim */ if((regions=H5S_hyper_get_regions(&num_regions,io_info->space->extent.u.simple.rank, - (uintn)(dim+1), + (unsigned)(dim+1), io_info->space->select.sel_info.hslab.hyper_lst->count, io_info->space->select.sel_info.hslab.hyper_lst->lo_bounds, io_info->iter->hyp.pos,io_info->space->select.offset))!=NULL) { @@ -658,7 +658,7 @@ H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info) printf("%s: check 2.1, region #%d: start=%d, end=%d\n", FUNC,i,(int)regions[i].start,(int)regions[i].end); #endif /* QAK */ - if((uintn)(dim+2)==io_info->space->extent.u.simple.rank) { + if((unsigned)(dim+2)==io_info->space->extent.u.simple.rank) { #ifdef QAK printf("%s: check 2.1.1, num_regions=%d\n",FUNC,(int)num_regions); #endif /* QAK */ @@ -779,7 +779,7 @@ H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info) #ifdef QAK printf("%s: check 3.5, dim=%d, region #%d={%d, %d}\n",FUNC,(int)dim,(int)i,(int)regions[i].start,(int)regions[i].end); { - intn k; + int k; printf("pos={"); for(k=0; k<io_info->space->extent.u.simple.rank; k++) { @@ -824,7 +824,7 @@ H5S_hyper_fread (intn dim, H5S_hyper_io_info_t *io_info) } /* end for */ #ifdef QAK { - intn k; + int k; printf("%s: check 6.0, dim=%d\n",FUNC,(int)dim); printf("pos={"); @@ -867,10 +867,10 @@ H5S_hyper_iter_next (const H5S_t *file_space, H5S_sel_iter_t *file_iter) { hsize_t iter_offset[H5O_LAYOUT_NDIMS]; hsize_t iter_count[H5O_LAYOUT_NDIMS]; - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ - uintn i; /* Counters */ - uintn ndims; /* Number of dimensions of dataset */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ + unsigned i; /* Counters */ + unsigned ndims; /* Number of dimensions of dataset */ FUNC_ENTER (H5S_hyper_iter_next, FAIL); @@ -976,13 +976,13 @@ H5S_hyper_fread_opt (H5F_t *f, const struct H5O_layout_t *layout, fast_dim_buf_off; hsize_t tot_blk_count; /* Total number of blocks left to output */ size_t act_blk_count; /* Actual number of blocks to output */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ hsize_t acc; /* Accumulator */ hsize_t buf_off; /* Current buffer offset for copying memory */ - intn i; /* Counters */ - uintn u; /* Counters */ - intn ndims; /* Number of dimensions of dataset */ + int i; /* Counters */ + unsigned u; /* Counters */ + int ndims; /* Number of dimensions of dataset */ size_t actual_read; /* The actual number of elements to read in */ size_t actual_bytes; /* The actual number of bytes to copy */ size_t io_left; /* The number of elements left in I/O operation */ @@ -1625,17 +1625,17 @@ H5S_hyper_fgath (H5F_t *f, const struct H5O_layout_t *layout, *------------------------------------------------------------------------- */ static hsize_t -H5S_hyper_fwrite (intn dim, H5S_hyper_io_info_t *io_info) +H5S_hyper_fwrite (int dim, H5S_hyper_io_info_t *io_info) { hsize_t region_size; /* Size of lowest region */ - uintn parm_init=0; /* Whether one-shot parameters set up */ + unsigned parm_init=0; /* Whether one-shot parameters set up */ H5S_hyper_region_t *regions; /* Pointer to array of hyperslab nodes overlapped */ size_t num_regions; /* number of regions overlapped */ size_t i; /* Counters */ - intn j; + int j; hsize_t num_written=0; /* Number of elements read */ - uintn cache_hyper; /* Hyperslab caching turned on? */ - uintn block_limit; /* Hyperslab cache limit */ + unsigned cache_hyper; /* Hyperslab caching turned on? */ + unsigned block_limit; /* Hyperslab cache limit */ FUNC_ENTER (H5S_hyper_fwrite, 0); @@ -1654,7 +1654,7 @@ H5S_hyper_fwrite (intn dim, H5S_hyper_io_info_t *io_info) /* Get a sorted list (in the next dimension down) of the regions which */ /* overlap the current index in this dim */ if((regions=H5S_hyper_get_regions(&num_regions,io_info->space->extent.u.simple.rank, - (uintn)(dim+1), + (unsigned)(dim+1), io_info->space->select.sel_info.hslab.hyper_lst->count, io_info->space->select.sel_info.hslab.hyper_lst->lo_bounds, io_info->iter->hyp.pos,io_info->space->select.offset))!=NULL) { @@ -1671,7 +1671,7 @@ H5S_hyper_fwrite (intn dim, H5S_hyper_io_info_t *io_info) /* Check if this is the second to last dimension in dataset */ /* (Which means that we've got a list of the regions in the fastest */ /* changing dimension and should input those regions) */ - if((uintn)(dim+2)==io_info->space->extent.u.simple.rank) { + if((unsigned)(dim+2)==io_info->space->extent.u.simple.rank) { /* perform I/O on data from regions */ for(i=0; i<num_regions && io_info->nelmts>0; i++) { @@ -1819,13 +1819,13 @@ H5S_hyper_fwrite_opt (H5F_t *f, const struct H5O_layout_t *layout, fast_dim_buf_off; hsize_t tot_blk_count; /* Total number of blocks left to output */ size_t act_blk_count; /* Actual number of blocks to output */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ hsize_t acc; /* Accumulator */ hsize_t buf_off; /* Current buffer offset for copying memory */ - intn i; /* Counters */ - uintn u; /* Counters */ - intn ndims; /* Number of dimensions of dataset */ + int i; /* Counters */ + unsigned u; /* Counters */ + int ndims; /* Number of dimensions of dataset */ size_t actual_write; /* The actual number of elements to write out */ size_t actual_bytes; /* The actual number of bytes to copy */ size_t io_left; /* The number of elements left in I/O operation */ @@ -2461,13 +2461,13 @@ H5S_hyper_fscat (H5F_t *f, const struct H5O_layout_t *layout, *------------------------------------------------------------------------- */ static hsize_t -H5S_hyper_mread (intn dim, H5S_hyper_io_info_t *io_info) +H5S_hyper_mread (int dim, H5S_hyper_io_info_t *io_info) { hsize_t region_size; /* Size of lowest region */ H5S_hyper_region_t *regions; /* Pointer to array of hyperslab nodes overlapped */ size_t num_regions; /* number of regions overlapped */ size_t i; /* Counters */ - intn j; + int j; hsize_t num_read=0; /* Number of elements read */ FUNC_ENTER (H5S_hyper_mread, 0); @@ -2481,7 +2481,7 @@ H5S_hyper_mread (intn dim, H5S_hyper_io_info_t *io_info) /* Get a sorted list (in the next dimension down) of the regions which */ /* overlap the current index in this dim */ if((regions=H5S_hyper_get_regions(&num_regions,io_info->space->extent.u.simple.rank, - (uintn)(dim+1), + (unsigned)(dim+1), io_info->space->select.sel_info.hslab.hyper_lst->count, io_info->space->select.sel_info.hslab.hyper_lst->lo_bounds, io_info->iter->hyp.pos,io_info->space->select.offset))!=NULL) { @@ -2498,7 +2498,7 @@ H5S_hyper_mread (intn dim, H5S_hyper_io_info_t *io_info) FUNC,i,(int)regions[i].start,(int)regions[i].end); #endif /* QAK */ - if((uintn)(dim+2)==io_info->space->extent.u.simple.rank) { + if((unsigned)(dim+2)==io_info->space->extent.u.simple.rank) { /* Set up hyperslab I/O parameters which apply to all regions */ @@ -2627,12 +2627,12 @@ H5S_hyper_mread_opt (const void *_buf, size_t elmt_size, hsize_t tot_blk_count; /* Total number of blocks left to output */ size_t act_blk_count; /* Actual number of blocks to output */ size_t fast_dim_buf_off; /* Local copy of amount to move fastest dimension buffer offset */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ hsize_t acc; /* Accumulator */ - intn i; /* Counters */ - uintn u; /* Counters */ - intn ndims; /* Number of dimensions of dataset */ + int i; /* Counters */ + unsigned u; /* Counters */ + int ndims; /* Number of dimensions of dataset */ size_t actual_read; /* The actual number of elements to read in */ size_t actual_bytes; /* The actual number of bytes to copy */ size_t io_left; /* The number of elements left in I/O operation */ @@ -2681,7 +2681,7 @@ for(i=0; i<ndims; i++) /* Check if we stopped in the middle of a sequence of elements */ if((mem_iter->hyp.pos[fast_dim]-mem_space->select.sel_info.hslab.diminfo[fast_dim].start)%mem_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 || ((mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) { - uintn leftover; /* The number of elements left over from the last sequence */ + unsigned leftover; /* The number of elements left over from the last sequence */ #ifdef QAK printf("%s: Check 1.0, io_left=%lu\n",FUNC,(unsigned long)io_left); @@ -3135,13 +3135,13 @@ H5S_hyper_mgath (const void *_buf, size_t elmt_size, *------------------------------------------------------------------------- */ static size_t -H5S_hyper_mwrite (intn dim, H5S_hyper_io_info_t *io_info) +H5S_hyper_mwrite (int dim, H5S_hyper_io_info_t *io_info) { hsize_t region_size; /* Size of lowest region */ H5S_hyper_region_t *regions; /* Pointer to array of hyperslab nodes overlapped */ size_t num_regions; /* number of regions overlapped */ size_t i; /* Counters */ - intn j; + int j; hsize_t num_write=0; /* Number of elements written */ FUNC_ENTER (H5S_hyper_mwrite, 0); @@ -3154,7 +3154,7 @@ H5S_hyper_mwrite (intn dim, H5S_hyper_io_info_t *io_info) /* Get a sorted list (in the next dimension down) of the regions which */ /* overlap the current index in this dim */ if((regions=H5S_hyper_get_regions(&num_regions,io_info->space->extent.u.simple.rank, - (uintn)(dim+1), + (unsigned)(dim+1), io_info->space->select.sel_info.hslab.hyper_lst->count, io_info->space->select.sel_info.hslab.hyper_lst->lo_bounds, io_info->iter->hyp.pos,io_info->space->select.offset))!=NULL) { @@ -3169,7 +3169,7 @@ H5S_hyper_mwrite (intn dim, H5S_hyper_io_info_t *io_info) /* Check if this is the second to last dimension in dataset */ /* (Which means that we've got a list of the regions in the fastest */ /* changing dimension and should input those regions) */ - if((uintn)(dim+2)==io_info->space->extent.u.simple.rank) { + if((unsigned)(dim+2)==io_info->space->extent.u.simple.rank) { /* Set up hyperslab I/O parameters which apply to all regions */ @@ -3300,12 +3300,12 @@ H5S_hyper_mwrite_opt (const void *_tconv_buf, size_t elmt_size, hsize_t tot_blk_count; /* Total number of blocks left to output */ size_t act_blk_count; /* Actual number of blocks to output */ size_t fast_dim_buf_off; /* Local copy of amount to move fastest dimension buffer offset */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ hsize_t acc; /* Accumulator */ - intn i; /* Counters */ - uintn u; /* Counters */ - intn ndims; /* Number of dimensions of dataset */ + int i; /* Counters */ + unsigned u; /* Counters */ + int ndims; /* Number of dimensions of dataset */ size_t actual_write; /* The actual number of elements to read in */ size_t actual_bytes; /* The actual number of bytes to copy */ size_t io_left; /* The number of elements left in I/O operation */ @@ -3354,7 +3354,7 @@ for(i=0; i<ndims; i++) /* Check if we stopped in the middle of a sequence of elements */ if((mem_iter->hyp.pos[fast_dim]-mem_space->select.sel_info.hslab.diminfo[fast_dim].start)%mem_space->select.sel_info.hslab.diminfo[fast_dim].stride!=0 || ((mem_iter->hyp.pos[fast_dim]!=mem_space->select.sel_info.hslab.diminfo[fast_dim].start) && mem_space->select.sel_info.hslab.diminfo[fast_dim].stride==1)) { - uintn leftover; /* The number of elements left over from the last sequence */ + unsigned leftover; /* The number of elements left over from the last sequence */ #ifdef QAK printf("%s: Check 1.0, io_left=%lu\n",FUNC,(unsigned long)io_left); @@ -3803,7 +3803,7 @@ H5S_hyper_mscat (const void *_tconv_buf, size_t elmt_size, EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -intn +int H5S_hyper_bound_comp(const void *_b1, const void *_b2) { const H5S_hyper_bound_t *b1=(const H5S_hyper_bound_t *)_b1; /* Ptr to first boundary element */ @@ -3836,8 +3836,8 @@ H5S_hyper_bound_comp(const void *_b1, const void *_b2) USAGE herr_t H5S_hyper_node_add(head, start, size) H5S_hyper_node_t *head; IN: Pointer to head of hyperslab list - intn endflag; IN: "size" array actually contains "end" array - uintn rank; IN: # of dimensions of the node + int endflag; IN: "size" array actually contains "end" array + unsigned rank; IN: # of dimensions of the node const hssize_t *start; IN: Offset of block const hsize_t *size; IN: Size of block RETURNS @@ -3850,10 +3850,10 @@ H5S_hyper_bound_comp(const void *_b1, const void *_b2) REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5S_hyper_node_add (H5S_hyper_node_t **head, intn endflag, uintn rank, const hssize_t *start, const hsize_t *size) +H5S_hyper_node_add (H5S_hyper_node_t **head, int endflag, unsigned rank, const hssize_t *start, const hsize_t *size) { H5S_hyper_node_t *slab; /* New hyperslab node to add */ - uintn u; /* Counters */ + unsigned u; /* Counters */ herr_t ret_value=SUCCEED; FUNC_ENTER (H5S_hyper_node_add, FAIL); @@ -3993,8 +3993,8 @@ H5S_hyper_add (H5S_t *space, H5S_hyper_node_t *piece_lst) H5S_hyper_node_t *tmp_slab; /* Temporary hyperslab node */ H5S_hyper_bound_t *tmp; /* Temporary pointer to an hyperslab bound array */ size_t elem_count; /* Number of elements in hyperslab selection */ - uintn piece_count; /* Number of hyperslab pieces being added */ - uintn u; /* Counters */ + unsigned piece_count; /* Number of hyperslab pieces being added */ + unsigned u; /* Counters */ herr_t ret_value=SUCCEED; FUNC_ENTER (H5S_hyper_add, FAIL); @@ -4058,7 +4058,7 @@ H5S_hyper_add (H5S_t *space, H5S_hyper_node_t *piece_lst) #ifdef QAK printf("%s: check 4.0\n",FUNC); { - uintn v; + unsigned v; for(u=0; u<space->extent.u.simple.rank; u++) { for(v=0; v<space->select.sel_info.hslab.hyper_lst->count; v++) { @@ -4096,7 +4096,7 @@ H5S_hyper_add (H5S_t *space, H5S_hyper_node_t *piece_lst) #ifdef QAK printf("%s: check 6.0, elem_count=%d\n",FUNC,(int)elem_count); { - uintn v; + unsigned v; for(u=0; u<space->extent.u.simple.rank; u++) { for(v=0; v<space->select.sel_info.hslab.hyper_lst->count; v++) { @@ -4205,10 +4205,10 @@ H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, *new_nodes=NULL; /* List of new nodes added */ hssize_t *start=NULL; /* Temporary arrays of start & sizes (for splitting nodes) */ hsize_t *end=NULL; /* Temporary arrays of start & sizes (for splitting nodes) */ - uintn rank; /* Cached copy of the rank of the dataspace */ - intn overlapped; /* Flag for overlapping nodes */ - intn non_intersect; /* Flag for non-intersecting nodes */ - uintn u; /* Counters */ + unsigned rank; /* Cached copy of the rank of the dataspace */ + int overlapped; /* Flag for overlapping nodes */ + int non_intersect; /* Flag for non-intersecting nodes */ + unsigned u; /* Counters */ enum /* Cases for edge overlaps */ {OVERLAP_BOTH,OVERLAP_LOWER,OVERLAP_UPPER,WITHIN,NO_OVERLAP} clip_case; herr_t ret_value=SUCCEED; @@ -4431,7 +4431,7 @@ H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, #ifdef QAK { H5S_hyper_node_t *tmp_reg; /* Temp. hyperslab selection region pointer */ - uintn v; + unsigned v; tmp_reg=space->select.sel_info.hslab.hyper_lst->head; while(tmp_reg!=NULL) { @@ -4478,7 +4478,7 @@ H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, #ifdef QAK { H5S_hyper_node_t *tmp_reg; /* Temp. hyperslab selection region pointer */ - uintn v; + unsigned v; tmp_reg=space->select.sel_info.hslab.hyper_lst->head; while(tmp_reg!=NULL) { @@ -4596,7 +4596,7 @@ herr_t H5S_hyper_release (H5S_t *space) { H5S_hyper_node_t *curr,*next; /* Pointer to hyperslab nodes */ - uintn u; /* Counters */ + unsigned u; /* Counters */ FUNC_ENTER (H5S_hyper_release, FAIL); @@ -4762,7 +4762,7 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src) H5S_hyper_list_t *new_hyper=NULL; /* New hyperslab selection */ H5S_hyper_node_t *curr, *new, *new_head; /* Hyperslab information nodes */ H5S_hyper_dim_t *new_diminfo=NULL; /* New per-dimension info array[rank] */ - uintn u; /* Counters */ + unsigned u; /* Counters */ size_t v; /* Counters */ herr_t ret_value=SUCCEED; /* return value */ @@ -4917,7 +4917,7 @@ htri_t H5S_hyper_select_valid (const H5S_t *space) { H5S_hyper_node_t *curr; /* Hyperslab information nodes */ - uintn u; /* Counter */ + unsigned u; /* Counter */ htri_t ret_value=TRUE; /* return value */ FUNC_ENTER (H5S_hyper_select_valid, FAIL); @@ -4999,7 +4999,7 @@ hssize_t H5S_hyper_select_serial_size (const H5S_t *space) { H5S_hyper_node_t *curr; /* Hyperslab information nodes */ - uintn u; /* Counter */ + unsigned u; /* Counter */ hssize_t block_count; /* block counter for regular hyperslabs */ hssize_t ret_value=FAIL; /* return value */ @@ -5062,13 +5062,13 @@ H5S_hyper_select_serialize (const H5S_t *space, uint8_t *buf) H5S_hyper_node_t *curr; /* Hyperslab information nodes */ uint8_t *lenp; /* pointer to length location for later storage */ uint32_t len=0; /* number of bytes used */ - intn i; /* local counting variable */ - uintn u; /* local counting variable */ + int i; /* local counting variable */ + unsigned u; /* local counting variable */ hssize_t block_count; /* block counter for regular hyperslabs */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ - intn ndims; /* Rank of the dataspace */ - intn done; /* Whether we are done with the iteration */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ + int ndims; /* Rank of the dataspace */ + int done; /* Whether we are done with the iteration */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_point_select_serialize, FAIL); @@ -5249,7 +5249,7 @@ H5S_hyper_select_deserialize (H5S_t *space, const uint8_t *buf) hssize_t *tend=NULL; /* temporary hyperslab pointers */ hsize_t *tcount=NULL; /* temporary hyperslab pointers */ hsize_t *tblock=NULL; /* temporary hyperslab pointers */ - uintn i,j; /* local counting variables */ + unsigned i,j; /* local counting variables */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_hyper_select_deserialize, FAIL); @@ -5339,8 +5339,8 @@ herr_t H5S_hyper_bounds(H5S_t *space, hsize_t *start, hsize_t *end) { H5S_hyper_node_t *node; /* Hyperslab node */ - intn rank; /* Dataspace rank */ - intn i; /* index variable */ + int rank; /* Dataspace rank */ + int i; /* index variable */ herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER (H5S_hyper_bounds, FAIL); @@ -5406,8 +5406,8 @@ H5S_hyper_select_contiguous(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ H5S_hyper_node_t *node; /* Hyperslab node */ - uintn rank; /* Dataspace rank */ - uintn u; /* index variable */ + unsigned rank; /* Dataspace rank */ + unsigned u; /* index variable */ FUNC_ENTER (H5S_hyper_select_contiguous, FAIL); @@ -5482,10 +5482,10 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op, size_t slice[H5O_LAYOUT_NDIMS]; /* Size of preceding dimension's slice */ H5S_hyper_node_t *add=NULL, /* List of hyperslab nodes to add */ *uniq=NULL; /* List of unique hyperslab nodes */ - uintn acc; /* Accumulator for building slices */ - uintn contig; /* whether selection is contiguous or not */ - intn i; /* Counters */ - uintn u,v; /* Counters */ + unsigned acc; /* Accumulator for building slices */ + unsigned contig; /* whether selection is contiguous or not */ + int i; /* Counters */ + unsigned u,v; /* Counters */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_generate_hyperslab, FAIL); @@ -5662,7 +5662,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, { hsize_t *_stride=NULL; /* Stride array */ hsize_t *_block=NULL; /* Block size array */ - uintn u; /* Counters */ + unsigned u; /* Counters */ H5S_hyper_dim_t *diminfo; /* per-dimension info for the selection */ herr_t ret_value=FAIL; /* return value */ @@ -5916,7 +5916,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, *------------------------------------------------------------------------- */ static herr_t -H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info) +H5S_hyper_select_iterate_mem (int dim, H5S_hyper_iter_info_t *iter_info) { hsize_t offset; /* offset of region in buffer */ void *tmp_buf; /* temporary location of the element in the buffer */ @@ -5924,7 +5924,7 @@ H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info) size_t num_regions; /* number of regions overlapped */ herr_t user_ret=0; /* User's return value */ size_t i; /* Counters */ - intn j; + int j; FUNC_ENTER (H5S_hyper_select_iterate_mem, 0); @@ -5933,7 +5933,7 @@ H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info) /* Get a sorted list (in the next dimension down) of the regions which */ /* overlap the current index in this dim */ if((regions=H5S_hyper_get_regions(&num_regions,iter_info->space->extent.u.simple.rank, - (uintn)(dim+1), + (unsigned)(dim+1), iter_info->space->select.sel_info.hslab.hyper_lst->count, iter_info->space->select.sel_info.hslab.hyper_lst->lo_bounds, iter_info->iter->hyp.pos,iter_info->space->select.offset))!=NULL) { @@ -5941,7 +5941,7 @@ H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info) /* Check if this is the second to last dimension in dataset */ /* (Which means that we've got a list of the regions in the fastest */ /* changing dimension and should input those regions) */ - if((uintn)(dim+2)==iter_info->space->extent.u.simple.rank) { + if((unsigned)(dim+2)==iter_info->space->extent.u.simple.rank) { HDmemcpy(iter_info->mem_offset, iter_info->iter->hyp.pos,(iter_info->space->extent.u.simple.rank*sizeof(hssize_t))); iter_info->mem_offset[iter_info->space->extent.u.simple.rank]=0; @@ -6055,11 +6055,11 @@ H5S_hyper_select_iterate_mem_opt(H5S_sel_iter_t UNUSED *iter, void *buf, hid_t t size_t elem_size; /* Size of data element in buffer */ hssize_t temp_off; /* Offset in a given dimension */ uint8_t *loc; /* Current element location */ - intn i; /* Counter */ - uintn u; /* Counter */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ - uintn ndims; /* Rank of the dataspace */ + int i; /* Counter */ + unsigned u; /* Counter */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ + unsigned ndims; /* Rank of the dataspace */ herr_t user_ret=0; /* User's return value */ FUNC_ENTER (H5S_hyper_select_iterate_mem_opt, FAIL); diff --git a/src/H5Smpio.c b/src/H5Smpio.c index e4600ea..6968b47 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -37,7 +37,7 @@ /* Interface initialization */ #define PABLO_MASK H5Sall_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size, @@ -158,7 +158,7 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size, int offset[H5S_MAX_RANK]; int max_xtent[H5S_MAX_RANK]; H5S_hyper_dim_t *diminfo; /* [rank] */ - intn rank; + int rank; int block_length[2]; MPI_Datatype inner_type, outer_type, old_type[2]; MPI_Aint extent_len, displacement[2]; diff --git a/src/H5Snone.c b/src/H5Snone.c index 7186d07..553e3fd 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -20,7 +20,7 @@ /* Interface initialization */ #define PABLO_MASK H5Snone_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5S_select_none(H5S_t *space); diff --git a/src/H5Spkg.h b/src/H5Spkg.h index 25a89d1..bc6f66e 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -23,7 +23,7 @@ */ /* Simple extent container */ typedef struct H5S_simple_t { - uintn rank; /* Number of dimensions */ + unsigned rank; /* Number of dimensions */ hsize_t *size; /* Current size of the dimensions */ hsize_t *max; /* Maximum size of the dimensions */ #ifdef LATER @@ -58,10 +58,10 @@ typedef struct H5S_hyper_node_tag { hssize_t *start; /* Pointer to a corner of a hyperslab closest to the origin */ hssize_t *end; /* Pointer to a corner of a hyperslab furthest from the origin */ struct { - uintn cached; /* Flag to indicate that the block is cached (during I/O only) */ + unsigned cached; /* Flag to indicate that the block is cached (during I/O only) */ size_t size; /* Size of cached block (in elements) */ - uintn rleft; /* Read elements left to access in block */ - uintn wleft; /* Write elements left to access in block */ + unsigned rleft; /* Read elements left to access in block */ + unsigned wleft; /* Write elements left to access in block */ uint8_t *block; /* Pointer into buffer for cache */ uint8_t *rpos; /* Pointer to current read location within block */ uint8_t *wpos; /* Pointer to current write location within block */ @@ -183,9 +183,9 @@ __DLL__ int H5S_hyper_compare_regions(const void *r1, const void *r2); __DLL__ int H5S_hyper_compare_bounds(const void *r1, const void *r2); __DLL__ herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src); __DLL__ htri_t H5S_hyper_select_valid(const H5S_t *space); -__DLL__ intn H5S_hyper_bound_comp(const void *_b1, const void *_b2); -__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, intn endflag, - uintn rank, const hssize_t *start, +__DLL__ int H5S_hyper_bound_comp(const void *_b1, const void *_b2); +__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, int endflag, + unsigned rank, const hssize_t *start, const hsize_t *size); __DLL__ herr_t H5S_hyper_clip(H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 780daf8..119da32 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -21,7 +21,7 @@ /* Interface initialization */ #define PABLO_MASK H5Spoint_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5S_point_init (const H5S_t *space, H5S_sel_iter_t *iter); static hsize_t H5S_point_favail (const H5S_t *space, const H5S_sel_iter_t *iter, @@ -129,7 +129,7 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss { H5S_pnt_node_t *top, *curr, *new; /* Point selection nodes */ const hssize_t *coord=(const hssize_t *)_coord; /* Pointer to the actual coordinates */ - uintn i; /* Counter */ + unsigned i; /* Counter */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_point_add, FAIL); @@ -165,7 +165,7 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss #ifdef QAK printf("%s: check 1.3\n",FUNC); { - intn j; + int j; for(j=0; j<space->extent.u.simple.rank; j++) { printf("%s: pnt[%d]=%d\n",FUNC,(int)j,(int)new->pnt[j]); @@ -291,8 +291,8 @@ H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout, hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */ hssize_t zero[H5O_LAYOUT_NDIMS]; /*zero */ uint8_t *buf=(uint8_t *)_buf; /* Alias for pointer arithmetic */ - uintn ndims; /* Number of dimensions of dataset */ - uintn u; /*counters */ + unsigned ndims; /* Number of dimensions of dataset */ + unsigned u; /*counters */ hsize_t num_read; /* number of elements read into buffer */ FUNC_ENTER (H5S_point_fgath, 0); @@ -394,8 +394,8 @@ H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout, hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */ hssize_t zero[H5O_LAYOUT_NDIMS]; /*zero vector */ const uint8_t *buf=(const uint8_t *)_buf; /* Alias for pointer arithmetic */ - uintn ndims; /* Number of dimensions of dataset */ - uintn u; /*counters */ + unsigned ndims; /* Number of dimensions of dataset */ + unsigned u; /*counters */ hsize_t num_written; /* number of elements written from buffer */ FUNC_ENTER (H5S_point_fscat, FAIL); @@ -502,8 +502,8 @@ H5S_point_mgath (const void *_buf, size_t elmt_size, uint8_t *tconv_buf=(uint8_t *)_tconv_buf; hsize_t acc; /* coordinate accumulator */ hsize_t off; /* coordinate offset */ - intn space_ndims; /*dimensionality of space*/ - intn i; /*counters */ + int space_ndims; /*dimensionality of space*/ + int i; /*counters */ hsize_t num_gath; /* number of elements gathered */ FUNC_ENTER (H5S_point_mgath, 0); @@ -578,8 +578,8 @@ H5S_point_mscat (const void *_tconv_buf, size_t elmt_size, const uint8_t *tconv_buf=(const uint8_t *)_tconv_buf; hsize_t acc; /* coordinate accumulator */ hsize_t off; /* coordinate offset */ - intn space_ndims; /*dimensionality of space*/ - intn i; /*counters */ + int space_ndims; /*dimensionality of space*/ + int i; /*counters */ hsize_t num_scat; /* Number of elements scattered */ FUNC_ENTER (H5S_point_mscat, FAIL); @@ -760,7 +760,7 @@ H5S_point_copy (H5S_t *dst, const H5S_t *src) #ifdef QAK printf("%s: check 5.0\n",FUNC); { - intn i; + int i; for(i=0; i<src->extent.u.simple.rank; i++) printf("%s: check 5.1, new->pnt[%d]=%d\n",FUNC,i,(int)new->pnt[i]); } @@ -809,7 +809,7 @@ htri_t H5S_point_select_valid (const H5S_t *space) { H5S_pnt_node_t *curr; /* Point information nodes */ - uintn u; /* Counter */ + unsigned u; /* Counter */ htri_t ret_value=TRUE; /* return value */ FUNC_ENTER (H5S_point_select_valid, FAIL); @@ -919,7 +919,7 @@ H5S_point_select_serialize (const H5S_t *space, uint8_t *buf) H5S_pnt_node_t *curr; /* Point information nodes */ uint8_t *lenp; /* pointer to length location for later storage */ uint32_t len=0; /* number of bytes used */ - uintn u; /* local counting variable */ + unsigned u; /* local counting variable */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_point_select_serialize, FAIL); @@ -989,7 +989,7 @@ H5S_point_select_deserialize (H5S_t *space, const uint8_t *buf) uint32_t rank; /* Rank of points */ size_t num_elem=0; /* Number of elements in selection */ hssize_t *coord=NULL, *tcoord; /* Pointer to array of elements */ - uintn i,j; /* local counting variables */ + unsigned i,j; /* local counting variables */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_point_select_deserialize, FAIL); @@ -1057,8 +1057,8 @@ herr_t H5S_point_bounds(H5S_t *space, hsize_t *start, hsize_t *end) { H5S_pnt_node_t *node; /* Point node */ - intn rank; /* Dataspace rank */ - intn i; /* index variable */ + int rank; /* Dataspace rank */ + int i; /* index variable */ herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER (H5S_point_bounds, FAIL); @@ -1312,7 +1312,7 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t hsize_t offset; /* offset of region in buffer */ void *tmp_buf; /* temporary location of the element in the buffer */ H5S_pnt_node_t *node; /* Point node */ - uintn rank; /* Dataspace rank */ + unsigned rank; /* Dataspace rank */ herr_t ret_value=0; /* return value */ FUNC_ENTER (H5S_point_select_iterate, 0); diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index f1c355d..11eb054 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -199,29 +199,29 @@ __DLL__ H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space); __DLL__ H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds); __DLL__ hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds); __DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds); -__DLL__ intn H5S_get_simple_extent_ndims(const H5S_t *ds); -__DLL__ intn H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/, +__DLL__ int H5S_get_simple_extent_ndims(const H5S_t *ds); +__DLL__ int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/, hsize_t max_dims[]/*out*/); __DLL__ herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space); __DLL__ H5S_t *H5S_read(struct H5G_entry_t *ent); -__DLL__ intn H5S_cmp(const H5S_t *ds1, const H5S_t *ds2); +__DLL__ int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2); __DLL__ htri_t H5S_is_simple(const H5S_t *sdim); -__DLL__ uintn H5S_nelem(const H5S_t *space); +__DLL__ unsigned H5S_nelem(const H5S_t *space); __DLL__ herr_t H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op, const hssize_t start[], const hsize_t _stride[], const hsize_t count[], const hsize_t _block[]); -__DLL__ intn H5S_get_hyperslab(const H5S_t *ds, hssize_t offset[]/*out*/, +__DLL__ int H5S_get_hyperslab(const H5S_t *ds, hssize_t offset[]/*out*/, hsize_t size[]/*out*/, hsize_t stride[]/*out*/); __DLL__ herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src); __DLL__ herr_t H5S_extent_release(H5S_t *space); __DLL__ herr_t H5S_select_release(H5S_t *space); __DLL__ hssize_t H5S_get_select_npoints(const H5S_t *space); -__DLL__ intn H5S_extend(H5S_t *space, const hsize_t *size); +__DLL__ int H5S_extend(H5S_t *space, const hsize_t *size); __DLL__ htri_t H5S_select_valid(const H5S_t *space); __DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, - intn indent, intn fwidth); + int indent, int fwidth); __DLL__ hssize_t H5S_select_serial_size(const H5S_t *space); __DLL__ herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index e7548dc..a0be458 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -21,7 +21,7 @@ /* Interface initialization */ #define PABLO_MASK H5Sselect_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static hssize_t H5S_get_select_hyper_nblocks(H5S_t *space); static hssize_t H5S_get_select_elem_npoints(H5S_t *space); @@ -591,7 +591,7 @@ static hssize_t H5S_get_select_hyper_nblocks(H5S_t *space) { hssize_t ret_value=FAIL; /* return value */ - uintn u; /* Counter */ + unsigned u; /* Counter */ FUNC_ENTER (H5S_get_select_hyper_nblocks, FAIL); @@ -764,12 +764,12 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hsize_t startblock, hsize_t numbloc hssize_t offset[H5O_LAYOUT_NDIMS]; /* Offset of element in dataspace */ hssize_t temp_off; /* Offset in a given dimension */ H5S_hyper_node_t *node; /* Hyperslab node */ - intn rank; /* Dataspace rank */ - intn i; /* Counter */ - intn fast_dim; /* Rank of the fastest changing dimension for the dataspace */ - intn temp_dim; /* Temporary rank holder */ - intn ndims; /* Rank of the dataspace */ - intn done; /* Whether we are done with the iteration */ + int rank; /* Dataspace rank */ + int i; /* Counter */ + int fast_dim; /* Rank of the fastest changing dimension for the dataspace */ + int temp_dim; /* Temporary rank holder */ + int ndims; /* Rank of the dataspace */ + int done; /* Whether we are done with the iteration */ herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER (H5S_get_select_hyper_blocklist, FAIL); @@ -976,7 +976,7 @@ static herr_t H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoints, hsize_t *buf) { H5S_pnt_node_t *node; /* Point node */ - intn rank; /* Dataspace rank */ + int rank; /* Dataspace rank */ herr_t ret_value=SUCCEED; /* return value */ FUNC_ENTER (H5S_get_select_elem_pointlist, FAIL); @@ -1090,8 +1090,8 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint static herr_t H5S_get_select_bounds(H5S_t *space, hsize_t *start, hsize_t *end) { - intn rank; /* Dataspace rank */ - intn i; /* index variable */ + int rank; /* Dataspace rank */ + int i; /* index variable */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_get_select_bounds, FAIL); @@ -25,7 +25,7 @@ #define H5T_COMPND_INC 64 /*typical max numb of members per struct */ /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_interface static herr_t H5T_init_interface(void); @@ -183,11 +183,11 @@ size_t H5T_NATIVE_UINT_FAST64_ALIGN_g = 0; * which is used as the key by which the `entries' array is sorted. */ static struct { - intn npaths; /*number of paths defined */ - intn apaths; /*number of paths allocated */ + int npaths; /*number of paths defined */ + int apaths; /*number of paths allocated */ H5T_path_t **path; /*sorted array of path pointers */ - intn nsoft; /*number of soft conversions defined */ - intn asoft; /*number of soft conversions allocated */ + int nsoft; /*number of soft conversions defined */ + int asoft; /*number of soft conversions allocated */ H5T_soft_t *soft; /*unsorted array of soft conversions */ } H5T_g; @@ -195,7 +195,7 @@ static struct { H5T_overflow_t H5T_overflow_g = NULL; /* Local static functions */ -static herr_t H5T_print_stats(H5T_path_t *path, intn *nprint/*in,out*/); +static herr_t H5T_print_stats(H5T_path_t *path, int *nprint/*in,out*/); /* Declare the free list for H5T_t's */ H5FL_DEFINE(H5T_t); @@ -1327,7 +1327,7 @@ H5T_init_interface(void) * *------------------------------------------------------------------------- */ -static intn +static int H5T_unlock_cb (void *_dt, const void UNUSED *key) { H5T_t *dt = (H5T_t *)_dt; @@ -1361,10 +1361,10 @@ H5T_unlock_cb (void *_dt, const void UNUSED *key) * called. *------------------------------------------------------------------------- */ -intn +int H5T_term_interface(void) { - intn i, nprint=0, n=0; + int i, nprint=0, n=0; H5T_path_t *path = NULL; if (interface_initialize_g) { @@ -1928,7 +1928,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls) htri_t H5T_detect_class (H5T_t *dt, H5T_class_t cls) { - intn i; + int i; FUNC_ENTER (H5T_detect_class, FAIL); @@ -3273,7 +3273,7 @@ int H5Tget_nmembers(hid_t type_id) { H5T_t *dt = NULL; - intn ret_value = FAIL; + int ret_value = FAIL; FUNC_ENTER(H5Tget_num_members, FAIL); H5TRACE1("Is","i",type_id); @@ -4098,8 +4098,8 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_path_t *old_path=NULL; /*existing conversion path */ H5T_path_t *new_path=NULL; /*new conversion path */ H5T_cdata_t cdata; /*temporary conversion data */ - intn nprint=0; /*number of paths shut down */ - intn i; /*counter */ + int nprint=0; /*number of paths shut down */ + int i; /*counter */ herr_t ret_value=FAIL; /*return value */ FUNC_ENTER(H5Tregister, FAIL); @@ -4155,7 +4155,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); } - H5T_g.asoft = (intn)na; + H5T_g.asoft = (int)na; H5T_g.soft = x; } HDstrncpy (H5T_g.soft[H5T_g.nsoft].name, name, H5T_NAMELEN); @@ -4285,8 +4285,8 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, { H5T_path_t *path = NULL; /*conversion path */ H5T_soft_t *soft = NULL; /*soft conversion information */ - intn nprint=0; /*number of paths shut down */ - intn i; /*counter */ + int nprint=0; /*number of paths shut down */ + int i; /*counter */ FUNC_ENTER(H5T_unregister, FAIL); @@ -4820,7 +4820,7 @@ H5T_t * H5T_copy(const H5T_t *old_dt, H5T_copy_t method) { H5T_t *new_dt=NULL, *tmp=NULL; - intn i; + int i; char *s; FUNC_ENTER(H5T_copy, NULL); @@ -4883,7 +4883,7 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method) switch(new_dt->type) { case H5T_COMPOUND: { - intn accum_change=0; /* Amount of change in the offset of the fields */ + int accum_change=0; /* Amount of change in the offset of the fields */ /* * Copy all member fields to new type, then overwrite the @@ -4901,8 +4901,8 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method) new_dt->u.compnd.nmembs * sizeof(H5T_cmemb_t)); for (i=0; i<new_dt->u.compnd.nmembs; i++) { - intn j; - intn old_match; + int j; + int old_match; s = new_dt->u.compnd.memb[i].name; new_dt->u.compnd.memb[i].name = H5MM_xstrdup(s); @@ -5135,7 +5135,7 @@ H5T_lock (H5T_t *dt, hbool_t immutable) herr_t H5T_close(H5T_t *dt) { - intn i; + int i; H5T_t *parent = dt->parent; FUNC_ENTER(H5T_close, FAIL); @@ -5606,7 +5606,7 @@ H5T_set_offset(H5T_t *dt, size_t offset) herr_t H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member) { - intn idx, i; + int idx, i; size_t total_size; FUNC_ENTER(H5T_insert, FAIL); @@ -5648,7 +5648,7 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member) HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); } - parent->u.compnd.nalloc = (intn)na; + parent->u.compnd.nalloc = (int)na; parent->u.compnd.memb = x; } @@ -5989,7 +5989,7 @@ H5T_enum_insert(H5T_t *dt, const char *name, void *value) /* Increase table sizes */ if (dt->u.enumer.nmembs >= dt->u.enumer.nalloc) { - intn n = MAX(32, 2*dt->u.enumer.nalloc); + int n = MAX(32, 2*dt->u.enumer.nalloc); if (NULL==(names=H5MM_realloc(dt->u.enumer.name, n*sizeof(char*)))) { HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); @@ -6042,8 +6042,8 @@ H5T_enum_insert(H5T_t *dt, const char *name, void *value) char * H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size) { - intn lt, md, rt; /*indices for binary search */ - intn cmp; /*comparison result */ + int lt, md, rt; /*indices for binary search */ + int cmp; /*comparison result */ FUNC_ENTER(H5T_enum_nameof, NULL); @@ -6111,8 +6111,8 @@ H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size) herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/) { - intn lt, md, rt; /*indices for binary search */ - intn cmp; /*comparison result */ + int lt, md, rt; /*indices for binary search */ + int cmp; /*comparison result */ FUNC_ENTER(H5T_enum_nameof, FAIL); @@ -6170,12 +6170,12 @@ H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/) * Compares bitfields and opaque types. *------------------------------------------------------------------------- */ -intn +int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2) { - intn *idx1 = NULL, *idx2 = NULL; - intn ret_value = 0; - intn i, j, tmp; + int *idx1 = NULL, *idx2 = NULL; + int ret_value = 0; + int i, j, tmp; hbool_t swapped; size_t base_size; @@ -6212,8 +6212,8 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2) HGOTO_DONE(1); /* Build an index for each type so the names are sorted */ - if (NULL==(idx1 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn))) || - NULL==(idx2 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(intn)))) { + if (NULL==(idx1 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(int))) || + NULL==(idx2 = H5MM_malloc(dt1->u.compnd.nmembs * sizeof(int)))) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed"); } @@ -6288,8 +6288,8 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2) HGOTO_DONE(1); /* Build an index for each type so the names are sorted */ - if (NULL==(idx1 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn))) || - NULL==(idx2 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(intn)))) { + if (NULL==(idx1 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(int))) || + NULL==(idx2 = H5MM_malloc(dt1->u.enumer.nmembs * sizeof(int)))) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed"); } @@ -6573,15 +6573,15 @@ H5T_path_t * H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_t func) { - intn lt, rt; /*left and right edges */ - intn md; /*middle */ - intn cmp; /*comparison result */ + int lt, rt; /*left and right edges */ + int md; /*middle */ + int cmp; /*comparison result */ H5T_path_t *table=NULL; /*path existing in the table */ H5T_path_t *path=NULL; /*new path */ H5T_path_t *ret_value=NULL; /*return value */ hid_t src_id=-1, dst_id=-1; /*src and dst type identifiers */ - intn i; /*counter */ - intn nprint=0; /*lines of output printed */ + int i; /*counter */ + int nprint=0; /*lines of output printed */ FUNC_ENTER(H5T_path_find, NULL); assert((!src && !dst) || (src && dst)); @@ -6776,7 +6776,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); } - H5T_g.apaths = (intn)na; + H5T_g.apaths = (int)na; H5T_g.path = x; } if (cmp>0) md++; @@ -6983,7 +6983,7 @@ H5Tarray_create(hid_t base_id, int ndims, const hsize_t dim[/* ndims */], { H5T_t *base = NULL; /* base data type */ H5T_t *dt = NULL; /* new array data type */ - intn i; /* local index variable */ + int i; /* local index variable */ hid_t ret_value = FAIL; /* return value */ FUNC_ENTER(H5Tarray_create, FAIL); @@ -7038,7 +7038,7 @@ H5T_array_create(H5T_t *base, int ndims, const hsize_t dim[/* ndims */], const int perm[/* ndims */]) { H5T_t *ret_value = NULL; /*new array data type */ - intn i; /* local index variable */ + int i; /* local index variable */ FUNC_ENTER(H5T_array_create, NULL); @@ -7140,7 +7140,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]) { H5T_t *dt = NULL; /* pointer to array data type */ herr_t ret_value = SUCCEED; /* return value */ - intn i; /* Local index variable */ + int i; /* Local index variable */ FUNC_ENTER(H5Tget_array_dims, FAIL); H5TRACE3("e","i*h*Is",type_id,dims,perm); @@ -7192,7 +7192,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]) *------------------------------------------------------------------------- */ static herr_t -H5T_print_stats(H5T_path_t UNUSED *path, intn UNUSED *nprint/*in,out*/) +H5T_print_stats(H5T_path_t UNUSED *path, int UNUSED *nprint/*in,out*/) { #ifdef H5T_DEBUG hsize_t nbytes; @@ -71,24 +71,24 @@ #define Max(a,b) ( (a) > (b) ? (a) : (b) ) /* Local Function Prototypes */ -static H5TB_NODE * H5TB_end(H5TB_NODE * root, intn side); -static H5TB_NODE *H5TB_ffind(H5TB_NODE * root, void * key, uintn fast_compare, +static H5TB_NODE * H5TB_end(H5TB_NODE * root, int side); +static H5TB_NODE *H5TB_ffind(H5TB_NODE * root, void * key, unsigned fast_compare, H5TB_NODE ** pp); -static herr_t H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, intn side, intn added); -static H5TB_NODE *H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, intn side); -static H5TB_NODE *H5TB_nbr(H5TB_NODE * ptr, intn side); +static herr_t H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, int side, int added); +static H5TB_NODE *H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, int side); +static H5TB_NODE *H5TB_nbr(H5TB_NODE * ptr, int side); #ifdef H5TB_DEBUG static herr_t H5TB_printNode(H5TB_NODE * node, void(*key_dump)(void *,void *)); static herr_t H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *), - intn method); + int method); #endif /* H5TB_DEBUG */ /* Declare a free list to manage the H5TB_NODE struct */ H5FL_DEFINE_STATIC(H5TB_NODE); #define PABLO_MASK H5TB_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -167,7 +167,7 @@ static intn interface_initialize_g = 0; *------------------------------------------------------------------------- */ H5TB_TREE * -H5TB_dmake(H5TB_cmp_t cmp, intn arg, uintn fast_compare) +H5TB_dmake(H5TB_cmp_t cmp, int arg, unsigned fast_compare) { H5TB_TREE *tree; @@ -257,12 +257,12 @@ H5TB_dfind(H5TB_TREE * tree, void * key, H5TB_NODE ** pp) */ H5TB_NODE * H5TB_find(H5TB_NODE * root, void * key, - H5TB_cmp_t compar, intn arg, H5TB_NODE ** pp) + H5TB_cmp_t compar, int arg, H5TB_NODE ** pp) { H5TB_NODE *ptr = root; H5TB_NODE *parent = NULL; - intn cmp = 1; - intn side; + int cmp = 1; + int side; FUNC_ENTER (H5TB_find, NULL); @@ -347,12 +347,12 @@ H5TB_dless(H5TB_TREE * tree, void * key, H5TB_NODE ** pp) *------------------------------------------------------------------------- */ H5TB_NODE * -H5TB_less(H5TB_NODE * root, void * key, H5TB_cmp_t compar, intn arg, H5TB_NODE ** pp) +H5TB_less(H5TB_NODE * root, void * key, H5TB_cmp_t compar, int arg, H5TB_NODE ** pp) { H5TB_NODE *ptr = root; H5TB_NODE *parent = NULL; - intn cmp = 1; - intn side; + int cmp = 1; + int side; FUNC_ENTER(H5TB_less,NULL); @@ -504,9 +504,9 @@ H5TB_dins(H5TB_TREE * tree, void * item, void * key) *------------------------------------------------------------------------- */ H5TB_NODE * -H5TB_ins(H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t compar, intn arg) +H5TB_ins(H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t compar, int arg) { - intn cmp; + int cmp; H5TB_NODE *ptr, *parent; FUNC_ENTER(H5TB_ins,NULL); @@ -585,7 +585,7 @@ H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp) H5TB_NODE *leaf; /* Node with one or zero children */ H5TB_NODE *par; /* Parent of `leaf' */ H5TB_NODE *next; /* Next/prev node near `leaf' (`leaf's `side' thread) */ - intn side; /* `leaf' is `side' child of `par' */ + int side; /* `leaf' is `side' child of `par' */ void * data; /* Saved pointer to data item of deleted node */ FUNC_ENTER(H5TB_rem, NULL); @@ -632,7 +632,7 @@ H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp) /* Case 3: Remove root (of 1- or 2-node tree) */ if (NULL == par) { - side = (intn) UnBal(node); /* Which side root has a child on */ + side = (int) UnBal(node); /* Which side root has a child on */ /* Case 3a: Remove root of 2-node tree: */ if (side) { @@ -988,7 +988,7 @@ H5TB_count(H5TB_TREE * tree) *------------------------------------------------------------------------- */ herr_t -H5TB_dump(H5TB_TREE *tree, void (*key_dump)(void *,void *), intn method) +H5TB_dump(H5TB_TREE *tree, void (*key_dump)(void *,void *), int method) { FUNC_ENTER(H5TB_dump,FAIL); @@ -1058,7 +1058,7 @@ H5TB_printNode(H5TB_NODE * node, void(*key_dump)(void *,void *)) */ static herr_t H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *), - intn method) + int method) { FUNC_ENTER(H5TB_dumpNode,FAIL); @@ -1115,7 +1115,7 @@ H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *), *------------------------------------------------------------------------- */ static H5TB_NODE * -H5TB_end(H5TB_NODE * root, intn side) +H5TB_end(H5TB_NODE * root, int side) { FUNC_ENTER (H5TB_end, NULL); @@ -1130,7 +1130,7 @@ H5TB_end(H5TB_NODE * root, intn side) /* Returns pointer to neighboring node (to LEFT or RIGHT): */ static H5TB_NODE * -H5TB_nbr(H5TB_NODE * ptr, intn side) +H5TB_nbr(H5TB_NODE * ptr, int side) { FUNC_ENTER (H5TB_nbr, NULL); @@ -1148,12 +1148,12 @@ H5TB_nbr(H5TB_NODE * ptr, intn side) /* This routine is based on tbbtfind (fix bugs in both places!) */ /* Returns a pointer to the found node (or NULL) */ static H5TB_NODE * -H5TB_ffind(H5TB_NODE * root, void * key, uintn fast_compare, H5TB_NODE ** pp) +H5TB_ffind(H5TB_NODE * root, void * key, unsigned fast_compare, H5TB_NODE ** pp) { H5TB_NODE *ptr = root; H5TB_NODE *parent = NULL; - intn side; - intn cmp = 1; + int side; + int cmp = 1; FUNC_ENTER (H5TB_ffind, NULL); @@ -1174,7 +1174,7 @@ H5TB_ffind(H5TB_NODE * root, void * key, uintn fast_compare, H5TB_NODE ** pp) case H5TB_FAST_INTN_COMPARE: if (ptr) { - while (0 != (cmp = (*(intn *)key - *(intn *)ptr->key))) { + while (0 != (cmp = (*(int *)key - *(int *)ptr->key))) { parent = ptr; side = (cmp < 0) ? LEFT : RIGHT; if (!HasChild(ptr, side)) @@ -1214,10 +1214,10 @@ H5TB_ffind(H5TB_NODE * root, void * key, uintn fast_compare, H5TB_NODE ** pp) * pointers to children. */ static H5TB_NODE * -H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, intn side) +H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, int side) { H5TB_NODE *kid = ptr->link[side]; /* Sibling to be swapped with parent */ - intn deep[3]; /* Relative depths of three sub-trees involved. */ + int deep[3]; /* Relative depths of three sub-trees involved. */ /* 0:ptr->link[Other(side)], 1:kid->link[Other(side)], 2:kid->link[side] */ H5TB_flag ptrflg; /* New value for ptr->flags (ptr->flags used after set) */ H5TB_leaf plcnt, prcnt, /* current values of the ptr's and kid's leaf count */ @@ -1319,11 +1319,11 @@ H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, intn side) * are usually required. */ static herr_t -H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, intn side, intn added) +H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, int side, int added) { - intn deeper = added; /* 1 if sub-tree got longer; -1 if got shorter */ - intn odelta; - intn obal; + int deeper = added; /* 1 if sub-tree got longer; -1 if got shorter */ + int odelta; + int obal; FUNC_ENTER(H5TB_balance,FAIL); diff --git a/src/H5TBprivate.h b/src/H5TBprivate.h index 23a75b7..f4faa3b 100644 --- a/src/H5TBprivate.h +++ b/src/H5TBprivate.h @@ -115,7 +115,7 @@ __DLL__ void *H5TB_free (H5TB_NODE ** root, void(*fd) (void *), void(*fk) __DLL__ long H5TB_count (H5TB_TREE * tree); #ifdef H5TB_DEBUG -__DLL__ herr_t H5TB_dump(H5TB_TREE *ptree, void (*key_dump)(void *,void *), intn method); +__DLL__ herr_t H5TB_dump(H5TB_TREE *ptree, void (*key_dump)(void *,void *), int method); #endif /* H5TB_DEBUG */ #if defined c_plusplus || defined __cplusplus diff --git a/src/H5Tbit.c b/src/H5Tbit.c index 516b1d1..55541a1 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -18,7 +18,7 @@ /* Interface initialization */ #define PABLO_MASK H5Tbit_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -40,16 +40,16 @@ void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, size_t src_offset, size_t size) { - intn shift; - uintn mask_lo, mask_hi; - intn s_idx, d_idx; + int shift; + unsigned mask_lo, mask_hi; + int s_idx, d_idx; /* * Normalize the offset to be a byte number and a bit offset within that * byte. */ - s_idx = (intn)src_offset / 8; - d_idx = (intn)dst_offset / 8; + s_idx = (int)src_offset / 8; + d_idx = (int)dst_offset / 8; src_offset %= 8; dst_offset %= 8; @@ -110,7 +110,7 @@ H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, * bits). SHIFT is three since the source must be shifted right three bits * to line up with the destination. */ - shift = (intn)dst_offset; + shift = (int)dst_offset; mask_lo = (1<<(8-shift))-1; mask_hi = (~mask_lo) & 0xff; @@ -254,10 +254,10 @@ H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val) void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, hbool_t value) { - intn idx; + int idx; /* Normalize */ - idx = (intn)offset / 8; + idx = (int)offset / 8; offset %= 8; /* The first partial byte */ diff --git a/src/H5Tconv.c b/src/H5Tconv.c index e65e03a..941149c 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -19,7 +19,7 @@ /* Conversion data for H5T_conv_struct() */ typedef struct H5T_conv_struct_t { - intn *src2dst; /*mapping from src to dst member num */ + int *src2dst; /*mapping from src to dst member num */ hid_t *src_memb_id; /*source member type ID's */ hid_t *dst_memb_id; /*destination member type ID's */ H5T_path_t **memb_path; /*conversion path for each member */ @@ -27,9 +27,9 @@ typedef struct H5T_conv_struct_t { /* Conversion data for H5T_conv_enum() */ typedef struct H5T_enum_struct_t { - intn base; /*lowest `in' value */ - intn length; /*num elements in arrays */ - intn *src2dst; /*map from src to dst index */ + int base; /*lowest `in' value */ + int length; /*num elements in arrays */ + int *src2dst; /*map from src to dst index */ } H5T_enum_struct_t; /* Conversion data for the hardware conversion functions */ @@ -39,7 +39,7 @@ typedef struct H5T_conv_hw_t { } H5T_conv_hw_t; /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Declare a free list to manage pieces of vlen data */ @@ -581,7 +581,7 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, { uint8_t *buf = (uint8_t*)_buf; H5T_t *src=NULL, *dst=NULL; /*source and dest data types */ - intn direction; /*direction of traversal */ + int direction; /*direction of traversal */ hsize_t elmtno; /*element number */ hsize_t olap; /*num overlapping elements */ size_t half_size; /*1/2 of total size for swapping*/ @@ -850,7 +850,7 @@ static herr_t H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) { H5T_conv_struct_t *priv = (H5T_conv_struct_t*)(cdata->priv); - intn i, j, *src2dst = NULL; + int i, j, *src2dst = NULL; H5T_t *type = NULL; hid_t tid; @@ -862,7 +862,7 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) */ if (NULL==(priv=cdata->priv=H5MM_calloc(sizeof(H5T_conv_struct_t))) || NULL==(priv->src2dst=H5MM_malloc(src->u.compnd.nmembs * - sizeof(intn))) || + sizeof(int))) || NULL==(priv->src_memb_id=H5MM_malloc(src->u.compnd.nmembs * sizeof(hid_t))) || NULL==(priv->dst_memb_id=H5MM_malloc(dst->u.compnd.nmembs * @@ -995,13 +995,13 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, uint8_t *xbuf=buf, *xbkg=bkg; /*temp pointers into buf and bkg*/ H5T_t *src = NULL; /*source data type */ H5T_t *dst = NULL; /*destination data type */ - intn *src2dst = NULL; /*maps src member to dst member */ + int *src2dst = NULL; /*maps src member to dst member */ H5T_cmemb_t *src_memb = NULL; /*source struct member descript.*/ H5T_cmemb_t *dst_memb = NULL; /*destination struct memb desc. */ size_t offset; /*byte offset wrt struct */ size_t src_delta; /*source stride */ hsize_t elmtno; - intn i; /*counters */ + int i; /*counters */ H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv); FUNC_ENTER (H5T_conv_struct, FAIL); @@ -1241,12 +1241,12 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, uint8_t *xbkg = NULL; /*temporary pointer into `bkg' */ H5T_t *src = NULL; /*source data type */ H5T_t *dst = NULL; /*destination data type */ - intn *src2dst = NULL; /*maps src member to dst member */ + int *src2dst = NULL; /*maps src member to dst member */ H5T_cmemb_t *src_memb = NULL; /*source struct member descript.*/ H5T_cmemb_t *dst_memb = NULL; /*destination struct memb desc. */ size_t offset; /*byte offset wrt struct */ hsize_t elmtno; /*element counter */ - intn i; /*counters */ + int i; /*counters */ H5T_conv_struct_t *priv = NULL; /*private data */ FUNC_ENTER (H5T_conv_struct_opt, FAIL); @@ -1480,12 +1480,12 @@ static herr_t H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata) { H5T_enum_struct_t *priv=NULL; /*private conversion data */ - intn n; /*src value cast as native int */ - intn domain[2]; /*min and max source values */ - intn *map=NULL; /*map from src value to dst idx */ - intn length; /*nelmts in map array */ + int n; /*src value cast as native int */ + int domain[2]; /*min and max source values */ + int *map=NULL; /*map from src value to dst idx */ + int length; /*nelmts in map array */ herr_t ret_value=FAIL; /*return value */ - intn i, j; /*counters */ + int i, j; /*counters */ FUNC_ENTER(H5T_conv_enum_init, FAIL); @@ -1632,8 +1632,8 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, uint8_t *buf = (uint8_t*)_buf; /*cast for pointer arithmetic */ H5T_t *src=NULL, *dst=NULL; /*src and dst data types */ uint8_t *s=NULL, *d=NULL; /*src and dst BUF pointers */ - intn src_delta, dst_delta; /*conversion strides */ - intn n; /*src value cast as native int */ + int src_delta, dst_delta; /*conversion strides */ + int n; /*src value cast as native int */ hsize_t i; /*counters */ H5T_enum_struct_t *priv = (H5T_enum_struct_t*)(cdata->priv); @@ -1699,7 +1699,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, * Direction of conversion. */ if (buf_stride) { - src_delta = dst_delta = (intn)buf_stride; + src_delta = dst_delta = (int)buf_stride; s = d = buf; } else if (dst->size <= src->size) { src_delta = (int)src->size; /*overflow shouldn't be possible*/ @@ -1823,7 +1823,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, void *conv_buf=NULL; /*temporary conversion buffer */ size_t conv_buf_size; /*size of conversion buffer in bytes */ uint8_t dbuf[64],*dbuf_ptr=dbuf;/*temp destination buffer */ - intn direction; /*direction of traversal */ + int direction; /*direction of traversal */ hsize_t elmtno; /*element number counter */ FUNC_ENTER (H5T_conv_vlen, FAIL); @@ -2031,9 +2031,9 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, H5T_t *dst = NULL; /*destination data type */ uint8_t *sp, *dp; /*source and dest traversal ptrs */ size_t src_delta, dst_delta; /*source & destination stride */ - intn direction; /*direction of traversal */ + int direction; /*direction of traversal */ hsize_t elmtno; /*element number counter */ - intn i; /* local index variable */ + int i; /* local index variable */ FUNC_ENTER (H5T_conv_array, FAIL); @@ -2190,7 +2190,7 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, { H5T_t *src = NULL; /*source data type */ H5T_t *dst = NULL; /*destination data type */ - intn direction; /*direction of traversal */ + int direction; /*direction of traversal */ hsize_t elmtno; /*element number */ size_t half_size; /*half the type size */ hsize_t olap; /*num overlapping elements */ @@ -2531,7 +2531,7 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, H5T_t *dst_p; /*destination data type */ H5T_atomic_t src; /*atomic source info */ H5T_atomic_t dst; /*atomic destination info */ - intn direction; /*forward or backward traversal */ + int direction; /*forward or backward traversal */ hsize_t elmtno; /*element number */ size_t half_size; /*half the type size */ hsize_t olap; /*num overlapping elements */ @@ -2968,7 +2968,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, { H5T_t *src=NULL; /*source data type */ H5T_t *dst=NULL; /*destination data type */ - intn direction; /*direction of traversal */ + int direction; /*direction of traversal */ hsize_t elmtno; /*element number */ hsize_t olap; /*num overlapping elements */ size_t nchars=0; /*number of characters copied */ @@ -6102,17 +6102,17 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, uint8_t tmp[8]; /*temporary destination buffer */ H5T_t *src = NULL; /*source data type */ hsize_t elmtno; /*element counter */ - uintn sign; /*sign bit */ - uintn cin, cout; /*carry in/out */ - uintn mbits=0; /*mantissa bits */ - uintn exponent; /*exponent */ - intn i; /*counter */ + unsigned sign; /*sign bit */ + unsigned cin, cout; /*carry in/out */ + unsigned mbits=0; /*mantissa bits */ + unsigned exponent; /*exponent */ + int i; /*counter */ FUNC_ENTER (H5T_conv_i32le_f64le, FAIL); switch (cdata->command) { case H5T_CONV_INIT: - assert (sizeof(intn)>=4); + assert (sizeof(int)>=4); cdata->need_bkg = H5T_BKG_NO; break; diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 8d92d5c..b3dbf44 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -71,8 +71,8 @@ typedef enum H5T_sort_t { /* A compound data type */ typedef struct H5T_compnd_t { - intn nalloc; /*num entries allocated in MEMB array*/ - intn nmembs; /*number of members defined in struct*/ + int nalloc; /*num entries allocated in MEMB array*/ + int nmembs; /*number of members defined in struct*/ H5T_sort_t sorted; /*how are members sorted? */ hbool_t has_array; /* Set if this type has an array datatype member */ /* and should be written with the new version of */ @@ -82,8 +82,8 @@ typedef struct H5T_compnd_t { /* An enumeration data type */ typedef struct H5T_enum_t { - intn nalloc; /*num entries allocated */ - intn nmembs; /*number of members defined in enum */ + int nalloc; /*num entries allocated */ + int nmembs; /*number of members defined in enum */ H5T_sort_t sorted; /*how are members sorted? */ uint8_t *value; /*array of values */ char **name; /*array of symbol names */ @@ -112,9 +112,9 @@ typedef struct H5T_opaque_t { /* An array datatype */ typedef struct H5T_array_t { size_t nelem; /* total number of elements in array */ - intn ndims; /* member dimensionality */ + int ndims; /* member dimensionality */ size_t dim[H5S_MAX_RANK]; /* size in each dimension */ - intn perm[H5S_MAX_RANK]; /* index permutation */ + int perm[H5S_MAX_RANK]; /* index permutation */ } H5T_array_t; typedef enum H5T_state_t { diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index cf37304..72f068a 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -108,7 +108,7 @@ __DLL__ herr_t H5T_path_force_reinit(H5T_t *dt); __DLL__ H5T_class_t H5T_get_class(const H5T_t *dt); __DLL__ htri_t H5T_detect_class (H5T_t *dt, H5T_class_t cls); __DLL__ size_t H5T_get_size(const H5T_t *dt); -__DLL__ intn H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); +__DLL__ int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2); __DLL__ htri_t H5T_is_atomic(const H5T_t *dt); __DLL__ herr_t H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member); diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 6932d70..4d31903 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -25,7 +25,7 @@ #define PABLO_MASK H5Tvlen_mask /* Interface initialization */ -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL /* Local functions */ @@ -506,7 +506,7 @@ herr_t H5T_vlen_disk_write(hid_t plist_id, H5F_t *f, void *vl_addr, void *buf, h static herr_t H5T_vlen_reclaim_recurse(void *elem, H5T_t *dt, H5MM_free_t free_func, void *free_info) { - intn i; /* local index variable */ + int i; /* local index variable */ size_t j; /* local index variable */ herr_t ret_value = SUCCEED; @@ -679,8 +679,8 @@ H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc) { htri_t vlen_changed; /* Whether H5T_vlen_mark changed the type (even if the size didn't change) */ htri_t ret_value = 0; /* Indicate that success, but no location change */ - intn i; /* Local index variable */ - intn accum_change=0; /* Amount of change in the offset of the fields */ + int i; /* Local index variable */ + int accum_change=0; /* Amount of change in the offset of the fields */ size_t old_size; /* Previous size of a field */ FUNC_ENTER(H5T_vlen_mark, FAIL); @@ -13,7 +13,7 @@ #define H5V_HYPER_NDIMS H5O_LAYOUT_NDIMS #define PABLO_MASK H5V_mask -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -38,7 +38,7 @@ static intn interface_initialize_g = 0; *------------------------------------------------------------------------- */ herr_t -H5V_stride_optimize1(uintn *np/*in,out*/, hsize_t *elmt_size/*in,out*/, +H5V_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/, hsize_t *size, hssize_t *stride1) { FUNC_ENTER(H5V_stride_optimize1, FAIL); @@ -84,7 +84,7 @@ H5V_stride_optimize1(uintn *np/*in,out*/, hsize_t *elmt_size/*in,out*/, *------------------------------------------------------------------------- */ herr_t -H5V_stride_optimize2(uintn *np/*in,out*/, hsize_t *elmt_size/*in,out*/, +H5V_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/, hsize_t *size, hssize_t *stride1, hssize_t *stride2) { FUNC_ENTER(H5V_stride_optimize2, FAIL); @@ -228,14 +228,14 @@ H5V_stride_optimize2(uintn *np/*in,out*/, hsize_t *elmt_size/*in,out*/, *------------------------------------------------------------------------- */ hsize_t -H5V_hyper_stride(uintn n, const hsize_t *size, +H5V_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size, const hssize_t *offset, hssize_t *stride/*out*/) { hsize_t skip; /*starting point byte offset */ hsize_t acc; /*accumulator */ hsize_t tmp; - intn i; /*counter */ + int i; /*counter */ FUNC_ENTER(H5V_hyper_stride, (HDabort(), 0)); @@ -293,7 +293,7 @@ H5V_hyper_stride(uintn n, const hsize_t *size, default: /* others */ - for (i=(intn)(n-2), acc=1; i>=0; --i) { + for (i=(int)(n-2), acc=1; i>=0; --i) { tmp = acc * (total_size[i+1] - size[i+1]); assert (tmp<((hsize_t)1<<(8*sizeof(hssize_t)-1))); stride[i] = (hssize_t)tmp; /*overflow checked*/ @@ -331,12 +331,12 @@ H5V_hyper_stride(uintn n, const hsize_t *size, *------------------------------------------------------------------------- */ htri_t -H5V_hyper_eq(intn n, +H5V_hyper_eq(int n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2) { hsize_t nelmts1 = 1, nelmts2 = 1; - intn i; + int i; if (n <= 0) return TRUE; @@ -372,11 +372,11 @@ H5V_hyper_eq(intn n, *------------------------------------------------------------------------- */ htri_t -H5V_hyper_disjointp(uintn n, +H5V_hyper_disjointp(unsigned n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2) { - uintn u; + unsigned u; if (!n || !size1 || !size2) return TRUE; @@ -420,9 +420,9 @@ H5V_hyper_disjointp(uintn n, *------------------------------------------------------------------------- */ herr_t -H5V_hyper_fill(uintn n, const hsize_t *_size, +H5V_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, const hssize_t *offset, void *_dst, - uintn fill_value) + unsigned fill_value) { uint8_t *dst = (uint8_t*)_dst; /*cast for ptr arithmetic */ hsize_t size[H5V_HYPER_NDIMS]; /*a modifiable copy of _size */ @@ -431,7 +431,7 @@ H5V_hyper_fill(uintn n, const hsize_t *_size, hsize_t elmt_size = 1; /*bytes per element */ herr_t status; /*function return status */ #ifndef NDEBUG - uintn u; + unsigned u; #endif FUNC_ENTER(H5V_hyper_fill, FAIL); @@ -495,7 +495,7 @@ H5V_hyper_fill(uintn n, const hsize_t *_size, *------------------------------------------------------------------------- */ herr_t -H5V_hyper_copy(uintn n, const hsize_t *_size, +H5V_hyper_copy(unsigned n, const hsize_t *_size, /*destination*/ const hsize_t *dst_size, const hssize_t *dst_offset, @@ -516,7 +516,7 @@ H5V_hyper_copy(uintn n, const hsize_t *_size, hsize_t tmp2; herr_t status; /*return status */ #ifndef NDEBUG - uintn u; + unsigned u; #endif FUNC_ENTER(H5V_hyper_copy, FAIL); @@ -548,7 +548,7 @@ H5V_hyper_copy(uintn n, const hsize_t *_size, { hsize_t dst_acc; /*accumulator */ hsize_t src_acc; /*accumulator */ - intn ii; /*counter */ + int ii; /*counter */ /* init */ dst_stride[n-1] = 1; @@ -632,7 +632,7 @@ H5V_hyper_copy(uintn n, const hsize_t *_size, default: /* others */ - for (ii=(intn)(n-2), dst_acc=1, src_acc=1; ii>=0; --ii) { + for (ii=(int)(n-2), dst_acc=1, src_acc=1; ii>=0; --ii) { tmp1 = dst_acc * (dst_size[ii+1] - size[ii+1]); tmp2 = src_acc * (src_size[ii+1] - size[ii+1]); assert (tmp1<((hsize_t)1<<(8*sizeof(hssize_t)-1))); @@ -675,14 +675,14 @@ H5V_hyper_copy(uintn n, const hsize_t *_size, *------------------------------------------------------------------------- */ herr_t -H5V_stride_fill(uintn n, hsize_t elmt_size, const hsize_t *size, - const hssize_t *stride, void *_dst, uintn fill_value) +H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, + const hssize_t *stride, void *_dst, unsigned fill_value) { uint8_t *dst = (uint8_t*)_dst; /*cast for ptr arithmetic */ hsize_t idx[H5V_HYPER_NDIMS]; /*1-origin indices */ hsize_t nelmts; /*number of elements to fill */ hsize_t i; /*counter */ - intn j; /*counter */ + int j; /*counter */ hbool_t carry; /*subtraction carray value */ FUNC_ENTER(H5V_stride_fill, FAIL); @@ -695,7 +695,7 @@ H5V_stride_fill(uintn n, hsize_t elmt_size, const hsize_t *size, HDmemset(dst, (signed)fill_value, (size_t)elmt_size); /* Decrement indices and advance pointer */ - for (j=(intn)(n-1), carry=TRUE; j>=0 && carry; --j) { + for (j=(int)(n-1), carry=TRUE; j>=0 && carry; --j) { dst += stride[j]; if (--idx[j]) @@ -730,7 +730,7 @@ H5V_stride_fill(uintn n, hsize_t elmt_size, const hsize_t *size, *------------------------------------------------------------------------- */ herr_t -H5V_stride_copy(uintn n, hsize_t elmt_size, const hsize_t *size, +H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride, const void *_src) { @@ -739,7 +739,7 @@ H5V_stride_copy(uintn n, hsize_t elmt_size, const hsize_t *size, hsize_t idx[H5V_HYPER_NDIMS]; /*1-origin indices */ hsize_t nelmts; /*num elements to copy */ hsize_t i; /*counter */ - intn j; /*counters */ + int j; /*counters */ hbool_t carry; /*carray for subtraction*/ FUNC_ENTER(H5V_stride_copy, FAIL); @@ -754,7 +754,7 @@ H5V_stride_copy(uintn n, hsize_t elmt_size, const hsize_t *size, HDmemcpy(dst, src, (size_t)elmt_size); /* Decrement indices and advance pointers */ - for (j=(intn)(n-1), carry=TRUE; j>=0 && carry; --j) { + for (j=(int)(n-1), carry=TRUE; j>=0 && carry; --j) { src += src_stride[j]; dst += dst_stride[j]; @@ -795,12 +795,12 @@ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, /* destination */ - intn dst_n, const hsize_t *dst_size, + int dst_n, const hsize_t *dst_size, const hssize_t *dst_stride, void *_dst, /* source */ - intn src_n, const hsize_t *src_size, + int src_n, const hsize_t *src_size, const hssize_t *src_stride, const void *_src) { @@ -809,7 +809,7 @@ H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, hsize_t dst_idx[H5V_HYPER_NDIMS]; hsize_t src_idx[H5V_HYPER_NDIMS]; hsize_t i; - intn j; + int j; hbool_t carry; FUNC_ENTER(H5V_stride_copy2, FAIL); @@ -917,11 +917,11 @@ H5V_array_fill(void *_dst, const void *src, size_t size, size_t count) *------------------------------------------------------------------------- */ hsize_t -H5V_array_offset(uintn n, const hsize_t *total_size, const hssize_t *offset) +H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset) { hsize_t skip; /*starting point byte offset */ hsize_t acc; /*accumulator */ - intn i; /*counter */ + int i; /*counter */ FUNC_ENTER(H5V_array_stride, (HDabort(), 0)); @@ -930,7 +930,7 @@ H5V_array_offset(uintn n, const hsize_t *total_size, const hssize_t *offset) assert(offset); /* others */ - for (i=(intn)(n-1), acc=1, skip=0; i>=0; --i) { + for (i=(int)(n-1), acc=1, skip=0; i>=0; --i) { skip += acc * offset[i]; acc *= total_size[i]; } diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index df8fe44..37143ff 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -34,45 +34,45 @@ /* A null pointer is equivalent to a zero vector */ #define H5V_ZERO NULL -__DLL__ hsize_t H5V_hyper_stride(uintn n, const hsize_t *size, +__DLL__ hsize_t H5V_hyper_stride(unsigned n, const hsize_t *size, const hsize_t *total_size, const hssize_t *offset, hssize_t *stride); -__DLL__ htri_t H5V_hyper_disjointp(uintn n, const hssize_t *offset1, +__DLL__ htri_t H5V_hyper_disjointp(unsigned n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -__DLL__ htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, +__DLL__ htri_t H5V_hyper_eq(int n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); -__DLL__ herr_t H5V_hyper_fill(uintn n, const hsize_t *_size, +__DLL__ herr_t H5V_hyper_fill(unsigned n, const hsize_t *_size, const hsize_t *total_size, const hssize_t *offset, void *_dst, - uintn fill_value); -__DLL__ herr_t H5V_hyper_copy(uintn n, const hsize_t *size, + unsigned fill_value); +__DLL__ herr_t H5V_hyper_copy(unsigned n, const hsize_t *size, const hsize_t *dst_total_size, const hssize_t *dst_offset, void *_dst, const hsize_t *src_total_size, const hssize_t *src_offset, const void *_src); -__DLL__ herr_t H5V_stride_fill(uintn n, hsize_t elmt_size, const hsize_t *size, +__DLL__ herr_t H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hssize_t *stride, void *_dst, - uintn fill_value); -__DLL__ herr_t H5V_stride_copy(uintn n, hsize_t elmt_size, const hsize_t *_size, + unsigned fill_value); +__DLL__ herr_t H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *_size, const hssize_t *dst_stride, void *_dst, const hssize_t *src_stride, const void *_src); -__DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n, +__DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, int dst_n, const hsize_t *dst_size, const hssize_t *dst_stride, void *_dst, - intn src_n, const hsize_t *src_size, + int src_n, const hsize_t *src_size, const hssize_t *src_stride, const void *_src); -__DLL__ herr_t H5V_stride_optimize1(uintn *np, hsize_t *elmt_size, +__DLL__ herr_t H5V_stride_optimize1(unsigned *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1); -__DLL__ herr_t H5V_stride_optimize2(uintn *np, hsize_t *elmt_size, +__DLL__ herr_t H5V_stride_optimize2(unsigned *np, hsize_t *elmt_size, hsize_t *size, hssize_t *stride1, hssize_t *stride2); __DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size, size_t count); -__DLL__ hsize_t H5V_array_offset(uintn n, const hsize_t *total_size, +__DLL__ hsize_t H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset); @@ -96,7 +96,7 @@ __DLL__ hsize_t H5V_array_offset(uintn n, const hsize_t *total_size, *------------------------------------------------------------------------- */ static H5_inline hsize_t UNUSED -H5V_vector_reduce_product(uintn n, const hsize_t *v) +H5V_vector_reduce_product(unsigned n, const hsize_t *v) { size_t ans = 1; @@ -123,7 +123,7 @@ H5V_vector_reduce_product(uintn n, const hsize_t *v) *------------------------------------------------------------------------- */ static H5_inline htri_t UNUSED -H5V_vector_zerop_u(intn n, const hsize_t *v) +H5V_vector_zerop_u(int n, const hsize_t *v) { if (!v) return TRUE; while (n--) { @@ -150,7 +150,7 @@ H5V_vector_zerop_u(intn n, const hsize_t *v) *------------------------------------------------------------------------- */ static H5_inline htri_t UNUSED -H5V_vector_zerop_s(intn n, const hssize_t *v) +H5V_vector_zerop_s(int n, const hssize_t *v) { if (!v) return TRUE; while (n--) { @@ -178,8 +178,8 @@ H5V_vector_zerop_s(intn n, const hssize_t *v) * *------------------------------------------------------------------------- */ -static H5_inline intn UNUSED -H5V_vector_cmp_u (intn n, const hsize_t *v1, const hsize_t *v2) +static H5_inline int UNUSED +H5V_vector_cmp_u (int n, const hsize_t *v1, const hsize_t *v2) { if (v1 == v2) return 0; while (n--) { @@ -211,8 +211,8 @@ H5V_vector_cmp_u (intn n, const hsize_t *v1, const hsize_t *v2) * *------------------------------------------------------------------------- */ -static H5_inline intn UNUSED -H5V_vector_cmp_s (uintn n, const hssize_t *v1, const hssize_t *v2) +static H5_inline int UNUSED +H5V_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2) { if (v1 == v2) return 0; while (n--) { @@ -240,7 +240,7 @@ H5V_vector_cmp_s (uintn n, const hssize_t *v1, const hssize_t *v2) *------------------------------------------------------------------------- */ static H5_inline void UNUSED -H5V_vector_inc(intn n, hsize_t *v1, const hsize_t *v2) +H5V_vector_inc(int n, hsize_t *v1, const hsize_t *v2) { while (n--) *v1++ += *v2++; } @@ -16,7 +16,7 @@ /* Interface initialization */ #define PABLO_MASK H5Z_mask #define INTERFACE_INIT H5Z_init_interface -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; static herr_t H5Z_init_interface (void); static size_t H5Z_table_alloc_g = 0; @@ -64,7 +64,7 @@ H5Z_init_interface (void) * *------------------------------------------------------------------------- */ -intn +int H5Z_term_interface (void) { size_t i; @@ -252,7 +252,7 @@ H5Z_register (H5Z_filter_t id, const char *comment, H5Z_func_t func) *------------------------------------------------------------------------- */ herr_t -H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, uintn flags, +H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, size_t cd_nelmts, const unsigned int cd_values[/*cd_nelmts*/]) { size_t idx, i; @@ -260,7 +260,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, uintn flags, FUNC_ENTER(H5Z_append, FAIL); assert(pline); assert(filter>=0 && filter<=H5Z_FILTER_MAX); - assert(0==(flags & ~((uintn)H5Z_FLAG_DEFMASK))); + assert(0==(flags & ~((unsigned)H5Z_FLAG_DEFMASK))); assert(0==cd_nelmts || cd_values); /* @@ -292,7 +292,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, uintn flags, pline->filter[idx].name = NULL; /*we'll pick it up later*/ pline->filter[idx].cd_nelmts = cd_nelmts; if (cd_nelmts>0) { - pline->filter[idx].cd_values = H5MM_malloc(cd_nelmts*sizeof(uintn)); + pline->filter[idx].cd_values = H5MM_malloc(cd_nelmts*sizeof(unsigned)); if (NULL==pline->filter[idx].cd_values) { HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for filter"); @@ -372,13 +372,13 @@ H5Z_find(H5Z_filter_t id) *------------------------------------------------------------------------- */ herr_t -H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, uintn flags, - uintn *filter_mask/*in,out*/, size_t *nbytes/*in,out*/, +H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, unsigned flags, + unsigned *filter_mask/*in,out*/, size_t *nbytes/*in,out*/, size_t *buf_size/*in,out*/, void **buf/*in,out*/) { size_t i, idx, new_nbytes; H5Z_class_t *fclass=NULL; - uintn failed = 0; + unsigned failed = 0; #ifdef H5Z_DEBUG H5_timer_t timer; #endif @@ -386,7 +386,7 @@ H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, uintn flags, FUNC_ENTER(H5Z_pipeline, FAIL); assert(f); - assert(0==(flags & ~((uintn)H5Z_FLAG_INVMASK))); + assert(0==(flags & ~((unsigned)H5Z_FLAG_INVMASK))); assert(filter_mask); assert(nbytes && *nbytes>0); assert(buf_size && *buf_size>0); diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 753cc9e..5b7035f 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -20,7 +20,7 @@ /* Interface initialization */ #define PABLO_MASK H5Z_deflate_mask #define INTERFACE_INIT NULL -static intn interface_initialize_g = 0; +static int interface_initialize_g = 0; /*------------------------------------------------------------------------- diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h index 4726435..f1e46e2 100644 --- a/src/H5Zprivate.h +++ b/src/H5Zprivate.h @@ -34,10 +34,10 @@ struct H5O_pline_t; /*forward decl*/ __DLL__ herr_t H5Z_register(H5Z_filter_t id, const char *comment, H5Z_func_t filter); __DLL__ herr_t H5Z_append(struct H5O_pline_t *pline, H5Z_filter_t filter, - uintn flags, size_t cd_nelmts, + unsigned flags, size_t cd_nelmts, const unsigned int cd_values[]); __DLL__ herr_t H5Z_pipeline(H5F_t *f, const struct H5O_pline_t *pline, - uintn flags, uintn *filter_mask/*in,out*/, + unsigned flags, unsigned *filter_mask/*in,out*/, size_t *nbytes/*in,out*/, size_t *buf_size/*in,out*/, void **buf/*in,out*/); __DLL__ H5Z_class_t *H5Z_find(H5Z_filter_t id); diff --git a/src/H5detect.c b/src/H5detect.c index 006b248..c48e9a5 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -402,7 +402,7 @@ print_results(int nd, detected_t *d) #include \"H5MMprivate.h\"\n\ #include \"H5Tpkg.h\"\n\ \n\ -static intn interface_initialize_g = 0;\n\ +static int interface_initialize_g = 0;\n\ #define INTERFACE_INIT NULL\n\ \n\ /* Declare external the free list for H5T_t's */\n\ @@ -412,7 +412,7 @@ H5FL_EXTERN(H5T_t);\n\ /* The interface termination function */ printf("\n\ -intn\n\ +int\n\ H5TN_term_interface(void)\n\ {\n\ interface_initialize_g = 0;\n\ diff --git a/src/H5private.h b/src/H5private.h index c791a91..f6f7b26 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -405,13 +405,6 @@ MS doesn't recognize it yet (as of April 2001) #endif /* - * Define a type for generic integers. Use this instead of `int' to - * show that some thought went into the algorithm. - */ -typedef int intn; -typedef unsigned uintn; - -/* * Maximum and minimum values. These should be defined in <limits.h> for the * most part. */ @@ -1069,7 +1062,7 @@ extern hbool_t H5_libinit_g; /*good thing C's lazy about extern! */ * through one of these two sets of macros. */ #ifdef H5_HAVE_PABLO -# define PABLO_SAVE(func_id) intn pablo_func_id = func_id; +# define PABLO_SAVE(func_id) int pablo_func_id = func_id; # define PABLO_TRACE_ON(m, f) TRACE_ON(m,f) # define PABLO_TRACE_OFF(m, f) TRACE_OFF(m,f) #else @@ -1083,17 +1076,17 @@ __DLL__ herr_t H5_init_library(void); __DLL__ void H5_term_library(void); /* Functions to terminate interfaces */ -__DLL__ intn H5A_term_interface(void); -__DLL__ intn H5D_term_interface(void); -__DLL__ intn H5F_term_interface(void); -__DLL__ intn H5G_term_interface(void); -__DLL__ intn H5I_term_interface(void); -__DLL__ intn H5P_term_interface(void); -__DLL__ intn H5R_term_interface(void); -__DLL__ intn H5S_term_interface(void); -__DLL__ intn H5TN_term_interface(void); -__DLL__ intn H5T_term_interface(void); -__DLL__ intn H5Z_term_interface(void); +__DLL__ int H5A_term_interface(void); +__DLL__ int H5D_term_interface(void); +__DLL__ int H5F_term_interface(void); +__DLL__ int H5G_term_interface(void); +__DLL__ int H5I_term_interface(void); +__DLL__ int H5P_term_interface(void); +__DLL__ int H5R_term_interface(void); +__DLL__ int H5S_term_interface(void); +__DLL__ int H5TN_term_interface(void); +__DLL__ int H5T_term_interface(void); +__DLL__ int H5Z_term_interface(void); #endif |