diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2013-08-22 20:44:25 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-08-22 20:44:25 (GMT) |
commit | 1220779c318ab305b956833131e5be9027f07cfe (patch) | |
tree | 5a49a2ac01fca56f1e0f9fb998c3aa8fbc703466 /hl/src/H5DS.c | |
parent | 4df44aafaf8572814e705d0f259da2c0d081aae4 (diff) | |
download | hdf5-1220779c318ab305b956833131e5be9027f07cfe.zip hdf5-1220779c318ab305b956833131e5be9027f07cfe.tar.gz hdf5-1220779c318ab305b956833131e5be9027f07cfe.tar.bz2 |
[svn-r24060] Bring revisions #24002 - 24029 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'hl/src/H5DS.c')
-rw-r--r-- | hl/src/H5DS.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index cb3a1ce..5f8cd50 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -1872,12 +1872,9 @@ ssize_t H5DSget_scale_name(hid_t did, if (H5Sclose(sid) < 0) goto out; if (buf) - { free(buf); - buf=NULL; - } - return (ssize_t) MAX(0,nbytes-1); + return (ssize_t)(nbytes - 1); /* error zone */ out: @@ -1887,10 +1884,7 @@ out: H5Sclose(sid); } H5E_END_TRY; if (buf) - { free(buf); - buf=NULL; - } return FAIL; } |