summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c39
1 files changed, 8 insertions, 31 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 21991cb..8a4b019 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -3088,7 +3088,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5F_addr_encode_len
+ * Function: H5F_addr_encode
*
* Purpose: Encodes an address into the buffer pointed to by *PP and
* then increments the pointer to the first byte after the
@@ -3099,53 +3099,30 @@ done:
* Programmer: Robb Matzke
* Friday, November 7, 1997
*
+ * Modifications:
+ * Robb Matzke, 1999-07-28
+ * The ADDR argument is passed by value.
*-------------------------------------------------------------------------
*/
void
-H5F_addr_encode_len(uint8_t **pp/*in,out*/, haddr_t addr, unsigned addr_len)
+H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
{
unsigned u; /* Local index variable */
+ HDassert(f);
HDassert(pp && *pp);
if(H5F_addr_defined(addr)) {
- for(u = 0; u < addr_len; u++) {
+ for(u = 0; u < H5F_SIZEOF_ADDR(f); u++) {
*(*pp)++ = (uint8_t)(addr & 0xff);
addr >>= 8;
} /* end for */
assert("overflow" && 0 == addr);
} /* end if */
else {
- for(u = 0; u < addr_len; u++)
+ for(u = 0; u < H5F_SIZEOF_ADDR(f); u++)
*(*pp)++ = 0xff;
} /* end else */
-} /* end H5F_addr_encode_len() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5F_addr_encode
- *
- * Purpose: Encodes an address into the buffer pointed to by *PP and
- * then increments the pointer to the first byte after the
- * address. An undefined value is stored as all 1's.
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- * Friday, November 7, 1997
- *
- * Modifications:
- * Robb Matzke, 1999-07-28
- * The ADDR argument is passed by value.
- *-------------------------------------------------------------------------
- */
-void
-H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
-{
- HDassert(f);
- HDassert(pp && *pp);
-
- H5F_addr_encode_len(pp, addr, H5F_SIZEOF_ADDR(f));
} /* end H5F_addr_encode() */