summaryrefslogtreecommitdiffstats
path: root/src/H5Oefl.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2000-10-10 07:43:38 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2000-10-10 07:43:38 (GMT)
commitba28c64ba7b36ee8a98c2f312f87fa1424f9a07c (patch)
tree3e890bc815dc7417676b608423d39f2b4294ce82 /src/H5Oefl.c
parent428f04e82a7bff2e4a7600db9616ff3a5ecd07a8 (diff)
downloadhdf5-ba28c64ba7b36ee8a98c2f312f87fa1424f9a07c.zip
hdf5-ba28c64ba7b36ee8a98c2f312f87fa1424f9a07c.tar.gz
hdf5-ba28c64ba7b36ee8a98c2f312f87fa1424f9a07c.tar.bz2
[svn-r2652] Purpose:
Maintainance & performance enhancements Description: Re-arranged header files to protect private symbols better. Changed optimized regular hyperslab I/O to compute the offsets more efficiently from previous method of using matrix operations. Added sequential I/O operations at a more abstract level (at the same level as H5F_arr_read/write), to support the optimized hyperslab I/O. Platforms tested: Solaris 2.6 (baldric) & FreeBSD 4.1.1 (hawkwind)
Diffstat (limited to 'src/H5Oefl.c')
-rw-r--r--src/H5Oefl.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 0a16485..6793873 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -5,8 +5,11 @@
* Programmer: Robb Matzke <matzke@llnl.gov>
* Tuesday, November 25, 1997
*/
+#define H5F_PACKAGE /*suppress error about including H5Fpkg */
+
#include <H5private.h>
#include <H5Eprivate.h>
+#include <H5Fpkg.h>
#include <H5HLprivate.h>
#include <H5MMprivate.h>
#include <H5Oprivate.h>
@@ -116,16 +119,16 @@ H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
}
for (i=0; i<mesg->nused; i++) {
/* Name */
- H5F_decode_length (f, p, mesg->slot[i].name_offset);
+ H5F_DECODE_LENGTH (f, p, mesg->slot[i].name_offset);
s = H5HL_peek(f, mesg->heap_addr, mesg->slot[i].name_offset);
assert (s && *s);
mesg->slot[i].name = H5MM_xstrdup (s);
/* File offset */
- H5F_decode_length (f, p, mesg->slot[i].offset);
+ H5F_DECODE_LENGTH (f, p, mesg->slot[i].offset);
/* Size */
- H5F_decode_length (f, p, mesg->slot[i].size);
+ H5F_DECODE_LENGTH (f, p, mesg->slot[i].size);
assert (mesg->slot[i].size>0);
}
@@ -191,9 +194,9 @@ H5O_efl_encode(H5F_t *f, uint8_t *p, const void *_mesg)
* created.
*/
assert(mesg->slot[i].name_offset);
- H5F_encode_length (f, p, mesg->slot[i].name_offset);
- H5F_encode_length (f, p, mesg->slot[i].offset);
- H5F_encode_length (f, p, mesg->slot[i].size);
+ H5F_ENCODE_LENGTH (f, p, mesg->slot[i].name_offset);
+ H5F_ENCODE_LENGTH (f, p, mesg->slot[i].offset);
+ H5F_ENCODE_LENGTH (f, p, mesg->slot[i].size);
}
FUNC_LEAVE(SUCCEED);