[svn-r4] Changed SIZEOF_OFFSET and SIZEOF_SIZE to H5F_SIZEOF_OFFSET and

	H5F_SIZEOF_SIZE.  Modified files to use these instead of
	accessing the hdf5_file_t struct directly.

	Changed address return values from H5B to -1 for error.

	Changed off_t to haddr_t for anything that's a file address.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/H5G.c b/src/H5G.c
index fafecac..1af38f3 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -104,7 +104,7 @@ H5G_decode (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent)
       abort();
    }
 
-   *pp = p_ret + 2*SIZEOF_OFFSET(f) + 4 + 24;
+   *pp = p_ret + 2*H5F_SIZEOF_OFFSET(f) + 4 + 24;
    return 0;
 }
 
@@ -190,7 +190,7 @@ H5G_encode (hdf5_file_t *f, uint8 **pp, H5G_entry_t *ent)
       abort();
    }
 
-   *pp = p_ret + 2*SIZEOF_OFFSET(f) + 4 + 24;
+   *pp = p_ret + 2*H5F_SIZEOF_OFFSET(f) + 4 + 24;
    return 0;
 }