diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-11-21 20:13:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-11-21 20:13:17 (GMT) |
| commit | f749d4678751a43e9d1bb15a6ad6ca922c63d584 (patch) | |
| tree | aca9311d499a33220aa465976973e1d4244907af | |
| parent | dd87124e3a9069e8229adb13d8219d8ce1a07126 (diff) | |
| download | hdf5-f749d4678751a43e9d1bb15a6ad6ca922c63d584.zip hdf5-f749d4678751a43e9d1bb15a6ad6ca922c63d584.tar.gz hdf5-f749d4678751a43e9d1bb15a6ad6ca922c63d584.tar.bz2 | |
[svn-r7871] Purpose:
Code cleanup
Description:
Make some functions static and remove unused variables, etc.
Platforms tested:
FreeBSD 4.9 (sleipnir)
too minor to require h5committest
| -rw-r--r-- | src/H5Gprivate.h | 1 | ||||
| -rw-r--r-- | src/H5I.c | 8 | ||||
| -rw-r--r-- | src/H5Iprivate.h | 1 | ||||
| -rw-r--r-- | src/H5Tbit.c | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h index b2bff6c..2bf2c3f 100644 --- a/src/H5Gprivate.h +++ b/src/H5Gprivate.h @@ -38,7 +38,6 @@ #include "H5private.h" /* Generic Functions */ #include "H5Bprivate.h" /* B-trees */ #include "H5Fprivate.h" /* File access */ -#include "H5Gprivate.h" /* Group */ #include "H5RSprivate.h" /* Reference-counted strings */ /* @@ -117,6 +117,7 @@ H5FL_DEFINE_STATIC(H5I_id_info_t); /*--------------------- Local function prototypes ---------------------------*/ static herr_t H5I_init_interface(void); static H5I_id_info_t *H5I_find_id(hid_t id); +static hid_t H5I_get_file_id(hid_t obj_id); #ifdef H5I_DEBUG_OUTPUT static herr_t H5I_debug(H5I_type_t grp); #endif /* H5I_DEBUG_OUTPUT */ @@ -842,7 +843,7 @@ done: * *------------------------------------------------------------------------- */ -hid_t +static hid_t H5I_get_file_id(hid_t obj_id) { H5G_entry_t *ent; @@ -1175,11 +1176,8 @@ H5I_find_id(hid_t id) /* Check arguments */ grp = H5I_GRP(id); - - if (grp <= H5I_BADID || grp >= H5I_NGROUPS) { + if (grp <= H5I_BADID || grp >= H5I_NGROUPS) HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid group number"); - } - grp_ptr = H5I_id_group_list_g[grp]; if (grp_ptr == NULL || grp_ptr->count <= 0) HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "invalid group"); diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index 42369e3..79819a5 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -67,7 +67,6 @@ H5_DLL hid_t H5I_register(H5I_type_t grp, void *object); H5_DLL void *H5I_object(hid_t id); H5_DLL void *H5I_object_verify(hid_t id, H5I_type_t id_type); H5_DLL H5I_type_t H5I_get_type(hid_t id); -H5_DLL hid_t H5I_get_file_id(hid_t obj_id); H5_DLL void *H5I_remove(hid_t id); H5_DLL void *H5I_search(H5I_type_t grp, H5I_search_func_t func, void *key); H5_DLL int H5I_inc_ref(hid_t id); diff --git a/src/H5Tbit.c b/src/H5Tbit.c index 73576c3..f2ad5f1 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -183,14 +183,12 @@ H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size) hsize_t val=0; size_t i, hs; hsize_t ret_value; /* Return value */ - void *pt; FUNC_ENTER_NOAPI(H5T_bit_get_d, 0); assert (8*sizeof(val)>=size); H5T_bit_copy ((uint8_t*)&val, 0, buf, offset, size); - switch (((H5T_t*)(H5I_object(H5T_NATIVE_INT_g)))->u.atomic.order) { case H5T_ORDER_LE: break; |