summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-05 20:28:34 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-05 20:28:34 (GMT)
commit46f683cf14957d39550e826e374e1f3f5a64958c (patch)
treebbba7b3c43ed2b4af88b78dd8d06636919d5effc /src/H5D.c
parentb7d05e45c85d44810ca1f63485329002feb14640 (diff)
downloadhdf5-46f683cf14957d39550e826e374e1f3f5a64958c.zip
hdf5-46f683cf14957d39550e826e374e1f3f5a64958c.tar.gz
hdf5-46f683cf14957d39550e826e374e1f3f5a64958c.tar.bz2
[svn-r876] Changes since 19981102
---------------------- ./bin/snapshot Made same fix as for the release script yesterday. ./src/H5D.c ./src/H5Dprivate.h ./src/H5G.c ./src/H5Gprivate.h ./src/H5Gpublic.h ./src/H5O.c ./src/H5Oprivate.h ./src/H5RA.c ./src/H5RAprivate.h ./src/H5T.c ./src/H5Tprivate.h Improved object type checking. Instead of determining the object type by trying to open each of the possible types, we keep a table of associations between object type number (like H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa' function that returns true if the object header has the right messages to make the object a particular type. This mechanism also allows specialization of object types by permitting an object to satisfy more than one `isa' function. Added `isa' functions for groups, datasets, ragged arrays, and committed data types. ./src/H5config.h.in Added HAVE_STAT_ST_BLOCKS. I thought this had already been added, but apparently not. ./tools/h5ls.c Removed system include files since they're already included by H5private.h and since I wasn't including them portably anyway. By default, 1-byte integer types are printed as integer values instead of ASCII characters. However, the `-s' or `--string' command-line switch causes the data to be interpretted as ASCII. String data types are always printed as character data. Ragged arrays are now identified as ragged arrays and h5ls doesn't descend into the group automatically. This uses the new object type specialization stuff. ./tools/h5tools.c ./tools/h5tools.h Added the ability to print 1-byte integer types as either ASCII or numeric data instead of always ASCII. The default is to print as numeric data.
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c61
1 files changed, 55 insertions, 6 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 62e6b74..65dca31 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1101,7 +1101,57 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
FUNC_LEAVE(ret_value);
}
+
/*-------------------------------------------------------------------------
+ * Function: H5D_isa
+ *
+ * Purpose: Determines if an object has the requisite messages for being
+ * a dataset.
+ *
+ * Return: Success: TRUE if the required dataset messages are
+ * present; FALSE otherwise.
+ *
+ * Failure: FAIL if the existence of certain messages
+ * cannot be determined.
+ *
+ * Programmer: Robb Matzke
+ * Monday, November 2, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5D_isa(H5G_entry_t *ent)
+{
+ htri_t exists;
+
+ FUNC_ENTER(H5D_isa, FAIL);
+ assert(ent);
+
+ /* Data type */
+ if ((exists=H5O_exists(ent, H5O_DTYPE, 0))<0) {
+ HRETURN_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+ "unable to read object header");
+ } else if (!exists) {
+ HRETURN(FALSE);
+ }
+
+ /* Layout */
+ if ((exists=H5O_exists(ent, H5O_LAYOUT, 0))<0) {
+ HRETURN_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
+ "unable to read object header");
+ } else if (!exists) {
+ HRETURN(FALSE);
+ }
+
+
+
+ FUNC_LEAVE(TRUE);
+}
+
+/*
+ *-------------------------------------------------------------------------
* Function: H5D_open
*
* Purpose: Finds a dataset named NAME in file F and builds a descriptor
@@ -1130,7 +1180,7 @@ H5D_open(H5G_entry_t *loc, const char *name)
{
H5D_t *dataset = NULL; /*the dataset which was found */
H5D_t *ret_value = NULL; /*return value */
- H5G_entry_t ent; /* Dataset symbol table entry */
+ H5G_entry_t ent; /*dataset symbol table entry */
FUNC_ENTER(H5D_open, NULL);
@@ -1173,10 +1223,10 @@ done:
H5D_t *
H5D_open_oid(H5G_entry_t *ent)
{
- H5D_t *dataset = NULL; /* New dataset struct */
- H5D_t *ret_value = NULL; /*return value */
+ H5D_t *dataset = NULL; /*new dataset struct */
+ H5D_t *ret_value = NULL; /*return value */
+ H5S_t *space = NULL; /*data space */
intn i;
- H5S_t *space = NULL;
FUNC_ENTER(H5D_open_oid, NULL);
@@ -1290,8 +1340,7 @@ H5D_open_oid(H5G_entry_t *ent)
ret_value = dataset;
done:
- if (space)
- H5S_close (space);
+ if (space) H5S_close (space);
if (ret_value==NULL && dataset) {
if (H5F_addr_defined(&(dataset->ent.header))) {
H5O_close(&(dataset->ent));