diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-30 14:47:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-30 14:47:36 (GMT) |
| commit | 6a664ffa5aba85eb2d35526fa9d41a5b69f7f21d (patch) | |
| tree | 85e4273747035ee91732d18146e3438fdb306b26 /tools/lib/h5tools_str.c | |
| parent | 2b3e867b8499068ec6acf1f5e5b80ca698fca913 (diff) | |
| download | hdf5-6a664ffa5aba85eb2d35526fa9d41a5b69f7f21d.zip hdf5-6a664ffa5aba85eb2d35526fa9d41a5b69f7f21d.tar.gz hdf5-6a664ffa5aba85eb2d35526fa9d41a5b69f7f21d.tar.bz2 | |
[svn-r26648] Description:
Bring r26635 from trunk to 1.8 branch:
Bring r26651 from autotools_rework branch to trunk:
Remove the VSNPRINTF_WORKS macro, it's working around bugs in old SGI
& HP compilers.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'tools/lib/h5tools_str.c')
| -rw-r--r-- | tools/lib/h5tools_str.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index ac191d6..22518d6 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -155,11 +155,7 @@ h5tools_str_append(h5tools_str_t *str/*in,out*/, const char *fmt, ...) * to lack of buffer size, so try one more time after realloc more * buffer size before return NULL. */ - if (nchars < 0 -#ifndef H5_VSNPRINTF_WORKS - && (HDstrlen(str->s) < str->nalloc) -#endif - ) { + if (nchars < 0) { /* failure, such as bad format */ return NULL; } |