summaryrefslogtreecommitdiffstats
path: root/src/H5Fmount.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:56:57 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:56:57 (GMT)
commitab2ff6eda496173e038d97685f96dd2de9e3df29 (patch)
tree14c6e9b0f608eacfb3a6e22ea73cc4effcf34968 /src/H5Fmount.c
parent416af901799f3ab85b1578696ece3c319877add1 (diff)
downloadhdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.zip
hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.gz
hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.bz2
[svn-r16280] Description:
Bring revision 16278 back from revise_chunks branch: Update layout information in DCPL to unify all information in one underlying property and switch to using H5O_layout_t for storing it, which simplifies things considerably. Also, fix many compiler warnings. Tested on: FreeBSD/32 6.3 (duty) in debug mode (Original patch tested on many machines)
Diffstat (limited to 'src/H5Fmount.c')
-rw-r--r--src/H5Fmount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index a428cd6..ff4b1eb 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -339,7 +339,7 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
for(u = 0; u < parent->shared->mtab.nmounts; u++) {
if(parent->shared->mtab.child[u].file->shared == child->shared) {
/* Found the correct index */
- child_idx = u;
+ child_idx = (int)u;
break;
} /* end if */
} /* end for */
@@ -368,7 +368,7 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "not a mount point")
/* Found the correct index, set the info about the child */
- child_idx = md;
+ child_idx = (int)md;
H5G_loc_free(&mp_loc);
mp_loc_setup = FALSE;
mp_loc.oloc = mnt_oloc;
@@ -397,8 +397,8 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name")
/* Eliminate the mount point from the table */
- HDmemmove(parent->shared->mtab.child + child_idx, parent->shared->mtab.child + child_idx + 1,
- (parent->shared->mtab.nmounts - child_idx - 1) * sizeof(parent->shared->mtab.child[0]));
+ HDmemmove(parent->shared->mtab.child + (unsigned)child_idx, (parent->shared->mtab.child + (unsigned)child_idx) + 1,
+ ((parent->shared->mtab.nmounts - (unsigned)child_idx) - 1) * sizeof(parent->shared->mtab.child[0]));
parent->shared->mtab.nmounts -= 1;
parent->nmounts -= 1;