summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-04-29 06:20:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-04-29 06:20:50 (GMT)
commitcc5b2ff93bc5b81993c104e64f3669a4d8f0c0a5 (patch)
tree67198d5997628d5a6640a7862ec5c96794e97244 /hl/fortran
parent27496ae0c7b8b1be7165d3720711b15c3a2d1288 (diff)
downloadhdf5-cc5b2ff93bc5b81993c104e64f3669a4d8f0c0a5.zip
hdf5-cc5b2ff93bc5b81993c104e64f3669a4d8f0c0a5.tar.gz
hdf5-cc5b2ff93bc5b81993c104e64f3669a4d8f0c0a5.tar.bz2
[svn-r12314] Purpose:
Code cleanup Description: Big clean up on high-level library code, including: - Removing include of HDF5 private header file(!) - Reduce number of compiler warnings - Untangle header files, etc. Platforms tested: FreeBSD 4.11 (sleipnir) w/C++ Linux 2.4/64 (mir) w/C++ & FORTRAN
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/src/H5IMcc.c3
-rwxr-xr-xhl/fortran/src/H5IMfc.c6
-rwxr-xr-xhl/fortran/src/H5TBfc.c8
3 files changed, 6 insertions, 11 deletions
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 19a99ba..b2e487c 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -12,10 +12,7 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "H5IMprivate.h"
#include "H5IMcc.h"
-#include "H5f90i_gen.h"
-
#include <string.h>
#include <stdlib.h>
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index 0062d60..a680e17 100755
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -14,10 +14,8 @@
/* This files contains C stubs for H5D Fortran APIs */
-#include "H5IMprivate.h"
#include "H5IMcc.h"
#include "H5LTf90proto.h"
-#include "../../../fortran/src/H5f90i_gen.h"
/*-------------------------------------------------------------------------
@@ -64,7 +62,7 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
* Call H5IMmake_image_8bitf function.
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5IMmake_image_8bitf(c_loc_id,c_name,*width,*height,buf);
+ ret = H5IMmake_image_8bitf(c_loc_id,c_name,(hsize_t)*width,(hsize_t)*height,buf);
if (ret < 0) return ret_value;
ret_value = 0;
@@ -175,7 +173,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5IMmake_image_24bitf(c_loc_id,c_name,*width,*height,c_il,buf);
+ ret = H5IMmake_image_24bitf(c_loc_id,c_name,(hsize_t)*width,(hsize_t)*height,c_il,buf);
if (ret < 0) return ret_value;
ret_value = 0;
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 2bce973..656a393 100755
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -58,7 +58,7 @@ nh5tbmake_table_c(int_f *namelen1,
char *c_name1;
int c_namelen1;
hsize_t num_elem;
- int i;
+ hsize_t i;
int max_len=1;
hid_t c_loc_id = *loc_id;
hsize_t c_nfields = *nfields;
@@ -340,7 +340,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id,
* Call H5TBwrite_fields_name function.
*/
- ret = H5TBwrite_fields_index(c_loc_id,c_name,1,c_field_index,c_start,c_nrecords,c_type_size,
+ ret = H5TBwrite_fields_index(c_loc_id,c_name,(hsize_t)1,c_field_index,c_start,c_nrecords,c_type_size,
0,c_type_sizes,buf);
if (ret < 0) return ret_value;
@@ -404,7 +404,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id,
* Call H5TBread_fields_index function.
*/
- ret = H5TBread_fields_index(c_loc_id,c_name,1,c_field_index,c_start,c_nrecords,c_type_size,
+ ret = H5TBread_fields_index(c_loc_id,c_name,(hsize_t)1,c_field_index,c_start,c_nrecords,c_type_size,
0,c_type_sizes,buf);
if (ret < 0) return ret_value;
@@ -625,7 +625,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
char *c_name;
int c_namelen;
hsize_t num_elem;
- int i;
+ hsize_t i;
int max_len=1;
hid_t c_loc_id = *loc_id;
hsize_t c_nfields = *nfields;