summaryrefslogtreecommitdiffstats
path: root/src/H5Gprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
commite87fc517b8fc391cf18c268ce0b195eb7398a4a7 (patch)
tree494d1d87f71f87f320707989b7f12eec0f1d3805 /src/H5Gprivate.h
parenteef2829d1655e42225b2400c6e3d123be26e08a8 (diff)
downloadhdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.zip
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.gz
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.bz2
[svn-r4355] Purpose:
Code cleanup (sorta) Description: When the first versions of the HDF5 library were designed, I remembered vividly the difficulties of porting code from a 32-bit platform to a 16-bit platform and asked that people use intn & uintn instead of int & unsigned int, respectively. However, in hindsight, this was overkill and unnecessary since we weren't going to be porting the HDF5 library to 16-bit architectures. Currently, the extra uintn & intn typedefs are causing problems for users who'd like to include both the HDF5 and HDF4 header files in one source module (like Kent's h4toh5 library). Solution: Changed the uintn & intn's to unsigned and int's respectively. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'src/H5Gprivate.h')
-rw-r--r--src/H5Gprivate.h16
1 files changed, 8 insertions, 8 deletions
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