diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2013-02-04 14:46:14 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2013-02-04 14:46:14 (GMT) |
| commit | ccdd2b66f1b00b2e7cad60754fcbdd8f069bd6ae (patch) | |
| tree | a24837d38ae992f545c2f6c1f6fac98cdbbc8922 /src/H5FDmulti.c | |
| parent | 87cd27e6d872d0dc2b3fd23c6e4673929bbaf612 (diff) | |
| download | hdf5-ccdd2b66f1b00b2e7cad60754fcbdd8f069bd6ae.zip hdf5-ccdd2b66f1b00b2e7cad60754fcbdd8f069bd6ae.tar.gz hdf5-ccdd2b66f1b00b2e7cad60754fcbdd8f069bd6ae.tar.bz2 | |
[svn-r23224] Description:
Bring r23223 from trunk to 1.8 branch:
Revert use of snprintf() for sprintf(), as it is not supported on Windows.
(And file a bug, http://jira.hdfgroup.uiuc.edu/browse/HDFFV-8302, for the
general problem)
Tested:
Mac OSX/64 10.8.2 (amazon)
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index f730211..036604b 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -335,7 +335,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, meta_name[sizeof(meta_name) - 1] = '\0'; } else - snprintf(meta_name, sizeof(meta_name), "%%s%s", meta_ext); + sprintf(meta_name, "%%s%s", meta_ext); } else { strncpy(meta_name, "%s.meta", sizeof(meta_name)); @@ -353,7 +353,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, raw_name[sizeof(raw_name) - 1] = '\0'; } else - snprintf(raw_name, sizeof(raw_name), "%%s%s", raw_ext); + sprintf(raw_name, "%%s%s", raw_ext); } else { strncpy(raw_name, "%s.raw", sizeof(raw_name)); @@ -487,7 +487,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, if (!memb_name) { assert(strlen(letters)==H5FD_MEM_NTYPES); for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) { - snprintf(_memb_name[mt], sizeof(_memb_name[mt]), "%%s-%c.h5", letters[mt]); + sprintf(_memb_name[mt], "%%s-%c.h5", letters[mt]); _memb_name_ptrs[mt] = _memb_name[mt]; } memb_name = _memb_name_ptrs; @@ -2222,7 +2222,7 @@ open_members(H5FD_multi_t *file) /* Note: This truncates the user's filename down to only sizeof(tmp) * characters. -QK & JK, 2013/01/17 */ - snprintf(tmp, sizeof(tmp), file->fa.memb_name[mt], file->name); + sprintf(tmp, file->fa.memb_name[mt], file->name); #ifdef H5FD_MULTI_DEBUG if(file->flags & H5F_ACC_DEBUG) |