From 6fc0bffac6e099b32c2e195207625e66e5b40c05 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 23 Jun 2004 12:56:57 -0500 Subject: [svn-r8732] Purpose: Code cleanup Description: Reduce compiler warnings on SGI IRIX Platforms tested: FreeBSD 4.10 (sleipnir) SGI IRIX6 (Cheryl's machine) Too minor to require full h5committest --- config/irix6.x | 4 ++-- perform/perf_meta.c | 6 ++++-- src/H5.c | 7 +++---- src/H5D.c | 6 +++--- src/H5Distore.c | 4 ++++ src/H5I.c | 4 ++-- src/H5Olayout.c | 6 ++---- src/H5Omtime.c | 4 +++- src/H5Osdspace.c | 2 +- src/H5Sall.c | 2 +- src/H5Shyper.c | 3 +-- src/H5Snone.c | 2 +- src/H5Tvlen.c | 4 +--- test/dtypes.c | 3 +-- tools/h5dump/h5dump.c | 2 +- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/config/irix6.x b/config/irix6.x index dcdf91e..2221b3f 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -71,11 +71,11 @@ case "X-$CC_BASENAME" in DEBUG_CPPFLAGS= # Extra production flags - PROD_CFLAGS="-O -s" + PROD_CFLAGS="-O -OPT:Olimit=0 -s" PROD_CPPFLAGS= # Extra profiling flags - PROFILE_CFLAGS=-pg + PROFILE_CFLAGS= PROFILE_CPPFLAGS= ;; esac diff --git a/perform/perf_meta.c b/perform/perf_meta.c index 2f7cb92..fc9872d 100644 --- a/perform/perf_meta.c +++ b/perform/perf_meta.c @@ -668,15 +668,17 @@ error: */ double retrieve_time(void) { +#ifdef H5_HAVE_PARALLEL if(facc_type == FACC_DEFAULT) { +#endif /*H5_HAVE_PARALLEL*/ struct timeval t; gettimeofday(&t, NULL); return ((double)t.tv_sec + (double)t.tv_usec / 1000000); - } else { #ifdef H5_HAVE_PARALLEL + } else { return MPI_Wtime(); -#endif /*H5_HAVE_PARALLEL*/ } +#endif /*H5_HAVE_PARALLEL*/ } diff --git a/src/H5.c b/src/H5.c index 6c79466..b105721 100644 --- a/src/H5.c +++ b/src/H5.c @@ -322,11 +322,10 @@ H5dont_atexit(void) H5TRACE0("e",""); if (dont_atexit_g) - HGOTO_DONE(FAIL) + ret_value=FAIL; + else + dont_atexit_g = TRUE; - dont_atexit_g = TRUE; - -done: FUNC_LEAVE_API(ret_value) } diff --git a/src/H5D.c b/src/H5D.c index 5d58e65..7d1652d 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -710,7 +710,7 @@ done: *------------------------------------------------------------------------- */ static int -H5D_crt_fill_value_cmp(const void *value1, const void *value2, size_t size) +H5D_crt_fill_value_cmp(const void *value1, const void *value2, size_t UNUSED size) { const H5O_fill_t *fill1=(const H5O_fill_t *)value1, /* Create local aliases for values */ *fill2=(const H5O_fill_t *)value2; @@ -766,7 +766,7 @@ done: *------------------------------------------------------------------------- */ static int -H5D_crt_ext_file_list_cmp(const void *value1, const void *value2, size_t size) +H5D_crt_ext_file_list_cmp(const void *value1, const void *value2, size_t UNUSED size) { const H5O_efl_t *efl1=(const H5O_efl_t *)value1, /* Create local aliases for values */ *efl2=(const H5O_efl_t *)value2; @@ -848,7 +848,7 @@ done: *------------------------------------------------------------------------- */ static int -H5D_crt_data_pipeline_cmp(const void *value1, const void *value2, size_t size) +H5D_crt_data_pipeline_cmp(const void *value1, const void *value2, size_t UNUSED size) { const H5O_pline_t *pline1=(const H5O_pline_t *)value1, /* Create local aliases for values */ *pline2=(const H5O_pline_t *)value2; diff --git a/src/H5Distore.c b/src/H5Distore.c index ac3f4d4..c86b45c 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1677,7 +1677,9 @@ H5D_istore_readvv(H5F_t *f, const struct H5D_dxpl_cache_t *dxpl_cache, hid_t dxp { H5D_istore_ud1_t udata; /*B-tree pass-through */ haddr_t chunk_addr; /* Chunk address on disk */ +#ifndef NDEBUG size_t u; /* Local index variables */ +#endif ssize_t ret_value; /* Return value */ FUNC_ENTER_NOAPI(H5D_istore_readvv, FAIL); @@ -1780,7 +1782,9 @@ H5D_istore_writevv(H5F_t *f, const struct H5D_dxpl_cache_t *dxpl_cache, { H5D_istore_ud1_t udata; /*B-tree pass-through */ haddr_t chunk_addr; /* Chunk address on disk */ +#ifndef NDEBUG size_t u; /* Local index variables */ +#endif ssize_t ret_value; /* Return value */ FUNC_ENTER_NOAPI(H5D_istore_writevv, FAIL); diff --git a/src/H5I.c b/src/H5I.c index 55d0898..e538f52 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -235,7 +235,7 @@ H5I_type_t H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free FUNC_ENTER_API(H5Iregister_type, H5I_BADID); /* Call H5I_register_type with a value of 0 to get a new type */ - ret_value = H5I_register_type(0, hash_size, reserved, free_func); + ret_value = H5I_register_type((H5I_type_t)0, hash_size, reserved, free_func); done: FUNC_LEAVE_API(ret_value); @@ -312,7 +312,7 @@ H5I_type_t H5I_register_type(H5I_type_t type_id, size_t hash_size, unsigned rese if(H5I_id_type_list_g[i] == NULL) { /* Found a free type ID */ - ret_value = i; + ret_value = (H5I_type_t)i; done = 1; } } diff --git a/src/H5Olayout.c b/src/H5Olayout.c index eba35ae..e829606 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -133,7 +133,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "dimensionality is too large"); /* Layout class */ - mesg->type = *p++; + mesg->type = (H5D_layout_t)*p++; assert(H5D_CONTIGUOUS == mesg->type || H5D_CHUNKED == mesg->type || H5D_COMPACT == mesg->type); /* Reserved bytes */ @@ -181,7 +181,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t } /* end if */ else { /* Layout class */ - mesg->type = *p++; + mesg->type = (H5D_layout_t)*p++; /* Interpret the rest of the message according to the layout class */ switch(mesg->type) { @@ -318,7 +318,6 @@ H5O_layout_encode(H5F_t *f, uint8_t *p, const void *_mesg) default: HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "Invalid layout class"); - break; } /* end switch */ done: @@ -436,7 +435,6 @@ H5O_layout_meta_size(H5F_t *f, const void *_mesg) default: HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, 0, "Invalid layout class"); - break; } /* end switch */ done: diff --git a/src/H5Omtime.c b/src/H5Omtime.c index ac285bd..9e9702d 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -116,6 +116,7 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh) { time_t *mesg, the_time; + uint32_t tmp_time; /* Temporary copy of the time */ int version; /* Version of mtime information */ void *ret_value; /* Return value */ @@ -135,7 +136,8 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, p+=3; /* Get the time_t from the file */ - UINT32DECODE(p, the_time); + UINT32DECODE(p, tmp_time); + the_time=(time_t)tmp_time; /* The return value */ if (NULL==(mesg = H5FL_MALLOC(time_t))) diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index a78af13..e130977 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -129,7 +129,7 @@ H5O_sdspace_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_ /* Get the type of the extent */ if(version>=H5O_SDSPACE_VERSION_2) - sdim->type = *p++; + sdim->type = (H5S_class_t)*p++; else { /* Set the dataspace type to be simple or scalar as appropriate */ if(sdim->rank>0) diff --git a/src/H5Sall.c b/src/H5Sall.c index 13b89c0..5c124a6 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -405,7 +405,7 @@ H5S_all_release (H5S_t UNUSED * space) REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5S_all_copy(H5S_t *dst, const H5S_t *src, hbool_t UNUSED share_selection) +H5S_all_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selection) { FUNC_ENTER_NOAPI_NOFUNC(H5S_all_copy); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 572c58b..0425d76 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -6783,7 +6783,6 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter, size_t span_size=0; /* Number of bytes in current span to actually process */ size_t io_left; /* Number of elements left to process */ size_t io_bytes_left; /* Number of bytes left to process */ - size_t start_io_bytes_left; /* Initial number of bytes left to process */ size_t io_used; /* Number of elements processed */ size_t curr_seq=0; /* Number of sequence/offsets stored in the arrays */ size_t elem_size; /* Size of each element iterating over */ @@ -6818,7 +6817,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter, /* Set the amount of elements to perform I/O on, etc. */ H5_CHECK_OVERFLOW(iter->elmt_left,hsize_t,size_t); io_left=MIN(maxelem,(size_t)iter->elmt_left); - start_io_bytes_left=io_bytes_left=io_left*elem_size; + io_bytes_left=io_left*elem_size; /* Compute the cumulative size of dataspace dimensions */ for(i=fast_dim, acc=elem_size; i>=0; i--) { diff --git a/src/H5Snone.c b/src/H5Snone.c index c051e04..f2cc04f 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -373,7 +373,7 @@ H5S_none_release (H5S_t UNUSED * space) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_none_copy(H5S_t *dst, const H5S_t *src, hbool_t UNUSED share_selection) +H5S_none_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selection) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_copy); diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index c546f54..f40b075 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -752,10 +752,8 @@ H5T_vlen_disk_getlen(void *_vl) *------------------------------------------------------------------------- */ static void * -H5T_vlen_disk_getptr(void *_vl) +H5T_vlen_disk_getptr(void UNUSED *vl) { - uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_getptr) /* check parameters */ diff --git a/test/dtypes.c b/test/dtypes.c index d7a0ef1..5d2297d 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1698,10 +1698,9 @@ test_compound_10(void) cmpd_struct wdata[ARRAY_DIM]; cmpd_struct rdata[ARRAY_DIM]; hid_t file; - hid_t arr_tid, cmpd_tid, cstr_id, vlstr_id, dup_tid; + hid_t arr_tid, cmpd_tid, cstr_id, vlstr_id; hid_t space_id; hid_t dset_id; - hid_t xfer_pid; hsize_t arr_dim[1] = {ARRAY_DIM}; /* Array dimensions */ hsize_t dim1[1]; void *t1, *t2; diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 7ae01c4..a478f3b 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2474,7 +2474,7 @@ dump_fcpl(hid_t fid) indentation(indent + COL); printf("%s %d\n","OBJECTHEADER_VERSION", (int)shhdr); indentation(indent + COL); - printf("%s %d\n","USERBLOCK_VERSION", userblock); + HDfprintf(stdout,"%s %Hu\n","USERBLOCK_VERSION", userblock); indentation(indent + COL); printf("%s %d\n","OFFSET_SIZE", off_size); indentation(indent + COL); -- cgit v0.12