diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
commit | 6b45f5172ccb4311e0be9ae15da3758abb6b0e67 (patch) | |
tree | 5a7a112fe7a8a98c6fecb45b513789d15962eb3d /hl/fortran | |
parent | 6562465a2c2a58cfbc2f47bf60bb538f7a783933 (diff) | |
download | hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.zip hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.gz hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.bz2 |
[svn-r11245] Purpose:
Code cleanup
Description:
Trim trailing whitespace, which is making 'diff'ing the two branches
difficult.
Solution:
Ran this script in each directory:
foreach f (*.[ch] *.cpp)
sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
end
Platforms tested:
FreeBSD 4.11 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'hl/fortran')
-rw-r--r-- | hl/fortran/src/H5IMcc.c | 100 | ||||
-rw-r--r-- | hl/fortran/src/H5IMcc.h | 16 | ||||
-rwxr-xr-x | hl/fortran/src/H5IMfc.c | 132 | ||||
-rwxr-xr-x | hl/fortran/src/H5LTf90proto.h | 164 | ||||
-rwxr-xr-x | hl/fortran/src/H5LTfc.c | 234 | ||||
-rwxr-xr-x | hl/fortran/src/H5TBfc.c | 132 |
6 files changed, 389 insertions, 389 deletions
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index 192d58a..0ff802d 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -22,7 +22,7 @@ * private functions *------------------------------------------------------------------------- */ -herr_t H5IM_get_palette( hid_t loc_id, +herr_t H5IM_get_palette( hid_t loc_id, const char *image_name, int pal_number, hid_t tid, @@ -49,8 +49,8 @@ herr_t H5IM_get_palette( hid_t loc_id, *------------------------------------------------------------------------- */ -herr_t H5IMmake_image_8bitf( hid_t loc_id, - const char *dset_name, +herr_t H5IMmake_image_8bitf( hid_t loc_id, + const char *dset_name, hsize_t width, hsize_t height, int_f *buf ) @@ -58,17 +58,17 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id, hid_t did; /* dataset ID */ hid_t sid; /* space ID */ hsize_t dims[IMAGE8_RANK]; /* dimensions */ - + /* initialize the image dimensions */ - dims[0] = height; - dims[1] = width; - dims[2] = 1; + dims[0] = height; + dims[1] = width; + dims[2] = 1; /*------------------------------------------------------------------------- * create and write the dataset *------------------------------------------------------------------------- */ - + /* create the data space for the dataset. */ if ((sid=H5Screate_simple(IMAGE8_RANK,dims,NULL))<0) return -1; @@ -80,7 +80,7 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id, /* write with memory type H5T_NATIVE_INT */ /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/ /* Fail if otherwise */ - if (buf) + if (buf) { if (sizeof(int_f) == sizeof(int)) { if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0) @@ -105,7 +105,7 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id, * attach the specification attributes *------------------------------------------------------------------------- */ - + /* attach the CLASS attribute */ if ( H5LTset_attribute_string( loc_id, dset_name, "CLASS", IMAGE_CLASS ) < 0 ) return -1; @@ -139,9 +139,9 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id, * The memory datatype is H5T_NATIVE_INT. It is supposed to be called from * the FORTRAN interface where the image buffer is defined as type "integer" * - * Interlace Mode Dimensions in the Dataspace - * INTERLACE_PIXEL [height][width][pixel components] - * INTERLACE_PLANE [pixel components][height][width] + * Interlace Mode Dimensions in the Dataspace + * INTERLACE_PIXEL [height][width][pixel components] + * INTERLACE_PLANE [pixel components][height][width] * * * Modifications: @@ -149,8 +149,8 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id, *------------------------------------------------------------------------- */ -herr_t H5IMmake_image_24bitf( hid_t loc_id, - const char *dset_name, +herr_t H5IMmake_image_24bitf( hid_t loc_id, + const char *dset_name, hsize_t width, hsize_t height, const char *interlace, @@ -164,28 +164,28 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id, * attach the image dimensions according to the interlace mode *------------------------------------------------------------------------- */ - if ( strcmp( interlace, "INTERLACE_PIXEL" ) == 0 ) + if ( strcmp( interlace, "INTERLACE_PIXEL" ) == 0 ) { /* Number of color planes is defined as the third dimension */ - dims[0] = height; - dims[1] = width; - dims[2] = IMAGE24_RANK; + dims[0] = height; + dims[1] = width; + dims[2] = IMAGE24_RANK; } else - if ( strcmp( interlace, "INTERLACE_PLANE" ) == 0 ) + if ( strcmp( interlace, "INTERLACE_PLANE" ) == 0 ) { /* Number of color planes is defined as the first dimension */ - dims[0] = IMAGE24_RANK; - dims[1] = height; - dims[2] = width; + dims[0] = IMAGE24_RANK; + dims[1] = height; + dims[2] = width; } else return -1; - + /*------------------------------------------------------------------------- * create and write the dataset *------------------------------------------------------------------------- */ - + /* create the data space for the dataset. */ if ((sid=H5Screate_simple(IMAGE24_RANK,dims,NULL))<0) return -1; @@ -195,7 +195,7 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id, return -1; /* write with memory type H5T_NATIVE_INT */ - if (buf) + if (buf) { if (sizeof(int_f) == sizeof(int)) { if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0) @@ -263,11 +263,11 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id, *------------------------------------------------------------------------- */ -herr_t H5IMread_imagef( hid_t loc_id, - const char *dset_name, +herr_t H5IMread_imagef( hid_t loc_id, + const char *dset_name, int_f *buf ) { - hid_t did; + hid_t did; /* open the dataset */ if ( (did = H5Dopen( loc_id, dset_name )) < 0 ) @@ -314,7 +314,7 @@ out: * The memory datatype is H5T_NATIVE_INT. It is supposed to be called from * the FORTRAN interface where the image buffer is defined as type "integer" * - * based on HDF5 Image and Palette Specification + * based on HDF5 Image and Palette Specification * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: @@ -322,20 +322,20 @@ out: *------------------------------------------------------------------------- */ -herr_t H5IMmake_palettef( hid_t loc_id, +herr_t H5IMmake_palettef( hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, - int_f *pal_data ) + int_f *pal_data ) + +{ -{ - hid_t did; /* dataset ID */ hid_t sid; /* space ID */ int has_pal; - + /* Check if the dataset already exists */ has_pal = H5LTfind_dataset( loc_id, pal_name ); - + /* It exists. Return */ if ( has_pal == 1 ) return 0; @@ -344,7 +344,7 @@ herr_t H5IMmake_palettef( hid_t loc_id, * create and write the dataset *------------------------------------------------------------------------- */ - + /* create the data space for the dataset. */ if ((sid=H5Screate_simple(2,pal_dims,NULL))<0) return -1; @@ -354,7 +354,7 @@ herr_t H5IMmake_palettef( hid_t loc_id, return -1; /* write with memory type H5T_NATIVE_INT */ - if (pal_data) + if (pal_data) { if (sizeof(int_f) == sizeof(int)) { if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,pal_data)<0) @@ -387,7 +387,7 @@ herr_t H5IMmake_palettef( hid_t loc_id, /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/ if ( H5LTset_attribute_string( loc_id, pal_name, "PAL_VERSION", "1.2" ) < 0 ) return -1; - + return 0; } @@ -409,7 +409,7 @@ herr_t H5IMmake_palettef( hid_t loc_id, * The memory datatype is H5T_NATIVE_INT. It is supposed to be called from * the FORTRAN interface where the image buffer is defined as type "integer" * - * based on HDF5 Image and Palette Specification + * based on HDF5 Image and Palette Specification * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: @@ -417,7 +417,7 @@ herr_t H5IMmake_palettef( hid_t loc_id, *------------------------------------------------------------------------- */ -herr_t H5IMget_palettef( hid_t loc_id, +herr_t H5IMget_palettef( hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data ) @@ -447,19 +447,19 @@ herr_t H5IMget_palettef( hid_t loc_id, * Comments: * This function allows reading of an 8bit palette from disk disk * to memory type TID - * The memory datatype can be H5T_NATIVE_INT or H5T_NATIVE_UCHAR currently. + * The memory datatype can be H5T_NATIVE_INT or H5T_NATIVE_UCHAR currently. * the H5T_NATIVE_INT is supposed to be called from * the FORTRAN interface where the image buffer is defined as type "integer" * * Comments: - * based on HDF5 Image and Palette Specification + * based on HDF5 Image and Palette Specification * http://hdf.ncsa.uiuc.edu/HDF5/H5Image/ImageSpec.html * * Modifications: * *------------------------------------------------------------------------- */ -herr_t H5IM_get_palette( hid_t loc_id, +herr_t H5IM_get_palette( hid_t loc_id, const char *image_name, int pal_number, hid_t tid, @@ -488,7 +488,7 @@ herr_t H5IM_get_palette( hid_t loc_id, if ( (attr_id = H5Aopen_name( image_id, "PALETTE" )) < 0 ) goto out; - + if ( (attr_type = H5Aget_type( attr_id )) < 0 ) goto out; @@ -528,13 +528,13 @@ herr_t H5IM_get_palette( hid_t loc_id, goto out; free( refbuf ); - - } /* H5T_REFERENCE */ - - if ( H5Tclose( attr_type ) < 0 ) + + } /* H5T_REFERENCE */ + + if ( H5Tclose( attr_type ) < 0 ) goto out; - /* Close the attribute. */ + /* Close the attribute. */ if ( H5Aclose( attr_id ) < 0 ) goto out; diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h index 32c79ff..d568d73 100644 --- a/hl/fortran/src/H5IMcc.h +++ b/hl/fortran/src/H5IMcc.h @@ -31,29 +31,29 @@ extern "C" { -herr_t H5IMmake_image_8bitf( hid_t loc_id, - const char *dset_name, +herr_t H5IMmake_image_8bitf( hid_t loc_id, + const char *dset_name, hsize_t width, hsize_t height, int_f *buf ); -herr_t H5IMmake_image_24bitf( hid_t loc_id, - const char *dset_name, +herr_t H5IMmake_image_24bitf( hid_t loc_id, + const char *dset_name, hsize_t width, hsize_t height, const char *interlace, int_f *buf); -herr_t H5IMread_imagef( hid_t loc_id, - const char *dset_name, +herr_t H5IMread_imagef( hid_t loc_id, + const char *dset_name, int_f *buf ); -herr_t H5IMmake_palettef( hid_t loc_id, +herr_t H5IMmake_palettef( hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, int_f *pal_data ); -herr_t H5IMget_palettef( hid_t loc_id, +herr_t H5IMget_palettef( hid_t loc_id, const char *image_name, int pal_number, int_f *pal_data ); diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c index 7d09f10..822dbe6 100755 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -22,7 +22,7 @@ /*------------------------------------------------------------------------- * Function: h5immake_image_8bit_c * - * Purpose: Call H5IMmake_image_8bit + * Purpose: Call H5IMmake_image_8bit * * Return: Success: 0, Failure: -1 * @@ -39,11 +39,11 @@ */ int_f -nh5immake_image_8bit_c (hid_t_f *loc_id, +nh5immake_image_8bit_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *width, - hsize_t_f *height, + hsize_t_f *height, int_f *buf) { int ret_value = -1; @@ -56,7 +56,7 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -68,12 +68,12 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imread_image_c * - * Purpose: Call H5IMread_image + * Purpose: Call H5IMread_image * * Return: Success: 0, Failure: -1 * @@ -90,9 +90,9 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, */ int_f -nh5imread_image_c (hid_t_f *loc_id, +nh5imread_image_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *buf) { int ret_value = -1; @@ -106,7 +106,7 @@ nh5imread_image_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -119,12 +119,12 @@ nh5imread_image_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5immake_image_24bit_c * - * Purpose: Call H5IMmake_image_24bit + * Purpose: Call H5IMmake_image_24bit * * Return: Success: 0, Failure: -1 * @@ -141,11 +141,11 @@ nh5imread_image_c (hid_t_f *loc_id, */ int_f -nh5immake_image_24bit_c (hid_t_f *loc_id, +nh5immake_image_24bit_c (hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *ilen, - _fcd il, + _fcd il, hsize_t_f *width, hsize_t_f *height, void *buf) @@ -162,11 +162,11 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_ilen = *ilen; - c_il = (char *)HD5f2cstring(il, c_ilen); + c_il = (char *)HD5f2cstring(il, c_ilen); if (c_il == NULL) return ret_value; /* @@ -179,12 +179,12 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imget_image_info_c * - * Purpose: Call H5IMget_image_info + * Purpose: Call H5IMget_image_info * * Return: Success: 0, Failure: -1 * @@ -201,7 +201,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, */ int_f -nh5imget_image_info_c(hid_t_f *loc_id, +nh5imget_image_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *width, @@ -226,7 +226,7 @@ nh5imget_image_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -239,14 +239,14 @@ nh5imget_image_info_c(hid_t_f *loc_id, * Call H5IMget_image_info function. */ c_loc_id = (hid_t)*loc_id; - + ret = H5IMget_image_info(c_loc_id,c_name,&c_width,&c_height,&c_planes,c_buf,&c_npals); *width = (hsize_t_f) c_width; *height = (hsize_t_f) c_height; *planes = (hsize_t_f) c_planes; *npals = (hsize_t_f) c_npals; - + /* * Convert C name to FORTRAN and place it in the given buffer @@ -254,11 +254,11 @@ nh5imget_image_info_c(hid_t_f *loc_id, HD5packFstring(c_buf, _fcdtocp(interlace), (size_t)*ilen); if(c_buf) free(c_buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- @@ -281,7 +281,7 @@ nh5imget_image_info_c(hid_t_f *loc_id, */ int_f -nh5imis_image_c(hid_t_f *loc_id, +nh5imis_image_c(hid_t_f *loc_id, int_f *namelen, _fcd name) { @@ -293,7 +293,7 @@ nh5imis_image_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return -1; /* @@ -302,14 +302,14 @@ nh5imis_image_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; return( H5IMis_image(c_loc_id, c_name)); - -} + +} /*------------------------------------------------------------------------- * Function: h5immake_palette_c * - * Purpose: Call H5IMmake_palette + * Purpose: Call H5IMmake_palette * * Return: Success: 0, Failure: -1 * @@ -326,9 +326,9 @@ nh5imis_image_c(hid_t_f *loc_id, */ int_f -nh5immake_palette_c (hid_t_f *loc_id, +nh5immake_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *dims, void *buf) { @@ -345,7 +345,7 @@ nh5immake_palette_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_dims = malloc(sizeof(hsize_t) * (rank )); @@ -367,13 +367,13 @@ nh5immake_palette_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imlink_palette_c * - * Purpose: Call H5IMlink_palette + * Purpose: Call H5IMlink_palette * * Return: Success: 0, Failure: -1 * @@ -390,9 +390,9 @@ nh5immake_palette_c (hid_t_f *loc_id, */ int_f -nh5imlink_palette_c (hid_t_f *loc_id, +nh5imlink_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *ilen, _fcd pal_name) { @@ -409,11 +409,11 @@ nh5imlink_palette_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelenpal = *ilen; - c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); + c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); if (c_namepal == NULL) return ret_value; /* @@ -427,13 +427,13 @@ nh5imlink_palette_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imunlink_palette_c * - * Purpose: Call H5IMunlink_palette + * Purpose: Call H5IMunlink_palette * * Return: Success: 0, Failure: -1 * @@ -450,9 +450,9 @@ nh5imlink_palette_c (hid_t_f *loc_id, */ int_f -nh5imunlink_palette_c (hid_t_f *loc_id, +nh5imunlink_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *ilen, _fcd pal_name) { @@ -469,11 +469,11 @@ nh5imunlink_palette_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelenpal = *ilen; - c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); + c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); if (c_namepal == NULL) return ret_value; /* @@ -487,14 +487,14 @@ nh5imunlink_palette_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} - +} + /*------------------------------------------------------------------------- * Function: h5imget_npalettes_c * - * Purpose: Call H5IMget_npalettes + * Purpose: Call H5IMget_npalettes * * Return: Success: 0, Failure: -1 * @@ -511,7 +511,7 @@ nh5imunlink_palette_c (hid_t_f *loc_id, */ int_f -nh5imget_npalettes_c(hid_t_f *loc_id, +nh5imget_npalettes_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *npals) @@ -527,7 +527,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -538,18 +538,18 @@ nh5imget_npalettes_c(hid_t_f *loc_id, ret = H5IMget_npalettes(c_loc_id,c_name,&c_npals); *npals = (hsize_t_f) c_npals; - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imget_palette_info_c * - * Purpose: Call H5IMget_palette_info + * Purpose: Call H5IMget_palette_info * * Return: Success: 0, Failure: -1 * @@ -567,7 +567,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, int_f -nh5imget_palette_info_c(hid_t_f *loc_id, +nh5imget_palette_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *pal_number, @@ -585,7 +585,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -599,17 +599,17 @@ nh5imget_palette_info_c(hid_t_f *loc_id, dims[i] = (hsize_t_f) c_dims[i]; } - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5imget_palette_c * - * Purpose: Call H5IMget_palette + * Purpose: Call H5IMget_palette * * Return: Success: 0, Failure: -1 * @@ -627,7 +627,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, int_f -nh5imget_palette_c(hid_t_f *loc_id, +nh5imget_palette_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *pal_number, @@ -643,7 +643,7 @@ nh5imget_palette_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -652,13 +652,13 @@ nh5imget_palette_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} + - /*------------------------------------------------------------------------- * Function: h5imis_palette_c * @@ -679,7 +679,7 @@ nh5imget_palette_c(hid_t_f *loc_id, */ int_f -nh5imis_palette_c(hid_t_f *loc_id, +nh5imis_palette_c(hid_t_f *loc_id, int_f *namelen, _fcd name) { @@ -691,7 +691,7 @@ nh5imis_palette_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return -1; /* @@ -700,5 +700,5 @@ nh5imis_palette_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; return( H5IMis_palette(c_loc_id, c_name)); - -} + +} diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h index cae95cf..81c30a4 100755 --- a/hl/fortran/src/H5LTf90proto.h +++ b/hl/fortran/src/H5LTf90proto.h @@ -18,7 +18,7 @@ #include "H5public.h" #include "H5f90i.h" -#include <stdlib.h> +#include <stdlib.h> #include <string.h> @@ -82,118 +82,118 @@ 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 +H5_DLL int_f -nh5ltmake_dataset_c (hid_t_f *loc_id, +nh5ltmake_dataset_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, - int_f *rank, + _fcd name, + int_f *rank, hsize_t_f *dims, - hid_t_f *type_id, + hid_t_f *type_id, void *buf); -H5_DLL +H5_DLL int_f -nh5ltread_dataset_c (hid_t_f *loc_id, +nh5ltread_dataset_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, - hid_t_f *type_id, + _fcd name, + hid_t_f *type_id, void *buf, hsize_t_f *dims); H5_DLL int_f -nh5ltset_attribute_int_c(hid_t_f *loc_id, +nh5ltset_attribute_int_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf); H5_DLL int_f -nh5ltset_attribute_float_c(hid_t_f *loc_id, +nh5ltset_attribute_float_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf); H5_DLL int_f -nh5ltset_attribute_double_c(hid_t_f *loc_id, +nh5ltset_attribute_double_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf); H5_DLL int_f -nh5ltset_attribute_string_c(hid_t_f *loc_id, +nh5ltset_attribute_string_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf); H5_DLL int_f -nh5ltget_attribute_int_c(hid_t_f *loc_id, +nh5ltget_attribute_int_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf); H5_DLL int_f -nh5ltget_attribute_float_c(hid_t_f *loc_id, +nh5ltget_attribute_float_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf); H5_DLL int_f -nh5ltget_attribute_double_c(hid_t_f *loc_id, +nh5ltget_attribute_double_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf); H5_DLL int_f -nh5ltget_attribute_string_c(hid_t_f *loc_id, +nh5ltget_attribute_string_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf); H5_DLL int_f -nh5ltget_dataset_ndims_c(hid_t_f *loc_id, +nh5ltget_dataset_ndims_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *rank); H5_DLL int_f -nh5ltfind_dataset_c(hid_t_f *loc_id, +nh5ltfind_dataset_c(hid_t_f *loc_id, int_f *namelen, _fcd name); H5_DLL int_f -nh5ltget_dataset_info_c(hid_t_f *loc_id, +nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *dims, @@ -202,35 +202,35 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, H5_DLL int_f -nh5ltget_attribute_ndims_c(hid_t_f *loc_id, +nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, int_f *rank); H5_DLL int_f -nh5ltget_attribute_info_c(hid_t_f *loc_id, +nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, hsize_t_f *dims, int_f *type_class, size_t_f *type_size); H5_DLL int_f -nh5ltmake_dataset_string_c (hid_t_f *loc_id, +nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, char *buf); H5_DLL int_f -nh5ltread_dataset_string_c (hid_t_f *loc_id, +nh5ltread_dataset_string_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, char *buf); /*------------------------------------------------------------------------- @@ -240,32 +240,32 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, H5_DLL int_f -nh5immake_image_8bit_c (hid_t_f *loc_id, +nh5immake_image_8bit_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *width, - hsize_t_f *height, + hsize_t_f *height, int_f *buf); H5_DLL int_f -nh5imread_image_c (hid_t_f *loc_id, +nh5imread_image_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *buf); H5_DLL int_f -nh5immake_image_24bit_c (hid_t_f *loc_id, +nh5immake_image_24bit_c (hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *ilen, - _fcd il, + _fcd il, hsize_t_f *width, hsize_t_f *height, void *buf); H5_DLL int_f -nh5imget_image_info_c(hid_t_f *loc_id, +nh5imget_image_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *width, @@ -278,38 +278,38 @@ nh5imget_image_info_c(hid_t_f *loc_id, H5_DLL int_f -nh5imis_image_c(hid_t_f *loc_id, +nh5imis_image_c(hid_t_f *loc_id, int_f *namelen, _fcd name); H5_DLL int_f -nh5immake_palette_c (hid_t_f *loc_id, +nh5immake_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *dims, void *buf); H5_DLL int_f -nh5imlink_palette_c (hid_t_f *loc_id, +nh5imlink_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *ilen, _fcd pal_name); H5_DLL int_f -nh5imunlink_palette_c (hid_t_f *loc_id, +nh5imunlink_palette_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *ilen, _fcd pal_name); H5_DLL int_f -nh5imget_npalettes_c(hid_t_f *loc_id, +nh5imget_npalettes_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *npals); @@ -317,7 +317,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, H5_DLL int_f -nh5imget_palette_info_c(hid_t_f *loc_id, +nh5imget_palette_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *pal_number, @@ -325,7 +325,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, H5_DLL int_f -nh5imget_palette_c(hid_t_f *loc_id, +nh5imget_palette_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *pal_number, @@ -333,7 +333,7 @@ nh5imget_palette_c(hid_t_f *loc_id, H5_DLL int_f -nh5imis_palette_c(hid_t_f *loc_id, +nh5imis_palette_c(hid_t_f *loc_id, int_f *namelen, _fcd name); @@ -348,9 +348,9 @@ H5_DLL int_f nh5tbmake_table_c(int_f *namelen1, _fcd name1, - hid_t_f *loc_id, + hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, @@ -363,9 +363,9 @@ nh5tbmake_table_c(int_f *namelen1, H5_DLL int_f -nh5tbwrite_field_name_c(hid_t_f *loc_id, +nh5tbwrite_field_name_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *namelen1, _fcd field_name, hsize_t_f *start, @@ -375,9 +375,9 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbread_field_name_c(hid_t_f *loc_id, +nh5tbread_field_name_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *namelen1, _fcd field_name, hsize_t_f *start, @@ -387,9 +387,9 @@ nh5tbread_field_name_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbwrite_field_index_c(hid_t_f *loc_id, +nh5tbwrite_field_index_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, @@ -398,9 +398,9 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbread_field_index_c(hid_t_f *loc_id, +nh5tbread_field_index_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, @@ -409,7 +409,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbinsert_field_c(hid_t_f *loc_id, +nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *namelen1, @@ -420,7 +420,7 @@ nh5tbinsert_field_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbdelete_field_c(hid_t_f *loc_id, +nh5tbdelete_field_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *namelen1, @@ -429,17 +429,17 @@ nh5tbdelete_field_c(hid_t_f *loc_id, H5_DLL int_f -nh5tbget_table_info_c(hid_t_f *loc_id, +nh5tbget_table_info_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords); H5_DLL int_f -nh5tbget_field_info_c(hid_t_f *loc_id, +nh5tbget_field_info_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, size_t_f *field_sizes, size_t_f *field_offsets, diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 6078b23..693eca9 100755 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -22,7 +22,7 @@ /*------------------------------------------------------------------------- * Function: H5LTmake_dataset_c * - * Purpose: Call H5LTmake_dataset + * Purpose: Call H5LTmake_dataset * * Return: Success: 0, Failure: -1 * @@ -39,12 +39,12 @@ */ int_f -nh5ltmake_dataset_c (hid_t_f *loc_id, +nh5ltmake_dataset_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, - int_f *rank, + _fcd name, + int_f *rank, hsize_t_f *dims, - hid_t_f *type_id, + hid_t_f *type_id, void *buf) { int ret_value = -1; @@ -60,7 +60,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_dims = malloc(sizeof(hsize_t) * (*rank )); @@ -82,17 +82,17 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, ret = H5LTmake_dataset(c_loc_id, c_name, *rank, c_dims, c_type_id, buf ); free (c_dims); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTread_dataset_c * - * Purpose: Call H5LTmake_dataset + * Purpose: Call H5LTmake_dataset * * Return: Success: 0, Failure: -1 * @@ -109,10 +109,10 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, */ int_f -nh5ltread_dataset_c (hid_t_f *loc_id, +nh5ltread_dataset_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, - hid_t_f *type_id, + _fcd name, + hid_t_f *type_id, void *buf, hsize_t_f *dims) { @@ -127,7 +127,7 @@ nh5ltread_dataset_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -141,13 +141,13 @@ nh5ltread_dataset_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTmake_dataset_string_c * - * Purpose: Call H5LTmake_dataset + * Purpose: Call H5LTmake_dataset * * Return: Success: 0, Failure: -1 * @@ -164,9 +164,9 @@ nh5ltread_dataset_c (hid_t_f *loc_id, */ int_f -nh5ltmake_dataset_string_c (hid_t_f *loc_id, +nh5ltmake_dataset_string_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, char *buf) { int ret_value = -1; @@ -179,7 +179,7 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -192,13 +192,13 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTread_dataset_string_c * - * Purpose: Call H5LTread_dataset_string + * Purpose: Call H5LTread_dataset_string * * Return: Success: 0, Failure: -1 * @@ -215,9 +215,9 @@ nh5ltmake_dataset_string_c (hid_t_f *loc_id, */ int_f -nh5ltread_dataset_string_c (hid_t_f *loc_id, +nh5ltread_dataset_string_c (hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, char *buf) { int ret_value = -1; @@ -230,7 +230,7 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -243,14 +243,14 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} - +} + /*------------------------------------------------------------------------- * Function: H5LTset_attribute_int_c * - * Purpose: Call H5LTset_attribute_int + * Purpose: Call H5LTset_attribute_int * * Return: Success: 0, Failure: -1 * @@ -267,11 +267,11 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id, */ int_f -nh5ltset_attribute_int_c(hid_t_f *loc_id, +nh5ltset_attribute_int_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf) { @@ -288,11 +288,11 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -301,7 +301,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; c_size = (size_t)*size; - if (sizeof(int_f) == sizeof(int)) + if (sizeof(int_f) == sizeof(int)) ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,buf,c_size); else if (sizeof(int_f) == sizeof(long)) ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,buf,c_size); @@ -313,7 +313,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTset_attribute_float_c @@ -335,11 +335,11 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, */ int_f -nh5ltset_attribute_float_c(hid_t_f *loc_id, +nh5ltset_attribute_float_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf) { @@ -356,11 +356,11 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = *attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -370,11 +370,11 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, c_size = (size_t)*size; ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,buf,c_size); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- @@ -397,11 +397,11 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, */ int_f -nh5ltset_attribute_double_c(hid_t_f *loc_id, +nh5ltset_attribute_double_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, size_t_f *size, void *buf) { @@ -418,11 +418,11 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = *attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -432,11 +432,11 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, c_size = (size_t)*size; ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,buf,c_size); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTset_attribute_string_c @@ -458,11 +458,11 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, */ int_f -nh5ltset_attribute_string_c(hid_t_f *loc_id, +nh5ltset_attribute_string_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf) { int ret_value = -1; @@ -477,11 +477,11 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = *attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -490,16 +490,16 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTset_attribute_string(c_loc_id,c_name,c_attrname,buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTget_attribute_int_c * - * Purpose: Call H5LTget_attribute_int + * Purpose: Call H5LTget_attribute_int * * Return: Success: 0, Failure: -1 * @@ -516,11 +516,11 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_int_c(hid_t_f *loc_id, +nh5ltget_attribute_int_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf) { int ret_value = -1; @@ -535,18 +535,18 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* * Call H5LTget_attribute_int function. */ c_loc_id = (hid_t)*loc_id; - + if(sizeof(int_f) == sizeof(int)) ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,buf); else if (sizeof(int_f) == sizeof(long)) @@ -555,17 +555,17 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,buf); else return ret_value; - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTget_attribute_float_c * - * Purpose: Call H5LTget_attribute_float + * Purpose: Call H5LTget_attribute_float * * Return: Success: 0, Failure: -1 * @@ -582,11 +582,11 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_float_c(hid_t_f *loc_id, +nh5ltget_attribute_float_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf) { int ret_value = -1; @@ -601,11 +601,11 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -614,16 +614,16 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTget_attribute_double_c * - * Purpose: Call H5LTget_attribute_double + * Purpose: Call H5LTget_attribute_double * * Return: Success: 0, Failure: -1 * @@ -640,11 +640,11 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_double_c(hid_t_f *loc_id, +nh5ltget_attribute_double_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf) { int ret_value = -1; @@ -659,11 +659,11 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -672,16 +672,16 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTget_attribute_string_c * - * Purpose: Call H5LTget_attribute_string + * Purpose: Call H5LTget_attribute_string * * Return: Success: 0, Failure: -1 * @@ -698,11 +698,11 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_string_c(hid_t_f *loc_id, +nh5ltget_attribute_string_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, void *buf) { int ret_value = -1; @@ -717,11 +717,11 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -730,17 +730,17 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_attribute_string(c_loc_id,c_name,c_attrname,buf); - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: H5LTget_dataset_ndims_c * - * Purpose: Call H5LTget_dataset_ndims + * Purpose: Call H5LTget_dataset_ndims * * Return: Success: 0, Failure: -1 * @@ -757,9 +757,9 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, */ int_f -nh5ltget_dataset_ndims_c(hid_t_f *loc_id, +nh5ltget_dataset_ndims_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *rank) { int ret_value = -1; @@ -773,7 +773,7 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -782,12 +782,12 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank); - + if (ret < 0) return ret_value; *rank = (int_f)c_rank; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- @@ -810,7 +810,7 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, */ int_f -nh5ltfind_dataset_c(hid_t_f *loc_id, +nh5ltfind_dataset_c(hid_t_f *loc_id, int_f *namelen, _fcd name) { @@ -822,7 +822,7 @@ nh5ltfind_dataset_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return -1; /* @@ -831,13 +831,13 @@ nh5ltfind_dataset_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; return( H5LTfind_dataset(c_loc_id, c_name)); - -} + +} /*------------------------------------------------------------------------- * Function: h5ltget_dataset_info_c * - * Purpose: Call H5LTget_dataset_info + * Purpose: Call H5LTget_dataset_info * * Return: Success: 0, Failure: -1 * @@ -854,7 +854,7 @@ nh5ltfind_dataset_c(hid_t_f *loc_id, */ int_f -nh5ltget_dataset_info_c(hid_t_f *loc_id, +nh5ltget_dataset_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, hsize_t_f *dims, @@ -875,7 +875,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -891,16 +891,16 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, dims[i] = (hsize_t_f) c_dims[i]; } - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5ltget_attribute_ndims_c * - * Purpose: Call H5LTget_attribute_ndims + * Purpose: Call H5LTget_attribute_ndims * * Return: Success: 0, Failure: -1 * @@ -917,11 +917,11 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_ndims_c(hid_t_f *loc_id, +nh5ltget_attribute_ndims_c(hid_t_f *loc_id, int_f *namelen, - _fcd dsetname, + _fcd dsetname, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, int_f *rank) { int ret_value = -1; @@ -937,11 +937,11 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen =(int) *namelen; - c_name = (char *)HD5f2cstring(dsetname, c_namelen); + c_name = (char *)HD5f2cstring(dsetname, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -950,18 +950,18 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank); - + if (ret < 0) return ret_value; *rank = (int_f)c_rank; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5ltget_attribute_info_c * - * Purpose: Call H5LTget_attribute_info + * Purpose: Call H5LTget_attribute_info * * Return: Success: 0, Failure: -1 * @@ -978,11 +978,11 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, */ int_f -nh5ltget_attribute_info_c(hid_t_f *loc_id, +nh5ltget_attribute_info_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *attrnamelen, - _fcd attrname, + _fcd attrname, hsize_t_f *dims, int_f *type_class, size_t_f *type_size) @@ -1003,11 +1003,11 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = (int)*namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_attrnamelen = (int)*attrnamelen; - c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); + c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); if (c_attrname == NULL) return ret_value; /* @@ -1023,8 +1023,8 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, dims[i] = (hsize_t_f) c_dims[i]; } - + if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c index 6af79db..56515b1 100755 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -20,7 +20,7 @@ /*------------------------------------------------------------------------- * Function: h5tbmake_table_c * - * Purpose: Call H5TBmake_table + * Purpose: Call H5TBmake_table * * Return: Success: 0, Failure: -1 * @@ -38,9 +38,9 @@ int_f nh5tbmake_table_c(int_f *namelen1, _fcd name1, - hid_t_f *loc_id, + hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, hsize_t_f *nrecords, size_t_f *type_size, @@ -66,7 +66,7 @@ nh5tbmake_table_c(int_f *namelen1, hsize_t c_chunk_size = *chunk_size; size_t c_type_size = *type_size; size_t *c_field_offset; - hid_t *c_field_types; + hid_t *c_field_types; char **c_field_names; char *tmp, *tmp_p; @@ -80,11 +80,11 @@ nh5tbmake_table_c(int_f *namelen1, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelen1 = *namelen1; - c_name1 = (char *)HD5f2cstring(name1, c_namelen1); + c_name1 = (char *)HD5f2cstring(name1, c_namelen1); if (c_name1 == NULL) return ret_value; c_field_offset = (size_t*)malloc(sizeof(size_t) * (size_t)c_nfields); @@ -101,12 +101,12 @@ nh5tbmake_table_c(int_f *namelen1, /* * Allocate array of character pointers */ - c_field_names = (char **)malloc((size_t)num_elem * sizeof(char *)); + c_field_names = (char **)malloc((size_t)num_elem * sizeof(char *)); if (c_field_names == NULL) return ret_value; /* Copy data to long C string */ tmp = (char *)HD5f2cstring(field_names, (int)(max_len*num_elem)); - if (tmp == NULL) { + if (tmp == NULL) { free(c_field_names); return ret_value; } @@ -118,7 +118,7 @@ nh5tbmake_table_c(int_f *namelen1, for (i=0; i < num_elem; i++) { c_field_names[i] = (char *) malloc((size_t)namelen2[i]+1); memcpy(c_field_names[i], tmp_p, (size_t)namelen2[i]); - c_field_names[i][namelen2[i]] = '\0'; + c_field_names[i][namelen2[i]] = '\0'; tmp_p = tmp_p + max_len; } @@ -140,7 +140,7 @@ nh5tbmake_table_c(int_f *namelen1, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} @@ -148,7 +148,7 @@ nh5tbmake_table_c(int_f *namelen1, /*------------------------------------------------------------------------- * Function: h5tbwrite_field_name_c * - * Purpose: Call H5TBwrite_fields_name + * Purpose: Call H5TBwrite_fields_name * * Return: Success: 0, Failure: -1 * @@ -165,15 +165,15 @@ nh5tbmake_table_c(int_f *namelen1, */ int_f -nh5tbwrite_field_name_c(hid_t_f *loc_id, +nh5tbwrite_field_name_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, - void *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -194,11 +194,11 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelen1 = *namelen1; - c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); + c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); if (c_name1 == NULL) return ret_value; /* @@ -211,13 +211,13 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbread_field_name_c * - * Purpose: Call H5TBread_fields_name + * Purpose: Call H5TBread_fields_name * * Return: Success: 0, Failure: -1 * @@ -234,15 +234,15 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id, */ int_f -nh5tbread_field_name_c(hid_t_f *loc_id, +nh5tbread_field_name_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *namelen1, _fcd field_name, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, - void *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -263,11 +263,11 @@ nh5tbread_field_name_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelen1 = *namelen1; - c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); + c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); if (c_name1 == NULL) return ret_value; /* @@ -280,14 +280,14 @@ nh5tbread_field_name_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbwrite_field_index_c * - * Purpose: Call H5TBwrite_fields_index + * Purpose: Call H5TBwrite_fields_index * * Return: Success: 0, Failure: -1 * @@ -304,14 +304,14 @@ nh5tbread_field_name_c(hid_t_f *loc_id, */ int_f -nh5tbwrite_field_index_c(hid_t_f *loc_id, +nh5tbwrite_field_index_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, - void *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -332,7 +332,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; @@ -346,13 +346,13 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbread_field_index_c * - * Purpose: Call H5TBread_fields_index + * Purpose: Call H5TBread_fields_index * * Return: Success: 0, Failure: -1 * @@ -369,14 +369,14 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id, */ int_f -nh5tbread_field_index_c(hid_t_f *loc_id, +nh5tbread_field_index_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, int_f *field_index, hsize_t_f *start, hsize_t_f *nrecords, size_t_f *type_size, - void *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -397,7 +397,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -410,13 +410,13 @@ nh5tbread_field_index_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbinsert_field_c * - * Purpose: Call H5TBinsert_field + * Purpose: Call H5TBinsert_field * * Return: Success: 0, Failure: -1 * @@ -431,16 +431,16 @@ nh5tbread_field_index_c(hid_t_f *loc_id, * *------------------------------------------------------------------------- */ - + int_f -nh5tbinsert_field_c(hid_t_f *loc_id, +nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *namelen1, _fcd field_name, hid_t_f *field_type, int_f *position, - void *buf) + void *buf) { int ret_value = -1; herr_t ret; @@ -456,11 +456,11 @@ nh5tbinsert_field_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelen1 = *namelen1; - c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); + c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); if (c_name1 == NULL) return ret_value; /* @@ -472,13 +472,13 @@ nh5tbinsert_field_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbdelete_field_c * - * Purpose: Call H5TBdelete_field + * Purpose: Call H5TBdelete_field * * Return: Success: 0, Failure: -1 * @@ -493,13 +493,13 @@ nh5tbinsert_field_c(hid_t_f *loc_id, * *------------------------------------------------------------------------- */ - + int_f -nh5tbdelete_field_c(hid_t_f *loc_id, +nh5tbdelete_field_c(hid_t_f *loc_id, int_f *namelen, _fcd name, int_f *namelen1, - _fcd field_name) + _fcd field_name) { int ret_value = -1; herr_t ret; @@ -513,11 +513,11 @@ nh5tbdelete_field_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; c_namelen1 = *namelen1; - c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); + c_name1 = (char *)HD5f2cstring(field_name, c_namelen1); if (c_name1 == NULL) return ret_value; /* @@ -529,14 +529,14 @@ nh5tbdelete_field_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} - +} + /*------------------------------------------------------------------------- * Function: h5tbget_table_info_c * - * Purpose: Call H5TBread_fields_index + * Purpose: Call H5TBread_fields_index * * Return: Success: 0, Failure: -1 * @@ -553,11 +553,11 @@ nh5tbdelete_field_c(hid_t_f *loc_id, */ int_f -nh5tbget_table_info_c(hid_t_f *loc_id, +nh5tbget_table_info_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, - hsize_t_f *nrecords) + hsize_t_f *nrecords) { int ret_value = -1; herr_t ret; @@ -571,7 +571,7 @@ nh5tbget_table_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -586,14 +586,14 @@ nh5tbget_table_info_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*------------------------------------------------------------------------- * Function: h5tbget_field_info_c * - * Purpose: Call H5TBget_field_info + * Purpose: Call H5TBget_field_info * * Return: Success: 0, Failure: -1 * @@ -609,16 +609,16 @@ nh5tbget_table_info_c(hid_t_f *loc_id, *------------------------------------------------------------------------- */ int_f -nh5tbget_field_info_c(hid_t_f *loc_id, +nh5tbget_field_info_c(hid_t_f *loc_id, int_f *namelen, - _fcd name, + _fcd name, hsize_t_f *nfields, size_t_f *field_sizes, size_t_f *field_offsets, size_t_f *type_size, int_f *namelen2, /* field_names lenghts */ _fcd field_names) /* field_names */ - + { int ret_value = -1; herr_t ret; @@ -647,7 +647,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id, * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; @@ -659,7 +659,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id, c_field_names = malloc( sizeof(char*) * (size_t)c_nfields ); if (!c_field_names) return ret_value; - for ( i = 0; i < c_nfields; i++) + for ( i = 0; i < c_nfields; i++) { c_field_names[i] = malloc( sizeof(char) * HLTB_MAX_FIELD_LEN ); } @@ -683,12 +683,12 @@ nh5tbget_field_info_c(hid_t_f *loc_id, namelen2[i] = (int_f)strlen(c_field_names[i]); length = MAX(length, strlen(c_field_names[i])); tmp_p = tmp_p + c_lenmax; - } + } 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++) + 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]; @@ -709,5 +709,5 @@ nh5tbget_field_info_c(hid_t_f *loc_id, if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} |