[svn-r12973] Description:

    Finish removing library's internal code that uses H5G_get_objinfo() and
retarget it at either getting the link information or the object information,
as appropriate.  (Still need to add user-level tests for H5Oget_info(), but
since several internal components of the library depend on the internal version,
it appears to be working correctly).

Tested on:
    FreeBSD/32 4.11 (sleipnir)
    Linux/322.4 (heping)
    Linux/64 2.4 (mir)
    AIX/32 5.? (copper)
    Mac OS X/32 10.4.8 (amazon)

1 files changed, 4 insertions, 2 deletions

diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index b9e887b..fc91d23 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -89,10 +89,12 @@ typedef struct H5O_info_t {
     time_t		mtime;		/* Modification time		*/
     struct {
         unsigned version;		/* Version number of header format in file */
-        hsize_t size;			/* Total size of object header in file */
-        hsize_t free;			/* Free space within object header */
         unsigned nmesgs;		/* Number of object header messages */
         unsigned nchunks;		/* Number of object header chunks */
+        hsize_t hdr_size;		/* Total size of object header in file */
+        hsize_t meta_space;		/* Space within header for object header metadata information */
+        hsize_t mesg_space;		/* Space within header for actual message information */
+        hsize_t free_space;		/* Free space within object header */
         uint64_t msg_present;		/* Flags to indicate presence of message type in header */
         uint64_t msg_shared;		/* Flags to indicate message type is shared in header */
     } hdr;