TREX/trexio
1
0
Fork 0
mirror of https://github.com/TREX-CoE/trexio.git synced 2025-04-16 13:49:19 +02:00
Code Issues Projects Releases Wiki Activity

Fixed valgrind test_f.f90

Browse Source
This commit is contained in:
Anthony Scemama 2024-12-06 11:09:55 +01:00
parent cd369bd187
commit c7d5d4255b
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/templates_front/templator_front.org
View File

@ -684,7 +684,7 @@ return '\n'.join(result)
#+begin_src c :tangle prefix_front.h :exports none :noweb yes
const char* trexio_string_of_error(const trexio_exit_code error);
void trexio_string_of_error_f(const trexio_exit_code error, char result[<<MAX_STRING_LENGTH()>>]);
void trexio_string_of_error_f(const trexio_exit_code error, const int32_t size_string, char* const result);
#+end_src
*IMPORTANT!*
@ -838,12 +838,12 @@ trexio_string_of_error (const trexio_exit_code error)
}
void
trexio_string_of_error_f (const trexio_exit_code error, char result[<<MAX_STRING_LENGTH()>>])
trexio_string_of_error_f (const trexio_exit_code error, const int32_t str_size, char* const result)
{
const char* pSrc = trexio_string_of_error(error);
size_t sizeCp = strlen(pSrc);
if (sizeCp > <<MAX_STRING_LENGTH()>>) {
sizeCp = <<MAX_STRING_LENGTH()>>;
if ((int32_t) sizeCp > str_size) {
sizeCp = str_size;
}
memcpy(result, pSrc, sizeCp);
result[sizeCp] = '\0';
@ -854,11 +854,12 @@ trexio_string_of_error_f (const trexio_exit_code error, char result[<<MAX_STRING
#+begin_src f90 :tangle prefix_fortran.f90 :noexport :noweb yes
interface
subroutine trexio_string_of_error (error, string) bind(C, name='trexio_string_of_error_f')
subroutine trexio_string_of_error_f (error, str_size, string) bind(C)
import
integer(trexio_exit_code), intent(in), value :: error
character(kind=c_char), intent(out) :: string(<<MAX_STRING_LENGTH()>>)
end subroutine trexio_string_of_error
integer(c_int32_t), intent(in), value :: str_size
character(kind=c_char), intent(out) :: string(str_size)
end subroutine trexio_string_of_error_f
end interface
#+end_src
@ -6777,6 +6778,18 @@ contains
end function trexio_info
#+end_src
This function adds the string length as an extra argument to help the C code
check that the passed string is large enough.
#+begin_src f90 :tangle helper_fortran.f90 :noweb yes
subroutine trexio_string_of_error (error, string)
implicit none
integer(trexio_exit_code), intent(in) :: error
character*(*), intent(out) :: string
call trexio_string_of_error_f(error, len(string), string)
end subroutine trexio_string_of_error
#+end_src
The function below adapts the original C-based ~trexio_open~ for Fortran.
This is needed due to the fact that strings in C are terminated by ~NULL~ character ~\0~
unlike strings in Fortran.

3
tests/test_f.f90
View File

@ -661,7 +661,8 @@ subroutine test_read_void(file_name, back_end)
integer(trexio_t) :: trex_file
integer :: rc = 1
character(128) :: str
character*(128) :: str
str = ''
! ================= START OF TEST ===================== !