summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2014-03-31 23:35:09 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2014-03-31 23:35:09 (GMT)
commitd01ee66666f4cad8e5f3f67a51a5774adcc03e45 (patch)
tree1980b2237af734a2784314b85a8b8f4edbfcf14e /fortran
parentef9db69bf33a200f81ebb3e29dbcbbdab92938cf (diff)
downloadhdf5-d01ee66666f4cad8e5f3f67a51a5774adcc03e45.zip
hdf5-d01ee66666f4cad8e5f3f67a51a5774adcc03e45.tar.gz
hdf5-d01ee66666f4cad8e5f3f67a51a5774adcc03e45.tar.bz2
[svn-r24937] Adds an H5free_memory() function to the library for use with
functions that return library-allocated memory. The test and tool code were modified to use this new function where it's appropriate. Fixes HDFFV-7710, HDFFV-8519, and HDFFV-8551 Tested on: 64-bit Windows 7 w/ VS2012 32-bit LE linux w/ parallel and fortran (jam) 32-bit LE linux w/ fortran and C++ (jam)
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Ef.c12
-rw-r--r--fortran/src/H5Pf.c2
-rw-r--r--fortran/src/H5Tf.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c
index 8671b18..8677977 100644
--- a/fortran/src/H5Ef.c
+++ b/fortran/src/H5Ef.c
@@ -143,8 +143,8 @@ done:
* NAME
* h5eget_major_c
* PURPOSE
- * Call H5Eget_major to get a character string
- * describing an error specified by a major error number.
+ * Get a character string describing an error specified by a
+ * major error number.
* INPUTS
* error_no - Major error number
* OUTPUTS
@@ -173,7 +173,7 @@ nh5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen)
HGOTO_DONE(FAIL)
/*
- * Call H5Eget_major function.
+ * Call H5Eget_msg function.
*/
H5Eget_msg((hid_t)*error_no, NULL, c_name, c_namelen);
HD5packFstring((char*)c_name, _fcdtocp(name), c_namelen);
@@ -191,8 +191,8 @@ done:
* NAME
* h5eget_minor_c
* PURPOSE
- * Call H5Eget_minor to get a character string
- * describing an error specified by a minor error number.
+ * Get a character string describing an error specified by a
+ * minor error number.
* INPUTS
* error_no - Major error number
* OUTPUTS
@@ -221,7 +221,7 @@ nh5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen)
HGOTO_DONE(FAIL)
/*
- * Call H5Eget_minor function.
+ * Call H5Eget_msg function.
*/
H5Eget_msg((hid_t)*error_no, NULL, c_name, c_namelen);
HD5packFstring((char *)c_name, _fcdtocp(name), c_namelen);
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index cf10efc..7a3f899 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3388,7 +3388,7 @@ nh5pget_class_name_c(hid_t_f *cls, _fcd name, int_f *name_len)
HD5packFstring(c_name, _fcdtocp(name), (size_t)*name_len);
ret_value = (int_f)HDstrlen(c_name);
- HDfree(c_name);
+ H5free_memory(c_name);
DONE:
return ret_value;
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index c8ff6e0..df581ee 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -1280,7 +1280,7 @@ nh5tget_member_name_c ( hid_t_f *type_id ,int_f* idx, _fcd member_name, int_f *n
HD5packFstring(c_name, _fcdtocp(member_name), strlen(c_name));
*namelen = (int_f)strlen(c_name);
- HDfree(c_name);
+ H5free_memory(c_name);
ret_value = 0;
return ret_value;
}
@@ -1986,7 +1986,7 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, size_t_f* tag_size, int_f* taglen)
HD5packFstring(c_tag, _fcdtocp(tag), (size_t)*tag_size);
*taglen = (int_f)HDstrlen(c_tag);
- HDfree(c_tag);
+ H5free_memory(c_tag);
ret_value = 0;
return ret_value;
}