diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:04:11 (GMT) |
| commit | 366f0151ddf63b0a08c4cef7f295d78d9ecd117d (patch) | |
| tree | 2bcff4c4f4e8c4caa5dbd890ab441682a75f62bd /src/H5Gname.c | |
| parent | adb2fd1cc0858602046959689377dbdb60a4c3a6 (diff) | |
| parent | 370e6f3f56bafa13c19eaa292a16929a8b918120 (diff) | |
| download | hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.zip hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.gz hdf5-366f0151ddf63b0a08c4cef7f295d78d9ecd117d.tar.bz2 | |
[svn-r24301] merge from trunk.
resolve conflicts, etc...
Diffstat (limited to 'src/H5Gname.c')
| -rw-r--r-- | src/H5Gname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Gname.c b/src/H5Gname.c index 9dc8849..f48234d 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -325,7 +325,7 @@ H5G_build_fullpath(const char *prefix, const char *name) /* Build full path */ HDstrncpy(full_path, prefix, orig_path_len + 1); if(need_sep) - HDstrncat(full_path, "/", 1); + HDstrncat(full_path, "/", (size_t)1); HDstrncat(full_path, name, name_len); /* Create reference counted string for path */ @@ -1340,7 +1340,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t * /* If there's a buffer provided, copy into it, up to the limit of its size */ if(name) { /* Copy the initial path separator */ - HDstrncpy(name, "/", 2); + HDstrncpy(name, "/", (size_t)2); /* Append the rest of the path */ /* (less one character, for the initial path separator) */ |