diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 1997-08-01 21:25:07 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 1997-08-01 21:25:07 (GMT) |
| commit | f474322ca57d2bc5b5f99a7b92cf34d9ad319389 (patch) | |
| tree | 12b96e068398ef9106d0bfc71098a3a3e33fe68e | |
| parent | ace2983e763db689eb7c0a8b8cd84aff46d755c2 (diff) | |
| download | hdf5-f474322ca57d2bc5b5f99a7b92cf34d9ad319389.zip hdf5-f474322ca57d2bc5b5f99a7b92cf34d9ad319389.tar.gz hdf5-f474322ca57d2bc5b5f99a7b92cf34d9ad319389.tar.bz2 | |
[svn-r10] Added various constants, etc. for hooking new dimensionality and dataset
interfaces into the "meta-object" interface.
| -rw-r--r-- | src/H5Aproto.h | 1 | ||||
| -rw-r--r-- | src/H5Mprivate.h | 62 | ||||
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/hdf5lims.h | 1 |
4 files changed, 45 insertions, 24 deletions
diff --git a/src/H5Aproto.h b/src/H5Aproto.h index 2bf2ba5..3e2dd71 100644 --- a/src/H5Aproto.h +++ b/src/H5Aproto.h @@ -26,6 +26,7 @@ H5_FILE, /* Group ID for File objects */ H5_TEMPLATE, /* Group ID for Template objects */ H5_DATATYPE, /* Group ID for Datatype objects */ H5_DATASPACE, /* Group ID for Dataspace objects */ +H5_DATASET, /* Group ID for Dataset objects */ MAXGROUP /* Highest group in group_t (Invalid as true group) */ } group_t; diff --git a/src/H5Mprivate.h b/src/H5Mprivate.h index a1fb6cc..b97548b 100644 --- a/src/H5Mprivate.h +++ b/src/H5Mprivate.h @@ -49,34 +49,50 @@ meta_func_t meta_func_arr[]={ { /* Template object meta-functions (defined in H5C.c) */ H5_TEMPLATE, /* File-Creation Template Type ID */ H5C_create, /* File-Creation Template Create */ - NULL, + NULL, /* File-Creation Template Access */ H5C_copy, /* File-Creation Template Copy */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, + NULL, /* File-Creation Template FindName */ + NULL, /* File-Creation Template NameLen */ + NULL, /* File-Creation Template GetName */ + NULL, /* File-Creation Template SetName */ + NULL, /* File-Creation Template Search */ + NULL, /* File-Creation Template Index */ + NULL, /* File-Creation Template Flush */ + NULL, /* File-Creation Template Delete */ + NULL, /* File-Creation Template GetParent */ H5C_release /* File-Creation Template Release */ }, { /* Datatype object meta-functions (defined in H5T.c) */ H5_DATATYPE, /* Datatype Type ID */ - H5T_create, /* Datatype object functions */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - H5T_release + H5T_create, /* Datatype Create */ + NULL, /* Datatype Access */ + NULL, /* Dataspace Copy */ + NULL, /* Datatype FindName */ + NULL, /* Datatype NameLen */ + NULL, /* Datatype GetName */ + NULL, /* Datatype SetName */ + NULL, /* Datatype Search */ + NULL, /* Datatype Index */ + NULL, /* Datatype Flush */ + NULL, /* Datatype Delete */ + NULL, /* Datatype GetParent */ + H5T_release /* Datatype Release */ + }, + { /* Dimensionality object meta-functions (defined in H5P.c) */ + H5_DATASPACE, /* Dimensionality Type ID */ + H5P_create, /* Dimensionality Create */ + NULL, /* Dimensionality Access */ + NULL, /* Dimensionality Copy */ + NULL, /* Dimensionality FindName */ + NULL, /* Dimensionality NameLen */ + NULL, /* Dimensionality GetName */ + NULL, /* Dimensionality SetName */ + NULL, /* Dimensionality Search */ + NULL, /* Dimensionality Index */ + NULL, /* Dimensionality Flush */ + NULL, /* Dimensionality Delete */ + NULL, /* Dimensionality GetParent */ + H5P_release /* Dimensionality Release */ } }; diff --git a/src/Makefile b/src/Makefile index 0a710ee..13eeea4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,7 +28,7 @@ CFLAGS = -c $(MACHINE) $(DEFS) INCL = hdf5.h OBJ = H5.o H5E.o H5A.o H5F.o H5C.o H5M.o H5AC.o H5B.o H5MM.o H5MF.o H5T.o \ - H5Gnode.o H5H.o H5G.o H5P.o + H5Gnode.o H5H.o H5G.o H5P.o H5D.o $(TARGET): $(OBJ) $(AR) $(ARFLAGS) $(TARGET) $(OBJ) @@ -90,3 +90,6 @@ H5G.o: H5G.c $(INCL) H5Gprivate.h H5Gproto.h H5P.o: H5P.c $(INCL) H5Pprivate.h H5Pproto.h $(CC) $(CFLAGS) H5P.c + +H5D.o: H5D.c $(INCL) H5Dprivate.h H5Dproto.h + $(CC) $(CFLAGS) H5D.c diff --git a/src/hdf5lims.h b/src/hdf5lims.h index dc8648d..385b8a4 100644 --- a/src/hdf5lims.h +++ b/src/hdf5lims.h @@ -49,6 +49,7 @@ #define HDF5_TEMPID_HASHSIZE 64 #define HDF5_DATATYPEID_HASHSIZE 64 #define HDF5_DATASPACEID_HASHSIZE 64 +#define HDF5_DATASETID_HASHSIZE 64 /* Default file-creation template values */ #define HDF5_USERBLOCK_DEFAULT 0 /* Default to 0-byte sized user blocks */ |