diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-10 23:00:48 (GMT) |
---|---|---|
committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-04-10 23:00:48 (GMT) |
commit | 6a27582a4488d4d18a0b6cd584b8950ab02b81a7 (patch) | |
tree | 01615f7679a3d3ef4b2d9caa487874aa421df506 /tools/lib/h5tools_utils.c | |
parent | 7a4b02567e4de16d7478c10ffa07562b0daf320b (diff) | |
parent | 3875cc6960266775e8078c782c8864516865be67 (diff) | |
download | hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.zip hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.gz hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.bz2 |
[svn-r26781] Merge revisions 26305 through 26780 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'tools/lib/h5tools_utils.c')
-rw-r--r-- | tools/lib/h5tools_utils.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index d7c5adb..fc8cf1d 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -89,28 +89,11 @@ void parallel_print(const char* format, ...) HDvprintf(format, ap); else { if(overflow_file == NULL) /*no overflow has occurred yet */ { -#if 0 - printf("calling HDvsnprintf: OUTBUFF_SIZE=%ld, outBuffOffset=%ld, ", (long)OUTBUFF_SIZE, (long)outBuffOffset); -#endif bytes_written = HDvsnprintf(outBuff+outBuffOffset, OUTBUFF_SIZE-outBuffOffset, format, ap); -#if 0 - printf("bytes_written=%ld\n", (long)bytes_written); -#endif HDva_end(ap); HDva_start(ap, format); -#if 0 - printf("Result: bytes_written=%ld, OUTBUFF_SIZE-outBuffOffset=%ld\n", (long)bytes_written, (long)OUTBUFF_SIZE-outBuffOffset); -#endif - - if ((bytes_written < 0) || -#ifdef H5_VSNPRINTF_WORKS - (bytes_written >= (OUTBUFF_SIZE-outBuffOffset)) -#else - ((bytes_written+1) == (OUTBUFF_SIZE-outBuffOffset)) -#endif - ) - { + if((bytes_written < 0) || (bytes_written >= (OUTBUFF_SIZE - outBuffOffset))) { /* Terminate the outbuff at the end of the previous output */ outBuff[outBuffOffset] = '\0'; |