summaryrefslogtreecommitdiffstats
path: root/hl/src/H5DS.c
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2009-04-09 20:04:03 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2009-04-09 20:04:03 (GMT)
commit1dffdaa262aae487df0e9103466c14eafd882559 (patch)
treee1a11928dfe140d4b6f72da481b09164f3a3c52f /hl/src/H5DS.c
parent3fb6b6d6faee14846100214e6d4ac62efb0441f0 (diff)
downloadhdf5-1dffdaa262aae487df0e9103466c14eafd882559.zip
hdf5-1dffdaa262aae487df0e9103466c14eafd882559.tar.gz
hdf5-1dffdaa262aae487df0e9103466c14eafd882559.tar.bz2
[svn-r16720] merge 16719
clean warnings linux tested linux
Diffstat (limited to 'hl/src/H5DS.c')
-rw-r--r--hl/src/H5DS.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index c3b444c..9efa95e 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -482,7 +482,7 @@ herr_t H5DSattach_scale(hid_t did,
nelmts++;
- dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+ dsbuf = (ds_list_t*) malloc((size_t)nelmts * sizeof(ds_list_t));
if (dsbuf == NULL)
goto out;
@@ -831,7 +831,7 @@ herr_t H5DSdetach_scale(hid_t did,
if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
goto out;
- dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+ dsbuf = (ds_list_t*) malloc((size_t)nelmts * sizeof(ds_list_t));
if(dsbuf == NULL)
goto out;
@@ -907,7 +907,7 @@ herr_t H5DSdetach_scale(hid_t did,
goto out;
dims[0] = nelmts;
- dsbufn = malloc((size_t)nelmts * sizeof(ds_list_t));
+ dsbufn = (ds_list_t*) malloc((size_t)nelmts * sizeof(ds_list_t));
if(dsbufn == NULL)
goto out;
@@ -1195,7 +1195,7 @@ htri_t H5DSis_attached(hid_t did,
if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
goto out;
- dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+ dsbuf = (ds_list_t*) malloc((size_t)nelmts * sizeof(ds_list_t));
if (dsbuf == NULL)
goto out;
@@ -1596,7 +1596,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (buf)
{
- free((void *) buf);
+ free(buf);
buf = NULL;
}
}
@@ -1652,7 +1652,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (buf)
{
- free((void *) buf);
+ free(buf);
buf = NULL;
}
}