4 files changed, 8 insertions, 13 deletions
diff --git a/fortran/src/H5FDmpiof.c b/fortran/src/H5FDmpiof.c
index 2992a3b..3189477 100644
--- a/fortran/src/H5FDmpiof.c
+++ b/fortran/src/H5FDmpiof.c
@@ -112,10 +112,7 @@ nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
      herr_t ret;
      H5FD_mpio_xfer_t c_data_xfer_mode;
 /*
-     int CASE;
-
-     CASE = *data_xfer_mode;
-     switch (CASE) {
+     switch (*data_xfer_mode) {
 
         case H5FD_MPIO_INDEPENDENT_F:
              c_data_xfer_mode = H5FD_MPIO_INDEPENDENT;
@@ -157,7 +154,6 @@ nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
      hid_t c_prp_id;
      herr_t ret;
      H5FD_mpio_xfer_t c_data_xfer_mode;
-     int CASE;
 
      /*
       * Call H5Pget_xfer function.
@@ -167,8 +163,7 @@ nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode)
      if (ret < 0) return ret_value;
      *data_xfer_mode = (int_f)c_data_xfer_mode; 
 /*
-     CASE = c_data_xfer_mode;
-     switch (CASE) {
+     switch (c_data_xfer_mode) {
 
         case H5FD_MPIO_INDEPENDENT:
              *data_xfer_mode = H5FD_MPIO_INDEPENDENT_F;
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 9503d81..fb175b4 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1786,7 +1786,7 @@ nh5pset_fclose_degree_c ( hid_t_f *fapl_id , int_f *degree)
 {
   int ret_value = -1;
   hid_t c_fapl_id;
-  hid_t c_degree; 
+  H5F_close_degree_t c_degree; 
 
   c_fapl_id = (hid_t)*fapl_id;
   c_degree = (H5F_close_degree_t)*degree;
@@ -1842,7 +1842,7 @@ nh5pget_buffer_c ( hid_t_f *prp_id , hsize_t_f *size)
   c_prp_id = (hid_t)*prp_id;
   c_size = H5Pget_buffer(c_prp_id, NULL, NULL);
   if ( c_size <= 0  ) return ret_value;
-  *size = (hsize_t)c_size;
+  *size = (hsize_t_f)c_size;
   ret_value = 0;
   return ret_value;
 }
@@ -2627,7 +2627,7 @@ nh5pget_class_name_c(hid_t_f *class, _fcd name, int_f *name_len)
      if( c_name == NULL) goto DONE;
 
      HD5packFstring(c_name, _fcdtocp(name), (int)*name_len);
-     ret_value = strlen(c_name);
+     ret_value = (int_f)HDstrlen(c_name);
 
 DONE:
      HDfree(c_name);
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index fb3f185..06cb6e3 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -53,7 +53,7 @@ nh5rcreate_object_c (int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen)
 
      HDfree(c_name);
      if (ret_value_c >= 0)  {
-         *ref=ref_c;
+         *ref=(int_f)ref_c;
          ret_value = 0;
      }
        
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 3beadcd..cc4b279 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -726,7 +726,7 @@ nh5tget_norm_c ( hid_t_f *type_id , int_f *norm)
   c_norm = H5Tget_norm(c_type_id);
   if ( c_norm == 0  ) return ret_value;
 
-  *norm = (size_t_f)c_norm;
+  *norm = (int_f)c_norm;
   ret_value = 0; 
   return ret_value;
 }
@@ -1578,7 +1578,7 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, int_f* taglen)
   if (c_tag == NULL ) return ret_value;
 
   HD5packFstring(c_tag, _fcdtocp(tag), (int)strlen(c_tag));  
-  *taglen = strlen(c_tag);
+  *taglen = (int_f)HDstrlen(c_tag);
   HDfree(c_tag);
   ret_value = 0; 
   return ret_value;