diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-19 20:18:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-19 20:18:26 (GMT) |
| commit | de9088b6bb7969aade23f5af0d1e4e1806fcc0c4 (patch) | |
| tree | 5f77b2172513805db28c2907f119abe513550295 /src/H5SMcache.c | |
| parent | a75186cc511760578d8a9de722a16873371b6570 (diff) | |
| download | hdf5-de9088b6bb7969aade23f5af0d1e4e1806fcc0c4.zip hdf5-de9088b6bb7969aade23f5af0d1e4e1806fcc0c4.tar.gz hdf5-de9088b6bb7969aade23f5af0d1e4e1806fcc0c4.tar.bz2 | |
[svn-r13079] Description:
Add more tests for checking that writing to shared attributes works
correctly. (Looks like it still has a bug when dense storage is used, which
I'll correct shortly).
Add testing routine to shared message code, to retrieve reference count for
a shared message.
Add fractal heap 'op' callback for efficiently computing the hash value of
an existing encoded message in the shared message fractal heap.
Various minor cleanups and warning placations.
Tested on:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago2)
Diffstat (limited to 'src/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 155a3ab..1786c74 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -246,7 +246,7 @@ H5SM_load_table(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1 HDassert((size_t)(p - buf) == H5SM_TABLE_SIZE(f) - H5SM_SIZEOF_CHECKSUM); /* Allocate space for the index headers in memory*/ - if(NULL == (table->indexes = H5FL_ARR_MALLOC(H5SM_index_header_t, table->num_indexes))) + if(NULL == (table->indexes = H5FL_ARR_MALLOC(H5SM_index_header_t, (size_t)table->num_indexes))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for SOHM indexes") /* Read in the index headers */ @@ -337,13 +337,12 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_dest_table(H5F_t *f, H5SM_master_table_t* table) +H5SM_dest_table(H5F_t UNUSED *f, H5SM_master_table_t* table) { FUNC_ENTER_NOAPI_NOFUNC(H5SM_dest_table) - assert(table); - - assert(table->indexes); + HDassert(table); + HDassert(table->indexes); H5FL_ARR_FREE(H5SM_index_header_t, table->indexes); @@ -623,7 +622,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_dest_list(H5F_t *f, H5SM_list_t* list) +H5SM_dest_list(H5F_t UNUSED *f, H5SM_list_t* list) { FUNC_ENTER_NOAPI_NOFUNC(H5SM_dest_list) @@ -653,7 +652,7 @@ H5SM_dest_list(H5F_t *f, H5SM_list_t* list) *------------------------------------------------------------------------- */ static herr_t -H5SM_list_size(const H5F_t *f, const H5SM_list_t *list, size_t *size_ptr) +H5SM_list_size(const H5F_t UNUSED *f, const H5SM_list_t *list, size_t *size_ptr) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_size) |