diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-02-14 18:35:29 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-02-14 18:35:29 (GMT) |
| commit | e09ccc4a2168e79b9f7500b8ec68ed5f829c8604 (patch) | |
| tree | 61cb90b9ccdf9c2278fd57d10316694e1023f8af | |
| parent | 41d541f1c21389702014ccaf8a1546b9673d5981 (diff) | |
| parent | 0b98ddd12324e5dae17dd8135bf72094d66e5d17 (diff) | |
| download | hdf5-e09ccc4a2168e79b9f7500b8ec68ed5f829c8604.zip hdf5-e09ccc4a2168e79b9f7500b8ec68ed5f829c8604.tar.gz hdf5-e09ccc4a2168e79b9f7500b8ec68ed5f829c8604.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '0b98ddd12324e5dae17dd8135bf72094d66e5d17':
Fixed DT failure Description: Added a missing return statement to a non-void function. Platforms tested: Linux/64 (jelly) Linux/32 (jam) Darwin (osx1010test)
| -rw-r--r-- | test/ohdr.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/ohdr.c b/test/ohdr.c index 43346a5..e886bf9 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -745,7 +745,7 @@ char *version_string(H5F_libver_t libver) { char *str = NULL; - str = (char *) malloc(20 * sizeof(char)); + str = (char *) HDmalloc(20); if (str == NULL) { fprintf(stderr, "Allocation failed\n"); @@ -772,6 +772,9 @@ char *version_string(H5F_libver_t libver) sprintf(str, "%ld", (long)libver); break; } /* end switch */ + + /* Return the formed version bound string */ + return(str); } /* end of version_string */ @@ -780,12 +783,16 @@ char *version_string(H5F_libver_t libver) * * Purpose: Exercise private object header behavior and routines * - * Return: Success: 0 - * Failure: 1 + * Return: Success: 0 + * Failure: 1 * * Programmer: Robb Matzke * Tuesday, November 24, 1998 * + * Modification: + * - Added loop of combinations of low/high library format bounds + * (BMR, Feb 2018) + * *------------------------------------------------------------------------- */ int |