From abb2451dd5164e6b610589207b900a6464e21282 Mon Sep 17 00:00:00 2001 From: Jos Collin Date: Mon, 1 Jul 2019 14:32:33 +0530 Subject: [PATCH] rgw: Silence warning: control reaches end of non-void function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Build shows: [ 53%] Building CXX object src/mds/CMakeFiles/mds.dir/JournalPointer.cc.o ceph/src/rgw/rgw_rest_s3.cc: In member function ‘RGWOp* RGWHandler_REST_Bucket_S3::get_obj_op(bool)’: ceph/src/rgw/rgw_rest_s3.cc:3588:5: warning: control reaches end of non-void function [-Wreturn-type] } } ^ Fixes: 4ffc765c4c5debc665ade7769c4647c3a7278fd2 Fixes: http://tracker.ceph.com/issues/40747 Signed-off-by: Jos Collin --- src/rgw/rgw_rest_s3.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index bce2ca94576..ec2afd5b939 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -3579,13 +3579,19 @@ RGWOp *RGWHandler_REST_Bucket_S3::get_obj_op(bool get_data) // Non-website mode // Non-website mode if (get_data) { - if (list_type == 1) { - return new RGWListBucket_ObjStore_S3; - } else if(list_type == 2) { - return new RGWListBucket_ObjStore_S3v2; - } } else { - return new RGWStatBucket_ObjStore_S3; - } } + switch (list_type) { + case 1: + return new RGWListBucket_ObjStore_S3; + case 2: + return new RGWListBucket_ObjStore_S3v2; + default: + ldpp_dout(s, 5) << __func__ << ": unsupported list-type " << list_type << dendl; + return new RGWListBucket_ObjStore_S3; + } + } else { + return new RGWStatBucket_ObjStore_S3; + } +} RGWOp *RGWHandler_REST_Bucket_S3::op_get() { -- 2.39.5