summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5D.c7
-rw-r--r--src/H5Oattr.c3
-rw-r--r--src/H5Obogus.c1
-rw-r--r--src/H5Ocont.c5
-rw-r--r--src/H5Odtype.c1
-rw-r--r--src/H5Oefl.c1
-rw-r--r--src/H5Ofill.c2
-rw-r--r--src/H5Omtime.c2
-rw-r--r--src/H5Oname.c1
-rw-r--r--src/H5Onull.c1
-rw-r--r--src/H5Opline.c1
-rw-r--r--src/H5Oprivate.h1
-rw-r--r--src/H5Osdspace.c1
-rw-r--r--src/H5Oshared.c1
14 files changed, 22 insertions, 6 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 9704d0d..36b80d1 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -2406,10 +2406,11 @@ H5D_close(H5D_t *dataset)
} /* end if */
/* Remove the dataset from the list of opened objects in the file */
- if(H5FO_delete(dataset->ent.file,dataset->ent.header)<0)
+ if(H5FO_delete(dataset->ent.file, H5AC_dxpl_id, dataset->ent.header)<0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects");
/* Close the dataset object */
+ /* (This closes the file, if this is the last object open) */
H5O_close(&(dataset->ent));
/*
@@ -4441,7 +4442,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5D_flush
*
- * Purpose: Flush any compact datasets cached in memory
+ * Purpose: Flush any dataset information cached in memory
*
* Return: Success: Non-negative
* Failure: Negative
@@ -4451,7 +4452,7 @@ done:
*
* Date: August 14, 2002
*
- * Comments: Private function
+ * Comments: Just flushing the compact data information currently.
*
* Modifications:
*
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index ced7559..8b0326f 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -46,7 +46,8 @@ const H5O_class_t H5O_ATTR[1] = {{
H5O_attr_copy, /* copy the native value */
H5O_attr_size, /* size of raw message */
H5O_attr_reset, /* reset method */
- NULL, /* default free method */
+ NULL, /* free method */
+ NULL, /* file delete method */
NULL, /* get share method */
NULL, /* set share method */
H5O_attr_debug, /* debug the message */
diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index 4a803b6..90b7b3d 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -57,6 +57,7 @@ const H5O_class_t H5O_BOGUS[1] = {{
H5O_bogus_size, /*raw message size */
NULL, /*free internal memory */
NULL, /*free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_bogus_debug, /*debug the message */
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 0f6fd98..4b54c4a 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -52,8 +52,9 @@ const H5O_class_t H5O_CONT[1] = {{
H5O_cont_encode, /*encode message */
NULL, /*no copy method */
NULL, /*no size method */
- NULL, /*default reset method */
- NULL, /* default free method */
+ NULL, /*reset method */
+ NULL, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_cont_debug, /*debugging */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 5049d81..43d2aea 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -50,6 +50,7 @@ const H5O_class_t H5O_DTYPE[1] = {{
H5O_dtype_size, /* size of raw message */
H5O_dtype_reset, /* reset method */
H5O_dtype_free, /* free method */
+ NULL, /* file delete method */
H5O_dtype_get_share, /* get share method */
H5O_dtype_set_share, /* set share method */
H5O_dtype_debug, /* debug the message */
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index ae898ea..898da7f 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -49,6 +49,7 @@ const H5O_class_t H5O_EFL[1] = {{
H5O_efl_size, /*size of message on disk */
H5O_efl_reset, /*reset method */
NULL, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_efl_debug, /*debug the message */
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 2901351..6f94d01 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -60,6 +60,7 @@ const H5O_class_t H5O_FILL[1] = {{
H5O_fill_size, /*raw message size */
H5O_fill_reset, /*free internal memory */
H5O_fill_free, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_fill_debug, /*debug the message */
@@ -76,6 +77,7 @@ const H5O_class_t H5O_FILL_NEW[1] = {{
H5O_fill_new_size, /*raw message size */
H5O_fill_new_reset, /*free internal memory */
H5O_fill_new_free, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_fill_new_debug, /*debug the message */
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index ca89cc3..b1d7496 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -57,6 +57,7 @@ const H5O_class_t H5O_MTIME[1] = {{
H5O_mtime_size, /*raw message size */
H5O_mtime_reset, /* reset method */
H5O_mtime_free, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_mtime_debug, /*debug the message */
@@ -74,6 +75,7 @@ const H5O_class_t H5O_MTIME_NEW[1] = {{
H5O_mtime_new_size, /*raw message size */
H5O_mtime_reset, /* reset method */
H5O_mtime_free, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_mtime_debug, /*debug the message */
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 2d2e38c..e6b9fb6 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -54,6 +54,7 @@ const H5O_class_t H5O_NAME[1] = {{
H5O_name_size, /*raw message size */
H5O_name_reset, /*free internal memory */
NULL, /* free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_name_debug, /*debug the message */
diff --git a/src/H5Onull.c b/src/H5Onull.c
index fcdd85f..ca811da 100644
--- a/src/H5Onull.c
+++ b/src/H5Onull.c
@@ -43,6 +43,7 @@ const H5O_class_t H5O_NULL[1] = {{
NULL, /*no size method */
NULL, /*no reset method */
NULL, /*no free method */
+ NULL, /*no file delete method */
NULL, /*no get share method */
NULL, /*no set share method */
NULL, /*no debug method */
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 3bdffe7..21e5b11 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -56,6 +56,7 @@ const H5O_class_t H5O_PLINE[1] = {{
H5O_pline_size, /* size of raw message */
H5O_pline_reset, /* reset method */
H5O_pline_free, /* free method */
+ NULL, /* file delete method */
NULL, /* get share method */
NULL, /* set share method */
H5O_pline_debug, /* debug the message */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index f4292e6..9b40eeb 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -229,6 +229,7 @@ H5_DLL herr_t H5O_reset(hid_t type_id, void *native);
H5_DLL void *H5O_free(hid_t type_id, void *mesg);
H5_DLL void *H5O_copy(hid_t type_id, const void *mesg, void *dst);
H5_DLL size_t H5O_raw_size(hid_t type_id, H5F_t *f, const void *mesg);
+H5_DLL herr_t H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
H5_DLL herr_t H5O_debug_id(hid_t type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth);
H5_DLL herr_t H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
int fwidth);
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index 59c44ee..b08db50 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -46,6 +46,7 @@ const H5O_class_t H5O_SDSPACE[1] = {{
H5O_sdspace_size, /* size of symbol table entry */
H5O_sdspace_reset, /* default reset method */
H5O_sdspace_free, /* free method */
+ NULL, /* file delete method */
NULL, /* get share method */
NULL, /* set share method */
H5O_sdspace_debug, /* debug the message */
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 21f5154..c68657d 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -48,6 +48,7 @@ const H5O_class_t H5O_SHARED[1] = {{
H5O_shared_size, /*size method */
NULL, /*no reset method */
NULL, /*no free method */
+ NULL, /* file delete method */
NULL, /*get share method */
NULL, /*set share method */
H5O_shared_debug, /*debug method */
generated by cgit v0.12 at 2024-11-11 00:20:11 (GMT)