diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-08 19:44:20 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-08 19:44:20 (GMT) |
| commit | 978c9c9d93fc51ea64c83256a97d72d51656bc3a (patch) | |
| tree | 0f4064defe6e857fbcce12f26084aee7d8122645 /src/H5FDmulti.c | |
| parent | 8f5f04bff27812dde0a888fceadaf1a3dc17cc8e (diff) | |
| download | hdf5-978c9c9d93fc51ea64c83256a97d72d51656bc3a.zip hdf5-978c9c9d93fc51ea64c83256a97d72d51656bc3a.tar.gz hdf5-978c9c9d93fc51ea64c83256a97d72d51656bc3a.tar.bz2 | |
[svn-r13034] Description:
Take out separate memory type in the file for SOHM objects and create
aliases for existing memory types for SOHM use.
Tested on:
FreeBSD/32 4.11 (sleipnir)
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 3e7e1aa..398cd86 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -379,7 +379,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, * letters `s' (H5FD_MEM_SUPER), * `b' (H5FD_MEM_BTREE), `r' (H5FD_MEM_DRAW), * `g' (H5FD_MEM_GHEAP), 'l' (H5FD_MEM_LHEAP), - * `o' (H5FD_MEM_OHDR), 'h' (H5FD_MEM_SOHM). + * `o' (H5FD_MEM_OHDR). * * memb_addr: The value HADDR_UNDEF for each element. * @@ -439,7 +439,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, char _memb_name[H5FD_MEM_NTYPES][16]; const char *_memb_name_ptrs[H5FD_MEM_NTYPES]; haddr_t _memb_addr[H5FD_MEM_NTYPES]; - static const char *letters = "Xsbrglom"; + static const char *letters = "Xsbrglo"; static const char *func="H5FDset_fapl_multi"; /* Function Name for error reporting */ /*NO TRACE*/ @@ -776,7 +776,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/, strncpy(name, "NCSAmulti", (size_t)8); name[8] = '\0'; - assert(8==H5FD_MEM_NTYPES); + assert(7==H5FD_MEM_NTYPES); for (m=H5FD_MEM_SUPER; m<H5FD_MEM_NTYPES; m=(H5FD_mem_t)(m+1)) buf[m-1] = (unsigned char)file->fa.memb_map[m]; buf[7] = 0; |