summaryrefslogtreecommitdiffstats
path: root/src/H5FDros3.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-04-17 16:47:23 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-04-17 16:47:23 (GMT)
commit7ba692badf9a1bafb9d3b2f72efbbdf773b5932a (patch)
treee781fbe72d7731e649eeabfcae60aa9bd3e5efe8 /src/H5FDros3.c
parent19bca90648a6435d3757c8345ae629b588861f70 (diff)
parent384693d8e5917011c906cdca901baf1519d0ff87 (diff)
downloadhdf5-7ba692badf9a1bafb9d3b2f72efbbdf773b5932a.zip
hdf5-7ba692badf9a1bafb9d3b2f72efbbdf773b5932a.tar.gz
hdf5-7ba692badf9a1bafb9d3b2f72efbbdf773b5932a.tar.bz2
Merge pull request #2522 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:new_vfd_cleanup to develop
* commit '384693d8e5917011c906cdca901baf1519d0ff87': Fixed some minor cmp callback bugs and cleaned warnings.
Diffstat (limited to 'src/H5FDros3.c')
-rw-r--r--src/H5FDros3.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 75fcfd7..d99272c 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -325,7 +325,9 @@ hid_t
H5FD_ros3_init(void)
{
hid_t ret_value = H5I_INVALID_HID;
+#if ROS3_STATS
unsigned int bin_i;
+#endif
FUNC_ENTER_NOAPI(FAIL)
@@ -1347,7 +1349,7 @@ H5FD_ros3_cmp(
}
/* FAPL: AWS_REGION */
- if (f1->fa.aws_region[0] != '\0' && f1->fa.aws_region[0] != '\0') {
+ if (f1->fa.aws_region[0] != '\0' && f2->fa.aws_region[0] != '\0') {
if (HDstrcmp(f1->fa.aws_region, f2->fa.aws_region)) {
HGOTO_DONE(-1);
}
@@ -1362,7 +1364,7 @@ H5FD_ros3_cmp(
}
/* FAPL: SECRET_ID */
- if (f1->fa.secret_id[0] != '\0' && f1->fa.secret_id[0] != '\0') {
+ if (f1->fa.secret_id[0] != '\0' && f2->fa.secret_id[0] != '\0') {
if (HDstrcmp(f1->fa.secret_id, f2->fa.secret_id)) {
HGOTO_DONE(-1);
}
@@ -1377,7 +1379,7 @@ H5FD_ros3_cmp(
}
/* FAPL: SECRET_KEY */
- if (f1->fa.secret_key[0] != '\0' && f1->fa.secret_key[0] != '\0') {
+ if (f1->fa.secret_key[0] != '\0' && f2->fa.secret_key[0] != '\0') {
if (HDstrcmp(f1->fa.secret_key, f2->fa.secret_key)) {
HGOTO_DONE(-1);
}