From b88987969cf041afd7822a58a358a7a460fff682 Mon Sep 17 00:00:00 2001 From: Xinying Song Date: Fri, 17 Nov 2017 14:18:07 +0800 Subject: [PATCH] rgw: clean code with helper function dump_header_if_nonempty Signed-off-by: Xinying Song --- src/rgw/rgw_rest_s3.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index bdd8ea4ee8593..840a63d346267 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -245,10 +245,7 @@ int RGWGetObj_ObjStore_S3::send_response_data(bufferlist& bl, off_t bl_ofs, dump_content_length(s, total_len); dump_last_modified(s, lastmod); - if (!version_id.empty()) { - dump_header(s, "x-amz-version-id", version_id); - } - + dump_header_if_nonempty(s, "x-amz-version-id", version_id); if (! op_ret) { if (! lo_etag.empty()) { @@ -2042,9 +2039,7 @@ void RGWDeleteObj_ObjStore_S3::send_response() set_req_state_err(s, r); dump_errno(s); - if (!version_id.empty()) { - dump_header(s, "x-amz-version-id", version_id); - } + dump_header_if_nonempty(s, "x-amz-version-id", version_id); if (delete_marker) { dump_header(s, "x-amz-delete-marker", "true"); } -- 2.47.3