diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
| commit | db4acaf3abfcc3e156e7ac575005257ea4e3e065 (patch) | |
| tree | 0a496cf3d24b757f52133f3ce8e7f2b9e0cbd654 /src/H5SMcache.c | |
| parent | 2fdeab0ebde453b113cfab01b6bc32003e6e3275 (diff) | |
| download | hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.zip hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.gz hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.bz2 | |
[svn-r27165] Merge 27133 & 27158 from trunk:
- Add a new attribute function characterstic for format:
* H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z)))
- Rename UNUSED attribute characterstic to H5_ATTR_UNUSED.
- Rename NORETURN attribute characterstic to H5_ATTR_NORETURN
tested with h5committest.
Diffstat (limited to 'src/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index d89af73..49456d8 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -62,7 +62,7 @@ static H5SM_list_t *H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void * static herr_t H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_list_t *list); static herr_t H5SM_list_dest(H5F_t *f, H5SM_list_t* list); static herr_t H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy); -static herr_t H5SM_list_size(const H5F_t *f, const H5SM_list_t UNUSED *list, size_t *size_ptr); +static herr_t H5SM_list_size(const H5F_t *f, const H5SM_list_t H5_ATTR_UNUSED *list, size_t *size_ptr); /*********************/ @@ -113,7 +113,7 @@ const H5AC_class_t H5AC_SOHM_LIST[1] = {{ *------------------------------------------------------------------------- */ static H5SM_master_table_t * -H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void UNUSED *udata) +H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void H5_ATTR_UNUSED *udata) { H5SM_master_table_t *table = NULL; H5WB_t *wb = NULL; /* Wrapped buffer for table data */ @@ -355,7 +355,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_table_dest(H5F_t UNUSED *f, H5SM_master_table_t* table) +H5SM_table_dest(H5F_t H5_ATTR_UNUSED *f, H5SM_master_table_t* table) { herr_t ret_value = SUCCEED; /* Return value */ @@ -423,7 +423,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_table_size(const H5F_t UNUSED *f, const H5SM_master_table_t *table, size_t *size_ptr) +H5SM_table_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_master_table_t *table, size_t *size_ptr) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -729,7 +729,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_list_size(const H5F_t UNUSED *f, const H5SM_list_t *list, size_t *size_ptr) +H5SM_list_size(const H5F_t H5_ATTR_UNUSED *f, const H5SM_list_t *list, size_t *size_ptr) { FUNC_ENTER_NOAPI_NOINIT_NOERR |