diff options
Diffstat (limited to 'src/H5Oefl.c')
-rw-r--r-- | src/H5Oefl.c | 318 |
1 files changed, 149 insertions, 169 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c index b2eb269..b973443 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -16,56 +16,52 @@ * Tuesday, November 25, 1997 */ -#include "H5Omodule.h" /* This source code file is part of the H5O module */ +#include "H5Omodule.h" /* This source code file is part of the H5O module */ - -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Fprivate.h" /* File access */ -#include "H5HLprivate.h" /* Local Heaps */ -#include "H5MMprivate.h" /* Memory management */ -#include "H5Opkg.h" /* Object headers */ +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Fprivate.h" /* File access */ +#include "H5HLprivate.h" /* Local Heaps */ +#include "H5MMprivate.h" /* Memory management */ +#include "H5Opkg.h" /* Object headers */ /* PRIVATE PROTOTYPES */ -static void *H5O_efl_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, - unsigned *ioflags, size_t p_size, const uint8_t *p); +static void * H5O_efl_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size, + const uint8_t *p); static herr_t H5O_efl_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); -static void *H5O_efl_copy(const void *_mesg, void *_dest); +static void * H5O_efl_copy(const void *_mesg, void *_dest); static size_t H5O_efl_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); static herr_t H5O__efl_reset(void *_mesg); -static void *H5O__efl_copy_file(H5F_t *file_src, void *mesg_src, - H5F_t *file_dst, hbool_t *recompute_size, unsigned *mesg_flags, - H5O_copy_t *cpy_info, void *udata); -static herr_t H5O__efl_debug(H5F_t *f, const void *_mesg, FILE * stream, - int indent, int fwidth); +static void * H5O__efl_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size, + unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata); +static herr_t H5O__efl_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth); /* This message derives from H5O message class */ const H5O_msg_class_t H5O_MSG_EFL[1] = {{ - H5O_EFL_ID, /*message id number */ - "external file list", /*message name for debugging */ - sizeof(H5O_efl_t), /*native message size */ - 0, /* messages are sharable? */ - H5O_efl_decode, /*decode message */ - H5O_efl_encode, /*encode message */ - H5O_efl_copy, /*copy native value */ - H5O_efl_size, /*size of message on disk */ - H5O__efl_reset, /*reset method */ - NULL, /* free method */ - NULL, /* file delete method */ - NULL, /* link method */ - NULL, /*set share method */ - NULL, /*can share method */ - NULL, /* pre copy native value to file */ - H5O__efl_copy_file, /* copy native value to file */ - NULL, /* post copy native value to file */ - NULL, /* get creation index */ - NULL, /* set creation index */ - H5O__efl_debug /*debug the message */ + H5O_EFL_ID, /*message id number */ + "external file list", /*message name for debugging */ + sizeof(H5O_efl_t), /*native message size */ + 0, /* messages are sharable? */ + H5O_efl_decode, /*decode message */ + H5O_efl_encode, /*encode message */ + H5O_efl_copy, /*copy native value */ + H5O_efl_size, /*size of message on disk */ + H5O__efl_reset, /*reset method */ + NULL, /* free method */ + NULL, /* file delete method */ + NULL, /* link method */ + NULL, /*set share method */ + NULL, /*can share method */ + NULL, /* pre copy native value to file */ + H5O__efl_copy_file, /* copy native value to file */ + NULL, /* post copy native value to file */ + NULL, /* get creation index */ + NULL, /* set creation index */ + H5O__efl_debug /*debug the message */ }}; -#define H5O_EFL_VERSION 1 +#define H5O_EFL_VERSION 1 - /*------------------------------------------------------------------------- * Function: H5O_efl_decode * @@ -87,16 +83,15 @@ const H5O_msg_class_t H5O_MSG_EFL[1] = {{ *------------------------------------------------------------------------- */ static void * -H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, - unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, - size_t H5_ATTR_UNUSED p_size, const uint8_t *p) +H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, + unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { - H5O_efl_t *mesg = NULL; + H5O_efl_t * mesg = NULL; int version; - const char *s = NULL; - H5HL_t *heap; - size_t u; /* Local index variable */ - void *ret_value = NULL; /* Return value */ + const char *s = NULL; + H5HL_t * heap; + size_t u; /* Local index variable */ + void * ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -104,12 +99,12 @@ H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, HDassert(f); HDassert(p); - if(NULL == (mesg = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) + if (NULL == (mesg = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Version */ version = *p++; - if(version != H5O_EFL_VERSION) + if (version != H5O_EFL_VERSION) HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "bad version number for external file list message") /* Reserved */ @@ -117,7 +112,7 @@ H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, /* Number of slots */ UINT16DECODE(p, mesg->nalloc); - HDassert(mesg->nalloc>0); + HDassert(mesg->nalloc > 0); UINT16DECODE(p, mesg->nused); HDassert(mesg->nused <= mesg->nalloc); @@ -127,44 +122,44 @@ H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, #ifndef NDEBUG HDassert(H5F_addr_defined(mesg->heap_addr)); - if(NULL == (heap = H5HL_protect(f, mesg->heap_addr, H5AC__READ_ONLY_FLAG))) + if (NULL == (heap = H5HL_protect(f, mesg->heap_addr, H5AC__READ_ONLY_FLAG))) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value") s = (const char *)H5HL_offset_into(heap, 0); HDassert(s && !*s); - if(H5HL_unprotect(heap) < 0) + if (H5HL_unprotect(heap) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value") heap = NULL; #endif /* Decode the file list */ mesg->slot = (H5O_efl_entry_t *)H5MM_calloc(mesg->nalloc * sizeof(H5O_efl_entry_t)); - if(NULL == mesg->slot) + if (NULL == mesg->slot) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") - if(NULL == (heap = H5HL_protect(f, mesg->heap_addr, H5AC__READ_ONLY_FLAG))) + if (NULL == (heap = H5HL_protect(f, mesg->heap_addr, H5AC__READ_ONLY_FLAG))) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value") - for(u = 0; u < mesg->nused; u++) { + for (u = 0; u < mesg->nused; u++) { /* Name */ - H5F_DECODE_LENGTH (f, p, mesg->slot[u].name_offset); + H5F_DECODE_LENGTH(f, p, mesg->slot[u].name_offset); - if((s = (const char *)H5HL_offset_into(heap, mesg->slot[u].name_offset)) == NULL) + if ((s = (const char *)H5HL_offset_into(heap, mesg->slot[u].name_offset)) == NULL) HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "unable to get external file name") - if(*s == (char)'\0') + if (*s == (char)'\0') HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "invalid external file name") - mesg->slot[u].name = H5MM_xstrdup (s); + mesg->slot[u].name = H5MM_xstrdup(s); HDassert(mesg->slot[u].name); /* File offset */ - H5F_DECODE_LENGTH (f, p, mesg->slot[u].offset); + H5F_DECODE_LENGTH(f, p, mesg->slot[u].offset); /* Size */ - H5F_DECODE_LENGTH (f, p, mesg->slot[u].size); + H5F_DECODE_LENGTH(f, p, mesg->slot[u].size); } /* end for */ - if(H5HL_unprotect(heap) < 0) + if (H5HL_unprotect(heap) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value") heap = NULL; @@ -172,14 +167,13 @@ H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, ret_value = mesg; done: - if(ret_value == NULL) - if(mesg != NULL) + if (ret_value == NULL) + if (mesg != NULL) H5MM_xfree(mesg); FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_efl_decode() */ - /*------------------------------------------------------------------------- * Function: H5O_efl_encode * @@ -195,8 +189,8 @@ done: static herr_t H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg) { - const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; - size_t u; /* Local index variable */ + const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; + size_t u; /* Local index variable */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -224,21 +218,20 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons H5F_addr_encode(f, &p, mesg->heap_addr); /* Encode file list */ - for(u = 0; u < mesg->nused; u++) { - /* - * The name should have been added to the heap when the dataset was - * created. - */ - HDassert(mesg->slot[u].name_offset); - H5F_ENCODE_LENGTH(f, p, mesg->slot[u].name_offset); - H5F_ENCODE_LENGTH(f, p, (hsize_t)mesg->slot[u].offset); - H5F_ENCODE_LENGTH(f, p, mesg->slot[u].size); + for (u = 0; u < mesg->nused; u++) { + /* + * The name should have been added to the heap when the dataset was + * created. + */ + HDassert(mesg->slot[u].name_offset); + H5F_ENCODE_LENGTH(f, p, mesg->slot[u].name_offset); + H5F_ENCODE_LENGTH(f, p, (hsize_t)mesg->slot[u].offset); + H5F_ENCODE_LENGTH(f, p, mesg->slot[u].size); } /* end for */ FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O_efl_encode() */ - /*------------------------------------------------------------------------- * Function: H5O_efl_copy * @@ -257,11 +250,11 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons static void * H5O_efl_copy(const void *_mesg, void *_dest) { - const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg; - H5O_efl_t *dest = (H5O_efl_t *) _dest; - size_t u; /* Local index variable */ - hbool_t slot_allocated = FALSE; /* Flag to indicate that dynamic allocation has begun */ - void *ret_value = NULL; /* Return value */ + const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; + H5O_efl_t * dest = (H5O_efl_t *)_dest; + size_t u; /* Local index variable */ + hbool_t slot_allocated = FALSE; /* Flag to indicate that dynamic allocation has begun */ + void * ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -269,43 +262,42 @@ H5O_efl_copy(const void *_mesg, void *_dest) HDassert(mesg); /* Allocate destination message, if necessary */ - if(!dest && NULL == (dest = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) + if (!dest && NULL == (dest = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message") /* copy */ *dest = *mesg; /* Deep copy allocated information */ - if(dest->nalloc > 0) { - if(NULL == (dest->slot = (H5O_efl_entry_t *)H5MM_calloc(dest->nalloc * sizeof(H5O_efl_entry_t)))) + if (dest->nalloc > 0) { + if (NULL == (dest->slot = (H5O_efl_entry_t *)H5MM_calloc(dest->nalloc * sizeof(H5O_efl_entry_t)))) HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slots") slot_allocated = TRUE; - for(u = 0; u < mesg->nused; u++) { + for (u = 0; u < mesg->nused; u++) { dest->slot[u] = mesg->slot[u]; - if(NULL == (dest->slot[u].name = H5MM_xstrdup(mesg->slot[u].name))) + if (NULL == (dest->slot[u].name = H5MM_xstrdup(mesg->slot[u].name))) HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "can't allocate efl message slot name") } /* end for */ - } /* end if */ + } /* end if */ /* Set return value */ ret_value = dest; done: - if(NULL == ret_value) { - if(slot_allocated) { - for(u = 0; u < dest->nused; u++) - if(dest->slot[u].name != NULL && dest->slot[u].name != mesg->slot[u].name) + if (NULL == ret_value) { + if (slot_allocated) { + for (u = 0; u < dest->nused; u++) + if (dest->slot[u].name != NULL && dest->slot[u].name != mesg->slot[u].name) dest->slot[u].name = (char *)H5MM_xfree(dest->slot[u].name); dest->slot = (H5O_efl_entry_t *)H5MM_xfree(dest->slot); } /* end if */ - if(NULL == _dest) + if (NULL == _dest) dest = (H5O_efl_t *)H5MM_xfree(dest); } /* end if */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_efl_copy() */ - /*------------------------------------------------------------------------- * Function: H5O_efl_size * @@ -326,8 +318,8 @@ done: static size_t H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg) { - const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg; - size_t ret_value = 0; + const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; + size_t ret_value = 0; FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -335,18 +327,17 @@ H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void * HDassert(f); HDassert(mesg); - ret_value = (size_t)H5F_SIZEOF_ADDR(f) + /*heap address */ - 2 + /*slots allocated*/ - 2 + /*num slots used*/ - 4 + /*reserved */ - mesg->nused * ((size_t)H5F_SIZEOF_SIZE(f) + /*name offset */ - (size_t)H5F_SIZEOF_SIZE(f) + /*file offset */ - (size_t)H5F_SIZEOF_SIZE(f)); /*file size */ + ret_value = (size_t)H5F_SIZEOF_ADDR(f) + /*heap address */ + 2 + /*slots allocated*/ + 2 + /*num slots used*/ + 4 + /*reserved */ + mesg->nused * ((size_t)H5F_SIZEOF_SIZE(f) + /*name offset */ + (size_t)H5F_SIZEOF_SIZE(f) + /*file offset */ + (size_t)H5F_SIZEOF_SIZE(f)); /*file size */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_efl_size() */ - /*------------------------------------------------------------------------- * Function: H5O__efl_reset * @@ -363,8 +354,8 @@ H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void * static herr_t H5O__efl_reset(void *_mesg) { - H5O_efl_t *mesg = (H5O_efl_t *) _mesg; - size_t u; /* Local index variable */ + H5O_efl_t *mesg = (H5O_efl_t *)_mesg; + size_t u; /* Local index variable */ FUNC_ENTER_STATIC_NOERR @@ -372,9 +363,9 @@ H5O__efl_reset(void *_mesg) HDassert(mesg); /* reset */ - if(mesg->slot) { - for(u = 0; u < mesg->nused; u++) { - mesg->slot[u].name = (char *)H5MM_xfree(mesg->slot[u].name); + if (mesg->slot) { + for (u = 0; u < mesg->nused; u++) { + mesg->slot[u].name = (char *)H5MM_xfree(mesg->slot[u].name); mesg->slot[u].name_offset = 0; } /* end for */ mesg->slot = (H5O_efl_entry_t *)H5MM_xfree(mesg->slot); @@ -385,7 +376,6 @@ H5O__efl_reset(void *_mesg) FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O__efl_reset() */ - /*------------------------------------------------------------------------- * Function: H5O_efl_total_size * @@ -402,29 +392,28 @@ H5O__efl_reset(void *_mesg) *------------------------------------------------------------------------- */ hsize_t -H5O_efl_total_size (H5O_efl_t *efl) +H5O_efl_total_size(H5O_efl_t *efl) { - hsize_t ret_value = 0, tmp; + hsize_t ret_value = 0, tmp; FUNC_ENTER_NOAPI_NOINIT - if(efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size) - ret_value = H5O_EFL_UNLIMITED; + if (efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size) + ret_value = H5O_EFL_UNLIMITED; else { - size_t u; /* Local index variable */ + size_t u; /* Local index variable */ - for(u = 0; u < efl->nused; u++, ret_value = tmp) { - tmp = ret_value + efl->slot[u].size; - if(tmp <= ret_value) - HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, 0, "total external storage size overflowed"); - } /* end for */ - } /* end else */ + for (u = 0; u < efl->nused; u++, ret_value = tmp) { + tmp = ret_value + efl->slot[u].size; + if (tmp <= ret_value) + HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, 0, "total external storage size overflowed"); + } /* end for */ + } /* end else */ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_efl_total_size() */ - /*------------------------------------------------------------------------- * Function: H5O__efl_copy_file * @@ -441,14 +430,14 @@ done: */ static void * H5O__efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_dst, - hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags, - H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *_udata) + hbool_t H5_ATTR_UNUSED *recompute_size, unsigned H5_ATTR_UNUSED *mesg_flags, + H5O_copy_t H5_ATTR_UNUSED *cpy_info, void H5_ATTR_UNUSED *_udata) { - H5O_efl_t *efl_src = (H5O_efl_t *) mesg_src; - H5O_efl_t *efl_dst = NULL; - H5HL_t *heap = NULL; /* Pointer to local heap for EFL file names */ - size_t idx, size, name_offset, heap_size; - void *ret_value = NULL; /* Return value */ + H5O_efl_t *efl_src = (H5O_efl_t *)mesg_src; + H5O_efl_t *efl_dst = NULL; + H5HL_t * heap = NULL; /* Pointer to local heap for EFL file names */ + size_t idx, size, name_offset, heap_size; + void * ret_value = NULL; /* Return value */ FUNC_ENTER_STATIC_TAG(H5AC__COPIED_TAG) @@ -457,34 +446,34 @@ H5O__efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_d HDassert(file_dst); /* Allocate space for the destination efl */ - if(NULL == (efl_dst = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) + if (NULL == (efl_dst = (H5O_efl_t *)H5MM_calloc(sizeof(H5O_efl_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Copy the "top level" information */ H5MM_memcpy(efl_dst, efl_src, sizeof(H5O_efl_t)); /* Determine size needed for destination heap */ - heap_size = H5HL_ALIGN(1); /* "empty" name */ - for(idx = 0; idx < efl_src->nused; idx++) + heap_size = H5HL_ALIGN(1); /* "empty" name */ + for (idx = 0; idx < efl_src->nused; idx++) heap_size += H5HL_ALIGN(HDstrlen(efl_src->slot[idx].name) + 1); /* Create name heap */ - if(H5HL_create(file_dst, heap_size, &efl_dst->heap_addr/*out*/) < 0) + if (H5HL_create(file_dst, heap_size, &efl_dst->heap_addr /*out*/) < 0) HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, NULL, "can't create heap") /* Pin the heap down in memory */ - if(NULL == (heap = H5HL_protect(file_dst, efl_dst->heap_addr, H5AC__NO_FLAGS_SET))) + if (NULL == (heap = H5HL_protect(file_dst, efl_dst->heap_addr, H5AC__NO_FLAGS_SET))) HGOTO_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to protect EFL file name heap") /* Insert "empty" name first */ - if(UFAIL == (name_offset = H5HL_insert(file_dst, heap, (size_t)1, ""))) + if (UFAIL == (name_offset = H5HL_insert(file_dst, heap, (size_t)1, ""))) HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap") HDassert(0 == name_offset); /* allocate array of external file entries */ - if(efl_src->nalloc > 0) { + if (efl_src->nalloc > 0) { size = efl_src->nalloc * sizeof(H5O_efl_entry_t); - if((efl_dst->slot = (H5O_efl_entry_t *)H5MM_calloc(size)) == NULL) + if ((efl_dst->slot = (H5O_efl_entry_t *)H5MM_calloc(size)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* copy content from the source. Need to update later */ @@ -492,10 +481,10 @@ H5O__efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_d } /* end if */ /* copy the name from the source */ - for(idx = 0; idx < efl_src->nused; idx++) { + for (idx = 0; idx < efl_src->nused; idx++) { efl_dst->slot[idx].name = H5MM_xstrdup(efl_src->slot[idx].name); - if(UFAIL == (efl_dst->slot[idx].name_offset = H5HL_insert(file_dst, heap, - HDstrlen(efl_dst->slot[idx].name) + 1, efl_dst->slot[idx].name))) + if (UFAIL == (efl_dst->slot[idx].name_offset = H5HL_insert( + file_dst, heap, HDstrlen(efl_dst->slot[idx].name) + 1, efl_dst->slot[idx].name))) HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap") } /* end for */ @@ -504,16 +493,15 @@ H5O__efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_d done: /* Release resources */ - if(heap && H5HL_unprotect(heap) < 0) + if (heap && H5HL_unprotect(heap) < 0) HDONE_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to unprotect EFL file name heap") - if(!ret_value) - if(efl_dst) + if (!ret_value) + if (efl_dst) H5MM_xfree(efl_dst); FUNC_LEAVE_NOAPI_TAG(ret_value) } /* end H5O__efl_copy_file() */ - /*------------------------------------------------------------------------- * Function: H5O__efl_debug * @@ -527,11 +515,10 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5O__efl_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE * stream, - int indent, int fwidth) +H5O__efl_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int indent, int fwidth) { - const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg; - size_t u; + const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; + size_t u; FUNC_ENTER_STATIC_NOERR @@ -542,36 +529,29 @@ H5O__efl_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE * stream, HDassert(indent >= 0); HDassert(fwidth >= 0); - HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, - "Heap address:", mesg->heap_addr); + HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, "Heap address:", mesg->heap_addr); - HDfprintf(stream, "%*s%-*s %u/%u\n", indent, "", fwidth, - "Slots used/allocated:", - mesg->nused, mesg->nalloc); + HDfprintf(stream, "%*s%-*s %u/%u\n", indent, "", fwidth, "Slots used/allocated:", mesg->nused, + mesg->nalloc); - for(u = 0; u < mesg->nused; u++) { - char buf[64]; + for (u = 0; u < mesg->nused; u++) { + char buf[64]; - HDsnprintf(buf, sizeof(buf), "File %u", (unsigned)u); - HDfprintf(stream, "%*s%s:\n", indent, "", buf); + HDsnprintf(buf, sizeof(buf), "File %u", (unsigned)u); + HDfprintf(stream, "%*s%s:\n", indent, "", buf); - HDfprintf(stream, "%*s%-*s \"%s\"\n", indent+3, "", MAX (fwidth-3, 0), - "Name:", - mesg->slot[u].name); + HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(fwidth - 3, 0), + "Name:", mesg->slot[u].name); - HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0), - "Name offset:", - (unsigned long)(mesg->slot[u].name_offset)); + HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0), + "Name offset:", (unsigned long)(mesg->slot[u].name_offset)); - HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0), - "Offset of data in file:", - (unsigned long)(mesg->slot[u].offset)); + HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0), + "Offset of data in file:", (unsigned long)(mesg->slot[u].offset)); - HDfprintf(stream, "%*s%-*s %lu\n", indent+3, "", MAX (fwidth-3, 0), - "Bytes reserved for data:", - (unsigned long)(mesg->slot[u].size)); + HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(fwidth - 3, 0), + "Bytes reserved for data:", (unsigned long)(mesg->slot[u].size)); } /* end for */ FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O__efl_debug() */ - |