From 93bc31f6a0007bcf215db02255ddae6532d38268 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 28 Aug 2003 11:30:51 -0500 Subject: [svn-r7428] Purpose: Code cleanup Description: De-linted more code Platforms tested: FreeBSD 4.8 (sleipnir) too minor to need h5committest --- src/H5FO.c | 50 ++++++++++++++++++++++++++------------------------ src/H5FOprivate.h | 6 +++--- src/hdf5.lnt | 1 + 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/H5FO.c b/src/H5FO.c index efb5f65..9d973ac 100644 --- a/src/H5FO.c +++ b/src/H5FO.c @@ -22,14 +22,16 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5FO_mask + #include "H5Eprivate.h" /* Error handling */ #include "H5Fpkg.h" /* File access */ #include "H5FLprivate.h" /* Free lists */ #include "H5FOprivate.h" /* File objects */ #include "H5Oprivate.h" /* Object headers */ -#define PABLO_MASK H5FO_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT NULL @@ -67,11 +69,11 @@ H5FL_DEFINE_STATIC(H5FO_open_obj_t); REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5FO_create(H5F_t *f) +H5FO_create(const H5F_t *f) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_create,FAIL); + FUNC_ENTER_NOAPI(H5FO_create,FAIL) /* Sanity check */ assert(f); @@ -79,10 +81,10 @@ H5FO_create(H5F_t *f) /* Create TBBT used to store open object info */ if((f->shared->open_objs=H5TB_fast_dmake(H5TB_FAST_HADDR_COMPARE))==NULL) - HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create open object TBBT"); + HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create open object TBBT") done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_create() */ @@ -113,7 +115,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr) H5FO_open_obj_t *open_obj; /* Information about open object */ hid_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_opened,FAIL); + FUNC_ENTER_NOAPI(H5FO_opened,FAIL) /* Sanity check */ assert(f); @@ -132,7 +134,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr) ret_value=FAIL; done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_opened() */ @@ -158,12 +160,12 @@ done: REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5FO_insert(H5F_t *f, haddr_t addr, hid_t id) +H5FO_insert(const H5F_t *f, haddr_t addr, hid_t id) { H5FO_open_obj_t *open_obj; /* Information about open object */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_insert,FAIL); + FUNC_ENTER_NOAPI(H5FO_insert,FAIL) /* Sanity check */ assert(f); @@ -174,7 +176,7 @@ H5FO_insert(H5F_t *f, haddr_t addr, hid_t id) /* Allocate new opened object information structure */ if((open_obj=H5FL_MALLOC(H5FO_open_obj_t))==NULL) - HGOTO_ERROR(H5E_CACHE,H5E_NOSPACE,FAIL,"memory allocation failed"); + HGOTO_ERROR(H5E_CACHE,H5E_NOSPACE,FAIL,"memory allocation failed") /* Assign information */ open_obj->addr=addr; @@ -183,10 +185,10 @@ H5FO_insert(H5F_t *f, haddr_t addr, hid_t id) /* Insert into TBBT */ if(H5TB_dins(f->shared->open_objs,open_obj,open_obj)==NULL) - HGOTO_ERROR(H5E_CACHE,H5E_CANTINSERT,FAIL,"can't insert object into TBBT"); + HGOTO_ERROR(H5E_CACHE,H5E_CANTINSERT,FAIL,"can't insert object into TBBT") done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_insert() */ @@ -216,7 +218,7 @@ H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr) H5FO_open_obj_t *open_obj; /* Information about open object */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_delete,FAIL); + FUNC_ENTER_NOAPI(H5FO_delete,FAIL) /* Sanity check */ assert(f); @@ -226,23 +228,23 @@ H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr) /* Get the object node from the TBBT */ if((obj_node=H5TB_dfind(f->shared->open_objs,&addr,NULL))==NULL) - HGOTO_ERROR(H5E_CACHE,H5E_NOTFOUND,FAIL,"can't locate object in TBBT"); + HGOTO_ERROR(H5E_CACHE,H5E_NOTFOUND,FAIL,"can't locate object in TBBT") /* Remove from TBBT */ if((open_obj=H5TB_rem(&f->shared->open_objs->root,obj_node,NULL))==NULL) - HGOTO_ERROR(H5E_CACHE,H5E_CANTRELEASE,FAIL,"can't remove object from TBBT"); + HGOTO_ERROR(H5E_CACHE,H5E_CANTRELEASE,FAIL,"can't remove object from TBBT") /* Check if the object was deleted from the file */ if(open_obj->deleted) { if(H5O_delete(f, dxpl_id, addr)<0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file"); + HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file") } /* end if */ /* Release the object information */ H5FL_FREE(H5FO_open_obj_t,open_obj); done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_delete() */ @@ -274,7 +276,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr) H5FO_open_obj_t *open_obj; /* Information about open object */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_mark,FAIL); + FUNC_ENTER_NOAPI(H5FO_mark,FAIL) /* Sanity check */ assert(f); @@ -292,7 +294,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr) ret_value=FAIL; done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_mark() */ @@ -315,11 +317,11 @@ done: REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5FO_dest(H5F_t *f) +H5FO_dest(const H5F_t *f) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FO_dest,FAIL); + FUNC_ENTER_NOAPI(H5FO_dest,FAIL) /* Sanity check */ assert(f); @@ -328,12 +330,12 @@ H5FO_dest(H5F_t *f) /* Check if the object info set is empty */ if(H5TB_count(f->shared->open_objs)!=0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "objects still in open object info set"); + HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "objects still in open object info set") /* Release the open object info set TBBT */ f->shared->open_objs=H5TB_dfree(f->shared->open_objs,NULL,NULL); done: - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FO_dest() */ diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h index f9780ae..389f7ad 100644 --- a/src/H5FOprivate.h +++ b/src/H5FOprivate.h @@ -34,12 +34,12 @@ typedef H5TB_TREE H5FO_t; /* Currently, all open objects are stored in TBB /* Macros */ /* Private routines */ -H5_DLL herr_t H5FO_create(H5F_t *f); +H5_DLL herr_t H5FO_create(const H5F_t *f); H5_DLL hid_t H5FO_opened(const H5F_t *f, haddr_t addr); -H5_DLL herr_t H5FO_insert(H5F_t *f, haddr_t addr, hid_t id); +H5_DLL herr_t H5FO_insert(const H5F_t *f, haddr_t addr, hid_t id); H5_DLL herr_t H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr); H5_DLL herr_t H5FO_mark(const H5F_t *f, haddr_t addr); -H5_DLL herr_t H5FO_dest(H5F_t *f); +H5_DLL herr_t H5FO_dest(const H5F_t *f); #endif /* _H5FOprivate_H */ diff --git a/src/hdf5.lnt b/src/hdf5.lnt index 20c57df..51ef047 100755 --- a/src/hdf5.lnt +++ b/src/hdf5.lnt @@ -89,6 +89,7 @@ H5FDsec2.c H5FDstdio.c H5FL.c + H5FO.c H5V.c H5Z.c -- cgit v0.12