diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-03-10 15:47:59 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-03-10 15:47:59 (GMT) |
| commit | 6cfd5c146267e771e46d37709c405c7732feeaf0 (patch) | |
| tree | d9eb91f315735e48eda173531bcaf10269d65db3 /src/H5Oalloc.c | |
| parent | a127510b7b3049d0e136b677b180c8e644bdc7ea (diff) | |
| download | hdf5-6cfd5c146267e771e46d37709c405c7732feeaf0.zip hdf5-6cfd5c146267e771e46d37709c405c7732feeaf0.tar.gz hdf5-6cfd5c146267e771e46d37709c405c7732feeaf0.tar.bz2 | |
[svn-r13487] Description:
Eliminate message count from new version of object header prefix -
it can be computed when the header is loaded and the table of messages is
built.
Tested on:
FreeBSD/32 6.2 (duty)
Diffstat (limited to 'src/H5Oalloc.c')
| -rw-r--r-- | src/H5Oalloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 555c7b0..957de77 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -64,7 +64,6 @@ static herr_t H5O_eliminate_gap(H5O_t *oh, H5O_mesg_t *mesg, uint8_t *new_gap_loc, size_t new_gap_size); static herr_t H5O_alloc_null(H5O_t *oh, unsigned null_idx, const H5O_msg_class_t *new_type, void *new_native, size_t new_size); -static herr_t H5O_alloc_msgs(H5O_t *oh, size_t min_alloc); static htri_t H5O_alloc_extend_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno, size_t size, unsigned * msg_idx); static unsigned H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, @@ -395,7 +394,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5O_alloc_msgs(H5O_t *oh, size_t min_alloc) { size_t old_alloc; /* Old number of messages allocated */ @@ -410,7 +409,7 @@ H5O_alloc_msgs(H5O_t *oh, size_t min_alloc) /* Initialize number of messages information */ old_alloc = oh->alloc_nmesgs; - na = oh->alloc_nmesgs + MAX(oh->alloc_nmesgs, min_alloc); + na = oh->alloc_nmesgs + MAX(oh->alloc_nmesgs, min_alloc); /* At least double */ /* Attempt to allocate more memory */ if(NULL == (new_mesg = H5FL_SEQ_REALLOC(H5O_mesg_t, oh->mesg, na))) |