diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-13 15:25:37 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-13 15:25:37 (GMT) |
| commit | a7724facc70ef6b8297f8a1fe6cf486305967d0e (patch) | |
| tree | 05bd3bfd50ab506e77a272863933ce23a3143740 | |
| parent | 4f5a47da500427803c71d953143e0d9565fb56a0 (diff) | |
| download | hdf5-a7724facc70ef6b8297f8a1fe6cf486305967d0e.zip hdf5-a7724facc70ef6b8297f8a1fe6cf486305967d0e.tar.gz hdf5-a7724facc70ef6b8297f8a1fe6cf486305967d0e.tar.bz2 | |
[svn-r28875] Merge of r28861 from trunk (minor string format change). Fixes HDFFV-9640.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
parallel only (MPICH 3.1.4)
| -rw-r--r-- | src/H5Eprivate.h | 2 | ||||
| -rw-r--r-- | test/error_test.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index b36780b..94a9244 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -113,7 +113,7 @@ extern int H5E_mpi_error_str_len; #define HMPI_ERROR(mpierr){ \ MPI_Error_string(mpierr, H5E_mpi_error_str, &H5E_mpi_error_str_len); \ - HERROR(H5E_INTERNAL, H5E_MPIERRSTR, H5E_mpi_error_str); \ + HERROR(H5E_INTERNAL, H5E_MPIERRSTR, "%s", H5E_mpi_error_str); \ } #define HMPI_DONE_ERROR(retcode, str, mpierr){ \ HMPI_ERROR(mpierr); \ diff --git a/test/error_test.c b/test/error_test.c index e712d86..64f301d 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -498,7 +498,7 @@ test_create(void) if(err_num != 0) TEST_ERROR /* Push an error with a long description */ - if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR; + if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR; /* Check the number of errors on stack */ err_num = H5Eget_num(estack_id); @@ -543,7 +543,7 @@ test_copy(void) herr_t ret; /* Generic return value */ /* Push an error with a long description */ - if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR; + if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR; /* Check the number of errors on stack */ err_num = H5Eget_num(H5E_DEFAULT); |