summaryrefslogtreecommitdiffstats
path: root/hl/src/H5DS.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-08-18 00:31:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-08-18 00:31:01 (GMT)
commit6e58f671ec62120246a94101a80a47259ffb96c3 (patch)
tree204ba14aa8e2fad6bb78ef8128c3f98c48e26f39 /hl/src/H5DS.c
parentb5a5441e7c5eb09cb53677326c3e84f80acdf108 (diff)
downloadhdf5-6e58f671ec62120246a94101a80a47259ffb96c3.zip
hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.gz
hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.bz2
[svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch: Clean up compiler warnings Tested on: Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'hl/src/H5DS.c')
-rw-r--r--hl/src/H5DS.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index c7c1719..e60d587 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;
}