summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-11-20 19:10:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-11-20 19:10:12 (GMT)
commit300fcb978b69cf04cd979735385707ffa1836251 (patch)
treea3fe67e166ab0f4c71f8d1091a182e3a7cf04e11
parent6ab0e9f0929738cdb3ba87fd409c68ad3db4178c (diff)
downloadhdf5-300fcb978b69cf04cd979735385707ffa1836251.zip
hdf5-300fcb978b69cf04cd979735385707ffa1836251.tar.gz
hdf5-300fcb978b69cf04cd979735385707ffa1836251.tar.bz2
[svn-r4621] Purpose:
Code cleanup Description: Get rid of IDs from internal function calls. Platforms tested: FreeBSD 4.4 (hawkwind)
-rw-r--r--src/H5Distore.c14
-rw-r--r--src/H5Fistore.c14
2 files changed, 18 insertions, 10 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 4ddb4d4..ed3c673 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -41,7 +41,7 @@
#include "H5MFprivate.h"
#include "H5MMprivate.h"
#include "H5Oprivate.h"
-#include "H5Pprivate.h"
+#include "H5Pprivate.h" /* Property lists */
#include "H5Vprivate.h"
/* MPIO driver needed for special checks */
@@ -1348,6 +1348,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
herr_t status; /*func return status */
void *chunk=NULL; /*the file chunk */
void *ret_value=NULL; /*return value */
+ H5P_genplist_t *plist=NULL; /* Property list */
FUNC_ENTER (H5F_istore_lock, NULL);
@@ -1501,8 +1502,9 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
ent->chunk = chunk;
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
- H5Pget(dxpl_id,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios));
+ assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+ assert((plist=H5I_object(dxpl_id))!=NULL);
+ H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios));
/* Add it to the cache */
assert(NULL==rdcc->slot[idx]);
@@ -1610,6 +1612,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
H5F_rdcc_ent_t *ent = NULL;
int found = -1;
unsigned u;
+ H5P_genplist_t *plist; /* Property list */
FUNC_ENTER (H5F_istore_unlock, FAIL);
@@ -1644,8 +1647,9 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
x.chunk = chunk;
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
- H5Pget(dxpl_id,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios));
+ assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+ assert((plist=H5I_object(dxpl_id))!=NULL);
+ H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios));
H5F_istore_flush_entry (f, &x, TRUE);
} else {
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 4ddb4d4..ed3c673 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -41,7 +41,7 @@
#include "H5MFprivate.h"
#include "H5MMprivate.h"
#include "H5Oprivate.h"
-#include "H5Pprivate.h"
+#include "H5Pprivate.h" /* Property lists */
#include "H5Vprivate.h"
/* MPIO driver needed for special checks */
@@ -1348,6 +1348,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
herr_t status; /*func return status */
void *chunk=NULL; /*the file chunk */
void *ret_value=NULL; /*return value */
+ H5P_genplist_t *plist=NULL; /* Property list */
FUNC_ENTER (H5F_istore_lock, NULL);
@@ -1501,8 +1502,9 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
ent->chunk = chunk;
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
- H5Pget(dxpl_id,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios));
+ assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+ assert((plist=H5I_object(dxpl_id))!=NULL);
+ H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(ent->split_ratios));
/* Add it to the cache */
assert(NULL==rdcc->slot[idx]);
@@ -1610,6 +1612,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
H5F_rdcc_ent_t *ent = NULL;
int found = -1;
unsigned u;
+ H5P_genplist_t *plist; /* Property list */
FUNC_ENTER (H5F_istore_unlock, FAIL);
@@ -1644,8 +1647,9 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
x.chunk = chunk;
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
- H5Pget(dxpl_id,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios));
+ assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
+ assert((plist=H5I_object(dxpl_id))!=NULL);
+ H5P_get(plist,H5D_XFER_BTREE_SPLIT_RATIO_NAME,&(x.split_ratios));
H5F_istore_flush_entry (f, &x, TRUE);
} else {