diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-10-21 18:02:32 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-10-21 18:02:32 -0700 |
| commit | ccaab2abf9e49ce3e50c15df793a3a3ca6b29bb8 (patch) | |
| tree | 16745920ab5fe8041f72832443c80f954ee536c4 /src/rgw/rgw_rest_swift.cc | |
| parent | db7eb771226beaa2372ef5860ce742cb3457cd89 (diff) | |
| download | ceph-wip-6606.tar.gz | |
rgw: init src_bucket_name, src_object in the S3 handlerwip-6606
Be consistent and initialize these fields also in the S3 case.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'src/rgw/rgw_rest_swift.cc')
| -rw-r--r-- | src/rgw/rgw_rest_swift.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index eba16d86899..95d54aef3f9 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -864,8 +864,8 @@ int RGWHandler_ObjStore_SWIFT::init(RGWRados *store, struct req_state *s, RGWCli s->copy_source = s->info.env->get("HTTP_X_COPY_FROM"); if (s->copy_source) { - ret = RGWCopyObj::parse_copy_location(s->copy_source, s->src_bucket_name, s->src_object); - if (!ret) + bool result = RGWCopyObj::parse_copy_location(s->copy_source, s->src_bucket_name, s->src_object); + if (!result) return -ERR_BAD_URL; } @@ -878,8 +878,8 @@ int RGWHandler_ObjStore_SWIFT::init(RGWRados *store, struct req_state *s, RGWCli string dest_bucket_name; string dest_object; - ret = RGWCopyObj::parse_copy_location(req_dest, dest_bucket_name, dest_object); - if (!ret) + bool result = RGWCopyObj::parse_copy_location(req_dest, dest_bucket_name, dest_object); + if (!result) return -ERR_BAD_URL; if (dest_bucket_name != s->bucket_name_str) { |