diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-03-28 15:44:24 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-03-28 15:44:24 (GMT) |
| commit | 98353176a6dd3b8709d95e6643210e79ed5b19c8 (patch) | |
| tree | 1d65b411863a622f2ca80b50f52b1c6d45cb501b /src | |
| parent | fd88a0006ead7571a652586c9f2eb376123b2f3b (diff) | |
| parent | be4198eb4146dbcd7a380b7fb48980c73b518c74 (diff) | |
| download | hdf5-98353176a6dd3b8709d95e6643210e79ed5b19c8.zip hdf5-98353176a6dd3b8709d95e6643210e79ed5b19c8.tar.gz hdf5-98353176a6dd3b8709d95e6643210e79ed5b19c8.tar.bz2 | |
[svn-r23474] Bring recent trunk changes into the VOL branch including the fix to Ph5diff
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5AC.c | 6 | ||||
| -rw-r--r-- | src/H5Dchunk.c | 2 | ||||
| -rw-r--r-- | src/H5HFsection.c | 2 | ||||
| -rw-r--r-- | src/H5Pfapl.c | 6 |
4 files changed, 8 insertions, 8 deletions
@@ -2998,7 +2998,7 @@ done: *------------------------------------------------------------------------- */ #ifdef H5_HAVE_PARALLEL -herr_t +static herr_t H5AC_construct_candidate_list(H5AC_t * cache_ptr, H5AC_aux_t * aux_ptr, int sync_point_op) @@ -3212,7 +3212,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr, H5C_auto_size_ctl_t * int_conf_ptr) { @@ -4157,7 +4157,7 @@ done: *------------------------------------------------------------------------- */ #ifdef H5_HAVE_PARALLEL -herr_t +static herr_t H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f, hid_t dxpl_id, H5AC_t * cache_ptr) diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index e3f060a..497846b 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2174,7 +2174,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5D__chunk_cinfo_cache_reset(H5D_chunk_cached_t *last) { FUNC_ENTER_PACKAGE_NOERR diff --git a/src/H5HFsection.c b/src/H5HFsection.c index 72ea100..bf779a6 100644 --- a/src/H5HFsection.c +++ b/src/H5HFsection.c @@ -449,7 +449,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5HF_sect_node_free(H5HF_free_section_t *sect, H5HF_indirect_t *iblock) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 0636095..50fe271 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -2500,7 +2500,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5P_file_image_info_del(hid_t UNUSED prop_id, const char UNUSED *name, size_t UNUSED size, void *value) { H5FD_file_image_info_t info; /* Image info struct */ @@ -2554,7 +2554,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5P_file_image_info_copy(const char UNUSED *name, size_t UNUSED size, void *value) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2629,7 +2629,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5P_file_image_info_close(const char UNUSED *name, size_t UNUSED size, void *value) { herr_t ret_value = SUCCEED; /* Return value */ |