From 10ceea996cc3db7b49b3fc676a84df8f5a9efd57 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 2 Feb 2011 12:01:22 -0800 Subject: [PATCH] RGW: fix shadowed variable error int ret and bool ret shadow this->ret, setting ret before the goto therefore had no effect in these cases. Signed-off-by: Samuel Just --- src/rgw/rgw_op.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index f302f77e24a..a63e1d55e2c 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -319,7 +319,7 @@ void RGWPutObj::execute() goto done; } - bool ret = policy.create_canned(s->user.user_id, s->user.display_name, s->canned_acl); + ret = policy.create_canned(s->user.user_id, s->user.display_name, s->canned_acl); if (!ret) { err.code = "InvalidArgument"; ret = -EINVAL; @@ -333,7 +333,7 @@ void RGWPutObj::execute() if (supplied_md5_b64) { RGW_LOG(15) << "supplied_md5_b64=" << supplied_md5_b64 << endl; - int ret = ceph_unarmor(supplied_md5_bin, &supplied_md5_bin[MD5::DIGESTSIZE + 1], + ret = ceph_unarmor(supplied_md5_bin, &supplied_md5_bin[MD5::DIGESTSIZE + 1], supplied_md5_b64, supplied_md5_b64 + strlen(supplied_md5_b64)); RGW_LOG(15) << "ceph_armor ret=" << ret << endl; if (ret != MD5::DIGESTSIZE) { -- 2.47.3