From 03ab48c9c306fee878c4f3a97f858f90c078bfdf Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 20 May 2002 13:43:31 -0500 Subject: [svn-r5444] Purpose: Code cleanup Description: Clean up warnings on IRIX64 6.5 (modi4) Platforms tested: IRIX64 6.5 (modi4) --- fortran/src/H5Pf.c | 13 +++++++++---- src/H5FD.c | 4 ++-- src/H5FDmulti.c | 48 +++++++++++++++++++++++------------------------ src/H5I.c | 4 ++-- src/H5Ofill.c | 12 ++++++------ src/H5private.h | 14 ++++++++++++++ test/dsets.c | 4 ++++ test/dtypes.c | 17 ++++++++--------- test/fillval.c | 9 ++++----- test/h5test.c | 4 ++-- test/stab.c | 2 +- testpar/t_mdset.c | 6 ++++++ tools/lib/h5tools_utils.h | 2 +- 13 files changed, 83 insertions(+), 56 deletions(-) diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index 49c518a..2ea4e5e 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -645,7 +645,11 @@ nh5pget_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk) int i; herr_t ret; int c_ik; +#ifdef H5_WANT_H5_V1_4_COMPAT int c_lk; +#else /* H5_WANT_H5_V1_4_COMPAT */ + unsigned c_lk; +#endif /* H5_WANT_H5_V1_4_COMPAT */ /* * Call H5Pget_sym_k function. @@ -1646,12 +1650,14 @@ nh5pget_external_c(hid_t_f *prp_id,int*idx, size_t_f* name_size, _fcd name, int_ * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit) +nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit) { int ret_value = -1; +#ifdef H5_WANT_H5_V1_4_COMPAT hid_t c_prp_id; herr_t ret; unsigned c_cache, c_limit; + c_cache = (unsigned) *cache; c_limit = (unsigned) *limit; @@ -1659,7 +1665,6 @@ nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit) * Call H5Pset_hyper_cache function. */ c_prp_id = *prp_id; -#ifdef H5_WANT_H5_V1_4_COMPAT ret = H5Pset_hyper_cache(c_prp_id, c_cache, c_limit); if (ret < 0) return ret_value; #endif /* H5_WANT_H5_V1_4_COMPAT */ @@ -1681,9 +1686,10 @@ nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit) * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit) +nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit) { int ret_value = -1; +#ifdef H5_WANT_H5_V1_4_COMPAT hid_t c_prp_id; herr_t ret; unsigned c_cache, c_limit; @@ -1691,7 +1697,6 @@ nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit) * Call H5Pget__hyper_cache function. */ c_prp_id = *prp_id; -#ifdef H5_WANT_H5_V1_4_COMPAT ret = H5Pget_hyper_cache(c_prp_id, &c_cache, &c_limit); if (ret < 0) return ret_value; *cache = (int_f)c_cache; diff --git a/src/H5FD.c b/src/H5FD.c index b43b84d..fcffb45 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -207,7 +207,7 @@ H5FDregister(const H5FD_class_t *cls) HRETURN_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL, "`read' and/or `write' method is not defined"); } - for (type=H5FD_MEM_DEFAULT; typefl_map[type]fl_map[type]>=H5FD_MEM_NTYPES) { HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, @@ -904,7 +904,7 @@ H5FD_close(H5FD_t *file) /* Free all free-lists, leaking any memory thus described. Also leaks * file space allocated but not used when metadata aggregation is * turned on. */ - for (i=H5FD_MEM_DEFAULT; ifl[i]; cur; cur=next) { #ifdef H5F_DEBUG nblocks++; diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index ea09b90..2e7045b 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -43,7 +43,7 @@ hbool_t _seen[H5FD_MEM_NTYPES]; \ \ memset(_seen, 0, sizeof _seen); \ - for (_unmapped=H5FD_MEM_SUPER; _unmapped0 && LOOPVAR=H5FD_MEM_NTYPES) @@ -513,7 +513,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, memcpy(memb_map, fa->memb_map, H5FD_MEM_NTYPES*sizeof(H5FD_mem_t)); } if (memb_fapl) { - for (mt=H5FD_MEM_DEFAULT; mtmemb_fapl[mt]>=0) { memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]); } else { @@ -522,7 +522,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/, } } if (memb_name) { - for (mt=H5FD_MEM_DEFAULT; mtmemb_name[mt]) { memb_name[mt] = malloc(strlen(fa->memb_name[mt])+1); strcpy(memb_name[mt], fa->memb_name[mt]); @@ -578,7 +578,7 @@ H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl) H5Epush_ret(func, H5E_PLIST, H5E_BADTYPE, "not a data transfer property list", -1); if (!memb_dxpl) H5Epush_ret(func, H5E_INTERNAL, H5E_BADVALUE, "invalid pointer", -1); - for (mt=H5FD_MEM_DEFAULT; mtmemb_dxpl[mt]>=0) { memb_dxpl[mt] = H5Pcopy(dx->memb_dxpl[mt]); } else { @@ -729,7 +729,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/, strcpy(name, "NCSAmulti"); assert(7==H5FD_MEM_NTYPES); - for (m=H5FD_MEM_SUPER; mfa.memb_map[m]; } buf[7] = 0; @@ -989,7 +989,7 @@ H5FD_multi_fapl_copy(const void *_old_fa) H5Eclear(); memcpy(new_fa, old_fa, sizeof(H5FD_multi_fapl_t)); - for (mt=H5FD_MEM_DEFAULT; mtmemb_fapl[mt]>=0) { new_fa->memb_fapl[mt] = H5Pcopy(old_fa->memb_fapl[mt]); if (new_fa->memb_fapl[mt]<0) nerrors++; @@ -1002,7 +1002,7 @@ H5FD_multi_fapl_copy(const void *_old_fa) } if (nerrors) { - for (mt=H5FD_MEM_DEFAULT; mtmemb_fapl[mt]>=0) H5Pclose(new_fa->memb_fapl[mt]); if (new_fa->memb_name[mt]) free(new_fa->memb_name[mt]); } @@ -1038,7 +1038,7 @@ H5FD_multi_fapl_free(void *_fa) /* Clear the error stack */ H5Eclear(); - for (mt=H5FD_MEM_DEFAULT; mtmemb_fapl[mt]>=0) H5Pclose(fa->memb_fapl[mt]); if (fa->memb_name[mt]) free(fa->memb_name[mt]); } @@ -1078,7 +1078,7 @@ H5FD_multi_dxpl_copy(const void *_old_dx) H5Eclear(); memcpy(new_dx, old_dx, sizeof(H5FD_multi_dxpl_t)); - for (mt=H5FD_MEM_DEFAULT; mtmemb_dxpl[mt]>=0) { new_dx->memb_dxpl[mt] = H5Pcopy(old_dx->memb_dxpl[mt]); if (new_dx->memb_dxpl[mt]<0) nerrors++; @@ -1086,7 +1086,7 @@ H5FD_multi_dxpl_copy(const void *_old_dx) } if (nerrors) { - for (mt=H5FD_MEM_DEFAULT; mtmemb_dxpl[mt]); free(new_dx); H5Epush_ret(func, H5E_INTERNAL, H5E_BADVALUE, "invalid freespace objects", NULL); @@ -1120,7 +1120,7 @@ H5FD_multi_dxpl_free(void *_dx) /* Clear the error stack */ H5Eclear(); - for (mt=H5FD_MEM_DEFAULT; mtmemb_dxpl[mt]>=0) H5Pclose(dx->memb_dxpl[mt]); free(dx); @@ -1323,7 +1323,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2) /* Clear the error stack */ H5Eclear(); - for (mt=H5FD_MEM_DEFAULT; mtmemb[mt] && f2->memb[mt]) break; if (!cmp) { if (f1->memb[mt]) cmp = -1; @@ -1431,7 +1431,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, haddr_t eoa) H5Eclear(); /* Find the subfile in which the new EOA value falls */ - for (mt=H5FD_MEM_SUPER; mtfa.memb_map[mt]; if (H5FD_MEM_DEFAULT==mmt) mmt = mt; assert(mmt>0 && mmtfa.memb_map[mt]; if (H5FD_MEM_DEFAULT==mmt) mmt = mt; assert(mmt>0 && mmtfa.memb_map[mt]; if (H5FD_MEM_DEFAULT==mmt) mmt = mt; assert(mmt>0 && mmtmemb[mt]) { H5E_BEGIN_TRY { if (H5FDflush(file->memb[mt],closing)<0) nerrors++; diff --git a/src/H5I.c b/src/H5I.c index 1f47030..f7992f7 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -121,14 +121,14 @@ H5I_term_interface(void) if (interface_initialize_g) { /* How many groups are still being used? */ - for (grp=(H5I_type_t)0; grpid_list) n++; } /* If no groups are used then clean up */ if (0==n) { - for (grp=(H5I_type_t)0; grpspace_time = *p++; + mesg->space_time = (H5D_space_time_t)*p++; /* Fill value write time */ - mesg->fill_time = *p++; + mesg->fill_time = (H5D_fill_time_t)*p++; /* Whether fill value is defined */ mesg->fill_defined = *p++; @@ -510,9 +510,9 @@ H5O_fill_new_reset(void *_mesg) H5T_close(mesg->type); mesg->type = NULL; } - mesg->space_time = 0; - mesg->fill_time = 0; - mesg->fill_defined = 0; + mesg->space_time = (H5D_space_time_t)0; + mesg->fill_time = (H5D_fill_time_t)0; + mesg->fill_defined = (H5D_fill_value_t)0; FUNC_LEAVE(SUCCEED); } @@ -712,7 +712,7 @@ H5O_fill_convert(void *_fill, H5T_t *dset_type) } H5T_close(fill->type); fill->type = NULL; - fill->size = H5T_get_size(dset_type); + H5_ASSIGN_OVERFLOW(fill->size,H5T_get_size(dset_type),size_t,ssize_t); ret_value = SUCCEED; done: diff --git a/src/H5private.h b/src/H5private.h index 425fd32..15721db 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -411,6 +411,20 @@ #endif /* + * A macro to portably increment enumerated types. + */ +#ifndef H5_INC_ENUM +# define H5_INC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)+1)) +#endif + +/* + * A macro to portably decrement enumerated types. + */ +#ifndef H5_DEC_ENUM +# define H5_DEC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)-1)) +#endif + +/* * A macro for detecting over/under-flow when casting between types */ #ifndef NDEBUG diff --git a/test/dsets.c b/test/dsets.c index fd3d479..1343f22 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -366,13 +366,17 @@ test_compression(hid_t file) const hsize_t chunk_size[2] = {2, 25}; const hssize_t hs_offset[2] = {7, 30}; const hsize_t hs_size[2] = {4, 50}; +#if !(defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)) const char *not_supported; +#endif hsize_t i, j, n; void *tconv_buf = NULL; +#if !(defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)) not_supported = " Deflate compression is not supported.\n" " The zlib was not found when hdf5 was configured."; +#endif TESTING("compression (setup)"); diff --git a/test/dtypes.c b/test/dtypes.c index d423582..13df634 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1112,7 +1112,6 @@ test_query(void) hid_t file=-1, tid1=-1, tid2=-1; char filename[1024]; char compnd_type[]="Compound_type", enum_type[]="Enum_type"; - int nmembs, indx; short enum_val; TESTING("query functions of compound and enumeration types"); @@ -1182,24 +1181,24 @@ test_query(void) } /* end if */ /* Query member number and member index by name, for compound type. */ - if((nmembs=H5Tget_nmembers(tid1))!=4) { + if(H5Tget_nmembers(tid1)!=4) { H5_FAILED(); printf("Can't get member number\n"); goto error; } /* end if */ - if((indx=H5Tget_member_index(tid1, "c"))!=2) { + if(H5Tget_member_index(tid1, "c")!=2) { H5_FAILED(); printf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by name, for enumeration type. */ - if((nmembs=H5Tget_nmembers(tid2))!=5) { + if(H5Tget_nmembers(tid2)!=5) { H5_FAILED(); printf("Can't get member number\n"); goto error; } /* end if */ - if((indx=H5Tget_member_index(tid2, "ORANGE"))!=3) { + if(H5Tget_member_index(tid2, "ORANGE")!=3) { H5_FAILED(); printf("Can't get correct index number\n"); goto error; @@ -1242,24 +1241,24 @@ test_query(void) } /* end if */ /* Query member number and member index by name, for compound type */ - if((nmembs=H5Tget_nmembers(tid1))!=4) { + if(H5Tget_nmembers(tid1)!=4) { H5_FAILED(); printf("Can't get member number\n"); goto error; } /* end if */ - if((indx=H5Tget_member_index(tid1, "c"))!=2) { + if(H5Tget_member_index(tid1, "c")!=2) { H5_FAILED(); printf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by name, for enumeration type */ - if((nmembs=H5Tget_nmembers(tid2))!=5) { + if(H5Tget_nmembers(tid2)!=5) { H5_FAILED(); printf("Can't get member number\n"); goto error; } /* end if */ - if((indx=H5Tget_member_index(tid2, "ORANGE"))!=3) { + if(H5Tget_member_index(tid2, "ORANGE")!=3) { H5_FAILED(); printf("Can't get correct index number\n"); goto error; diff --git a/test/fillval.c b/test/fillval.c index 100180f..97bb690 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -100,7 +100,6 @@ static hid_t create_compound_type(void) static int test_getset(void) { - herr_t status; hid_t dcpl=-1; int fill_i; hid_t type_ss=-1, type_si=-1; @@ -138,7 +137,7 @@ test_getset(void) * no fill value should result in a failure. */ H5E_BEGIN_TRY { - status = H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i); + H5Pget_fill_value(dcpl, H5T_NATIVE_INT, &fill_i); } H5E_END_TRY; if (fill_i != 0) { H5_FAILED(); @@ -226,7 +225,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) { hid_t file=-1, space=-1, dcpl=-1, comp_type_id=-1; hid_t dset1=-1, dset2=-1, dset3=-1, dset4=-1, dset5=-1, - dset6=-1, dset7=-1, dset8=-1, dset9=-1; + dset6=-1, /* dset7=-1, */ dset8=-1, dset9=-1; hsize_t cur_size[5] = {32, 16, 8, 4, 2}; hsize_t ch_size[5] = {1, 1, 1, 4, 2}; short rd_s, fill_s = 0x1234; @@ -303,7 +302,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if(H5Pset_fill_value(dcpl, -1, NULL)<0) goto error; if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; H5E_BEGIN_TRY { - if((dset7 = H5Dcreate(file, "dset7", H5T_NATIVE_LONG, space, dcpl))!=FAIL) + if(H5Dcreate(file, "dset7", H5T_NATIVE_LONG, space, dcpl)!=FAIL) goto error; } H5E_END_TRY; @@ -342,7 +341,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) * Supposed to fail. */ if(H5Pset_fill_value(dcpl, -1, NULL)<0) goto error; H5E_BEGIN_TRY { - if((dset7 = H5Dcreate(file, "dset7", H5T_NATIVE_LONG, space, dcpl))!=FAIL) + if(H5Dcreate(file, "dset7", H5T_NATIVE_LONG, space, dcpl)!=FAIL) goto error; } H5E_END_TRY; diff --git a/test/h5test.c b/test/h5test.c index 05d5147..23ecb33 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -151,7 +151,7 @@ h5_cleanup(const char *base_name[], hid_t fapl) H5FD_mem_t mt; assert(strlen(multi_letters)==H5FD_MEM_NTYPES); - for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt=mt+1) { + for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]); HDremove(temp); /*don't care if it fails*/ @@ -443,7 +443,7 @@ h5_fileaccess(void) HDmemset(memb_addr, 0, sizeof memb_addr); assert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES); - for (mt=H5FD_MEM_DEFAULT; mt