summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:10 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:10 (GMT)
commit1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8 (patch)
treec5f4f7b06142b328c247ecc9eb233e4a6344bb12 /fortran/src
parent20c09524ea348f4009555a1cba2731842b9af80e (diff)
parentf19e06b59ee53f17465a7b5974c25c3245a40d9a (diff)
downloadhdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.zip
hdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.tar.gz
hdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.tar.bz2
Merge pull request #2321 in HDFFV/hdf5 from ~DYOUNG/werror:reduce-werror-diffs-3 to develop
* commit 'f19e06b59ee53f17465a7b5974c25c3245a40d9a': testpar/t_2Gio.c: Fix a typo that I think was introduced by a previous warnings PR. An array element was assigned to itself---shape[2]Â =Â shape[2];---instead of being assigned to chunk[2].
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5Pf.c33
-rw-r--r--fortran/src/H5match_types.c2
2 files changed, 21 insertions, 14 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 9fdd19b..2cacc8c 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -488,12 +488,26 @@ h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
* Removed extra length parameters EP 7/6/00
* SOURCE
*/
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+int_f
+h5pget_version_c (hid_t_f H5_ATTR_UNUSED *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr)
+/******/
+{
+ /*
+ * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
+ */
+ *boot = (int_f)0;
+ *freelist = (int_f)0;
+ *stab = (int_f)0;
+ *shhdr = (int_f)0;
+
+ return 0;
+}
+#else /* H5_NO_DEPRECATED_SYMBOLS */
int_f
h5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr)
/******/
{
- int ret_value = -1;
-#ifndef H5_NO_DEPRECATED_SYMBOLS
herr_t ret;
unsigned c_boot;
unsigned c_freelist;
@@ -504,25 +518,16 @@ h5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab,
* Call H5Pget_version function.
*/
ret = H5Pget_version((hid_t)*prp_id, &c_boot, &c_freelist, &c_stab, &c_shhdr);
- if (ret < 0) return ret_value;
+ if (ret < 0) return -1;
*boot = (int_f)c_boot;
*freelist = (int_f)c_freelist;
*stab = (int_f)c_stab;
*shhdr = (int_f)c_shhdr;
-#else /* H5_NO_DEPRECATED_SYMBOLS */
- /*
- * Fill in fake values [since we need a file ID to call H5Fget_info :-( -QAK ]
- */
- *boot = (int_f)0;
- *freelist = (int_f)0;
- *stab = (int_f)0;
- *shhdr = (int_f)0;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- ret_value = 0;
- return ret_value;
+ return 0;
}
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
/****if* H5Pf/h5pget_userblock_c
* NAME
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 2a6204d..ec2d66f 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -153,7 +153,9 @@ int main(void)
int FORTRAN_NUM_INTEGER_KINDS=H5_FORTRAN_NUM_INTEGER_KINDS;
int H5_FORTRAN_NUM_REAL_KINDS;
+#if H5_FORTRAN_HAVE_C_LONG_DOUBLE!=0
int found_long_double = 0;
+#endif
/* Open target files */
c_header = fopen(CFILE, "w");