diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:26:51 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-22 00:26:51 (GMT) |
| commit | fb238c24a5c6679c7555c95f887b7f4a49dbb640 (patch) | |
| tree | f3d4107271fa1c56c9a9beae272653acb95d5527 /tools/lib/h5tools_str.c | |
| parent | 0be8c1687945eb0e55fac84c7aa9901ca9898a26 (diff) | |
| download | hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.zip hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.tar.gz hdf5-fb238c24a5c6679c7555c95f887b7f4a49dbb640.tar.bz2 | |
[svn-r27849] Description:
Normalize against incoming changes on VDS branch.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest forthcoming)
Diffstat (limited to 'tools/lib/h5tools_str.c')
| -rw-r--r-- | tools/lib/h5tools_str.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 88308ed..9d151d0 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -454,8 +454,7 @@ h5tools_str_dump_region_blocks(h5tools_str_t *str, hid_t region, for (i = 0; i < nblocks; i++) { int j; - h5tools_str_append(str, info->dset_blockformat_pre, i ? "," OPTIONAL_LINE_BREAK " " : "", - (unsigned long)i); + h5tools_str_append(str, info->dset_blockformat_pre, i ? "," OPTIONAL_LINE_BREAK " " : "", (unsigned long)i); /* Start coordinates and opposite corner */ for (j = 0; j < ndims; j++) @@ -1398,8 +1397,7 @@ h5tools_str_replace ( const char *string, const char *substr, const char *replac char *head = NULL; if ( substr == NULL || replacement == NULL ) - return HDstrdup (string); - + return HDstrdup (string); newstr = HDstrdup (string); head = newstr; while ( (tok = HDstrstr ( head, substr ))){ @@ -1407,8 +1405,8 @@ h5tools_str_replace ( const char *string, const char *substr, const char *replac newstr = (char *)HDmalloc( HDstrlen( oldstr ) - HDstrlen( substr ) + HDstrlen( replacement ) + 1 ); if ( newstr == NULL ){ - HDfree (oldstr); - return NULL; + HDfree (oldstr); + return NULL; } HDmemcpy ( newstr, oldstr, tok - oldstr ); HDmemcpy ( newstr + (tok - oldstr), replacement, HDstrlen ( replacement ) ); |