mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into hdf5_1_10

Browse Source
This commit is contained in:
M. Scot Breitenfeld 2018-01-31 13:06:30 -06:00
commit afafd79e79
6 changed files with 70 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -48,7 +48,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # use silent rules where a
##
## By default, it is enabled. Users can configure with
## --disable-maintainer-mode to prevent running the autotools.
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE([disable])
## ----------------------------------------------------------------------
## Set prefix default (install directory) to a directory in the build area.

1
release_docs/RELEASE.txt
View File

@ -476,6 +476,7 @@ Bug Fixes since HDF5-1.10.1 release
(HDFFV-10248, DER, 2017/07/05)
- CMake
Too many commands for POST_BUILD step caused command line to be

6
release_docs/USING_HDF5_CMake.txt
View File

@ -289,9 +289,9 @@ endif()
set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
#TAR_SOURCE - name of tarfile
#if (NOT DEFINED TAR_SOURCE)
# set (CTEST_USE_TAR_SOURCE "HDF5Examples-1.10.1-Source")
#endif ()
#if(NOT DEFINED TAR_SOURCE)
# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.10.5-Source")
#endif()
###############################################################################################################
if(WIN32)

58
src/H5Dvirtual.c
View File

@ -147,7 +147,7 @@ H5FL_DEFINE(H5O_storage_virtual_name_seg_t);
H5FL_DEFINE_STATIC(H5D_virtual_held_file_t);
/*-------------------------------------------------------------------------
* Function: H5D_virtual_check_mapping_pre
*
@ -217,7 +217,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_check_mapping_pre() */
/*-------------------------------------------------------------------------
* Function: H5D_virtual_check_mapping_post
*
@ -285,7 +285,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_check_mapping_post() */
/*-------------------------------------------------------------------------
* Function: H5D_virtual_update_min_dims
*
@ -344,7 +344,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_update_min_dims() */
/*-------------------------------------------------------------------------
* Function: H5D_virtual_check_min_dims
*
@ -389,7 +389,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_check_min_dims() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_copy_layout
*
@ -553,7 +553,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_copy_layout() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_reset_layout
*
@ -637,7 +637,7 @@ H5D__virtual_reset_layout(H5O_layout_t *layout)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_reset_layout() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_copy
*
@ -683,7 +683,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_copy() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_delete
*
@ -819,7 +819,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_open_source_dset() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_reset_source_dset
*
@ -906,7 +906,7 @@ H5D__virtual_reset_source_dset(H5O_storage_virtual_ent_t *virtual_ent,
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_reset_source_dset() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_str_append
*
@ -982,7 +982,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D__virtual_str_append() */
/*-------------------------------------------------------------------------
* Function: H5D_virtual_parse_source_name
*
@ -1098,7 +1098,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_parse_source_name() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_copy_parsed_name
*
@ -1155,7 +1155,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_copy_parsed_name() */
/*-------------------------------------------------------------------------
* Function: H5D_virtual_free_parsed_name
*
@ -1188,7 +1188,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_free_parsed_name() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_build_source_name
*
@ -1290,7 +1290,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_build_source_name() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_set_extent_unlim
*
@ -1718,7 +1718,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_set_extent_unlim() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_init_all
*
@ -1942,7 +1942,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_init_all() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_init
*
@ -2037,7 +2037,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_init() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_is_space_alloc
*
@ -2069,7 +2069,7 @@ H5D__virtual_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_is_space_alloc() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_pre_io
*
@ -2310,7 +2310,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_pre_io() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_post_io
*
@ -2360,7 +2360,7 @@ H5D__virtual_post_io(H5O_storage_virtual_t *storage)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_post_io() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_read_one
*
@ -2417,7 +2417,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_read_one() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_read
*
@ -2550,7 +2550,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_read() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_write_one
*
@ -2609,7 +2609,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_write_one() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_write
*
@ -2686,7 +2686,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_write() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_flush
*
@ -2734,7 +2734,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_flush() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_hold_source_dset_files
*
@ -2812,7 +2812,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_hold_source_dset_files() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_refresh_source_dset
*
@ -2852,7 +2852,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_refresh_source_dsets() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_refresh_source_dsets
*
@ -2905,7 +2905,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__virtual_refresh_source_dsets() */
/*-------------------------------------------------------------------------
* Function: H5D__virtual_release_source_dset_files
*

70
src/H5Fint.c
View File

@ -99,7 +99,7 @@ H5FL_DEFINE(H5F_t);
/* Declare a free list to manage the H5F_file_t struct */
H5FL_DEFINE(H5F_file_t);
/*-------------------------------------------------------------------------
* Function: H5F_get_access_plist
*
@ -214,7 +214,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_get_access_plist() */
/*-------------------------------------------------------------------------
* Function: H5F_get_obj_count
*
@ -242,7 +242,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_get_obj_count() */
/*-------------------------------------------------------------------------
* Function: H5F_get_obj_ids
*
@ -269,7 +269,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_get_obj_ids() */
/*---------------------------------------------------------------------------
* Function: H5F_get_objects
*
@ -371,7 +371,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_get_objects() */
/*-------------------------------------------------------------------------
* Function: H5F_get_objects_cb
*
@ -787,7 +787,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__is_hdf5() */
/*-------------------------------------------------------------------------
* Function: H5F_new
*
@ -1051,7 +1051,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_new() */
/*-------------------------------------------------------------------------
* Function: H5F__dest
*
@ -1310,7 +1310,7 @@ H5F__dest(H5F_t *f, hid_t meta_dxpl_id, hid_t raw_dxpl_id, hbool_t flush)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_dest() */
/*-------------------------------------------------------------------------
* Function: H5F_open
*
@ -1728,7 +1728,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_open() */
/*-------------------------------------------------------------------------
* Function: H5F_flush_phase1
*
@ -1765,7 +1765,7 @@ H5F__flush_phase1(H5F_t *f, hid_t meta_dxpl_id)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__flush_phase1() */
/*-------------------------------------------------------------------------
* Function: H5F__flush_phase2
*
@ -1827,7 +1827,7 @@ H5F__flush_phase2(H5F_t *f, hid_t meta_dxpl_id, hid_t raw_dxpl_id, hbool_t closi
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__flush_phase2() */
/*-------------------------------------------------------------------------
* Function: H5F__flush
*
@ -1859,7 +1859,7 @@ H5F__flush(H5F_t *f, hid_t meta_dxpl_id, hid_t raw_dxpl_id, hbool_t closing)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__flush() */
/*-------------------------------------------------------------------------
* Function: H5F_close
*
@ -1920,7 +1920,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_close() */
/*-------------------------------------------------------------------------
* Function: H5F_try_close
*
@ -2093,7 +2093,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_try_close() */
/*-------------------------------------------------------------------------
* Function: H5F_get_id
*
@ -2129,7 +2129,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_get_id() */
/*-------------------------------------------------------------------------
* Function: H5F_incr_nopen_objs
*
@ -2150,7 +2150,7 @@ H5F_incr_nopen_objs(H5F_t *f)
FUNC_LEAVE_NOAPI(++f->nopen_objs)
} /* end H5F_incr_nopen_objs() */
/*-------------------------------------------------------------------------
* Function: H5F_decr_nopen_objs
*
@ -2171,7 +2171,7 @@ H5F_decr_nopen_objs(H5F_t *f)
FUNC_LEAVE_NOAPI(--f->nopen_objs)
} /* end H5F_decr_nopen_objs() */
/*-------------------------------------------------------------------------
* Function: H5F_build_actual_name
*
@ -2293,7 +2293,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_build_actual_name() */
/*-------------------------------------------------------------------------
* Function: H5F_addr_encode_len
*
@ -2330,7 +2330,7 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
FUNC_LEAVE_NOAPI_VOID
} /* end H5F_addr_encode_len() */
/*-------------------------------------------------------------------------
* Function: H5F_addr_encode
*
@ -2354,7 +2354,7 @@ H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
FUNC_LEAVE_NOAPI_VOID
} /* end H5F_addr_encode() */
/*-------------------------------------------------------------------------
* Function: H5F_addr_decode_len
*
@ -2418,7 +2418,7 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
FUNC_LEAVE_NOAPI_VOID
} /* end H5F_addr_decode_len() */
/*-------------------------------------------------------------------------
* Function: H5F_addr_decode
*
@ -2445,7 +2445,7 @@ H5F_addr_decode(const H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*o
FUNC_LEAVE_NOAPI_VOID
} /* end H5F_addr_decode() */
/*-------------------------------------------------------------------------
* Function: H5F_set_grp_btree_shared
*
@ -2471,7 +2471,7 @@ H5F_set_grp_btree_shared(H5F_t *f, H5UC_t *rc)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_grp_btree_shared() */
/*-------------------------------------------------------------------------
* Function: H5F_set_sohm_addr
*
@ -2496,7 +2496,7 @@ H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_sohm_addr() */
/*-------------------------------------------------------------------------
* Function: H5F_set_sohm_vers
*
@ -2521,7 +2521,7 @@ H5F_set_sohm_vers(H5F_t *f, unsigned vers)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_sohm_vers() */
/*-------------------------------------------------------------------------
* Function: H5F_set_sohm_nindexes
*
@ -2546,7 +2546,7 @@ H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_sohm_nindexes() */
/*-------------------------------------------------------------------------
* Function: H5F_set_store_msg_crt_idx
*
@ -2571,7 +2571,7 @@ H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_store_msg_crt_idx() */
/*-------------------------------------------------------------------------
* Function: H5F_get_file_image
*
@ -2687,7 +2687,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_get_file_image() */
/*-------------------------------------------------------------------------
* Function: H5F_track_metadata_read_retries
*
@ -2735,7 +2735,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_track_metadata_read_retries() */
/*-------------------------------------------------------------------------
* Function: H5F_set_retries
*
@ -2771,7 +2771,7 @@ H5F_set_retries(H5F_t *f)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5F_set_retries() */
/*-------------------------------------------------------------------------
* Function: H5F_object_flush_cb
*
@ -2801,7 +2801,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_object_flush_cb() */
/*-------------------------------------------------------------------------
* Function: H5F__set_base_addr
*
@ -2828,7 +2828,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__set_base_addr() */
/*-------------------------------------------------------------------------
* Function: H5F__set_eoa
*
@ -2855,7 +2855,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__set_eoa() */
/*-------------------------------------------------------------------------
* Function: H5F__set_paged_aggr
*
@ -2884,7 +2884,7 @@ done:
} /* end H5F__set_paged_aggr() */
#ifdef H5_HAVE_PARALLEL
/*-------------------------------------------------------------------------
* Function: H5F_set_coll_md_read
*
@ -2909,7 +2909,7 @@ H5F_set_coll_md_read(H5F_t *f, H5P_coll_md_read_flag_t cmr)
} /* H5F_set_coll_md_read() */
#endif /* H5_HAVE_PARALLEL */
/*-------------------------------------------------------------------------
* Function: H5F_set_latest_flags
*

2
tools/src/h5repack/h5repack_parse.c
View File

@ -462,7 +462,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
return obj_list;
}
/*-------------------------------------------------------------------------
* Function: parse_layout
*