From 8c8c227a6f096ede8e0d7fe2ad969f26f65eeb2c Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Fri, 20 Jan 2023 13:33:06 -0500 Subject: [PATCH] rgw: clean up header files Remove trailing spaces and use "#pragma once" rather than "#ifndef" to assure a header files is only loaded once during compilation. Signed-off-by: J. Eric Ivancich --- src/rgw/driver/rados/rgw_rados.h | 22 +++++++++++----------- src/rgw/driver/rados/rgw_rest_log.h | 2 +- src/rgw/rgw_basic_types.h | 2 +- src/rgw/rgw_common.h | 6 +++--- src/rgw/rgw_cr_rest.h | 2 +- src/rgw/rgw_file.h | 10 +++++----- src/rgw/rgw_frontend.h | 2 +- src/rgw/rgw_http_client_types.h | 2 +- src/rgw/rgw_kafka.h | 6 +++--- src/rgw/rgw_main.h | 2 +- src/rgw/rgw_mdlog.h | 4 ++-- src/rgw/rgw_op.h | 26 +++++++++++++------------- src/rgw/rgw_orphan.h | 12 ++++++------ src/rgw/rgw_perf_counters.h | 3 ++- src/rgw/rgw_process.h | 2 +- src/rgw/rgw_process_env.h | 2 +- src/rgw/rgw_rest.h | 8 ++++---- src/rgw/rgw_rest_client.h | 2 +- src/rgw/rgw_rest_config.h | 2 +- src/rgw/rgw_rest_metadata.h | 2 +- src/rgw/rgw_rest_s3.h | 4 ++-- src/rgw/rgw_rest_s3website.h | 6 +++--- src/rgw/rgw_rest_sts.h | 4 ++-- src/rgw/rgw_sal.h | 2 +- src/rgw/rgw_sal_dbstore.h | 8 ++++---- src/rgw/rgw_sal_filter.h | 3 ++- src/rgw/rgw_swift_auth.h | 2 +- src/rgw/rgw_sync_policy.h | 2 +- src/rgw/rgw_torrent.h | 16 ++++++++-------- src/rgw/rgw_website.h | 6 +++--- src/rgw/rgw_xml.h | 2 +- 31 files changed, 88 insertions(+), 86 deletions(-) diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index a3258ac8b7239..eb161d72bce4e 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -408,7 +408,7 @@ class RGWRados int append_atomic_test(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, rgw::sal::Object* obj, librados::ObjectOperation& op, RGWObjState **state, RGWObjManifest** pmanifest, optional_yield y); - + int update_placement_map(); int store_bucket_info(RGWBucketInfo& info, std::map *pattrs, RGWObjVersionTracker *objv_tracker, bool exclusive); @@ -737,7 +737,7 @@ public: rgw_obj obj; rgw_raw_obj head_obj; } state; - + struct ConditionParams { const ceph::real_time *mod_ptr; const ceph::real_time *unmod_ptr; @@ -746,8 +746,8 @@ public: uint64_t mod_pg_ver; const char *if_match; const char *if_nomatch; - - ConditionParams() : + + ConditionParams() : mod_ptr(NULL), unmod_ptr(NULL), high_precision_time(false), mod_zone_id(0), mod_pg_ver(0), if_match(NULL), if_nomatch(NULL) {} } conds; @@ -773,7 +773,7 @@ public: struct Write { RGWRados::Object *target; - + struct MetaParams { ceph::real_time *mtime; std::map* rmattrs; @@ -845,7 +845,7 @@ public: DeleteResult() : delete_marker(false) {} } result; - + explicit Delete(RGWRados::Object *_target) : target(_target) {} int delete_obj(optional_yield y, const DoutPrefixProvider *dpp); @@ -948,7 +948,7 @@ public: void set_bilog_flags(uint16_t flags) { bilog_flags = flags; } - + void set_zones_trace(rgw_zone_set *_zones_trace) { zones_trace = _zones_trace; } @@ -1049,14 +1049,14 @@ public: const rgw_user& user, /* in */ rgw::sal::Bucket* bucket, /* in */ rgw::sal::Object* obj, /* in */ - const DoutPrefixProvider *dpp, /* in/out */ - optional_yield y); /* in */ + const DoutPrefixProvider *dpp, /* in/out */ + optional_yield y); /* in */ int swift_versioning_restore(RGWObjectCtx& obj_ctx, /* in/out */ const rgw_user& user, /* in */ rgw::sal::Bucket* bucket, /* in */ rgw::sal::Object* obj, /* in */ bool& restored, /* out */ - const DoutPrefixProvider *dpp); /* in/out */ + const DoutPrefixProvider *dpp); /* in/out */ int copy_obj_to_remote_dest(const DoutPrefixProvider *dpp, RGWObjState *astate, std::map& src_attrs, @@ -1182,7 +1182,7 @@ public: std::string *petag, const DoutPrefixProvider *dpp, optional_yield y); - + int transition_obj(RGWObjectCtx& obj_ctx, rgw::sal::Bucket* bucket, rgw::sal::Object& obj, diff --git a/src/rgw/driver/rados/rgw_rest_log.h b/src/rgw/driver/rados/rgw_rest_log.h index c8a0c4df07beb..02b1d133fc5b2 100644 --- a/src/rgw/driver/rados/rgw_rest_log.h +++ b/src/rgw/driver/rados/rgw_rest_log.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* diff --git a/src/rgw/rgw_basic_types.h b/src/rgw/rgw_basic_types.h index 1ccd160ba7ea9..4e473a0a9de77 100644 --- a/src/rgw/rgw_basic_types.h +++ b/src/rgw/rgw_basic_types.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 6102f6b0dee47..9f6e729051aea 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* @@ -9,9 +9,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #pragma once diff --git a/src/rgw/rgw_cr_rest.h b/src/rgw/rgw_cr_rest.h index cb103aeb83455..ba47c3dd622c5 100644 --- a/src/rgw/rgw_cr_rest.h +++ b/src/rgw/rgw_cr_rest.h @@ -440,7 +440,7 @@ public: virtual int send() = 0; virtual int write(bufferlist& data, bool *need_retry) = 0; /* reentrant */ virtual int drain_writes(bool *need_retry) = 0; /* reentrant */ - + virtual ~RGWStreamWriteResourceCRF() = default; }; diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h index fbbe782b73e0d..ea7c2b24c8fcc 100644 --- a/src/rgw/rgw_file.h +++ b/src/rgw/rgw_file.h @@ -868,7 +868,7 @@ namespace rgw { RGWFileHandle::FHCache fh_cache; RGWFileHandle::FhLRU fh_lru; - + std::string uid; // should match user.user_id, iiuc std::unique_ptr user; @@ -1043,7 +1043,7 @@ namespace rgw { const uint32_t flags = RGWFileHandle::FLAG_NONE) { using std::get; - // cast int32_t(RGWFileHandle::FLAG_NONE) due to strictness of Clang + // cast int32_t(RGWFileHandle::FLAG_NONE) due to strictness of Clang // the cast transfers a lvalue into a rvalue in the ctor // check the commit message for the full details LookupFHResult fhr { nullptr, uint32_t(RGWFileHandle::FLAG_NONE) }; @@ -1086,7 +1086,7 @@ namespace rgw { const uint32_t flags = RGWFileHandle::FLAG_NONE) { using std::get; - // cast int32_t(RGWFileHandle::FLAG_NONE) due to strictness of Clang + // cast int32_t(RGWFileHandle::FLAG_NONE) due to strictness of Clang // the cast transfers a lvalue into a rvalue in the ctor // check the commit message for the full details LookupFHResult fhr { nullptr, uint32_t(RGWFileHandle::FLAG_NONE) }; @@ -1236,8 +1236,8 @@ namespace rgw { MkObjResult create(RGWFileHandle* parent, const char *name, struct stat *st, uint32_t mask, uint32_t flags); - - MkObjResult symlink(RGWFileHandle* parent, const char *name, + + MkObjResult symlink(RGWFileHandle* parent, const char *name, const char *link_path, struct stat *st, uint32_t mask, uint32_t flags); MkObjResult mkdir(RGWFileHandle* parent, const char *name, struct stat *st, diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h index 4876fb8f85378..ca1a8cba14e97 100644 --- a/src/rgw/rgw_frontend.h +++ b/src/rgw/rgw_frontend.h @@ -131,7 +131,7 @@ public: RGWLoadGenFrontend(RGWProcessEnv& pe, RGWFrontendConfig *_conf) : RGWProcessFrontend(pe, _conf) {} - CephContext *get_cct() const { + CephContext *get_cct() const { return env.driver->ctx(); } diff --git a/src/rgw/rgw_http_client_types.h b/src/rgw/rgw_http_client_types.h index 39b0f1590f515..84e6ed6782043 100644 --- a/src/rgw/rgw_http_client_types.h +++ b/src/rgw/rgw_http_client_types.h @@ -56,7 +56,7 @@ class RGWIOProvider public: RGWIOProvider() {} - virtual ~RGWIOProvider() = default; + virtual ~RGWIOProvider() = default; void assign_io(RGWIOIDProvider& io_id_provider, int io_type = -1); rgw_io_id get_io_id(int io_type) { diff --git a/src/rgw/rgw_kafka.h b/src/rgw/rgw_kafka.h index 569fb631d2bc0..81f02106d78a2 100644 --- a/src/rgw/rgw_kafka.h +++ b/src/rgw/rgw_kafka.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp #pragma once @@ -41,7 +41,7 @@ int publish(connection_ptr_t& conn, // publish a message over a connection that was already created // and pass a callback that will be invoked (async) when broker confirms // receiving the message -int publish_with_confirm(connection_ptr_t& conn, +int publish_with_confirm(connection_ptr_t& conn, const std::string& topic, const std::string& message, reply_callback_t cb); @@ -51,7 +51,7 @@ std::string status_to_string(int s); // number of connections size_t get_connection_count(); - + // return the number of messages that were sent // to broker, but were not yet acked/nacked/timedout size_t get_inflight(); diff --git a/src/rgw/rgw_main.h b/src/rgw/rgw_main.h index 321fbfc8009e4..bbe5143518c56 100644 --- a/src/rgw/rgw_main.h +++ b/src/rgw/rgw_main.h @@ -34,7 +34,7 @@ class RGWPauser : public RGWRealmReloader::Pauser { public: ~RGWPauser() override = default; - + void add_pauser(Pauser* pauser) { pausers.push_back(pauser); } diff --git a/src/rgw/rgw_mdlog.h b/src/rgw/rgw_mdlog.h index abc590a3e4635..179cc2aca440c 100644 --- a/src/rgw/rgw_mdlog.h +++ b/src/rgw/rgw_mdlog.h @@ -123,7 +123,7 @@ public: const real_time& end_time, const std::string& marker, void **handle); void complete_list_entries(void *handle); - int list_entries(const DoutPrefixProvider *dpp, + int list_entries(const DoutPrefixProvider *dpp, void *handle, int max_entries, std::list& entries, @@ -152,7 +152,7 @@ struct RGWMetadataLogData { obj_version read_version; obj_version write_version; RGWMDLogStatus status; - + RGWMetadataLogData() : status(MDLOG_STATUS_UNKNOWN) {} void encode(bufferlist& bl) const; diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index a0e8b273ce074..9e2720988b08a 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -78,7 +78,7 @@ class StrategyRegistry; } } -int rgw_op_get_bucket_policy_from_attr(const DoutPrefixProvider *dpp, +int rgw_op_get_bucket_policy_from_attr(const DoutPrefixProvider *dpp, CephContext *cct, rgw::sal::Driver* driver, RGWBucketInfo& bucket_info, @@ -440,8 +440,8 @@ public: return 0; } - // get lua script to run as a "get object" filter - int get_lua_filter(std::unique_ptr* filter, + // get lua script to run as a "get object" filter + int get_lua_filter(std::unique_ptr* filter, RGWGetObj_Filter* cb); dmc::client_id dmclock_client() override { return dmc::client_id::data; } @@ -695,7 +695,7 @@ protected: boost::optional> parse_path(const std::string_view& path); - + std::pair handle_upload_path(req_state *s); @@ -901,8 +901,8 @@ public: class RGWListBucket : public RGWOp { protected: std::string prefix; - rgw_obj_key marker; - rgw_obj_key next_marker; + rgw_obj_key marker; + rgw_obj_key next_marker; rgw_obj_key end_marker; std::string max_keys; std::string delimiter; @@ -1283,8 +1283,8 @@ public: return 0; } - // get lua script to run as a "put object" filter - int get_lua_filter(std::unique_ptr* filter, + // get lua script to run as a "put object" filter + int get_lua_filter(std::unique_ptr* filter, rgw::sal::DataProcessor* cb); int get_data_cb(bufferlist& bl, off_t bl_ofs, off_t bl_len); @@ -1630,7 +1630,7 @@ public: class RGWGetLC : public RGWOp { protected: - + public: RGWGetLC() { } ~RGWGetLC() override { } @@ -2031,18 +2031,18 @@ public: class RGWDeleteMultiObj : public RGWOp { /** * Handles the deletion of an individual object and uses - * set_partial_response to record the outcome. + * set_partial_response to record the outcome. */ void handle_individual_object(const rgw_obj_key& o, optional_yield y, boost::asio::deadline_timer *formatter_flush_cond); - + /** * When the request is being executed in a coroutine, performs * the actual formatter flushing and is responsible for the * termination condition (when when all partial object responses * have been sent). Note that the formatter flushing must be handled - * on the coroutine that invokes the execute method vs. the + * on the coroutine that invokes the execute method vs. the * coroutines that are spawned to handle individual objects because * the flush logic uses a yield context that was captured * and saved on the req_state vs. one that is passed on the stack. @@ -2236,7 +2236,7 @@ inline void encode_delete_at_attr(boost::optional delete_at, { if (delete_at == boost::none) { return; - } + } bufferlist delatbl; encode(*delete_at, delatbl); diff --git a/src/rgw/rgw_orphan.h b/src/rgw/rgw_orphan.h index d32406864943c..db811d31d9a56 100644 --- a/src/rgw/rgw_orphan.h +++ b/src/rgw/rgw_orphan.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* @@ -8,9 +8,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #pragma once @@ -65,7 +65,7 @@ struct RGWOrphanSearchStage { void dump(Formatter *f) const; }; WRITE_CLASS_ENCODER(RGWOrphanSearchStage) - + struct RGWOrphanSearchInfo { std::string job_name; rgw_pool pool; @@ -262,7 +262,7 @@ class RGWRadosList { std::string& bucket_name, rgw_obj_key& obj_key, std::set& obj_oids); - int pop_and_handle_stat_op(const DoutPrefixProvider *dpp, + int pop_and_handle_stat_op(const DoutPrefixProvider *dpp, RGWObjectCtx& obj_ctx, std::deque& ops); @@ -279,7 +279,7 @@ public: include_rgw_obj_name(false) {} - int process_bucket(const DoutPrefixProvider *dpp, + int process_bucket(const DoutPrefixProvider *dpp, const std::string& bucket_instance_id, const std::string& prefix, const std::set& entries_filter); diff --git a/src/rgw/rgw_perf_counters.h b/src/rgw/rgw_perf_counters.h index 7596959859b5b..3c4e4e97f023f 100644 --- a/src/rgw/rgw_perf_counters.h +++ b/src/rgw/rgw_perf_counters.h @@ -1,7 +1,8 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp #pragma once + #include "include/common_fwd.h" extern PerfCounters *perfcounter; diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h index 67ebb710a4c29..640f07842f0b9 100644 --- a/src/rgw/rgw_process.h +++ b/src/rgw/rgw_process.h @@ -88,7 +88,7 @@ public: ceph::make_timespan(g_conf()->rgw_op_thread_suicide_timeout), &m_tp) { } - + virtual ~RGWProcess() = default; const RGWProcessEnv& get_env() const { return env; } diff --git a/src/rgw/rgw_process_env.h b/src/rgw/rgw_process_env.h index 3193ff15121f5..7e3abad65a7ff 100644 --- a/src/rgw/rgw_process_env.h +++ b/src/rgw/rgw_process_env.h @@ -47,4 +47,4 @@ struct RGWProcessEnv { rgw::flight::FlightStore* flight_store; #endif }; - + diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index 3780ed423e42b..434de99e9c2ec 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -145,13 +145,13 @@ public: class RGWGetBucketTags_ObjStore : public RGWGetBucketTags { public: RGWGetBucketTags_ObjStore() = default; - virtual ~RGWGetBucketTags_ObjStore() = default; + virtual ~RGWGetBucketTags_ObjStore() = default; }; class RGWPutBucketTags_ObjStore: public RGWPutBucketTags { public: RGWPutBucketTags_ObjStore() = default; - virtual ~RGWPutBucketTags_ObjStore() = default; + virtual ~RGWPutBucketTags_ObjStore() = default; }; class RGWGetBucketReplication_ObjStore : public RGWGetBucketReplication { @@ -163,13 +163,13 @@ public: class RGWPutBucketReplication_ObjStore: public RGWPutBucketReplication { public: RGWPutBucketReplication_ObjStore() = default; - virtual ~RGWPutBucketReplication_ObjStore() = default; + virtual ~RGWPutBucketReplication_ObjStore() = default; }; class RGWDeleteBucketReplication_ObjStore: public RGWDeleteBucketReplication { public: RGWDeleteBucketReplication_ObjStore() = default; - virtual ~RGWDeleteBucketReplication_ObjStore() = default; + virtual ~RGWDeleteBucketReplication_ObjStore() = default; }; class RGWListBuckets_ObjStore : public RGWListBuckets { diff --git a/src/rgw/rgw_rest_client.h b/src/rgw/rgw_rest_client.h index f61c183819d2e..c11199fdf27cc 100644 --- a/src/rgw/rgw_rest_client.h +++ b/src/rgw/rgw_rest_client.h @@ -181,7 +181,7 @@ class RGWRESTStreamRWRequest : public RGWHTTPStreamRWRequest { std::optional headers_gen; RGWEnv new_env; req_info new_info; - + protected: std::optional api_name; HostStyle host_style; diff --git a/src/rgw/rgw_rest_config.h b/src/rgw/rgw_rest_config.h index 5a0feb533b2f4..1910cbe0bc7ac 100644 --- a/src/rgw/rgw_rest_config.h +++ b/src/rgw/rgw_rest_config.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* diff --git a/src/rgw/rgw_rest_metadata.h b/src/rgw/rgw_rest_metadata.h index c741aefcb332c..ea7376a1bf03f 100644 --- a/src/rgw/rgw_rest_metadata.h +++ b/src/rgw/rgw_rest_metadata.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h index 7c1829aa7eb70..75b58ed43ca55 100644 --- a/src/rgw/rgw_rest_s3.h +++ b/src/rgw/rgw_rest_s3.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include "common/sstring.hh" #include "rgw_op.h" @@ -1174,7 +1174,7 @@ class STSEngine : public AWSEngine { int get_session_token(const DoutPrefixProvider* dpp, const std::string_view& session_token, STS::SessionToken& token) const; - result_t authenticate(const DoutPrefixProvider* dpp, + result_t authenticate(const DoutPrefixProvider* dpp, const std::string_view& access_key_id, const std::string_view& signature, const std::string_view& session_token, diff --git a/src/rgw/rgw_rest_s3website.h b/src/rgw/rgw_rest_s3website.h index 03bc64e47e4b3..3030926a7a310 100644 --- a/src/rgw/rgw_rest_s3website.h +++ b/src/rgw/rgw_rest_s3website.h @@ -8,13 +8,13 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #pragma once - + #include "rgw_rest_s3.h" class RGWHandler_REST_S3Website : public RGWHandler_REST_S3 { diff --git a/src/rgw/rgw_rest_sts.h b/src/rgw/rgw_rest_sts.h index 9c9488c6c171c..687f2d098d2a3 100644 --- a/src/rgw/rgw_rest_sts.h +++ b/src/rgw/rgw_rest_sts.h @@ -47,7 +47,7 @@ class WebTokenEngine : public rgw::auth::Engine { std::string get_role_name(const string& role_arn) const; std::string get_cert_url(const std::string& iss, const DoutPrefixProvider *dpp,optional_yield y) const; - + std::tuple, boost::optional> get_from_jwt(const DoutPrefixProvider* dpp, const std::string& token, const req_state* const s, optional_yield y) const; @@ -223,7 +223,7 @@ class RGWRESTMgr_STS : public RGWRESTMgr { public: RGWRESTMgr_STS() = default; ~RGWRESTMgr_STS() override = default; - + RGWRESTMgr *get_resource_mgr(req_state* const s, const std::string& uri, std::string* const out_uri) override { diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index 08b22db622285..8e302b10d572e 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -333,7 +333,7 @@ class Driver { rgw::notify::EventType event_type, optional_yield y, const std::string* object_name=nullptr) = 0; /** No-req_state variant (e.g., rgwlc) */ virtual std::unique_ptr get_notification( - const DoutPrefixProvider* dpp, rgw::sal::Object* obj, rgw::sal::Object* src_obj, + const DoutPrefixProvider* dpp, rgw::sal::Object* obj, rgw::sal::Object* src_obj, rgw::notify::EventType event_type, rgw::sal::Bucket* _bucket, std::string& _user_id, std::string& _user_tenant, std::string& _req_id, optional_yield y) = 0; diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index 98abb9d7634a0..788932ae50ac2 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -311,7 +311,7 @@ protected: DBStore* store; RGWRealm *realm{nullptr}; DBZoneGroup *zonegroup{nullptr}; - RGWZone *zone_public_config{nullptr}; /* external zone params, e.g., entrypoints, log flags, etc. */ + RGWZone *zone_public_config{nullptr}; /* external zone params, e.g., entrypoints, log flags, etc. */ RGWZoneParams *zone_params{nullptr}; /* internal zone params, e.g., rados pools */ RGWPeriod *current_period{nullptr}; @@ -403,7 +403,7 @@ protected: * MultipartUpload::Init - create head object of meta obj (src_obj_name + "." + upload_id) * [ Meta object stores all the parts upload info] * MultipartWriter::process - create all data/tail objects with obj_name same as - * meta obj (so that they can all be identified & deleted + * meta obj (so that they can all be identified & deleted * during abort) * MultipartUpload::Abort - Just delete meta obj .. that will indirectly delete all the * uploads associated with that upload id / meta obj so far. @@ -552,7 +552,7 @@ protected: int64_t end, RGWGetDataCB* cb, optional_yield y) override; - virtual int get_attr(const DoutPrefixProvider* dpp, const char* name, bufferlist& dest, optional_yield y) override; + virtual int get_attr(const DoutPrefixProvider* dpp, const char* name, bufferlist& dest, optional_yield y) override; }; struct DBDeleteOp : public DeleteOp { @@ -822,7 +822,7 @@ public: rgw::notify::EventType event_type, rgw::sal::Bucket* _bucket, std::string& _user_id, std::string& _user_tenant, std::string& _req_id, optional_yield y) override; - + virtual RGWLC* get_rgwlc(void) override; virtual RGWCoroutinesManagerRegistry* get_cr_registry() override { return NULL; } virtual int log_usage(const DoutPrefixProvider *dpp, std::map& usage_info) override; diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index f1fa08b7616de..b00540310bd19 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -205,7 +205,8 @@ public: rgw::notify::EventType event_type, optional_yield y, const std::string* object_name=nullptr) override; virtual std::unique_ptr get_notification( - const DoutPrefixProvider* dpp, rgw::sal::Object* obj, rgw::sal::Object* src_obj, + const DoutPrefixProvider* dpp, rgw::sal::Object* obj, rgw::sal::Object* src_obj, + rgw::notify::EventType event_type, rgw::sal::Bucket* _bucket, std::string& _user_id, std::string& _user_tenant, std::string& _req_id, optional_yield y) override; diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h index 4b71dbc705af7..85a103dbfd5aa 100644 --- a/src/rgw/rgw_swift_auth.h +++ b/src/rgw/rgw_swift_auth.h @@ -46,7 +46,7 @@ class TempURLEngine : public rgw::auth::Engine { const TempURLApplier::Factory* const apl_factory; /* Helper methods. */ - void get_owner_info(const DoutPrefixProvider* dpp, + void get_owner_info(const DoutPrefixProvider* dpp, const req_state* s, RGWUserInfo& owner_info, optional_yield y) const; diff --git a/src/rgw/rgw_sync_policy.h b/src/rgw/rgw_sync_policy.h index 0ee79b4702fc6..4758c426d4be5 100644 --- a/src/rgw/rgw_sync_policy.h +++ b/src/rgw/rgw_sync_policy.h @@ -291,7 +291,7 @@ struct rgw_sync_pipe_source_params { }; WRITE_CLASS_ENCODER(rgw_sync_pipe_source_params) -struct rgw_sync_pipe_dest_params { +struct rgw_sync_pipe_dest_params { std::optional acl_translation; std::optional storage_class; diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h index 704dba28cf865..bf2e2217c2531 100644 --- a/src/rgw/rgw_torrent.h +++ b/src/rgw/rgw_torrent.h @@ -43,7 +43,7 @@ public: void bencode_end(bufferlist& bl) { bl.append('e'); } //single values - void bencode(int value, bufferlist& bl) + void bencode(int value, bufferlist& bl) { bl.append('i'); char info[100] = { 0 }; @@ -53,33 +53,33 @@ public: } //single values - void bencode(const std::string& str, bufferlist& bl) + void bencode(const std::string& str, bufferlist& bl) { bencode_key(str, bl); } //dictionary elements - void bencode(const std::string& key, int value, bufferlist& bl) + void bencode(const std::string& key, int value, bufferlist& bl) { bencode_key(key, bl); bencode(value, bl); } //dictionary elements - void bencode(const std::string& key, const std::string& value, bufferlist& bl) + void bencode(const std::string& key, const std::string& value, bufferlist& bl) { bencode_key(key, bl); bencode(value, bl); } //key len - void bencode_key(const std::string& key, bufferlist& bl) + void bencode_key(const std::string& key, bufferlist& bl) { int len = key.length(); - char info[100] = { 0 }; + char info[100] = { 0 }; sprintf(info, "%d:", len); bl.append(info, strlen(info)); - bl.append(key.c_str(), len); + bl.append(key.c_str(), len); } }; @@ -120,7 +120,7 @@ public: uint64_t &total_len, ceph::bufferlist &bl_data, rgw_obj &obj); - + off_t get_data_len(); bool get_flag(); diff --git a/src/rgw/rgw_website.h b/src/rgw/rgw_website.h index 2ba22c87a8c70..bf92011ba6f56 100644 --- a/src/rgw/rgw_website.h +++ b/src/rgw/rgw_website.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp /* @@ -9,9 +9,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #pragma once diff --git a/src/rgw/rgw_xml.h b/src/rgw/rgw_xml.h index ab3f267ade1bd..74a8c27a095de 100644 --- a/src/rgw/rgw_xml.h +++ b/src/rgw/rgw_xml.h @@ -121,7 +121,7 @@ private: protected: // if objects are created while parsing, this should be implemented in the derived class // and be a factory for creating the classes derived from XMLObj - // note that not all sub-tags has to be constructed here, any such tag which is not + // note that not all sub-tags has to be constructed here, any such tag which is not // constructed will be lazily created when decode_xml() is invoked on it // // note that in case of different tags sharing the same name at different levels -- 2.39.5