diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-10 21:22:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-10 21:22:32 (GMT) |
| commit | d650d40507ef9748289d9823d1b3ccbd5f880538 (patch) | |
| tree | 30d1af8235da1f1fb94a20f3450ca318e0afa313 | |
| parent | cd5e734183d9aaddaab2693e746448849848f19c (diff) | |
| download | hdf5-inactive/merge_metadata_journaling.zip hdf5-inactive/merge_metadata_journaling.tar.gz hdf5-inactive/merge_metadata_journaling.tar.bz2 | |
[svn-r24779] Description:inactive/merge_metadata_journaling
Minor formatting tweaks
| -rw-r--r-- | src/H5B2cache.c | 9 | ||||
| -rw-r--r-- | src/H5B2pkg.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 4cbb817..c39890f 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -30,6 +30,7 @@ #define H5B2_PACKAGE /*suppress error about including H5B2pkg */ + /***********/ /* Headers */ /***********/ @@ -134,6 +135,7 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{ H5B2_cache_leaf_free_icr, }}; + /*****************************/ /* Library Private Variables */ /*****************************/ @@ -182,7 +184,6 @@ H5B2_cache_hdr_get_load_size(const void *_udata, size_t *image_len) * Purpose: Loads a B-tree header from the disk. * * Return: Success: Pointer to a new B-tree. - * * Failure: NULL * * Programmer: Quincey Koziol @@ -224,16 +225,16 @@ H5B2_cache_hdr_deserialize(const void *image, size_t UNUSED len, /* Magic number */ if(HDmemcmp(p, H5B2_HDR_MAGIC, (size_t)H5B2_SIZEOF_MAGIC)) - HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree header signature") + HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree header signature") p += H5B2_SIZEOF_MAGIC; /* Version */ if(*p++ != H5B2_HDR_VERSION) - HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "wrong B-tree header version") + HGOTO_ERROR(H5E_BTREE, H5E_BADRANGE, NULL, "wrong B-tree header version") /* B-tree type */ if(*p++ != (uint8_t)udata->type->id) - HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, NULL, "incorrect B-tree type") + HGOTO_ERROR(H5E_BTREE, H5E_BADTYPE, NULL, "incorrect B-tree type") /* Node size (in bytes) */ UINT32DECODE(p, node_size); diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index f0bb2b5..fb4cb99 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -143,7 +143,7 @@ typedef struct H5B2_internal_cache_ud_t { /* Callback info for loading a free space leaf node into the cache */ typedef struct H5B2_leaf_cache_ud_t { H5F_t *f; /* File that v2 b-tree header is within */ - const unsigned *nrec; /* Number of records in node to load */ + const unsigned *nrec; /* Number of records in node to load */ H5RC_t *bt2_shared; /* Ref counter for shared B-tree info */ } H5B2_leaf_cache_ud_t; |