diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-14 05:07:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-14 05:07:27 (GMT) |
| commit | b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48 (patch) | |
| tree | 2fa0da529498a379248304b59415184d0b641d7f /src/H5SMcache.c | |
| parent | 437b17f2b45d4b1afb9606ae444338b5abd40b79 (diff) | |
| download | hdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.zip hdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.tar.gz hdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.tar.bz2 | |
[svn-r17892] Decription:
Bring r17891 from trunk to 1.8 branch:
Switch the shared object header messages code to use the refactored
v2 B-tree routines. (this should be the interface that is using them)
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
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 e4be725..98c7362 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -136,7 +136,7 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1 /* Allocate space for the master table in memory */ if(NULL == (table = H5FL_CALLOC(H5SM_master_table_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed") /* Read number of indexes and version from file superblock */ table->num_indexes = f->shared->sohm_nindexes; @@ -177,13 +177,13 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1 /* Allocate space for the index headers in memory*/ if(NULL == (table->indexes = (H5SM_index_header_t *)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") + HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed for SOHM indexes") /* Read in the index headers */ for(x = 0; x < table->num_indexes; ++x) { /* Verify correct version of index list */ if(H5SM_LIST_VERSION != *p++) - HGOTO_ERROR(H5E_FILE, H5E_VERSION, NULL, "bad shared message list version number") + HGOTO_ERROR(H5E_SOHM, H5E_VERSION, NULL, "bad shared message list version number") /* Type of the index (list or B-tree) */ table->indexes[x].index_type= (H5SM_index_type_t)*p++; @@ -477,12 +477,12 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1, /* Allocate space for the SOHM list data structure */ if(NULL == (list = H5FL_MALLOC(H5SM_list_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed") HDmemset(&list->cache_info, 0, sizeof(H5AC_info_t)); /* Allocate list in memory as an array*/ if((list->messages = (H5SM_sohm_t *)H5FL_ARR_MALLOC(H5SM_sohm_t, header->list_max)) == NULL) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "file allocation failed for SOHM list") + HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "file allocation failed for SOHM list") list->header = header; |