summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-20 20:20:35 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-20 20:20:35 (GMT)
commit8a27e4f4a6a624931ba0b86444e8f21e8d735888 (patch)
tree9d82d6116ce2eb20be8f9a45ce468fd717ea2215 /src/H5F.c
parent97f8b83e2d35fe3be71217977b339077cbbd46d8 (diff)
downloadhdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.zip
hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.gz
hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.bz2
[svn-r18601] Description:
Bring r18581:18600 from trunk to revise_chunks branch. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug (h5committest not required on this branch)
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 274ec72..90a8cee 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -663,6 +663,18 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
oloc = NULL;
break;
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_FILE:
+ case H5I_DATASPACE:
+ case H5I_REFERENCE:
+ case H5I_VFL:
+ case H5I_GENPROP_CLS:
+ case H5I_GENPROP_LST:
+ case H5I_ERROR_CLASS:
+ case H5I_ERROR_MSG:
+ case H5I_ERROR_STACK:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object")
} /* end switch */
@@ -942,8 +954,8 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
done:
if(!ret_value && f) {
if(!shared)
- (void)H5FL_FREE(H5F_file_t, f->shared);
- (void)H5FL_FREE(H5F_t, f);
+ f->shared = H5FL_FREE(H5F_file_t, f->shared);
+ f = H5FL_FREE(H5F_t, f);
} /* end if */
FUNC_LEAVE_NOAPI(ret_value)
@@ -1090,7 +1102,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
if(H5FO_top_dest(f) < 0)
HDONE_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "problems closing file")
f->shared = NULL;
- (void)H5FL_FREE(H5F_t, f);
+ f = H5FL_FREE(H5F_t, f);
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_dest() */
@@ -1586,6 +1598,17 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
}
break;
+ case H5I_UNINIT:
+ case H5I_BADID:
+ case H5I_DATASPACE:
+ case H5I_REFERENCE:
+ case H5I_VFL:
+ case H5I_GENPROP_CLS:
+ case H5I_GENPROP_LST:
+ case H5I_ERROR_CLASS:
+ case H5I_ERROR_MSG:
+ case H5I_ERROR_STACK:
+ case H5I_NTYPES:
default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
} /* end switch */
@@ -1828,6 +1851,7 @@ H5F_try_close(H5F_t *f)
/* If we've gotten this far (ie. there are no open file IDs in the file/mount hierarchy), fall through to flush & close */
break;
+ case H5F_CLOSE_DEFAULT:
default:
HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file, unknown file close degree")
} /* end switch */