diff options
Diffstat (limited to 'hl/fortran/src')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | hl/fortran/src/H5LTf90proto.h | 192 | ||||
| -rwxr-xr-x | hl/fortran/src/H5TBfc.c | 218 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 5 |
4 files changed, 191 insertions, 232 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 421fdff..ca0a35f 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -51,6 +51,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE}) ADD_LIBRARY (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) +SET (SHARED_LINK_FLAGS " ") IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} @@ -58,11 +59,7 @@ IF (BUILD_SHARED_LIBS) BUILD_HDF5_DLL ) IF (MSVC) - SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL" - ) + SET (SHARED_LINK_FLAGS "/DLL") ENDIF (MSVC) ENDIF (WIN32 AND NOT CYGWIN) ENDIF (BUILD_SHARED_LIBS) @@ -72,6 +69,7 @@ IF (WIN32 AND NOT CYGWIN) HDF5F90_WINDOWS ) ENDIF (WIN32 AND NOT CYGWIN) +TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${SHARED_LINK_FLAGS}) SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran) TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index 8a9d6c0..3e45531 100755 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -23,8 +23,8 @@ #include <string.h> -H5_DLL char* HD5f2cstring (_fcd fdesc, int len); -H5_DLL void HD5packFstring (char *src, char *dest, size_t len); +HDF5_HL_F90CSTUBDLL char* HD5f2cstring (_fcd fdesc, int len); +HDF5_HL_F90CSTUBDLL void HD5packFstring (char *src, char *dest, size_t len); /* @@ -139,7 +139,7 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len); # define nh5tbget_table_info_c H5_FC_FUNC_(h5tbget_table_info_c, H5TBGET_TABLE_INFO_C) # define nh5tbget_field_info_c H5_FC_FUNC_(h5tbget_field_info_c, H5TBGET_FIELD_INFO_C) -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_c (hid_t_f *loc_id, int_f *namelen, @@ -149,7 +149,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int1_c (hid_t_f *loc_id, int_f *namelen, @@ -159,7 +159,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int2_c (hid_t_f *loc_id, int_f *namelen, @@ -169,7 +169,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_int3_c (hid_t_f *loc_id, int_f *namelen, @@ -179,7 +179,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl1_c (hid_t_f *loc_id, int_f *namelen, @@ -189,7 +189,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl2_c (hid_t_f *loc_id, int_f *namelen, @@ -199,7 +199,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_fl3_c (hid_t_f *loc_id, int_f *namelen, @@ -209,7 +209,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl1_c (hid_t_f *loc_id, int_f *namelen, @@ -219,7 +219,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl2_c (hid_t_f *loc_id, int_f *namelen, @@ -229,7 +229,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_dl3_c (hid_t_f *loc_id, int_f *namelen, @@ -239,7 +239,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint1_c (hid_t_f *loc_id, int_f *namelen, @@ -249,7 +249,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint2_c (hid_t_f *loc_id, int_f *namelen, @@ -259,7 +259,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nint3_c (hid_t_f *loc_id, int_f *namelen, @@ -269,7 +269,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id, int_f *namelen, @@ -279,7 +279,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id, int_f *namelen, @@ -289,7 +289,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id, int_f *namelen, @@ -299,7 +299,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id, int_f *namelen, @@ -309,7 +309,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id, int_f *namelen, @@ -319,7 +319,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id, int_f *namelen, @@ -329,7 +329,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id, hid_t_f *type_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_c (hid_t_f *loc_id, int_f *namelen, @@ -339,7 +339,7 @@ nh5ltread_dataset_c (hid_t_f *loc_id, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int1_c (hid_t_f *loc_id, int_f *namelen, @@ -348,7 +348,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int2_c (hid_t_f *loc_id, int_f *namelen, @@ -357,7 +357,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_int3_c (hid_t_f *loc_id, int_f *namelen, @@ -366,7 +366,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl1_c (hid_t_f *loc_id, int_f *namelen, @@ -375,7 +375,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl2_c (hid_t_f *loc_id, int_f *namelen, @@ -384,7 +384,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_fl3_c (hid_t_f *loc_id, int_f *namelen, @@ -393,7 +393,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl1_c (hid_t_f *loc_id, int_f *namelen, @@ -402,7 +402,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl2_c (hid_t_f *loc_id, int_f *namelen, @@ -411,7 +411,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_dl3_c (hid_t_f *loc_id, int_f *namelen, @@ -420,7 +420,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint1_c (hid_t_f *loc_id, int_f *namelen, @@ -429,7 +429,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint2_c (hid_t_f *loc_id, int_f *namelen, @@ -438,7 +438,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nint3_c (hid_t_f *loc_id, int_f *namelen, @@ -447,7 +447,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl1_c (hid_t_f *loc_id, int_f *namelen, @@ -456,7 +456,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl2_c (hid_t_f *loc_id, int_f *namelen, @@ -465,7 +465,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_nfl3_c (hid_t_f *loc_id, int_f *namelen, @@ -474,7 +474,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl1_c (hid_t_f *loc_id, int_f *namelen, @@ -483,7 +483,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl2_c (hid_t_f *loc_id, int_f *namelen, @@ -492,7 +492,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_ndl3_c (hid_t_f *loc_id, int_f *namelen, @@ -501,7 +501,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id, void *buf, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_int_c(hid_t_f *loc_id, int_f *namelen, @@ -511,7 +511,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_float_c(hid_t_f *loc_id, int_f *namelen, @@ -521,7 +521,7 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_double_c(hid_t_f *loc_id, int_f *namelen, @@ -531,7 +531,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, size_t_f *size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltset_attribute_string_c(hid_t_f *loc_id, int_f *namelen, @@ -542,7 +542,7 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_int_c(hid_t_f *loc_id, int_f *namelen, @@ -551,7 +551,7 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_float_c(hid_t_f *loc_id, int_f *namelen, @@ -560,7 +560,7 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_double_c(hid_t_f *loc_id, int_f *namelen, @@ -569,7 +569,7 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_string_c(hid_t_f *loc_id, int_f *namelen, @@ -578,20 +578,20 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, _fcd attrname, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_dataset_ndims_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *rank); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltfind_dataset_c(hid_t_f *loc_id, int_f *namelen, _fcd name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *namelen, @@ -600,7 +600,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *type_class, size_t_f *type_size); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *namelen, @@ -608,7 +608,7 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *attrnamelen, _fcd attrname, int_f *rank); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *namelen, @@ -619,7 +619,7 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *type_class, size_t_f *type_size); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *namelen, @@ -627,7 +627,7 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *buflen, char *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5ltread_dataset_string_c (hid_t_f *loc_id, int_f *namelen, @@ -639,7 +639,7 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, *------------------------------------------------------------------------- */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_image_8bit_c (hid_t_f *loc_id, int_f *namelen, @@ -647,14 +647,14 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, hsize_t_f *width, hsize_t_f *height, int_f *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imread_image_c (hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_image_24bit_c (hid_t_f *loc_id, int_f *namelen, @@ -664,7 +664,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, hsize_t_f *width, hsize_t_f *height, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_image_info_c(hid_t_f *loc_id, int_f *namelen, @@ -677,14 +677,14 @@ nh5imget_image_info_c(hid_t_f *loc_id, _fcd interlace); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imis_image_c(hid_t_f *loc_id, int_f *namelen, _fcd name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5immake_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -692,7 +692,7 @@ nh5immake_palette_c (hid_t_f *loc_id, hsize_t_f *dims, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imlink_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -700,7 +700,7 @@ nh5imlink_palette_c (hid_t_f *loc_id, int_f *ilen, _fcd pal_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imunlink_palette_c (hid_t_f *loc_id, int_f *namelen, @@ -708,7 +708,7 @@ nh5imunlink_palette_c (hid_t_f *loc_id, int_f *ilen, _fcd pal_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_npalettes_c(hid_t_f *loc_id, int_f *namelen, @@ -716,7 +716,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, hsize_t_f *npals); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_palette_info_c(hid_t_f *loc_id, int_f *namelen, @@ -724,7 +724,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, int_f *pal_number, hsize_t_f *dims); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imget_palette_c(hid_t_f *loc_id, int_f *namelen, @@ -732,7 +732,7 @@ nh5imget_palette_c(hid_t_f *loc_id, int_f *pal_number, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5imis_palette_c(hid_t_f *loc_id, int_f *namelen, @@ -745,7 +745,7 @@ nh5imis_palette_c(hid_t_f *loc_id, *------------------------------------------------------------------------- */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbmake_table_c(int_f *namelen1, _fcd name1, @@ -762,7 +762,7 @@ nh5tbmake_table_c(int_f *namelen1, int_f *len, /* field_names lenghts */ _fcd buf); /* field_names */ -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -774,7 +774,7 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_int_c(hid_t_f *loc_id, int_f *namelen, @@ -786,7 +786,7 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -798,7 +798,7 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -810,7 +810,7 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_name_st_c(hid_t_f *loc_id, int_f *namelen, @@ -822,7 +822,7 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -834,7 +834,7 @@ nh5tbread_field_name_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_int_c(hid_t_f *loc_id, int_f *namelen, @@ -846,7 +846,7 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -858,7 +858,7 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -870,7 +870,7 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_name_st_c(hid_t_f *loc_id, int_f *namelen, @@ -882,7 +882,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -893,7 +893,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_int_c(hid_t_f *loc_id, int_f *namelen, @@ -904,7 +904,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -915,7 +915,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -926,7 +926,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbwrite_field_index_st_c(hid_t_f *loc_id, int_f *namelen, @@ -937,7 +937,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -948,7 +948,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_int_c(hid_t_f *loc_id, int_f *namelen, @@ -959,7 +959,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -970,7 +970,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -981,7 +981,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbread_field_index_st_c(hid_t_f *loc_id, int_f *namelen, @@ -992,7 +992,7 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, @@ -1003,7 +1003,7 @@ nh5tbinsert_field_c(hid_t_f *loc_id, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_int_c(hid_t_f *loc_id, int_f *namelen, @@ -1013,7 +1013,7 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -1023,7 +1023,7 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_dl_c(hid_t_f *loc_id, int_f *namelen, @@ -1033,7 +1033,7 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbinsert_field_st_c(hid_t_f *loc_id, int_f *namelen, @@ -1043,7 +1043,7 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id, hid_t_f *field_type, int_f *position, void *buf); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbdelete_field_c(hid_t_f *loc_id, int_f *namelen, @@ -1052,7 +1052,7 @@ nh5tbdelete_field_c(hid_t_f *loc_id, _fcd field_name); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbget_table_info_c(hid_t_f *loc_id, int_f *namelen, @@ -1060,7 +1060,7 @@ nh5tbget_table_info_c(hid_t_f *loc_id, hsize_t_f *nfields, hsize_t_f *nrecords); -H5_DLL +HDF5_HL_F90CSTUBDLL int_f nh5tbget_field_info_c(hid_t_f *loc_id, int_f *namelen, diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c index e942138..76a3f1c 100755 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -32,9 +32,6 @@ * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ int_f @@ -58,11 +55,7 @@ nh5tbmake_table_c(int_f *namelen1, hsize_t num_elem; hsize_t i; int max_len = 1; - hid_t c_loc_id = *loc_id; - hsize_t c_nfields = *nfields; - hsize_t c_nrecords = *nrecords; - hsize_t c_chunk_size = *chunk_size; - size_t c_type_size = *type_size; + hsize_t c_nfields = (hsize_t)*nfields; size_t *c_field_offset = NULL; hid_t *c_field_types = NULL; char **c_field_names = NULL; @@ -70,10 +63,9 @@ nh5tbmake_table_c(int_f *namelen1, int_f ret_value = 0; num_elem = *nfields; - for(i = 0; i < num_elem; i++) { + for(i = 0; i < num_elem; i++) if(namelen2[i] > max_len) max_len = namelen2[i]; - } /* * convert FORTRAN name to C name @@ -87,10 +79,10 @@ nh5tbmake_table_c(int_f *namelen1, if(NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields))) HGOTO_DONE(FAIL) - for (i = 0; i < num_elem; i++) { + for(i = 0; i < num_elem; i++) { c_field_offset[i] = field_offset[i]; c_field_types[i] = field_types[i]; - } + } /* end for */ /* * allocate array of character pointers @@ -118,9 +110,9 @@ nh5tbmake_table_c(int_f *namelen1, /* * call H5TBmake_table function. */ - if(H5TBmake_table(c_name1, c_loc_id, c_name, c_nfields, c_nrecords, - c_type_size, c_field_names, c_field_offset, c_field_types, - c_chunk_size, NULL, *compress, NULL) < 0) + if(H5TBmake_table(c_name1, (hid_t)*loc_id, c_name, c_nfields, (hsize_t)*nrecords, + (size_t)*type_size, (const char **)c_field_names, c_field_offset, c_field_types, + (hsize_t)*chunk_size, NULL, *compress, NULL) < 0) HGOTO_DONE(FAIL) done: @@ -132,7 +124,7 @@ done: for(i = 0; i < num_elem; i++) { if(c_field_names[i]) HDfree(c_field_names[i]); - } + } /* end for */ HDfree(c_field_names); } /* end if */ if(tmp) @@ -143,8 +135,7 @@ done: HDfree(c_field_types); return ret_value; -} - +} /* end nh5tbmake_table_c() */ /*------------------------------------------------------------------------- * Function: h5tbwrite_field_name_c @@ -159,12 +150,8 @@ done: * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbwrite_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -177,26 +164,23 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, void *buf) { char *c_name = NULL; - char *c_name1 = NULL; - hid_t c_loc_id = *loc_id; - hsize_t c_start = *start; - hsize_t c_nrecords = *nrecords; - size_t c_type_size = *type_size; + char *c_name1 = NULL; + size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; /* - * convert FORTRAN name to C name - */ + * convert FORTRAN name to C name + */ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen))) HGOTO_DONE(FAIL) if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1))) HGOTO_DONE(FAIL) /* - * call H5TBwrite_fields_name function. - */ - if(H5TBwrite_fields_name(c_loc_id, c_name, c_name1, c_start, c_nrecords, - c_type_size, 0, &c_type_size, buf) < 0) + * call H5TBwrite_fields_name function. + */ + if(H5TBwrite_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, + (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0) HGOTO_DONE(FAIL) done: @@ -219,8 +203,10 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } + int_f nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, int_f *namelen, @@ -232,7 +218,8 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } int_f @@ -246,7 +233,8 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } int_f @@ -260,7 +248,8 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbwrite_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } /*------------------------------------------------------------------------- @@ -276,12 +265,8 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id, * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbread_field_name_c(hid_t_f *loc_id, int_f *namelen, @@ -295,25 +280,22 @@ nh5tbread_field_name_c(hid_t_f *loc_id, { char *c_name = NULL; char *c_name1 = NULL; - hid_t c_loc_id = *loc_id; - hsize_t c_start = *start; - hsize_t c_nrecords = *nrecords; - size_t c_type_size = *type_size; + size_t c_type_size[1] = {(size_t)*type_size}; int_f ret_value = 0; /* - * convert FORTRAN name to C name - */ + * convert FORTRAN name to C name + */ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen))) HGOTO_DONE(FAIL) if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1))) HGOTO_DONE(FAIL) /* - * call H5TBread_fields_name function. - */ - if(H5TBread_fields_name(c_loc_id, c_name, c_name1, c_start, c_nrecords, - c_type_size, 0, &c_type_size, buf) < 0) + * call H5TBread_fields_name function. + */ + if(H5TBread_fields_name((hid_t)*loc_id, c_name, c_name1, (hsize_t)*start, + (hsize_t)*nrecords, c_type_size[0], 0, c_type_size, buf) < 0) HGOTO_DONE(FAIL) done: @@ -336,7 +318,8 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } int_f @@ -350,7 +333,8 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } int_f @@ -364,7 +348,8 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } int_f @@ -378,7 +363,8 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_name_c(loc_id,namelen,name,namelen1,field_name,start,nrecords,type_size,buf); + return nh5tbread_field_name_c(loc_id, namelen, name, namelen1, field_name, + start, nrecords, type_size, buf); } /*------------------------------------------------------------------------- @@ -394,12 +380,8 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id, * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbwrite_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -411,25 +393,22 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, void *buf) { char *c_name = NULL; - hid_t c_loc_id = *loc_id; - hsize_t c_start = *start; - hsize_t c_nrecords = *nrecords; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; /* - * convert FORTRAN name to C name - */ + * convert FORTRAN name to C name + */ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen))) HGOTO_DONE(FAIL) /* - * call H5TBwrite_fields_name function. - */ - if(H5TBwrite_fields_index(c_loc_id, c_name, (hsize_t)1, &c_field_index, - c_start, c_nrecords, c_type_size, 0, &c_type_size, buf) < 0) + * call H5TBwrite_fields_name function. + */ + if(H5TBwrite_fields_index((hid_t)*loc_id, c_name, (hsize_t)1, &c_field_index, + (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0) HGOTO_DONE(FAIL) done: @@ -449,7 +428,8 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -462,7 +442,8 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -475,7 +456,8 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -488,7 +470,8 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbwrite_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbwrite_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } /*------------------------------------------------------------------------- @@ -504,12 +487,8 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id, * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbread_field_index_c(hid_t_f *loc_id, int_f *namelen, @@ -521,9 +500,6 @@ nh5tbread_field_index_c(hid_t_f *loc_id, void *buf) { char *c_name = NULL; - hid_t c_loc_id = *loc_id; - hsize_t c_start = *start; - hsize_t c_nrecords = *nrecords; size_t c_type_size = *type_size; int c_field_index = *field_index - 1; /* C zero based index */ int_f ret_value = 0; @@ -537,8 +513,8 @@ nh5tbread_field_index_c(hid_t_f *loc_id, /* * call H5TBread_fields_index function. */ - if(H5TBread_fields_index(c_loc_id, c_name,(hsize_t)1, &c_field_index, - c_start, c_nrecords, c_type_size, 0, &c_type_size, buf) < 0) + if(H5TBread_fields_index((hid_t)*loc_id, c_name,(hsize_t)1, &c_field_index, + (hsize_t)*start, (hsize_t)*nrecords, c_type_size, 0, &c_type_size, buf) < 0) HGOTO_DONE(FAIL) done: @@ -558,7 +534,8 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -571,7 +548,8 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -584,7 +562,8 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } int_f @@ -597,7 +576,8 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id, size_t_f *type_size, void *buf) { - return nh5tbread_field_index_c(loc_id,namelen,name,field_index,start,nrecords,type_size,buf); + return nh5tbread_field_index_c(loc_id, namelen, name, field_index, start, + nrecords, type_size, buf); } /*------------------------------------------------------------------------- @@ -613,12 +593,8 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id, * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, @@ -631,29 +607,25 @@ nh5tbinsert_field_c(hid_t_f *loc_id, { char *c_name = NULL; char *c_name1 = NULL; - hid_t c_loc_id = *loc_id; - hid_t c_field_type = *field_type; - hsize_t c_position = *position; int_f ret_value = 0; /* - * convert FORTRAN name to C name - */ + * convert FORTRAN name to C name + */ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen))) HGOTO_DONE(FAIL) if(NULL == (c_name1 = (char *)HD5f2cstring(field_name, (size_t)*namelen1))) HGOTO_DONE(FAIL) /* - * call H5TBinsert_field function. - */ - - if(H5TBinsert_field(c_loc_id, c_name, c_name1, c_field_type, c_position, - NULL, buf) < 0) + * call H5TBinsert_field function. + */ + if(H5TBinsert_field((hid_t)*loc_id, c_name, c_name1, (hid_t)*field_type, + (hsize_t)*position, NULL, buf) < 0) HGOTO_DONE(FAIL) done: - if(c_name ) + if(c_name) HDfree(c_name); if(c_name1) HDfree(c_name1); @@ -671,7 +643,8 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id, int_f *position, void *buf) { - return nh5tbinsert_field_c(loc_id,namelen,name,namelen1,field_name,field_type,position,buf); + return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name, + field_type, position, buf); } int_f @@ -684,7 +657,8 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id, int_f *position, void *buf) { - return nh5tbinsert_field_c(loc_id,namelen,name,namelen1,field_name,field_type,position,buf); + return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name, + field_type, position, buf); } int_f @@ -697,7 +671,8 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id, int_f *position, void *buf) { - return nh5tbinsert_field_c(loc_id,namelen,name,namelen1,field_name,field_type,position,buf); + return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name, + field_type, position, buf); } int_f @@ -710,7 +685,8 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id, int_f *position, void *buf) { - return nh5tbinsert_field_c(loc_id,namelen,name,namelen1,field_name,field_type,position,buf); + return nh5tbinsert_field_c(loc_id, namelen, name, namelen1, field_name, + field_type, position, buf); } /*------------------------------------------------------------------------- @@ -726,12 +702,8 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id, * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbdelete_field_c(hid_t_f *loc_id, int_f *namelen, @@ -741,7 +713,6 @@ nh5tbdelete_field_c(hid_t_f *loc_id, { char *c_name = NULL; char *c_name1 = NULL; - hid_t c_loc_id = *loc_id; int_f ret_value = 0; /* @@ -755,13 +726,12 @@ nh5tbdelete_field_c(hid_t_f *loc_id, /* * call H5TBinsert_field function. */ - if(H5TBdelete_field(c_loc_id, c_name, c_name1) < 0) + if(H5TBdelete_field((hid_t)*loc_id, c_name, c_name1) < 0) HGOTO_DONE(FAIL) done: if(c_name) HDfree(c_name); - if(c_name1) HDfree(c_name1); @@ -781,12 +751,8 @@ done: * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ - int_f nh5tbget_table_info_c(hid_t_f *loc_id, int_f *namelen, @@ -795,7 +761,6 @@ nh5tbget_table_info_c(hid_t_f *loc_id, hsize_t_f *nrecords) { char *c_name = NULL; - hid_t c_loc_id = *loc_id; hsize_t c_nfields; hsize_t c_nrecords; int_f ret_value = 0; @@ -809,7 +774,7 @@ nh5tbget_table_info_c(hid_t_f *loc_id, /* * call H5TBread_fields_index function. */ - if(H5TBget_table_info(c_loc_id, c_name, &c_nfields, &c_nrecords) < 0) + if(H5TBget_table_info((hid_t)*loc_id, c_name, &c_nfields, &c_nrecords) < 0) HGOTO_DONE(FAIL) *nfields = (hsize_t_f) c_nfields;; @@ -822,8 +787,6 @@ done: return ret_value; } - - /*------------------------------------------------------------------------- * Function: h5tbget_field_info_c * @@ -837,9 +800,6 @@ done: * * Comments: * -* Modifications: -* -* *------------------------------------------------------------------------- */ int_f @@ -856,9 +816,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id, { char *c_name = NULL; hsize_t num_elem; - hsize_t i; int max_len = 1; - hid_t c_loc_id = *loc_id; hsize_t c_nfields = *nfields; size_t *c_field_sizes = NULL; size_t *c_field_offsets = NULL; @@ -866,13 +824,13 @@ nh5tbget_field_info_c(hid_t_f *loc_id, char **c_field_names = NULL; char *tmp = NULL, *tmp_p; int c_lenmax = HLTB_MAX_FIELD_LEN; + hsize_t i; int_f ret_value = 0; num_elem = c_nfields; - for(i = 0; i < num_elem; i++) { + for(i = 0; i < num_elem; i++) if(namelen2[i] > max_len) max_len = namelen2[i]; - } /* * convert FORTRAN name to C name @@ -893,11 +851,11 @@ nh5tbget_field_info_c(hid_t_f *loc_id, /* * call H5TBget_field_info function. */ - if(H5TBget_field_info(c_loc_id, c_name, c_field_names, c_field_sizes, + if(H5TBget_field_info((hid_t)*loc_id, c_name, c_field_names, c_field_sizes, c_field_offsets, &c_type_size) < 0) HGOTO_DONE(FAIL) - /* return values*/ + /* return values */ /* names array */ if(NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1))) @@ -912,14 +870,14 @@ nh5tbget_field_info_c(hid_t_f *loc_id, HDmemcpy(tmp_p, c_field_names[i], field_name_len); namelen2[i] = (int_f)field_name_len; tmp_p += c_lenmax; - } + } /* end for */ HD5packFstring(tmp, _fcdtocp(field_names), (int)(c_lenmax * c_nfields)); *type_size = (size_t_f)c_type_size; for(i = 0; i < num_elem; i++) { field_sizes[i] = (size_t_f)c_field_sizes[i]; field_offsets[i] = (size_t_f)c_field_offsets[i]; - } + } /* end for */ done: if(c_name) diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index cbcfa47..7f8a35f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -174,6 +174,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@ DIRECT_VFD = @DIRECT_VFD@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ @@ -235,6 +236,7 @@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ MPI_GET_SIZE = @MPI_GET_SIZE@ @@ -291,6 +293,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -401,7 +404,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 66 +LT_VERS_REVISION = 70 LT_VERS_AGE = 0 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src |