diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-09-25 17:46:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-09-25 17:46:32 (GMT) |
| commit | ed663577a5394d34a0cfbe5cd5443af1f7957dc5 (patch) | |
| tree | f334d37a08de1f77ce046907bce49c9ff56c6597 /tools/h4toh5 | |
| parent | a6036953db9be2210acbed0882cf62c594b3a168 (diff) | |
| download | hdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.zip hdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.tar.gz hdf5-ed663577a5394d34a0cfbe5cd5443af1f7957dc5.tar.bz2 | |
[svn-r4473] Purpose:
Code cleanup for better compatibility with C++ compilers
Description:
C++ compilers are choking on our C code, for various reasons:
we used our UNUSED macro incorrectly when referring to pointer types
we used various C++ keywords as variables, etc.
we incremented enum's with the ++ operator.
Solution:
Changed variables, etc.to avoid C++ keywords (new, class, typename, typeid,
template)
Fixed usage of UNUSED macro from this:
char UNUSED *c
to this:
char * UNUSED c
Switched the enums from x++ to x=x+1
Platforms tested:
FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'tools/h4toh5')
| -rw-r--r-- | tools/h4toh5/h4toh5image.c | 4 | ||||
| -rw-r--r-- | tools/h4toh5/h4toh5sds.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/h4toh5/h4toh5image.c b/tools/h4toh5/h4toh5image.c index a1ab359..fd32405 100644 --- a/tools/h4toh5/h4toh5image.c +++ b/tools/h4toh5/h4toh5image.c @@ -64,8 +64,8 @@ int Image_h4_to_h5(int32 file_id,int32 ri_id,hid_t h5_group,hid_t h5_palgroup,in char* h5cimage_name; void* image_data; HDF_CHUNK_DEF c_def_out; - int32 chunk_dims[2]; - int32 chunk_dims24[3]; + hsize_t chunk_dims[2]; + hsize_t chunk_dims24[3]; int32 c_flags; int32 interlace_mode; diff --git a/tools/h4toh5/h4toh5sds.c b/tools/h4toh5/h4toh5sds.c index 3788c82..28c87f4 100644 --- a/tools/h4toh5/h4toh5sds.c +++ b/tools/h4toh5/h4toh5sds.c @@ -29,6 +29,12 @@ Author: Kent Yang(ymuqun@ncsa.uiuc.edu) #include "h4toh5main.h" +static int convert_zerosdsunlimit(int32 file_id, + int32 sds_id, + hid_t h5_group, + hid_t h5_dimgroup, + int h4_attr); + /*------------------------------------------------------------------------- * Function: Sds_h4_to_h5 * @@ -1707,7 +1713,7 @@ uint16 get_SDref(int32 file_id,uint16 tag,int32 sds_ref){ return sd_ref; } -int convert_zerosdsunlimit(int32 file_id, +static int convert_zerosdsunlimit(int32 file_id, int32 sds_id, hid_t h5_group, hid_t h5_dimgroup, |