summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-08-08 19:20:57 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-08-08 19:20:57 (GMT)
commitf3c2fbaff555ea11be81d55c83f6f31bb59d633b (patch)
tree38c7fb0569bebc5ce1254cd84b292ec20220e642 /fortran
parent2e1ef03cef0058566c4ab4f8f2490760f776b0a8 (diff)
downloadhdf5-f3c2fbaff555ea11be81d55c83f6f31bb59d633b.zip
hdf5-f3c2fbaff555ea11be81d55c83f6f31bb59d633b.tar.gz
hdf5-f3c2fbaff555ea11be81d55c83f6f31bb59d633b.tar.bz2
[svn-r7318] Purpose:
Code cleanup Description: Switched 'hobj_ref_t' from funny structure with array inside to just be 'haddr_t', since that was equivalent and less confusing. Platforms tested: h5committested
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Df.c8
-rw-r--r--fortran/src/H5Rf.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 21dbed9..3d4fb08 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -298,7 +298,7 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*(n));
if ( buf_c != NULL ) {
for (i = 0; i < n; i++) {
- HDmemcpy(buf_c[i].oid, buf, H5R_OBJ_REF_BUF_SIZE);
+ HDmemcpy(&buf_c[i], buf, H5R_OBJ_REF_BUF_SIZE);
buf = buf + REF_OBJ_BUF_LEN_F;
}
}
@@ -358,7 +358,7 @@ nh5dwrite_ref_obj_c_b (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_spac
buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*(n));
if ( buf_c != NULL ) {
for (i = 0; i < n; i++) {
- HDmemcpy(buf_c[i].oid, buf, H5R_OBJ_REF_BUF_SIZE);
+ HDmemcpy(&buf_c[i], buf, H5R_OBJ_REF_BUF_SIZE);
buf = buf + REF_OBJ_BUF_LEN_F;
}
}
@@ -694,7 +694,7 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
if (ret >=0) {
for (i = 0; i < n; i++) {
- HDmemcpy(buf, buf_c[i].oid, H5R_OBJ_REF_BUF_SIZE);
+ HDmemcpy(buf, &buf_c[i], H5R_OBJ_REF_BUF_SIZE);
buf = buf + REF_OBJ_BUF_LEN_F;
}
}
@@ -753,7 +753,7 @@ nh5dread_ref_obj_c_b (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space
ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
if (ret >=0) {
for (i = 0; i < n; i++) {
- HDmemcpy(buf, buf_c[i].oid, H5R_OBJ_REF_BUF_SIZE);
+ HDmemcpy(buf, &buf_c[i], H5R_OBJ_REF_BUF_SIZE);
buf = buf + REF_OBJ_BUF_LEN_F;
}
}
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index a7ef242..d673669 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -53,7 +53,7 @@ nh5rcreate_object_c (int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen)
HDfree(c_name);
if (ret_value_c >= 0) {
- HDmemcpy(ref, ref_c.oid, H5R_OBJ_REF_BUF_SIZE);
+ *ref=ref_c;
ret_value = 0;
}
@@ -160,7 +160,7 @@ nh5rdereference_object_c (hid_t_f *dset_id, int_f *ref, hid_t_f *obj_id)
hid_t c_obj_id;
hobj_ref_t ref_c;
- HDmemcpy (ref_c.oid, ref, H5R_OBJ_REF_BUF_SIZE);
+ ref_c=*ref;
/*
* Call H5Rdereference function.
@@ -225,7 +225,7 @@ nh5rget_object_type_obj_c (hid_t_f *dset_id, int_f *ref, int_f *obj_type)
int c_obj_type;
hobj_ref_t ref_c;
- HDmemcpy (ref_c.oid, ref, H5R_OBJ_REF_BUF_SIZE);
+ ref_c=*ref;
/*
* Call H5Rget_object_type function.