diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-11-21 22:48:03 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-11-21 22:48:03 (GMT) |
| commit | 72ecaf0940f8d6df7bedf14376ea3f2224efc0c6 (patch) | |
| tree | c132b19e6aa22c42dd53bb532abf534e6ffa58bf /src/H5SMcache.c | |
| parent | 88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4 (diff) | |
| parent | f6ad126673553838df0dec514c5d2c1b4b70df1a (diff) | |
| download | hdf5-72ecaf0940f8d6df7bedf14376ea3f2224efc0c6.zip hdf5-72ecaf0940f8d6df7bedf14376ea3f2224efc0c6.tar.gz hdf5-72ecaf0940f8d6df7bedf14376ea3f2224efc0c6.tar.bz2 | |
Merge branch 'develop' into eoc_valgrind_bugfix
Diffstat (limited to 'src/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 4de86e2..26db5d3 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -61,8 +61,7 @@ static herr_t H5SM__cache_table_get_load_size(const void *udata, size_t *image_len); static void *H5SM__cache_table_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); -static herr_t H5SM__cache_table_image_len(const void *thing, size_t *image_len, - hbool_t *compressed_ptr, size_t *compressed_image_len_ptr); +static herr_t H5SM__cache_table_image_len(const void *thing, size_t *image_len); static herr_t H5SM__cache_table_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5SM__cache_table_free_icr(void *thing); @@ -70,8 +69,7 @@ static herr_t H5SM__cache_table_free_icr(void *thing); static herr_t H5SM__cache_list_get_load_size(const void *udata, size_t *image_len); static void *H5SM__cache_list_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); -static herr_t H5SM__cache_list_image_len(const void *thing, size_t *image_len, - hbool_t *compressed_ptr, size_t *compressed_image_len_ptr); +static herr_t H5SM__cache_list_image_len(const void *thing, size_t *image_len); static herr_t H5SM__cache_list_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5SM__cache_list_free_icr(void *thing); @@ -94,7 +92,6 @@ const H5AC_class_t H5AC_SOHM_TABLE[1] = {{ H5SM__cache_table_serialize, /* 'serialize' callback */ NULL, /* 'notify' callback */ H5SM__cache_table_free_icr, /* 'free_icr' callback */ - NULL, /* 'clear' callback */ NULL, /* 'fsf_size' callback */ }}; @@ -110,7 +107,6 @@ const H5AC_class_t H5AC_SOHM_LIST[1] = {{ H5SM__cache_list_serialize, /* 'serialize' callback */ NULL, /* 'notify' callback */ H5SM__cache_list_free_icr, /* 'free_icr' callback */ - NULL, /* 'clear' callback */ NULL, /* 'fsf_size' callback */ }}; @@ -301,8 +297,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM__cache_table_image_len(const void *_thing, size_t *image_len, - hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr) +H5SM__cache_table_image_len(const void *_thing, size_t *image_len) { const H5SM_master_table_t *table = (const H5SM_master_table_t *)_thing; /* Shared message table to query */ @@ -319,10 +314,6 @@ H5SM__cache_table_image_len(const void *_thing, size_t *image_len, FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5SM__cache_table_image_len() */ -/***************************************/ -/* no H5SM_cache_table_pre_serialize() */ -/***************************************/ - /*------------------------------------------------------------------------- * Function: H5SM__cache_table_serialize @@ -591,8 +582,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM__cache_list_image_len(const void *_thing, size_t *image_len, - hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr) +H5SM__cache_list_image_len(const void *_thing, size_t *image_len) { const H5SM_list_t *list = (const H5SM_list_t *)_thing; /* Shared message list to query */ @@ -610,10 +600,6 @@ H5SM__cache_list_image_len(const void *_thing, size_t *image_len, FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5SM__cache_list_image_len() */ -/**************************************/ -/* no H5SM_cache_list_pre_serialize() */ -/**************************************/ - /*------------------------------------------------------------------------- * Function: H5SM__cache_list_serialize |