summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-01 16:01:52 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-01 16:01:52 (GMT)
commitc424f8017e4556609dcd0e1c9f63fa5250db58b0 (patch)
tree765cce2bd2d8a69425b764ee3407dbf99f5d56b3
parentee28e83e6fa4267aa0c46ca8dc7eb55082f60dcc (diff)
downloadhdf5-c424f8017e4556609dcd0e1c9f63fa5250db58b0.zip
hdf5-c424f8017e4556609dcd0e1c9f63fa5250db58b0.tar.gz
hdf5-c424f8017e4556609dcd0e1c9f63fa5250db58b0.tar.bz2
[svn-r18482] Description:
Remove unused symbol table entry dirty flag. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel (h5committest not required on this branch)
-rw-r--r--src/H5Gent.c3
-rw-r--r--src/H5Gnode.c40
-rw-r--r--src/H5Gpkg.h1
3 files changed, 1 insertions, 43 deletions
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 21023ee..d00d2de 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -460,9 +460,6 @@ H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
"Object header address:", ent->header);
- HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
- "Dirty:",
- ent->dirty ? "Yes" : "No");
HDfprintf(stream, "%*s%-*s ", indent, "", fwidth,
"Cache info type:");
switch(ent->type) {
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index af94a77..210f08e 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -81,7 +81,6 @@ static herr_t H5G_node_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr,
size_t *new_len, void **new_image);
static herr_t H5G_node_free_icr(haddr_t addr, size_t len, void *thing);
-static herr_t H5G_node_clear(haddr_t addr, size_t len, void *sym);
/* B-tree callbacks */
static H5RC_t *H5G_node_get_shared(const H5F_t *f, const void *_udata);
@@ -114,7 +113,7 @@ const H5AC_class_t H5AC_SNODE[1] = {{
NULL,
H5G_node_serialize,
H5G_node_free_icr,
- H5G_node_clear,
+ NULL,
}};
/* H5G inherits B-tree like properties from H5B */
@@ -500,40 +499,6 @@ H5G_node_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing)
/*-------------------------------------------------------------------------
- * Function: H5G_node_clear
- *
- * Purpose: Mark a symbol table node in memory as non-dirty.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * koziol@ncsa.uiuc.edu
- * Mar 20 2003
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_node_clear(haddr_t UNUSED addr, size_t UNUSED len, void *_sym)
-{
- H5G_node_t *sym = (H5G_node_t *)_sym;
- unsigned u; /* Local index variable */
-
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_clear)
-
- /*
- * Check arguments.
- */
- HDassert(sym);
-
- /* Look for dirty entries and reset their dirty flag. */
- for(u = 0; u < sym->nsyms; u++)
- sym->entry[u].dirty = FALSE;
-
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_node_clear() */
-
-
-/*-------------------------------------------------------------------------
* Function: H5G_node_create
*
* Purpose: Creates a new empty symbol table node. This function is
@@ -971,9 +936,6 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
/* Copy new entry into table */
H5G_ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW);
- /* Flag entry as dirty */
- insert_into->entry[idx].dirty = TRUE;
-
/* Increment # of symbols in table */
insert_into->nsyms += 1;
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index 2089bed..9f991c4 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -100,7 +100,6 @@ typedef union H5G_cache_t {
* points.
*/
typedef struct H5G_entry_t {
- hbool_t dirty; /*entry out-of-date? */
H5G_cache_type_t type; /*type of information cached */
H5G_cache_t cache; /*cached data from object header */
size_t name_off; /*offset of name within name heap */