diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-02-14 18:13:37 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-02-14 18:13:37 (GMT) |
| commit | 0b98ddd12324e5dae17dd8135bf72094d66e5d17 (patch) | |
| tree | 26436d44addf26463a4e6c113bfb405048070878 | |
| parent | 66ea3b8fb9fdff0a0ffa6ffd318ad5fc2c9a8f4b (diff) | |
| parent | 2ad0ddaa3e62b35d454dfb61db06d8ad90c2e7a8 (diff) | |
| download | hdf5-0b98ddd12324e5dae17dd8135bf72094d66e5d17.zip hdf5-0b98ddd12324e5dae17dd8135bf72094d66e5d17.tar.gz hdf5-0b98ddd12324e5dae17dd8135bf72094d66e5d17.tar.bz2 | |
Merge pull request #894 in HDFFV/hdf5 from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to develop
* commit '2ad0ddaa3e62b35d454dfb61db06d8ad90c2e7a8':
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 |