[svn-r73] Lots of added code for dataset I/O. Its now writing out datasets to the disk

correctly, but only in "native" format.  I'm adding the data-type conversions
and checking the reading later today.

1 files changed, 15 insertions, 4 deletions

diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 907395d..a5343d4 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -23,15 +23,25 @@
 /* Private headers needed by this file */
 #include <H5private.h>
 #include <H5Cprivate.h>	/* for the hobjtype_t type */
+#include <H5Gprivate.h> /* Symbol tables */
 #include <H5Tprivate.h>	/* for the h5_datatype_t type */
 #include <H5Pprivate.h>	/* for the H5P_sdim_t type */
+#include <H5Oprivate.h> /* Object Headers */
 
+/* Define a struct to carry all the information required to look up an object header */
 typedef struct {
-    hatom_t file;       /* ID of the file-store of this object */
-    char *name;         /* Name of dataset */
+    hatom_t fid;        /* File Id for object */
+    haddr_t ohdr;       /* Offset of the object header */
+    H5G_entry_t *dir;   /* directory entry for the directory the object is located in */
+    H5G_entry_t *ent;   /* directory entry for the object itself */
+  } H5D_oid_t;
+
+typedef struct {
+    hdf5_file_t *file;  /* Pointer to the file-store of this object */
+    H5O_name_t *name;   /* Name of dataset */
     hbool_t modified;   /* Whether the dataset has been modified from version on disk */
-    h5_datatype_t *type;    /* Pointer to datatype of the dataset */
-    H5P_sdim_t *dim;    /* Pointer to dimensionality of the dataset */
+    h5_datatype_t *type;  /* Pointer to datatype of the dataset */
+    H5P_dim_t *dim;     /* Pointer to dimensionality of the dataset */
     haddr_t header;     /* offset of the object header for this dataset */
     haddr_t data;       /* offset of the data in the file */
   } H5D_dataset_t;
@@ -43,6 +53,7 @@ typedef struct {
 
 /*-----------------_-- Local function prototypes ----------------------------*/
 hatom_t H5D_create(hatom_t owner_id, hobjtype_t type, const char *name);
+hatom_t H5D_access(hatom_t oid);
 herr_t H5D_flush(hatom_t oid);
 herr_t H5D_release(hatom_t oid);