[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, 8 insertions, 7 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 5dce2cd..9d10f19 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -37,8 +37,9 @@
  *		by the LOAD method if the DEST argument is non-zero.
  */
 typedef struct H5AC_class_t {
-   void		*(*load)(hdf5_file_t*, off_t addr, const void *udata);
-   herr_t	(*flush)(hdf5_file_t*, hbool_t dest, off_t addr, void *thing);
+   void		*(*load)(hdf5_file_t*, haddr_t addr, const void *udata);
+   herr_t	(*flush)(hdf5_file_t*, hbool_t dest, haddr_t addr,
+			 void *thing);
 } H5AC_class_t;
 
 /*
@@ -50,7 +51,7 @@ typedef struct H5AC_class_t {
 
 typedef struct H5AC_cache_t {
    const H5AC_class_t *type;	/*type of object stored here		*/
-   off_t	addr;		/*file address for object		*/
+   haddr_t	addr;		/*file address for object		*/
    void		*thing;		/*the thing which is cached		*/
 } H5AC_cache_t;
 
@@ -58,14 +59,14 @@ typedef struct H5AC_cache_t {
  * Library prototypes.
  */
 herr_t H5AC_dest (hdf5_file_t *f);
-void *H5AC_find (hdf5_file_t *f, const H5AC_class_t *type, off_t addr,
+void *H5AC_find (hdf5_file_t *f, const H5AC_class_t *type, haddr_t addr,
 		 const void *udata);
-herr_t H5AC_flush (hdf5_file_t *f, const H5AC_class_t *type, off_t addr,
+herr_t H5AC_flush (hdf5_file_t *f, const H5AC_class_t *type, haddr_t addr,
 		   hbool_t destroy);
 herr_t H5AC_new (hdf5_file_t *f);
 herr_t H5AC_rename (hdf5_file_t *f, const H5AC_class_t *type,
-		    off_t old, off_t new);
-herr_t H5AC_set (hdf5_file_t *f, const H5AC_class_t *type, off_t addr,
+		    haddr_t old, haddr_t new);
+herr_t H5AC_set (hdf5_file_t *f, const H5AC_class_t *type, haddr_t addr,
 		 void *thing);
 
 #endif /* !_H5ACprivate_H */