From 556fe9b8a649f2b3d7719df7f8168bb5e8006161 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 2 Nov 2011 17:23:31 +0000 Subject: [PATCH] Fortran API fixed --- src/Fortran/H5Block_F.c | 8 ++++++-- src/Fortran/H5Part_F.c | 4 ++-- src/Fortran/H5_F.c | 25 +++---------------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/Fortran/H5Block_F.c b/src/Fortran/H5Block_F.c index fdd61b9..f44c628 100755 --- a/src/Fortran/H5Block_F.c +++ b/src/Fortran/H5Block_F.c @@ -116,7 +116,9 @@ h5bl_3d_getview ( k_start, k_end); H5_API_RETURN (h5b_3d_get_view ( fh, - i_start, i_end, j_start, j_end, k_start, k_end )); + (h5_size_t*)i_start, (h5_size_t*)i_end, + (h5_size_t*)j_start, (h5_size_t*)j_end, + (h5_size_t*)k_start, (h5_size_t*)k_end )); } h5_err_t @@ -142,7 +144,9 @@ h5bl_3d_getreducedview ( k_start, k_end); H5_API_RETURN(h5b_3d_get_reduced_view ( fh, - i_start, i_end, j_start, j_end, k_start, k_end )); + (h5_size_t*)i_start, (h5_size_t*)i_end, + (h5_size_t*)j_start, (h5_size_t*)j_end, + (h5_size_t*)k_start, (h5_size_t*)k_end )); } h5_int64_t diff --git a/src/Fortran/H5Part_F.c b/src/Fortran/H5Part_F.c index 45dff89..7c6fda0 100755 --- a/src/Fortran/H5Part_F.c +++ b/src/Fortran/H5Part_F.c @@ -155,14 +155,14 @@ h5pt_setview ( h5_err_t h5pt_setview_indices ( const h5_int64_t *f, - const h5_int64_t *indices, + const h5_int64_t * const indices, const h5_int64_t *nelem ) { h5_file_t *fh = h5_filehandlefor2c(f); H5_API_ENTER (h5_err_t, "f=%p, indices=%p, nelem=%lld", fh, indices, (long long)*nelem); - H5_API_RETURN(h5u_set_view_indices ( fh, indices, *nelem )); + H5_API_RETURN(h5u_set_view_indices ( fh, (const h5_size_t*const)indices, *nelem )); } h5_err_t diff --git a/src/Fortran/H5_F.c b/src/Fortran/H5_F.c index 3d09ed9..005a23f 100644 --- a/src/Fortran/H5_F.c +++ b/src/Fortran/H5_F.c @@ -51,25 +51,6 @@ #endif -static h5_int32_t -_flagsfor2c ( - char * flags - ) { - - h5_int32_t fbits = 0x00; - - flags = strtok ( flags, "," ); - while ( flags != NULL ) { - if ( strcmp ( flags, "vfd_mpiposix" ) == 0 ) - fbits |= H5_VFD_MPIPOSIX; - else if ( strcmp ( flags, "vfd_independent" ) == 0 ) - fbits |= H5_VFD_INDEPENDENT; - flags = strtok ( NULL, "," ); - } - - return fbits; -} - /* open/close interface */ h5_err_t h5_openr ( @@ -79,7 +60,7 @@ h5_openr ( H5_API_ENTER (h5_err_t, "name='%s', l_name=%d", name, l_name); char *name2 = h5_strdupfor2c ( name, l_name ); - h5_file_t* f = h5_open_file ( name2, H5_O_RDONLY, 0 ); + h5_file_t* f = h5_open_file ( name2, H5_O_RDONLY, 0, 0 ); free ( name2 ); H5_API_RETURN((h5_int64_t)(size_t)f); } @@ -92,7 +73,7 @@ h5_openw ( H5_API_ENTER (h5_err_t, "name='%s', l_name=%d", name, l_name); char *name2 = h5_strdupfor2c ( name, l_name ); - h5_file_t* f = h5_open_file ( name2, H5_O_WRONLY, 0 ); + h5_file_t* f = h5_open_file ( name2, H5_O_WRONLY, 0, 0 ); free ( name2 ); H5_API_RETURN((h5_int64_t)(size_t)f); } @@ -105,7 +86,7 @@ h5pt_opena ( H5_API_ENTER (h5_err_t, "name='%s', l_name=%d", name, l_name); char *name2 = h5_strdupfor2c ( name, l_name ); - h5_file_t* f = h5_open_file ( name2, H5_O_APPEND, 0 ); + h5_file_t* f = h5_open_file ( name2, H5_O_APPEND, 0, 0 ); free ( name2 ); H5_API_RETURN((h5_int64_t)(size_t)f); }