diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-12-21 18:55:54 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-12-21 18:55:54 (GMT) |
commit | ea0f5d813bb26ec536f468d47f79bf93fb5a9401 (patch) | |
tree | 9d1f2cec912ce29b877327ada906721b98d5f0c5 /src/H5MM.c | |
parent | 26b328aec8e10b9101c76bc049b6b5045b5f00a5 (diff) | |
parent | 9ceca0f89a0d27a6dfaeb3dd0cab2680281c5b60 (diff) | |
download | hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.zip hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.tar.gz hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.tar.bz2 |
[svn-r28715] - merge from trunk
- fix farray, earray, and btree test to use correct function to retrieve internal file struct.
Diffstat (limited to 'src/H5MM.c')
-rw-r--r-- | src/H5MM.c | 35 |
1 files changed, 15 insertions, 20 deletions
@@ -15,13 +15,11 @@ /*------------------------------------------------------------------------- * - * Created: H5MM.c - * Jul 10 1997 - * Robb Matzke <matzke@llnl.gov> - * - * Purpose: Memory management functions. + * Created: H5MM.c + * Jul 10 1997 + * Robb Matzke <matzke@llnl.gov> * - * Modifications: + * Purpose: Memory management functions * *------------------------------------------------------------------------- */ @@ -168,7 +166,6 @@ H5MM_realloc(void *mem, size_t size) * NULL is an acceptable value for the input string. * * Return: Success: Pointer to a new string (NULL if s is NULL). - * * Failure: abort() * * Programmer: Robb Matzke @@ -179,7 +176,7 @@ H5MM_realloc(void *mem, size_t size) char * H5MM_xstrdup(const char *s) { - char *ret_value = NULL; + char *ret_value = NULL; FUNC_ENTER_NOAPI(NULL) @@ -204,7 +201,6 @@ done: * an error will be raised. * * Return: Success: Pointer to a new string - * * Failure: abort() * * Programmer: Robb Matzke @@ -231,21 +227,20 @@ done: /*------------------------------------------------------------------------- - * Function: H5MM_xfree + * Function: H5MM_xfree * - * Purpose: Just like free(3) except null pointers are allowed as - * arguments, and the return value (always NULL) can be - * assigned to the pointer whose memory was just freed: + * Purpose: Just like free(3) except null pointers are allowed as + * arguments, and the return value (always NULL) can be + * assigned to the pointer whose memory was just freed: * - * thing = H5MM_xfree (thing); + * thing = H5MM_xfree (thing); * - * Return: Success: NULL + * Return: Success: NULL + * Failure: never fails * - * Failure: never fails - * - * Programmer: Robb Matzke - * matzke@llnl.gov - * Jul 10 1997 + * Programmer: Robb Matzke + * matzke@llnl.gov + * Jul 10 1997 * *------------------------------------------------------------------------- */ |