diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-22 20:04:44 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-22 20:04:44 (GMT) |
commit | 683d60460a94869225094b4efc824258c5b0dcd3 (patch) | |
tree | 92f6400d0c7f80046231ad46048227cdf4940a34 /src/H5Gloc.c | |
parent | cacfe71beb159fc44df256f641d4faac594c802e (diff) | |
download | hdf5-683d60460a94869225094b4efc824258c5b0dcd3.zip hdf5-683d60460a94869225094b4efc824258c5b0dcd3.tar.gz hdf5-683d60460a94869225094b4efc824258c5b0dcd3.tar.bz2 |
[svn-r18617] Description:
Bring r18616 from trunk to 1.8 branch:
Clean up compiler warnings.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'src/H5Gloc.c')
-rw-r--r-- | src/H5Gloc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/H5Gloc.c b/src/H5Gloc.c index 6145839..d95d705 100644 --- a/src/H5Gloc.c +++ b/src/H5Gloc.c @@ -61,7 +61,7 @@ typedef struct { /* User data for checking if an object exists */ typedef struct { /* upward */ - hbool_t exists; /* Whether the object exists */ + htri_t exists; /* Whether the object exists */ } H5G_loc_exists_t; /* User data for looking up an object in a group by index */ @@ -69,7 +69,7 @@ typedef struct { /* downward */ hid_t lapl_id; /* LAPL to use for operation */ hid_t dxpl_id; /* DXPL to use for operation */ - H5_index_t idx_type; /* Index to use */ + H5_index_t idx_type; /* Index to use */ H5_iter_order_t order; /* Iteration order within index */ hsize_t n; /* Offset within index */ @@ -245,6 +245,10 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc) case H5I_REFERENCE: HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get group location of reference") + case H5I_UNINIT: + case H5I_BADID: + case H5I_VFL: + case H5I_NTYPES: default: HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid object ID") } /* end switch */ @@ -710,7 +714,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't check if object exists") /* Set return value */ - ret_value = (htri_t)udata.exists; + ret_value = udata.exists; done: FUNC_LEAVE_NOAPI(ret_value) |