From a177935165e83a1bec2cc731e128f585fce75acd Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Sat, 21 Jan 2023 12:37:05 -0500 Subject: [PATCH] rgw: refactor selected files for better above- vs below-the-line Move more files into driver/rados for better above- vs below- the-line. Use #pragma once everywhere (versus fixing all the Signed-off-by: Kaleb S. KEITHLEY --- src/rgw/CMakeLists.txt | 22 +++++++++---------- src/rgw/driver/dbstore/common/dbstore.h | 5 +---- src/rgw/driver/dbstore/common/dbstore_log.h | 5 +---- src/rgw/driver/dbstore/sqlite/sqliteDB.h | 5 +---- src/rgw/driver/rados/cls_fifo_legacy.h | 5 +---- src/rgw/driver/rados/rgw_cr_rados.h | 4 +--- src/rgw/driver/rados/rgw_cr_tools.h | 4 +--- src/rgw/driver/rados/rgw_d3n_datacache.h | 4 +--- src/rgw/driver/rados/rgw_data_sync.h | 5 +---- src/rgw/driver/rados/rgw_datalog.h | 6 +---- src/rgw/driver/rados/rgw_etag_verifier.h | 6 ++--- src/rgw/driver/rados/rgw_gc.h | 7 +----- src/rgw/driver/rados/rgw_lc_tier.h | 5 +---- src/rgw/driver/rados/rgw_log_backing.h | 5 +---- src/rgw/driver/rados/rgw_metadata.h | 4 +--- .../driver/rados/rgw_object_expirer_core.h | 4 +--- src/rgw/driver/rados/rgw_otp.h | 6 +---- src/rgw/{ => driver/rados}/rgw_pubsub.cc | 0 src/rgw/{ => driver/rados}/rgw_pubsub.h | 5 +---- src/rgw/{ => driver/rados}/rgw_pubsub_push.cc | 0 src/rgw/{ => driver/rados}/rgw_pubsub_push.h | 0 .../rados}/rgw_putobj_processor.cc | 0 .../{ => driver/rados}/rgw_putobj_processor.h | 0 src/rgw/{ => driver/rados}/rgw_rados.cc | 0 src/rgw/{ => driver/rados}/rgw_rados.h | 6 +---- src/rgw/{ => driver/rados}/rgw_reshard.cc | 0 src/rgw/{ => driver/rados}/rgw_reshard.h | 5 +---- src/rgw/{ => driver/rados}/rgw_rest_bucket.cc | 0 src/rgw/{ => driver/rados}/rgw_rest_bucket.h | 0 src/rgw/{ => driver/rados}/rgw_rest_log.cc | 0 src/rgw/{ => driver/rados}/rgw_rest_log.h | 0 src/rgw/driver/rados/rgw_service.h | 6 +---- src/rgw/driver/rados/rgw_sync.h | 4 +--- src/rgw/driver/rados/rgw_sync_module.h | 5 +---- src/rgw/driver/rados/rgw_sync_module_aws.h | 5 +---- src/rgw/driver/rados/rgw_sync_module_es.h | 5 +---- src/rgw/driver/rados/rgw_sync_module_log.h | 5 +---- src/rgw/driver/rados/rgw_sync_trace.h | 6 +---- src/rgw/driver/rados/rgw_tools.h | 4 +--- src/rgw/driver/rados/rgw_trim_bilog.h | 5 +---- src/rgw/driver/rados/rgw_user.h | 6 +---- src/rgw/driver/rados/rgw_zone.h | 5 +---- src/rgw/rgw_acl.h | 5 +---- src/rgw/rgw_acl_s3.h | 5 +---- src/rgw/rgw_acl_swift.h | 4 +--- src/rgw/rgw_asio_client.h | 5 +---- src/rgw/rgw_asio_frontend.h | 5 +---- src/rgw/rgw_auth.h | 6 +---- src/rgw/rgw_auth_filters.h | 5 +---- src/rgw/rgw_auth_keystone.h | 6 +---- src/rgw/rgw_auth_registry.h | 6 +---- src/rgw/rgw_auth_s3.h | 5 +---- src/rgw/rgw_b64.h | 5 +---- src/rgw/rgw_basic_types.h | 5 +---- src/rgw/rgw_cache.h | 5 +---- src/rgw/rgw_client_io.h | 5 +---- src/rgw/rgw_client_io_filters.h | 4 +--- src/rgw/rgw_compression.h | 5 +---- src/rgw/rgw_coroutine.h | 5 +---- src/rgw/rgw_cors.h | 4 +--- src/rgw/rgw_cors_s3.h | 4 +--- src/rgw/rgw_cors_swift.h | 4 +--- src/rgw/rgw_crypt.h | 5 +---- src/rgw/rgw_crypt_sanitize.h | 4 +--- src/rgw/rgw_d3n_cacherequest.h | 5 +---- src/rgw/rgw_dmclock.h | 6 ++--- src/rgw/rgw_dmclock_async_scheduler.h | 4 +--- src/rgw/rgw_dmclock_scheduler.h | 5 +---- src/rgw/rgw_dmclock_scheduler_ctx.h | 5 +---- src/rgw/rgw_dmclock_sync_scheduler.h | 4 +--- src/rgw/rgw_es_query.h | 6 +---- src/rgw/rgw_file.h | 5 +---- src/rgw/rgw_formats.h | 5 +---- src/rgw/rgw_frontend.h | 5 +---- src/rgw/rgw_http_client.h | 4 +--- src/rgw/rgw_http_client_curl.h | 5 +---- src/rgw/rgw_http_errors.h | 6 +---- src/rgw/rgw_iam_policy.h | 5 +---- src/rgw/rgw_iam_policy_keywords.h | 5 +---- src/rgw/rgw_keystone.h | 5 +---- src/rgw/rgw_kmip_client.h | 4 +--- src/rgw/rgw_kmip_client_impl.h | 6 ++--- src/rgw/rgw_kms.h | 4 +--- src/rgw/rgw_lc.h | 5 +---- src/rgw/rgw_lc_s3.h | 5 +---- src/rgw/rgw_ldap.h | 5 +---- src/rgw/rgw_lib.h | 5 +---- src/rgw/rgw_lib_frontend.h | 5 +---- src/rgw/rgw_loadgen.h | 5 +---- src/rgw/rgw_log.h | 6 +---- src/rgw/rgw_meta_sync_status.h | 5 +---- src/rgw/rgw_multi.h | 5 +---- src/rgw/rgw_multi_del.h | 6 +---- src/rgw/rgw_object_lock.h | 4 +--- src/rgw/rgw_oidc_provider.h | 5 +---- src/rgw/rgw_op.h | 5 +---- src/rgw/rgw_opa.h | 5 +---- src/rgw/rgw_os_lib.h | 5 +---- src/rgw/rgw_period_history.h | 5 +---- src/rgw/rgw_period_puller.h | 5 +---- src/rgw/rgw_period_pusher.h | 5 +---- src/rgw/rgw_policy_s3.h | 4 +--- src/rgw/rgw_process.h | 5 +---- src/rgw/rgw_quota.h | 5 +---- src/rgw/rgw_realm_reloader.h | 5 +---- src/rgw/rgw_realm_watcher.h | 5 +---- src/rgw/rgw_request.h | 5 +---- src/rgw/rgw_resolve.h | 5 +---- src/rgw/rgw_role.h | 7 ++---- src/rgw/rgw_s3select.h | 2 ++ src/rgw/rgw_string.h | 5 +---- src/rgw/rgw_sts.h | 4 +--- src/rgw/rgw_swift_auth.h | 6 +---- src/rgw/rgw_tag.h | 5 +---- src/rgw/rgw_tag_s3.h | 6 +---- src/rgw/rgw_tar.h | 5 +---- src/rgw/rgw_token.h | 5 +---- src/rgw/rgw_torrent.h | 4 +--- src/rgw/rgw_usage.h | 6 +---- src/rgw/rgw_web_idp.h | 5 +---- src/rgw/rgw_website.h | 5 +---- src/rgw/rgw_xml.h | 6 +---- src/rgw/services/svc_bucket_sobj.h | 2 +- src/rgw/services/svc_user_rados.h | 3 +-- 124 files changed, 128 insertions(+), 448 deletions(-) rename src/rgw/{ => driver/rados}/rgw_pubsub.cc (100%) rename src/rgw/{ => driver/rados}/rgw_pubsub.h (99%) rename src/rgw/{ => driver/rados}/rgw_pubsub_push.cc (100%) rename src/rgw/{ => driver/rados}/rgw_pubsub_push.h (100%) rename src/rgw/{ => driver/rados}/rgw_putobj_processor.cc (100%) rename src/rgw/{ => driver/rados}/rgw_putobj_processor.h (100%) rename src/rgw/{ => driver/rados}/rgw_rados.cc (100%) rename src/rgw/{ => driver/rados}/rgw_rados.h (99%) rename src/rgw/{ => driver/rados}/rgw_reshard.cc (100%) rename src/rgw/{ => driver/rados}/rgw_reshard.h (99%) rename src/rgw/{ => driver/rados}/rgw_rest_bucket.cc (100%) rename src/rgw/{ => driver/rados}/rgw_rest_bucket.h (100%) rename src/rgw/{ => driver/rados}/rgw_rest_log.cc (100%) rename src/rgw/{ => driver/rados}/rgw_rest_log.h (100%) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 7b13abfb57735..3f792bf8e069b 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -84,31 +84,24 @@ set(librgw_common_srcs rgw_multipart_meta_filter.cc rgw_obj_manifest.cc rgw_period.cc - rgw_pubsub.cc rgw_realm.cc rgw_sync.cc rgw_sync_policy.cc - rgw_pubsub_push.cc rgw_notify_event_type.cc rgw_period_history.cc rgw_period_puller.cc - rgw_reshard.cc rgw_coroutine.cc rgw_cr_rest.cc rgw_op.cc rgw_policy_s3.cc rgw_public_access.cc rgw_putobj.cc - rgw_putobj_processor.cc rgw_quota.cc - rgw_rados.cc rgw_resolve.cc rgw_rest.cc - rgw_rest_bucket.cc rgw_rest_client.cc rgw_rest_config.cc rgw_rest_conn.cc - rgw_rest_log.cc rgw_rest_metadata.cc rgw_rest_ratelimit.cc rgw_rest_role.cc @@ -168,6 +161,13 @@ set(librgw_common_srcs driver/rados/rgw_object_expirer_core.cc driver/rados/rgw_otp.cc driver/rados/rgw_period.cc + driver/rados/rgw_pubsub.cc + driver/rados/rgw_pubsub_push.cc + driver/rados/rgw_putobj_processor.cc + driver/rados/rgw_rados.cc + driver/rados/rgw_reshard.cc + driver/rados/rgw_rest_bucket.cc + driver/rados/rgw_rest_log.cc driver/rados/rgw_rest_pubsub.cc driver/rados/rgw_rest_realm.cc driver/rados/rgw_rest_user.cc @@ -345,20 +345,20 @@ set(rgw_a_srcs rgw_process.cc rgw_realm_reloader.cc rgw_realm_watcher.cc - rgw_rest_bucket.cc rgw_rest_config.cc rgw_rest_info.cc - rgw_rest_log.cc rgw_rest_metadata.cc rgw_rest_ratelimit.cc - driver/rados/rgw_rest_realm.cc rgw_rest_sts.cc rgw_rest_swift.cc rgw_rest_usage.cc rgw_signal.cc rgw_swift_auth.cc rgw_usage.cc - rgw_sts.cc) + rgw_sts.cc + driver/rados/rgw_rest_bucket.cc + driver/rados/rgw_rest_log.cc + driver/rados/rgw_rest_realm.cc) gperf_generate(${CMAKE_SOURCE_DIR}/src/rgw/rgw_iam_policy_keywords.gperf rgw_iam_policy_keywords.frag.cc) diff --git a/src/rgw/driver/dbstore/common/dbstore.h b/src/rgw/driver/dbstore/common/dbstore.h index 41aae8d8dfcae..b4a7ca057b388 100644 --- a/src/rgw/driver/dbstore/common/dbstore.h +++ b/src/rgw/driver/dbstore/common/dbstore.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef DB_STORE_H -#define DB_STORE_H +#pragma once #include #include @@ -2016,5 +2015,3 @@ struct db_get_obj_data { }; } } // namespace rgw::store - -#endif diff --git a/src/rgw/driver/dbstore/common/dbstore_log.h b/src/rgw/driver/dbstore/common/dbstore_log.h index 8d981d5adc419..416508369ef96 100644 --- a/src/rgw/driver/dbstore/common/dbstore_log.h +++ b/src/rgw/driver/dbstore/common/dbstore_log.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef DB_STORE_LOG_H -#define DB_STORE_LOG_H +#pragma once #include #include @@ -14,5 +13,3 @@ #undef dout_prefix #define dout_prefix *_dout << "rgw dbstore: " - -#endif diff --git a/src/rgw/driver/dbstore/sqlite/sqliteDB.h b/src/rgw/driver/dbstore/sqlite/sqliteDB.h index 4f651448a9948..ec0ef2bb28269 100644 --- a/src/rgw/driver/dbstore/sqlite/sqliteDB.h +++ b/src/rgw/driver/dbstore/sqlite/sqliteDB.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#ifndef SQLITE_DB_H -#define SQLITE_DB_H +#pragma once #include #include @@ -550,5 +549,3 @@ class SQLGetLCHead : public SQLiteDB, public GetLCHeadOp { int Execute(const DoutPrefixProvider *dpp, DBOpParams *params); int Bind(const DoutPrefixProvider *dpp, DBOpParams *params); }; - -#endif diff --git a/src/rgw/driver/rados/cls_fifo_legacy.h b/src/rgw/driver/rados/cls_fifo_legacy.h index 3ea54082d8877..b0a68157e6195 100644 --- a/src/rgw/driver/rados/cls_fifo_legacy.h +++ b/src/rgw/driver/rados/cls_fifo_legacy.h @@ -13,8 +13,7 @@ * */ -#ifndef CEPH_RGW_CLS_FIFO_LEGACY_H -#define CEPH_RGW_CLS_FIFO_LEGACY_H +#pragma once #include #include @@ -333,5 +332,3 @@ public: }; } - -#endif // CEPH_RGW_CLS_FIFO_LEGACY_H diff --git a/src/rgw/driver/rados/rgw_cr_rados.h b/src/rgw/driver/rados/rgw_cr_rados.h index 3451376ee6eaa..f17061b37ea29 100644 --- a/src/rgw/driver/rados/rgw_cr_rados.h +++ b/src/rgw/driver/rados/rgw_cr_rados.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_CR_RADOS_H -#define CEPH_RGW_CR_RADOS_H +#pragma once #include #include "include/ceph_assert.h" @@ -1640,4 +1639,3 @@ public: int operate(const DoutPrefixProvider* dpp) override; }; -#endif diff --git a/src/rgw/driver/rados/rgw_cr_tools.h b/src/rgw/driver/rados/rgw_cr_tools.h index ebdbfeb51b7f2..4cd97aa82f518 100644 --- a/src/rgw/driver/rados/rgw_cr_tools.h +++ b/src/rgw/driver/rados/rgw_cr_tools.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_CR_TOOLS_H -#define CEPH_RGW_CR_TOOLS_H +#pragma once #include "rgw_cr_rados.h" #include "rgw_tools.h" @@ -84,4 +83,3 @@ struct rgw_bucket_get_sync_policy_result { using RGWBucketGetSyncPolicyHandlerCR = RGWSimpleAsyncCR; -#endif diff --git a/src/rgw/driver/rados/rgw_d3n_datacache.h b/src/rgw/driver/rados/rgw_d3n_datacache.h index 5d3537f3b1484..98e61b63fe303 100644 --- a/src/rgw/driver/rados/rgw_d3n_datacache.h +++ b/src/rgw/driver/rados/rgw_d3n_datacache.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGWD3NDATACACHE_H -#define CEPH_RGWD3NDATACACHE_H +#pragma once #include "rgw_rados.h" #include @@ -258,4 +257,3 @@ int D3nRGWDataCache::get_obj_iterate_cb(const DoutPrefixProvider *dpp, const return 0; } -#endif diff --git a/src/rgw/driver/rados/rgw_data_sync.h b/src/rgw/driver/rados/rgw_data_sync.h index ccaa20884eb56..9059bd14cce7a 100644 --- a/src/rgw/driver/rados/rgw_data_sync.h +++ b/src/rgw/driver/rados/rgw_data_sync.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_DATA_SYNC_H -#define CEPH_RGW_DATA_SYNC_H +#pragma once #include #include @@ -867,5 +866,3 @@ public: bool supports_data_export() override { return false; } int create_instance(const DoutPrefixProvider *dpp, CephContext *cct, const JSONFormattable& config, RGWSyncModuleInstanceRef *instance) override; }; - -#endif diff --git a/src/rgw/driver/rados/rgw_datalog.h b/src/rgw/driver/rados/rgw_datalog.h index 695485bf2e41c..1c9a00c1fffb9 100644 --- a/src/rgw/driver/rados/rgw_datalog.h +++ b/src/rgw/driver/rados/rgw_datalog.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_DATALOG_H -#define CEPH_RGW_DATALOG_H +#pragma once #include #include @@ -379,6 +378,3 @@ public: // 1 on empty, 0 on non-empty, negative on error. virtual int is_empty(const DoutPrefixProvider *dpp) = 0; }; - - -#endif diff --git a/src/rgw/driver/rados/rgw_etag_verifier.h b/src/rgw/driver/rados/rgw_etag_verifier.h index 56a679ebddd31..18a4f5a3fb635 100644 --- a/src/rgw/driver/rados/rgw_etag_verifier.h +++ b/src/rgw/driver/rados/rgw_etag_verifier.h @@ -12,8 +12,8 @@ * same algorithm used at the source cluster i.e. MD5 sum of the individual ETag * on the MPU parts. */ -#ifndef CEPH_RGW_ETAG_VERIFIER_H -#define CEPH_RGW_ETAG_VERIFIER_H + +#pragma once #include "rgw_putobj.h" #include "rgw_op.h" @@ -88,5 +88,3 @@ int create_etag_verifier(const DoutPrefixProvider *dpp, etag_verifier_ptr& verifier); } // namespace rgw::putobj - -#endif /* CEPH_RGW_ETAG_VERIFIER_H */ diff --git a/src/rgw/driver/rados/rgw_gc.h b/src/rgw/driver/rados/rgw_gc.h index 196f2802c1649..f3df64099a1cd 100644 --- a/src/rgw/driver/rados/rgw_gc.h +++ b/src/rgw/driver/rados/rgw_gc.h @@ -1,9 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_GC_H -#define CEPH_RGW_GC_H - +#pragma once #include "include/types.h" #include "include/rados/librados.hpp" @@ -82,6 +80,3 @@ public: std::ostream& gen_prefix(std::ostream& out) const; }; - - -#endif diff --git a/src/rgw/driver/rados/rgw_lc_tier.h b/src/rgw/driver/rados/rgw_lc_tier.h index 1b21f262092af..729c4c304cd62 100644 --- a/src/rgw/driver/rados/rgw_lc_tier.h +++ b/src/rgw/driver/rados/rgw_lc_tier.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LC_TIER_H -#define CEPH_RGW_LC_TIER_H +#pragma once #include "rgw_lc.h" #include "rgw_rest_conn.h" @@ -50,5 +49,3 @@ struct RGWLCCloudTierCtx { /* Transition object to cloud endpoint */ int rgw_cloud_tier_transfer_object(RGWLCCloudTierCtx& tier_ctx, std::set& cloud_targets); - -#endif diff --git a/src/rgw/driver/rados/rgw_log_backing.h b/src/rgw/driver/rados/rgw_log_backing.h index a431574c46fa8..3dfdb8ee4ef11 100644 --- a/src/rgw/driver/rados/rgw_log_backing.h +++ b/src/rgw/driver/rados/rgw_log_backing.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LOGBACKING_H -#define CEPH_RGW_LOGBACKING_H +#pragma once #include #include @@ -393,5 +392,3 @@ public: return 0; } }; - -#endif diff --git a/src/rgw/driver/rados/rgw_metadata.h b/src/rgw/driver/rados/rgw_metadata.h index 72283702e7e13..c83db7c40437b 100644 --- a/src/rgw/driver/rados/rgw_metadata.h +++ b/src/rgw/driver/rados/rgw_metadata.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_METADATA_H -#define CEPH_RGW_METADATA_H +#pragma once #include #include @@ -297,4 +296,3 @@ void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::s void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::string& section, const std::string& key, std::string& name); void rgw_shard_name(const std::string& prefix, unsigned shard_id, std::string& name); -#endif diff --git a/src/rgw/driver/rados/rgw_object_expirer_core.h b/src/rgw/driver/rados/rgw_object_expirer_core.h index fccd4199e7ea9..be63815c19edc 100644 --- a/src/rgw/driver/rados/rgw_object_expirer_core.h +++ b/src/rgw/driver/rados/rgw_object_expirer_core.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_OBJEXP_H -#define CEPH_OBJEXP_H +#pragma once #include #include @@ -145,4 +144,3 @@ public: void start_processor(); void stop_processor(); }; -#endif /* CEPH_OBJEXP_H */ diff --git a/src/rgw/driver/rados/rgw_otp.h b/src/rgw/driver/rados/rgw_otp.h index eacff15314c21..885e8abb8e1d7 100644 --- a/src/rgw/driver/rados/rgw_otp.h +++ b/src/rgw/driver/rados/rgw_otp.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_OTP_H -#define CEPH_RGW_OTP_H +#pragma once #include "rgw_sal_fwd.h" #include "cls/otp/cls_otp_types.h" @@ -109,6 +108,3 @@ public: const rgw_user& user, optional_yield y, const RemoveParams& params = {}); }; - -#endif - diff --git a/src/rgw/rgw_pubsub.cc b/src/rgw/driver/rados/rgw_pubsub.cc similarity index 100% rename from src/rgw/rgw_pubsub.cc rename to src/rgw/driver/rados/rgw_pubsub.cc diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/driver/rados/rgw_pubsub.h similarity index 99% rename from src/rgw/rgw_pubsub.h rename to src/rgw/driver/rados/rgw_pubsub.h index c0e9e144bb2f0..08a329e4c02ae 100644 --- a/src/rgw/rgw_pubsub.h +++ b/src/rgw/driver/rados/rgw_pubsub.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_PUBSUB_H -#define CEPH_RGW_PUBSUB_H +#pragma once #include "services/svc_sys_obj.h" #include "rgw_tools.h" @@ -712,5 +711,3 @@ int RGWPubSub::write(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, cons return rgw_put_system_obj(dpp, svc_sysobj, obj.pool, obj.oid, bl, false, objv_tracker, real_time(), y); } - -#endif diff --git a/src/rgw/rgw_pubsub_push.cc b/src/rgw/driver/rados/rgw_pubsub_push.cc similarity index 100% rename from src/rgw/rgw_pubsub_push.cc rename to src/rgw/driver/rados/rgw_pubsub_push.cc diff --git a/src/rgw/rgw_pubsub_push.h b/src/rgw/driver/rados/rgw_pubsub_push.h similarity index 100% rename from src/rgw/rgw_pubsub_push.h rename to src/rgw/driver/rados/rgw_pubsub_push.h diff --git a/src/rgw/rgw_putobj_processor.cc b/src/rgw/driver/rados/rgw_putobj_processor.cc similarity index 100% rename from src/rgw/rgw_putobj_processor.cc rename to src/rgw/driver/rados/rgw_putobj_processor.cc diff --git a/src/rgw/rgw_putobj_processor.h b/src/rgw/driver/rados/rgw_putobj_processor.h similarity index 100% rename from src/rgw/rgw_putobj_processor.h rename to src/rgw/driver/rados/rgw_putobj_processor.h diff --git a/src/rgw/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc similarity index 100% rename from src/rgw/rgw_rados.cc rename to src/rgw/driver/rados/rgw_rados.cc diff --git a/src/rgw/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h similarity index 99% rename from src/rgw/rgw_rados.h rename to src/rgw/driver/rados/rgw_rados.h index 1b52951787272..a3258ac8b7239 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGWRADOS_H -#define CEPH_RGWRADOS_H +#pragma once #include #include @@ -1631,6 +1630,3 @@ struct get_obj_data { return flush(std::move(c)); } }; - - -#endif diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc similarity index 100% rename from src/rgw/rgw_reshard.cc rename to src/rgw/driver/rados/rgw_reshard.cc diff --git a/src/rgw/rgw_reshard.h b/src/rgw/driver/rados/rgw_reshard.h similarity index 99% rename from src/rgw/rgw_reshard.h rename to src/rgw/driver/rados/rgw_reshard.h index d8a8e4991db61..59819f3a58d20 100644 --- a/src/rgw/rgw_reshard.h +++ b/src/rgw/driver/rados/rgw_reshard.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_RESHARD_H -#define RGW_RESHARD_H +#pragma once #include #include @@ -273,5 +272,3 @@ public: // unblock any threads waiting on reshard void stop(); }; - -#endif diff --git a/src/rgw/rgw_rest_bucket.cc b/src/rgw/driver/rados/rgw_rest_bucket.cc similarity index 100% rename from src/rgw/rgw_rest_bucket.cc rename to src/rgw/driver/rados/rgw_rest_bucket.cc diff --git a/src/rgw/rgw_rest_bucket.h b/src/rgw/driver/rados/rgw_rest_bucket.h similarity index 100% rename from src/rgw/rgw_rest_bucket.h rename to src/rgw/driver/rados/rgw_rest_bucket.h diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/driver/rados/rgw_rest_log.cc similarity index 100% rename from src/rgw/rgw_rest_log.cc rename to src/rgw/driver/rados/rgw_rest_log.cc diff --git a/src/rgw/rgw_rest_log.h b/src/rgw/driver/rados/rgw_rest_log.h similarity index 100% rename from src/rgw/rgw_rest_log.h rename to src/rgw/driver/rados/rgw_rest_log.h diff --git a/src/rgw/driver/rados/rgw_service.h b/src/rgw/driver/rados/rgw_service.h index dc4991388a981..4c0b8d8421f76 100644 --- a/src/rgw/driver/rados/rgw_service.h +++ b/src/rgw/driver/rados/rgw_service.h @@ -1,9 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SERVICE_H -#define CEPH_RGW_SERVICE_H - +#pragma once #include #include @@ -215,5 +213,3 @@ struct RGWCtl { int init(RGWServices *_svc, rgw::sal::Driver* driver, const DoutPrefixProvider *dpp); }; - -#endif diff --git a/src/rgw/driver/rados/rgw_sync.h b/src/rgw/driver/rados/rgw_sync.h index 8c4e511ae3eeb..e6c255cc60145 100644 --- a/src/rgw/driver/rados/rgw_sync.h +++ b/src/rgw/driver/rados/rgw_sync.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SYNC_H -#define CEPH_RGW_SYNC_H +#pragma once #include @@ -546,4 +545,3 @@ RGWCoroutine* create_list_remote_mdlog_shard_cr(RGWMetaSyncEnv *env, uint32_t max_entries, rgw_mdlog_shard_data *result); -#endif diff --git a/src/rgw/driver/rados/rgw_sync_module.h b/src/rgw/driver/rados/rgw_sync_module.h index 6d974c39a274a..494e88608c11e 100644 --- a/src/rgw/driver/rados/rgw_sync_module.h +++ b/src/rgw/driver/rados/rgw_sync_module.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SYNC_MODULE_H -#define CEPH_RGW_SYNC_MODULE_H +#pragma once #include "rgw_common.h" #include "rgw_coroutine.h" @@ -198,5 +197,3 @@ public: }; void rgw_register_sync_modules(RGWSyncModulesManager *modules_manager); - -#endif diff --git a/src/rgw/driver/rados/rgw_sync_module_aws.h b/src/rgw/driver/rados/rgw_sync_module_aws.h index 48f0145fdf92e..92532ff00e7fa 100644 --- a/src/rgw/driver/rados/rgw_sync_module_aws.h +++ b/src/rgw/driver/rados/rgw_sync_module_aws.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_SYNC_MODULE_AWS_H -#define RGW_SYNC_MODULE_AWS_H +#pragma once #include "rgw_sync_module.h" @@ -107,5 +106,3 @@ class RGWAWSSyncModule : public RGWSyncModule { bool supports_data_export() override { return false;} int create_instance(const DoutPrefixProvider *dpp, CephContext *cct, const JSONFormattable& config, RGWSyncModuleInstanceRef *instance) override; }; - -#endif /* RGW_SYNC_MODULE_AWS_H */ diff --git a/src/rgw/driver/rados/rgw_sync_module_es.h b/src/rgw/driver/rados/rgw_sync_module_es.h index 6c0c422c39ccb..c8c9fcc439c55 100644 --- a/src/rgw/driver/rados/rgw_sync_module_es.h +++ b/src/rgw/driver/rados/rgw_sync_module_es.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SYNC_MODULE_ES_H -#define CEPH_RGW_SYNC_MODULE_ES_H +#pragma once #include "rgw_sync_module.h" @@ -58,5 +57,3 @@ public: return true; } }; - -#endif diff --git a/src/rgw/driver/rados/rgw_sync_module_log.h b/src/rgw/driver/rados/rgw_sync_module_log.h index ecf3bb78911ef..ab475959da374 100644 --- a/src/rgw/driver/rados/rgw_sync_module_log.h +++ b/src/rgw/driver/rados/rgw_sync_module_log.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SYNC_MODULE_LOG_H -#define CEPH_RGW_SYNC_MODULE_LOG_H +#pragma once #include "rgw_sync_module.h" @@ -14,5 +13,3 @@ public: } int create_instance(const DoutPrefixProvider *dpp, CephContext *cct, const JSONFormattable& config, RGWSyncModuleInstanceRef *instance) override; }; - -#endif diff --git a/src/rgw/driver/rados/rgw_sync_trace.h b/src/rgw/driver/rados/rgw_sync_trace.h index 9617dac70dbc9..1fcc8bed83012 100644 --- a/src/rgw/driver/rados/rgw_sync_trace.h +++ b/src/rgw/driver/rados/rgw_sync_trace.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SYNC_LOG_H -#define CEPH_RGW_SYNC_LOG_H +#pragma once #include @@ -140,6 +139,3 @@ public: bufferlist& out) override; std::string get_active_names(); }; - - -#endif diff --git a/src/rgw/driver/rados/rgw_tools.h b/src/rgw/driver/rados/rgw_tools.h index 6aeb9b8910058..d96912cb866be 100644 --- a/src/rgw/driver/rados/rgw_tools.h +++ b/src/rgw/driver/rados/rgw_tools.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_TOOLS_H -#define CEPH_RGW_TOOLS_H +#pragma once #include @@ -274,4 +273,3 @@ void rgw_complete_aio_completion(librados::AioCompletion* c, int r); // (Currently providing nullptr will wipe all attributes.) std::map* no_change_attrs(); -#endif diff --git a/src/rgw/driver/rados/rgw_trim_bilog.h b/src/rgw/driver/rados/rgw_trim_bilog.h index 5b9c4cdd7ec1b..6a11d24766be2 100644 --- a/src/rgw/driver/rados/rgw_trim_bilog.h +++ b/src/rgw/driver/rados/rgw_trim_bilog.h @@ -14,8 +14,7 @@ * Foundation. See file COPYING. */ -#ifndef RGW_SYNC_LOG_TRIM_H -#define RGW_SYNC_LOG_TRIM_H +#pragma once #include #include @@ -120,5 +119,3 @@ WRITE_CLASS_ENCODER(rgw::BucketTrimStatus); int bilog_trim(const DoutPrefixProvider* p, rgw::sal::RadosStore* store, RGWBucketInfo& bucket_info, uint64_t gen, int shard_id, std::string_view start_marker, std::string_view end_marker); - -#endif // RGW_SYNC_LOG_TRIM_H diff --git a/src/rgw/driver/rados/rgw_user.h b/src/rgw/driver/rados/rgw_user.h index 110124cdbc78d..83e3720f71bd2 100644 --- a/src/rgw/driver/rados/rgw_user.h +++ b/src/rgw/driver/rados/rgw_user.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_USER_H -#define CEPH_RGW_USER_H +#pragma once #include #include @@ -882,6 +881,3 @@ class RGWUserMetaHandlerAllocator { public: static RGWMetadataHandler *alloc(RGWSI_User *user_svc); }; - - -#endif diff --git a/src/rgw/driver/rados/rgw_zone.h b/src/rgw/driver/rados/rgw_zone.h index bede6c7a44812..2d69d5f1c7230 100644 --- a/src/rgw/driver/rados/rgw_zone.h +++ b/src/rgw/driver/rados/rgw_zone.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ZONE_H -#define CEPH_RGW_ZONE_H +#pragma once #include #include "rgw_zone_types.h" @@ -942,5 +941,3 @@ int delete_zone(const DoutPrefixProvider* dpp, optional_yield y, sal::ZoneWriter& writer); } // namespace rgw - -#endif diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h index aa346a63f13f6..c520501583b81 100644 --- a/src/rgw/rgw_acl.h +++ b/src/rgw/rgw_acl.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ACL_H -#define CEPH_RGW_ACL_H +#pragma once #include #include @@ -413,5 +412,3 @@ public: friend bool operator!=(const RGWAccessControlPolicy& lhs, const RGWAccessControlPolicy& rhs); }; WRITE_CLASS_ENCODER(RGWAccessControlPolicy) - -#endif diff --git a/src/rgw/rgw_acl_s3.h b/src/rgw/rgw_acl_s3.h index 9521b9f47371c..c234d722b997f 100644 --- a/src/rgw/rgw_acl_s3.h +++ b/src/rgw/rgw_acl_s3.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ACL_S3_H -#define CEPH_RGW_ACL_S3_H +#pragma once #include #include @@ -114,5 +113,3 @@ class RGWACLXMLParser_S3 : public RGWXMLParser public: explicit RGWACLXMLParser_S3(CephContext *_cct) : cct(_cct) {} }; - -#endif diff --git a/src/rgw/rgw_acl_swift.h b/src/rgw/rgw_acl_swift.h index 8d263e854d260..4cb1e4b8f8f57 100644 --- a/src/rgw/rgw_acl_swift.h +++ b/src/rgw/rgw_acl_swift.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ACL_SWIFT_H -#define CEPH_RGW_ACL_SWIFT_H +#pragma once #include #include @@ -57,4 +56,3 @@ public: const std::string& acl_str); boost::optional to_str() const; }; -#endif diff --git a/src/rgw/rgw_asio_client.h b/src/rgw/rgw_asio_client.h index a595b0351997b..f3e92b7e51c11 100644 --- a/src/rgw/rgw_asio_client.h +++ b/src/rgw/rgw_asio_client.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_ASIO_CLIENT_H -#define RGW_ASIO_CLIENT_H +#pragma once #include #include @@ -58,5 +57,3 @@ class ClientIO : public io::RestfulClient, } // namespace asio } // namespace rgw - -#endif // RGW_ASIO_CLIENT_H diff --git a/src/rgw/rgw_asio_frontend.h b/src/rgw/rgw_asio_frontend.h index 940b717b5f2b3..2de6f337a9fb3 100644 --- a/src/rgw/rgw_asio_frontend.h +++ b/src/rgw/rgw_asio_frontend.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_ASIO_FRONTEND_H -#define RGW_ASIO_FRONTEND_H +#pragma once #include #include "rgw_frontend.h" @@ -24,5 +23,3 @@ public: void pause_for_new_config() override; void unpause_with_new_config() override; }; - -#endif // RGW_ASIO_FRONTEND_H diff --git a/src/rgw/rgw_auth.h b/src/rgw/rgw_auth.h index b0beb185bac12..82e0d0c9755a4 100644 --- a/src/rgw/rgw_auth.h +++ b/src/rgw/rgw_auth.h @@ -1,9 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp - -#ifndef CEPH_RGW_AUTH_H -#define CEPH_RGW_AUTH_H +#pragma once #include #include @@ -791,5 +789,3 @@ uint32_t rgw_perms_from_aclspec_default_strategy( const rgw_user& uid, const rgw::auth::Identity::aclspec_t& aclspec, const DoutPrefixProvider *dpp); - -#endif /* CEPH_RGW_AUTH_H */ diff --git a/src/rgw/rgw_auth_filters.h b/src/rgw/rgw_auth_filters.h index 08f6d659c90d0..9e3818bef071d 100644 --- a/src/rgw/rgw_auth_filters.h +++ b/src/rgw/rgw_auth_filters.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_AUTH_FILTERS_H -#define CEPH_RGW_AUTH_FILTERS_H +#pragma once #include @@ -301,5 +300,3 @@ SysReqApplier add_sysreq(CephContext* const cct, } /* namespace auth */ } /* namespace rgw */ - -#endif /* CEPH_RGW_AUTH_FILTERS_H */ diff --git a/src/rgw/rgw_auth_keystone.h b/src/rgw/rgw_auth_keystone.h index 31a4388080a97..f3c9604370b9a 100644 --- a/src/rgw/rgw_auth_keystone.h +++ b/src/rgw/rgw_auth_keystone.h @@ -1,9 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp - -#ifndef CEPH_RGW_AUTH_KEYSTONE_H -#define CEPH_RGW_AUTH_KEYSTONE_H +#pragma once #include #include @@ -196,5 +194,3 @@ public: }; /* namespace keystone */ }; /* namespace auth */ }; /* namespace rgw */ - -#endif /* CEPH_RGW_AUTH_KEYSTONE_H */ diff --git a/src/rgw/rgw_auth_registry.h b/src/rgw/rgw_auth_registry.h index 992ee46e81c73..b9d239aecbd16 100644 --- a/src/rgw/rgw_auth_registry.h +++ b/src/rgw/rgw_auth_registry.h @@ -1,9 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp - -#ifndef CEPH_RGW_AUTH_REGISTRY_H -#define CEPH_RGW_AUTH_REGISTRY_H +#pragma once #include #include @@ -97,5 +95,3 @@ public: using rgw_auth_registry_t = rgw::auth::StrategyRegistry; using rgw_auth_registry_ptr_t = std::unique_ptr; - -#endif /* CEPH_RGW_AUTH_REGISTRY_H */ diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h index 2984c051662dd..a4471467b860e 100644 --- a/src/rgw/rgw_auth_s3.h +++ b/src/rgw/rgw_auth_s3.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_AUTH_S3_H -#define CEPH_RGW_AUTH_S3_H +#pragma once #include #include @@ -645,5 +644,3 @@ get_v2_signature(CephContext*, } /* namespace s3 */ } /* namespace auth */ } /* namespace rgw */ - -#endif diff --git a/src/rgw/rgw_b64.h b/src/rgw/rgw_b64.h index a1699ef61bcc8..2948f6f315867 100644 --- a/src/rgw/rgw_b64.h +++ b/src/rgw/rgw_b64.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_B64_H -#define RGW_B64_H +#pragma once #include #include @@ -83,5 +82,3 @@ namespace rgw { return outstr; } } /* namespace */ - -#endif /* RGW_B64_H */ diff --git a/src/rgw/rgw_basic_types.h b/src/rgw/rgw_basic_types.h index 168e8bc63b816..1ccd160ba7ea9 100644 --- a/src/rgw/rgw_basic_types.h +++ b/src/rgw/rgw_basic_types.h @@ -18,8 +18,7 @@ * radosgw or OSD contexts (e.g., rgw_sal.h, rgw_common.h) */ -#ifndef CEPH_RGW_BASIC_TYPES_H -#define CEPH_RGW_BASIC_TYPES_H +#pragma once #include #include @@ -283,5 +282,3 @@ struct RGWUploadPartInfo { static void generate_test_instances(std::list& o); }; WRITE_CLASS_ENCODER(RGWUploadPartInfo) - -#endif /* CEPH_RGW_BASIC_TYPES_H */ diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index cffa6573d63e8..e70beb0644620 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGWCACHE_H -#define CEPH_RGWCACHE_H +#pragma once #include #include @@ -221,5 +220,3 @@ public: void unchain_cache(RGWChainedCache *cache); void invalidate_all(); }; - -#endif diff --git a/src/rgw/rgw_client_io.h b/src/rgw/rgw_client_io.h index 5e47aee0627a4..aedfe4500b8d1 100644 --- a/src/rgw/rgw_client_io.h +++ b/src/rgw/rgw_client_io.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_CLIENT_IO_H -#define CEPH_RGW_CLIENT_IO_H +#pragma once #include #include @@ -434,5 +433,3 @@ public: std::istream(static_cast(this)) { } }; - -#endif /* CEPH_RGW_CLIENT_IO_H */ diff --git a/src/rgw/rgw_client_io_filters.h b/src/rgw/rgw_client_io_filters.h index 538d7f16723d6..55d405e1bb234 100644 --- a/src/rgw/rgw_client_io_filters.h +++ b/src/rgw/rgw_client_io_filters.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_CLIENT_IO_DECOIMPL_H -#define CEPH_RGW_CLIENT_IO_DECOIMPL_H +#pragma once #include @@ -453,4 +452,3 @@ ReorderingFilter add_reordering(T&& t) { } /* namespace io */ } /* namespace rgw */ -#endif /* CEPH_RGW_CLIENT_IO_DECOIMPL_H */ diff --git a/src/rgw/rgw_compression.h b/src/rgw/rgw_compression.h index e558f3bbd8ef6..84250bfe43ccb 100644 --- a/src/rgw/rgw_compression.h +++ b/src/rgw/rgw_compression.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_COMPRESSION_H -#define CEPH_RGW_COMPRESSION_H +#pragma once #include @@ -61,5 +60,3 @@ public: std::optional get_compressor_message() { return compressor_message; } }; /* RGWPutObj_Compress */ - -#endif /* CEPH_RGW_COMPRESSION_H */ diff --git a/src/rgw/rgw_coroutine.h b/src/rgw/rgw_coroutine.h index d43d0afbf87b6..eb3216640c641 100644 --- a/src/rgw/rgw_coroutine.h +++ b/src/rgw/rgw_coroutine.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_COROUTINE_H -#define CEPH_RGW_COROUTINE_H +#pragma once #ifdef _ASSERT_H #define NEED_ASSERT_H @@ -721,5 +720,3 @@ public: virtual int finish() { return 0; } virtual void request_cleanup() {} }; - -#endif diff --git a/src/rgw/rgw_cors.h b/src/rgw/rgw_cors.h index 1620795e8b480..17eaeeb82301c 100644 --- a/src/rgw/rgw_cors.h +++ b/src/rgw/rgw_cors.h @@ -13,8 +13,7 @@ * */ -#ifndef CEPH_RGW_CORS_H -#define CEPH_RGW_CORS_H +#pragma once #include #include @@ -133,4 +132,3 @@ static inline int validate_name_string(std::string_view o) { return -1; return 0; } -#endif /*CEPH_RGW_CORS_H*/ diff --git a/src/rgw/rgw_cors_s3.h b/src/rgw/rgw_cors_s3.h index f4ec8a1f95bff..8d92a3c5fd34b 100644 --- a/src/rgw/rgw_cors_s3.h +++ b/src/rgw/rgw_cors_s3.h @@ -13,8 +13,7 @@ * */ -#ifndef CEPH_RGW_CORS_S3_H -#define CEPH_RGW_CORS_S3_H +#pragma once #include #include @@ -57,4 +56,3 @@ class RGWCORSXMLParser_S3 : public RGWXMLParser public: explicit RGWCORSXMLParser_S3(const DoutPrefixProvider *_dpp, CephContext *_cct) : dpp(_dpp), cct(_cct) {} }; -#endif /*CEPH_RGW_CORS_S3_H*/ diff --git a/src/rgw/rgw_cors_swift.h b/src/rgw/rgw_cors_swift.h index 3eff9bea32be5..f5a1b14a0919c 100644 --- a/src/rgw/rgw_cors_swift.h +++ b/src/rgw/rgw_cors_swift.h @@ -13,8 +13,7 @@ * */ -#ifndef CEPH_RGW_CORS_SWIFT3_H -#define CEPH_RGW_CORS_SWIFT3_H +#pragma once #include #include @@ -82,4 +81,3 @@ class RGWCORSConfiguration_SWIFT : public RGWCORSConfiguration return 0; } }; -#endif /*CEPH_RGW_CORS_SWIFT3_H*/ diff --git a/src/rgw/rgw_crypt.h b/src/rgw/rgw_crypt.h index 33d6bc3bbc38c..6008dd05eaea6 100644 --- a/src/rgw/rgw_crypt.h +++ b/src/rgw/rgw_crypt.h @@ -5,8 +5,7 @@ * Crypto filters for Put/Post/Get operations. */ -#ifndef CEPH_RGW_CRYPT_H -#define CEPH_RGW_CRYPT_H +#pragma once #include @@ -171,5 +170,3 @@ static inline std::string get_str_attribute(std::map& a } int rgw_remove_sse_s3_bucket_key(req_state *s); - -#endif diff --git a/src/rgw/rgw_crypt_sanitize.h b/src/rgw/rgw_crypt_sanitize.h index 1f862089cbdf1..aa0261fc25188 100644 --- a/src/rgw/rgw_crypt_sanitize.h +++ b/src/rgw/rgw_crypt_sanitize.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_RGW_CRYPT_SANITIZE_H_ -#define RGW_RGW_CRYPT_SANITIZE_H_ +#pragma once #include #include "rgw_common.h" @@ -67,4 +66,3 @@ std::ostream& operator<<(std::ostream& out, const auth& x); std::ostream& operator<<(std::ostream& out, const log_content& x); } } -#endif /* RGW_RGW_CRYPT_SANITIZE_H_ */ diff --git a/src/rgw/rgw_d3n_cacherequest.h b/src/rgw/rgw_d3n_cacherequest.h index ad93a689f9c68..eac8c7610eeba 100644 --- a/src/rgw/rgw_d3n_cacherequest.h +++ b/src/rgw/rgw_d3n_cacherequest.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_CACHEREQUEST_H -#define RGW_CACHEREQUEST_H +#pragma once #include #include @@ -144,5 +143,3 @@ struct D3nL1CacheRequest { } }; - -#endif diff --git a/src/rgw/rgw_dmclock.h b/src/rgw/rgw_dmclock.h index 6805c00500035..6fad9cc1895ee 100644 --- a/src/rgw/rgw_dmclock.h +++ b/src/rgw/rgw_dmclock.h @@ -14,8 +14,8 @@ * */ -#ifndef RGW_DMCLOCK_H -#define RGW_DMCLOCK_H +#pragma once + #include "dmclock/src/dmclock_server.h" namespace rgw::dmclock { @@ -50,5 +50,3 @@ inline scheduler_t get_scheduler_t(CephContext* const cct) } } // namespace rgw::dmclock - -#endif /* RGW_DMCLOCK_H */ diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h index ccac09be7b059..7bde75870a5a2 100644 --- a/src/rgw/rgw_dmclock_async_scheduler.h +++ b/src/rgw/rgw_dmclock_async_scheduler.h @@ -12,8 +12,7 @@ * */ -#ifndef RGW_DMCLOCK_ASYNC_SCHEDULER_H -#define RGW_DMCLOCK_ASYNC_SCHEDULER_H +#pragma once #include "common/async/completion.h" @@ -216,4 +215,3 @@ private: }; } // namespace rgw::dmclock -#endif /* RGW_DMCLOCK_ASYNC_SCHEDULER_H */ diff --git a/src/rgw/rgw_dmclock_scheduler.h b/src/rgw/rgw_dmclock_scheduler.h index f3dc229db384a..655e12bef352f 100644 --- a/src/rgw/rgw_dmclock_scheduler.h +++ b/src/rgw/rgw_dmclock_scheduler.h @@ -12,8 +12,7 @@ * */ -#ifndef RGW_DMCLOCK_SCHEDULER_H -#define RGW_DMCLOCK_SCHEDULER_H +#pragma once #include "common/ceph_time.h" #include "common/ceph_context.h" @@ -85,5 +84,3 @@ private: }; } // namespace rgw::dmclock - -#endif // RGW_DMCLOCK_SCHEDULER_H diff --git a/src/rgw/rgw_dmclock_scheduler_ctx.h b/src/rgw/rgw_dmclock_scheduler_ctx.h index be3b2cc279415..f27b81c266e55 100644 --- a/src/rgw/rgw_dmclock_scheduler_ctx.h +++ b/src/rgw/rgw_dmclock_scheduler_ctx.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_DMCLOCK_SCHEDULER_CTX_H -#define RGW_DMCLOCK_SCHEDULER_CTX_H +#pragma once #include "common/perf_counters.h" #include "common/ceph_context.h" @@ -118,5 +117,3 @@ private: }; } // namespace rgw::dmclock - -#endif /* RGW_DMCLOCK_SCHEDULER_CTX_H */ diff --git a/src/rgw/rgw_dmclock_sync_scheduler.h b/src/rgw/rgw_dmclock_sync_scheduler.h index 8b3edc3a61383..740234965e939 100644 --- a/src/rgw/rgw_dmclock_sync_scheduler.h +++ b/src/rgw/rgw_dmclock_sync_scheduler.h @@ -12,8 +12,7 @@ * */ -#ifndef RGW_DMCLOCK_SYNC_SCHEDULER_H -#define RGW_DMCLOCK_SYNC_SCHEDULER_H +#pragma once #include "rgw_dmclock_scheduler.h" #include "rgw_dmclock_scheduler_ctx.h" @@ -76,4 +75,3 @@ SyncScheduler::SyncScheduler(CephContext *cct, GetClientCounters&& counters, {} } // namespace rgw::dmclock -#endif /* RGW_DMCLOCK_SYNC_SCHEDULER_H */ diff --git a/src/rgw/rgw_es_query.h b/src/rgw/rgw_es_query.h index 27cc36d75260e..f96e06f750575 100644 --- a/src/rgw/rgw_es_query.h +++ b/src/rgw/rgw_es_query.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ES_QUERY_H -#define CEPH_RGW_ES_QUERY_H +#pragma once #include "rgw_string.h" @@ -163,6 +162,3 @@ public: return (restricted_fields && restricted_fields->find(f) != restricted_fields->end()); } }; - - -#endif diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h index fbda86ba4cb39..fbbe782b73e0d 100644 --- a/src/rgw/rgw_file.h +++ b/src/rgw/rgw_file.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_FILE_H -#define RGW_FILE_H +#pragma once #include "include/rados/rgw_file.h" @@ -2855,5 +2854,3 @@ public: } /* namespace rgw */ - -#endif /* RGW_FILE_H */ diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h index d7e47259d5839..12ad224a3dbbe 100644 --- a/src/rgw/rgw_formats.h +++ b/src/rgw/rgw_formats.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_FORMATS_H -#define CEPH_RGW_FORMATS_H +#pragma once #include "common/Formatter.h" @@ -132,5 +131,3 @@ protected: public: RGWNullFlusher() : RGWFormatterFlusher(nullptr) {} }; - -#endif diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h index 34d3b06586cbd..4876fb8f85378 100644 --- a/src/rgw/rgw_frontend.h +++ b/src/rgw/rgw_frontend.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_FRONTEND_H -#define RGW_FRONTEND_H +#pragma once #include #include @@ -210,5 +209,3 @@ class RGWFrontendPauser : public RGWRealmReloader::Pauser { pauser->resume(driver); } }; - -#endif /* RGW_FRONTEND_H */ diff --git a/src/rgw/rgw_http_client.h b/src/rgw/rgw_http_client.h index d20b28cf4f940..dbd705a1880d4 100644 --- a/src/rgw/rgw_http_client.h +++ b/src/rgw/rgw_http_client.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_HTTP_CLIENT_H -#define CEPH_RGW_HTTP_CLIENT_H +#pragma once #include "common/async/yield_context.h" #include "common/Cond.h" @@ -347,4 +346,3 @@ public: static int send(RGWHTTPClient *req); static int process(RGWHTTPClient *req, optional_yield y); }; -#endif diff --git a/src/rgw/rgw_http_client_curl.h b/src/rgw/rgw_http_client_curl.h index 2a49a2c36c4da..a28826b0d8399 100644 --- a/src/rgw/rgw_http_client_curl.h +++ b/src/rgw/rgw_http_client_curl.h @@ -13,8 +13,7 @@ * */ -#ifndef RGW_HTTP_CLIENT_CURL_H -#define RGW_HTTP_CLIENT_CURL_H +#pragma once #include #include @@ -28,5 +27,3 @@ void setup_curl(boost::optional m); void cleanup_curl(); } } - -#endif diff --git a/src/rgw/rgw_http_errors.h b/src/rgw/rgw_http_errors.h index d8674552ab6a3..5e052819e052e 100644 --- a/src/rgw/rgw_http_errors.h +++ b/src/rgw/rgw_http_errors.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_HTTP_ERRORS_H_ -#define RGW_HTTP_ERRORS_H_ +#pragma once #include "rgw_common.h" @@ -43,6 +42,3 @@ static inline int rgw_http_error_to_errno(int http_err) return 0; /* unreachable */ } - - -#endif diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h index 564ddd530c0b9..ff6061c7550ea 100644 --- a/src/rgw/rgw_iam_policy.h +++ b/src/rgw/rgw_iam_policy.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_IAM_POLICY_H -#define CEPH_RGW_IAM_POLICY_H +#pragma once #include #include @@ -580,5 +579,3 @@ bool is_public(const Policy& p); } } - -#endif diff --git a/src/rgw/rgw_iam_policy_keywords.h b/src/rgw/rgw_iam_policy_keywords.h index 1c94dfe171039..8130ace456c60 100644 --- a/src/rgw/rgw_iam_policy_keywords.h +++ b/src/rgw/rgw_iam_policy_keywords.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_POLICY_S3V2_KEYWORDS_H -#define CEPH_RGW_POLICY_S3V2_KEYWORDS_H +#pragma once namespace rgw { namespace IAM { @@ -138,5 +137,3 @@ enum class Type { }; } } - -#endif // CEPH_RGW_POLICY_S3V2_KEYWORDS_H diff --git a/src/rgw/rgw_keystone.h b/src/rgw/rgw_keystone.h index 84961e4f9d29a..0ba88278268dd 100644 --- a/src/rgw/rgw_keystone.h +++ b/src/rgw/rgw_keystone.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_KEYSTONE_H -#define CEPH_RGW_KEYSTONE_H +#pragma once #include #include @@ -332,5 +331,3 @@ public: }; /* namespace keystone */ }; /* namespace rgw */ - -#endif diff --git a/src/rgw/rgw_kmip_client.h b/src/rgw/rgw_kmip_client.h index efc7db325b90e..2992921136e5d 100644 --- a/src/rgw/rgw_kmip_client.h +++ b/src/rgw/rgw_kmip_client.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_KMIP_CLIENT_H -#define CEPH_RGW_KMIP_CLIENT_H +#pragma once class RGWKMIPManager; @@ -64,4 +63,3 @@ public: void rgw_kmip_client_init(RGWKMIPManager &); void rgw_kmip_client_cleanup(); -#endif diff --git a/src/rgw/rgw_kmip_client_impl.h b/src/rgw/rgw_kmip_client_impl.h index 841df87f4c336..d36903a4b7959 100644 --- a/src/rgw/rgw_kmip_client_impl.h +++ b/src/rgw/rgw_kmip_client_impl.h @@ -1,8 +1,8 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_KMIP_CLIENT_IMPL_H -#define CEPH_RGW_KMIP_CLIENT_IMPL_H +#pragma once + struct RGWKmipWorker; class RGWKMIPManagerImpl: public RGWKMIPManager { protected: @@ -25,5 +25,3 @@ public: void stop(); friend RGWKmipWorker; }; -#endif - diff --git a/src/rgw/rgw_kms.h b/src/rgw/rgw_kms.h index ba9b436139ed7..f8e8655f261c9 100644 --- a/src/rgw/rgw_kms.h +++ b/src/rgw/rgw_kms.h @@ -5,8 +5,7 @@ * Server-side encryption integrations with Key Management Systems (SSE-KMS) */ -#ifndef CEPH_RGW_KMS_H -#define CEPH_RGW_KMS_H +#pragma once #include @@ -63,4 +62,3 @@ public: virtual int get_key(const DoutPrefixProvider *dpp, std::string_view key_id, std::string& actual_key) = 0; virtual ~SecretEngine(){}; }; -#endif diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h index e74b67fca6d05..bd8efd9b6d03e 100644 --- a/src/rgw/rgw_lc.h +++ b/src/rgw/rgw_lc.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LC_H -#define CEPH_RGW_LC_H +#pragma once #include #include @@ -639,5 +638,3 @@ bool s3_multipart_abort_header( std::string& rule_id); } // namespace rgw::lc - -#endif diff --git a/src/rgw/rgw_lc_s3.h b/src/rgw/rgw_lc_s3.h index 84ffdc6c8ad83..5486aef358057 100644 --- a/src/rgw/rgw_lc_s3.h +++ b/src/rgw/rgw_lc_s3.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LC_S3_H -#define CEPH_RGW_LC_S3_H +#pragma once #include #include @@ -99,5 +98,3 @@ public: int rebuild(RGWLifecycleConfiguration& dest); void dump_xml(Formatter *f) const; }; - -#endif diff --git a/src/rgw/rgw_ldap.h b/src/rgw/rgw_ldap.h index 06986e5f59ac7..05a48ce190005 100644 --- a/src/rgw/rgw_ldap.h +++ b/src/rgw/rgw_ldap.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_LDAP_H -#define RGW_LDAP_H +#pragma once #include "acconfig.h" @@ -137,5 +136,3 @@ namespace rgw { #include "include/ceph_assert.h" std::string parse_rgw_ldap_bindpw(CephContext* ctx); - -#endif /* RGW_LDAP_H */ diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h index 02317ea8e0846..1ad54b49b4857 100644 --- a/src/rgw/rgw_lib.h +++ b/src/rgw/rgw_lib.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_LIB_H -#define RGW_LIB_H +#pragma once #include #include "rgw_common.h" @@ -208,5 +207,3 @@ namespace rgw { }; /* RGWLibContinuedReq */ } /* namespace rgw */ - -#endif /* RGW_LIB_H */ diff --git a/src/rgw/rgw_lib_frontend.h b/src/rgw/rgw_lib_frontend.h index 57e58c522e596..1772724d218ed 100644 --- a/src/rgw/rgw_lib_frontend.h +++ b/src/rgw/rgw_lib_frontend.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_LIB_FRONTEND_H -#define RGW_LIB_FRONTEND_H +#pragma once #include @@ -112,5 +111,3 @@ namespace rgw { }; /* RGWLibFrontend */ } /* namespace rgw */ - -#endif /* RGW_LIB_FRONTEND_H */ diff --git a/src/rgw/rgw_loadgen.h b/src/rgw/rgw_loadgen.h index 5a0abca57f79c..7f3f847c2b102 100644 --- a/src/rgw/rgw_loadgen.h +++ b/src/rgw/rgw_loadgen.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LOADGEN_H -#define CEPH_RGW_LOADGEN_H +#pragma once #include #include @@ -71,5 +70,3 @@ public: size_t complete_request() override; }; - -#endif diff --git a/src/rgw/rgw_log.h b/src/rgw/rgw_log.h index 0c97b2f8a64bb..1dd79273e6a19 100644 --- a/src/rgw/rgw_log.h +++ b/src/rgw/rgw_log.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_LOG_H -#define CEPH_RGW_LOG_H +#pragma once #include #include "rgw_common.h" @@ -288,6 +287,3 @@ void rgw_log_usage_init(CephContext* cct, rgw::sal::Driver* driver); void rgw_log_usage_finalize(); void rgw_format_ops_log_entry(struct rgw_log_entry& entry, ceph::Formatter *formatter); - -#endif /* CEPH_RGW_LOG_H */ - diff --git a/src/rgw/rgw_meta_sync_status.h b/src/rgw/rgw_meta_sync_status.h index 6272b471db01b..f8a2ae3ee7ba3 100644 --- a/src/rgw/rgw_meta_sync_status.h +++ b/src/rgw/rgw_meta_sync_status.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_META_SYNC_STATUS_H -#define RGW_META_SYNC_STATUS_H +#pragma once #include @@ -120,5 +119,3 @@ struct rgw_meta_sync_status { static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(rgw_meta_sync_status) - -#endif diff --git a/src/rgw/rgw_multi.h b/src/rgw/rgw_multi.h index bb371e71c5e5a..f57c90e748956 100644 --- a/src/rgw/rgw_multi.h +++ b/src/rgw/rgw_multi.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_MULTI_H -#define CEPH_RGW_MULTI_H +#pragma once #include #include "rgw_xml.h" @@ -61,5 +60,3 @@ public: }; extern bool is_v2_upload_id(const std::string& upload_id); - -#endif diff --git a/src/rgw/rgw_multi_del.h b/src/rgw/rgw_multi_del.h index 6187aae37e8d3..b060decf420ad 100644 --- a/src/rgw/rgw_multi_del.h +++ b/src/rgw/rgw_multi_del.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_MULTI_DELETE_H_ -#define RGW_MULTI_DELETE_H_ +#pragma once #include #include "rgw_xml.h" @@ -61,6 +60,3 @@ public: RGWMultiDelXMLParser() {} ~RGWMultiDelXMLParser() override {} }; - - -#endif diff --git a/src/rgw/rgw_object_lock.h b/src/rgw/rgw_object_lock.h index 997c660e4cd11..27c73feaec92b 100644 --- a/src/rgw/rgw_object_lock.h +++ b/src/rgw/rgw_object_lock.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_OBJECT_LOCK_H -#define CEPH_RGW_OBJECT_LOCK_H +#pragma once #include #include "common/ceph_time.h" @@ -221,4 +220,3 @@ public: bool is_enabled() const; }; WRITE_CLASS_ENCODER(RGWObjectLegalHold) -#endif //CEPH_RGW_OBJECT_LOCK_H diff --git a/src/rgw/rgw_oidc_provider.h b/src/rgw/rgw_oidc_provider.h index c3b794df0d62a..581ee879a6422 100644 --- a/src/rgw/rgw_oidc_provider.h +++ b/src/rgw/rgw_oidc_provider.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_OIDC_PROVIDER_H -#define CEPH_RGW_OIDC_PROVIDER_H +#pragma once #include @@ -120,5 +119,3 @@ public: WRITE_CLASS_ENCODER(RGWOIDCProvider) } } // namespace rgw::sal -#endif /* CEPH_RGW_OIDC_PROVIDER_H */ - diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index d0ff70b3132dd..a0e8b273ce074 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -10,8 +10,7 @@ * to provide additional virtual methods such as send_response or get_params. */ -#ifndef CEPH_RGW_OP_H -#define CEPH_RGW_OP_H +#pragma once #include @@ -2669,5 +2668,3 @@ int rgw_policy_from_attrset(const DoutPrefixProvider *dpp, CephContext *cct, std::map& attrset, RGWAccessControlPolicy *policy); - -#endif /* CEPH_RGW_OP_H */ diff --git a/src/rgw/rgw_opa.h b/src/rgw/rgw_opa.h index 38824c58aeb2f..6fd3b21bdcf00 100644 --- a/src/rgw/rgw_opa.h +++ b/src/rgw/rgw_opa.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_OPA_H -#define RGW_OPA_H +#pragma once #include "rgw_common.h" #include "rgw_op.h" @@ -10,5 +9,3 @@ /* authorize request using OPA */ int rgw_opa_authorize(RGWOp*& op, req_state* s); - -#endif /* RGW_OPA_H */ diff --git a/src/rgw/rgw_os_lib.h b/src/rgw/rgw_os_lib.h index b65c7c22accb4..65df0a7266594 100644 --- a/src/rgw/rgw_os_lib.h +++ b/src/rgw/rgw_os_lib.h @@ -1,12 +1,9 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_OS_LIB_H -#define RGW_OS_LIB_H +#pragma once #include #include "rgw_common.h" #include "rgw_lib.h" - -#endif /* RGW_OS_LIB_H */ diff --git a/src/rgw/rgw_period_history.h b/src/rgw/rgw_period_history.h index 0d412c76a3bed..3d18fbf9e2271 100644 --- a/src/rgw/rgw_period_history.h +++ b/src/rgw/rgw_period_history.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_PERIOD_HISTORY_H -#define RGW_PERIOD_HISTORY_H +#pragma once #include #include @@ -113,5 +112,3 @@ class RGWPeriodHistory final { /// the current_history Cursor lookup(epoch_t realm_epoch); }; - -#endif // RGW_PERIOD_HISTORY_H diff --git a/src/rgw/rgw_period_puller.h b/src/rgw/rgw_period_puller.h index 654029dd1c4ef..88138d36b8ca4 100644 --- a/src/rgw/rgw_period_puller.h +++ b/src/rgw/rgw_period_puller.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_PERIOD_PULLER_H -#define CEPH_RGW_PERIOD_PULLER_H +#pragma once #include "rgw_period_history.h" #include "include/common_fwd.h" @@ -23,5 +22,3 @@ class RGWPeriodPuller : public RGWPeriodHistory::Puller { int pull(const DoutPrefixProvider *dpp, const std::string& period_id, RGWPeriod& period, optional_yield y) override; }; - -#endif // CEPH_RGW_PERIOD_PULLER_H diff --git a/src/rgw/rgw_period_pusher.h b/src/rgw/rgw_period_pusher.h index ae267a11e78e5..3ea7bd7ddebe0 100644 --- a/src/rgw/rgw_period_pusher.h +++ b/src/rgw/rgw_period_pusher.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_PERIOD_PUSHER_H -#define RGW_PERIOD_PUSHER_H +#pragma once #include #include @@ -53,5 +52,3 @@ class RGWPeriodPusher final : public RGWRealmWatcher::Watcher, class CRThread; //< contains thread, coroutine manager, http manager std::unique_ptr cr_thread; //< thread to run the push coroutines }; - -#endif // RGW_PERIOD_PUSHER_H diff --git a/src/rgw/rgw_policy_s3.h b/src/rgw/rgw_policy_s3.h index 14ad6c4e3af19..2a8a7ab096fd2 100644 --- a/src/rgw/rgw_policy_s3.h +++ b/src/rgw/rgw_policy_s3.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_POLICY_H -#define CEPH_RGW_POLICY_H +#pragma once #include @@ -56,4 +55,3 @@ public: int check(RGWPolicyEnv *env, std::string& err_msg); int from_json(bufferlist& bl, std::string& err_msg); }; -#endif diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h index 9d45362248e16..67ebb710a4c29 100644 --- a/src/rgw/rgw_process.h +++ b/src/rgw/rgw_process.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_PROCESS_H -#define RGW_PROCESS_H +#pragma once #include "rgw_common.h" #include "rgw_acl.h" @@ -158,5 +157,3 @@ extern int rgw_process_authenticated(RGWHandler_REST* handler, bool skip_retarget = false); #undef dout_context - -#endif /* RGW_PROCESS_H */ diff --git a/src/rgw/rgw_quota.h b/src/rgw/rgw_quota.h index b97e83a69b13c..632cb48171b25 100644 --- a/src/rgw/rgw_quota.h +++ b/src/rgw/rgw_quota.h @@ -13,8 +13,7 @@ * */ -#ifndef CEPH_RGW_QUOTA_H -#define CEPH_RGW_QUOTA_H +#pragma once #include "include/utime.h" #include "common/config_fwd.h" @@ -48,5 +47,3 @@ public: // apply default quotas from configuration void rgw_apply_default_bucket_quota(RGWQuotaInfo& quota, const ConfigProxy& conf); void rgw_apply_default_user_quota(RGWQuotaInfo& quota, const ConfigProxy& conf); - -#endif diff --git a/src/rgw/rgw_realm_reloader.h b/src/rgw/rgw_realm_reloader.h index 0a28cff18603e..25082a2e490d7 100644 --- a/src/rgw/rgw_realm_reloader.h +++ b/src/rgw/rgw_realm_reloader.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_REALM_RELOADER_H -#define RGW_REALM_RELOADER_H +#pragma once #include "rgw_realm_watcher.h" #include "common/Cond.h" @@ -63,5 +62,3 @@ class RGWRealmReloader : public RGWRealmWatcher::Watcher { ceph::condition_variable cond; //< to signal reload() after an invalid realm config C_Reload* reload_scheduled; //< reload() context if scheduled }; - -#endif // RGW_REALM_RELOADER_H diff --git a/src/rgw/rgw_realm_watcher.h b/src/rgw/rgw_realm_watcher.h index b2e3ac6b9d649..2a0c0d0769900 100644 --- a/src/rgw/rgw_realm_watcher.h +++ b/src/rgw/rgw_realm_watcher.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_REALM_WATCHER_H -#define RGW_REALM_WATCHER_H +#pragma once #include "include/rados/librados.hpp" #include "include/ceph_assert.h" @@ -65,5 +64,3 @@ class RGWRealmWatcher : public librados::WatchCtx2 { std::map watchers; }; - -#endif // RGW_REALM_WATCHER_H diff --git a/src/rgw/rgw_request.h b/src/rgw/rgw_request.h index ed54dca595ec4..cd05f51c94242 100644 --- a/src/rgw/rgw_request.h +++ b/src/rgw/rgw_request.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_REQUEST_H -#define RGW_REQUEST_H +#pragma once #include "rgw_common.h" #include "rgw_acl.h" @@ -39,5 +38,3 @@ RGWLoadGenRequest(uint64_t req_id, const std::string& _m, const std::string& _r, : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl), fail_flag(ff) {} }; - -#endif /* RGW_REQUEST_H */ diff --git a/src/rgw/rgw_resolve.h b/src/rgw/rgw_resolve.h index 92e09220cc6a0..0428e0a02fca5 100644 --- a/src/rgw/rgw_resolve.h +++ b/src/rgw/rgw_resolve.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_RESOLVE_H -#define CEPH_RGW_RESOLVE_H +#pragma once #include "rgw_common.h" @@ -23,5 +22,3 @@ public: extern void rgw_init_resolver(void); extern void rgw_shutdown_resolver(void); extern RGWResolver *rgw_resolver; - -#endif diff --git a/src/rgw/rgw_role.h b/src/rgw/rgw_role.h index 868578924f517..9183829d976b0 100644 --- a/src/rgw/rgw_role.h +++ b/src/rgw/rgw_role.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_ROLE_H -#define CEPH_RGW_ROLE_H +#pragma once #include @@ -10,7 +9,7 @@ #include "common/ceph_json.h" #include "common/ceph_context.h" -#include "rgw/rgw_rados.h" +#include "rgw_rados.h" #include "rgw_metadata.h" class RGWRados; @@ -208,5 +207,3 @@ private: Driver* driver; }; } } // namespace rgw::sal - -#endif /* CEPH_RGW_ROLE_H */ diff --git a/src/rgw/rgw_s3select.h b/src/rgw/rgw_s3select.h index 00d55cf93ea32..4a506ba4c0a4b 100644 --- a/src/rgw/rgw_s3select.h +++ b/src/rgw/rgw_s3select.h @@ -2,6 +2,8 @@ // vim: ts=8 sw=2 smarttab ft=cpp // +#pragma once + namespace rgw::s3select { RGWOp* create_s3select_op(); } diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h index 90e64f98a2587..e58a356f4715c 100644 --- a/src/rgw/rgw_string.h +++ b/src/rgw/rgw_string.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_STRING_H -#define CEPH_RGW_STRING_H +#pragma once #include #include @@ -234,5 +233,3 @@ static constexpr uint32_t MATCH_CASE_INSENSITIVE = 0x01; extern bool match_wildcards(std::string_view pattern, std::string_view input, uint32_t flags = 0); - -#endif diff --git a/src/rgw/rgw_sts.h b/src/rgw/rgw_sts.h index f73be37658972..65dbb17477f15 100644 --- a/src/rgw/rgw_sts.h +++ b/src/rgw/rgw_sts.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_STS_H -#define CEPH_RGW_STS_H +#pragma once #include "rgw_role.h" #include "rgw_auth.h" @@ -251,4 +250,3 @@ public: AssumeRoleWithWebIdentityResponse assumeRoleWithWebIdentity(const DoutPrefixProvider *dpp, AssumeRoleWithWebIdentityRequest& req); }; } -#endif /* CEPH_RGW_STS_H */ diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h index 1d5a54dde6003..4b71dbc705af7 100644 --- a/src/rgw/rgw_swift_auth.h +++ b/src/rgw/rgw_swift_auth.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_SWIFT_AUTH_H -#define CEPH_RGW_SWIFT_AUTH_H +#pragma once #include "rgw_common.h" #include "rgw_user.h" @@ -353,6 +352,3 @@ public: return new RGWHandler_SWIFT_Auth; } }; - - -#endif diff --git a/src/rgw/rgw_tag.h b/src/rgw/rgw_tag.h index 88a4e6652288a..15bb25ee832cf 100644 --- a/src/rgw/rgw_tag.h +++ b/src/rgw/rgw_tag.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_TAG_H -#define RGW_TAG_H +#pragma once #include #include @@ -48,5 +47,3 @@ protected: tag_map_t& get_tags() {return tag_map;} }; WRITE_CLASS_ENCODER(RGWObjTags) - -#endif /* RGW_TAG_H */ diff --git a/src/rgw/rgw_tag_s3.h b/src/rgw/rgw_tag_s3.h index e07e081fb48af..7cc892f1f669e 100644 --- a/src/rgw/rgw_tag_s3.h +++ b/src/rgw/rgw_tag_s3.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef RGW_TAG_S3_H -#define RGW_TAG_S3_H +#pragma once #include #include @@ -48,6 +47,3 @@ public: return tagset.rebuild(dest); } }; - - -#endif /* RGW_TAG_S3_H */ diff --git a/src/rgw/rgw_tar.h b/src/rgw/rgw_tar.h index f51a7fc66407b..b06943a3c1852 100644 --- a/src/rgw/rgw_tar.h +++ b/src/rgw/rgw_tar.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_TAR_H -#define CEPH_RGW_TAR_H +#pragma once #include #include @@ -152,5 +151,3 @@ interpret_block(const StatusIndicator& status, ceph::bufferlist& bl) { } /* namespace tar */ } /* namespace rgw */ - -#endif /* CEPH_RGW_TAR_H */ diff --git a/src/rgw/rgw_token.h b/src/rgw/rgw_token.h index 9505f970c6037..b2476596bec34 100644 --- a/src/rgw/rgw_token.h +++ b/src/rgw/rgw_token.h @@ -13,8 +13,7 @@ * */ -#ifndef RGW_TOKEN_H -#define RGW_TOKEN_H +#pragma once #include #include @@ -169,5 +168,3 @@ namespace rgw { } } /* namespace rgw */ - -#endif /* RGW_TOKEN_H */ diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h index 1f62ced351799..704dba28cf865 100644 --- a/src/rgw/rgw_torrent.h +++ b/src/rgw/rgw_torrent.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_TORRENT_H -#define CEPH_RGW_TORRENT_H +#pragma once #include #include @@ -138,4 +137,3 @@ private: void sha1(SHA1 *h, bufferlist &bl, off_t bl_len); int save_torrent_file(optional_yield y); }; -#endif /* CEPH_RGW_TORRENT_H */ diff --git a/src/rgw/rgw_usage.h b/src/rgw/rgw_usage.h index ec596ed75469f..b12b57df0d84b 100644 --- a/src/rgw/rgw_usage.h +++ b/src/rgw/rgw_usage.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_USAGE_H -#define CEPH_RGW_USAGE_H +#pragma once #include #include @@ -29,6 +28,3 @@ public: static int clear(const DoutPrefixProvider *dpp, rgw::sal::Driver* driver); }; - - -#endif diff --git a/src/rgw/rgw_web_idp.h b/src/rgw/rgw_web_idp.h index 089c4da665dc2..a9aa5b82916e2 100644 --- a/src/rgw/rgw_web_idp.h +++ b/src/rgw/rgw_web_idp.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_WEB_IDP_H -#define CEPH_RGW_WEB_IDP_H +#pragma once namespace rgw { namespace web_idp { @@ -25,5 +24,3 @@ struct WebTokenClaims { }; /* namespace web_idp */ }; /* namespace rgw */ - -#endif /* CEPH_RGW_WEB_IDP_H */ diff --git a/src/rgw/rgw_website.h b/src/rgw/rgw_website.h index fa3c19578fad0..2ba22c87a8c70 100644 --- a/src/rgw/rgw_website.h +++ b/src/rgw/rgw_website.h @@ -14,8 +14,7 @@ * */ -#ifndef RGW_WEBSITE_H -#define RGW_WEBSITE_H +#pragma once #include #include @@ -242,5 +241,3 @@ struct RGWBucketWebsiteConf } }; WRITE_CLASS_ENCODER(RGWBucketWebsiteConf) - -#endif diff --git a/src/rgw/rgw_xml.h b/src/rgw/rgw_xml.h index 6a34344fbeb99..ab3f267ade1bd 100644 --- a/src/rgw/rgw_xml.h +++ b/src/rgw/rgw_xml.h @@ -1,8 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab ft=cpp -#ifndef CEPH_RGW_XML_H -#define CEPH_RGW_XML_H +#pragma once #include #include @@ -370,6 +369,3 @@ static void encode_xml(const char *name, const std::optional& o, ceph::Format encode_xml(name, *o, f); } - - -#endif diff --git a/src/rgw/services/svc_bucket_sobj.h b/src/rgw/services/svc_bucket_sobj.h index 93e2063a70969..8e9fe063c1b13 100644 --- a/src/rgw/services/svc_bucket_sobj.h +++ b/src/rgw/services/svc_bucket_sobj.h @@ -22,13 +22,13 @@ #include "svc_meta_be.h" #include "svc_bucket_types.h" #include "svc_bucket.h" +#include "svc_bucket_sync.h" class RGWSI_Zone; class RGWSI_SysObj; class RGWSI_SysObj_Cache; class RGWSI_Meta; class RGWSI_SyncModules; -class RGWSI_Bucket_Sync; struct rgw_cache_entry_info; diff --git a/src/rgw/services/svc_user_rados.h b/src/rgw/services/svc_user_rados.h index ff1fe41989fb2..177f720d6b18b 100644 --- a/src/rgw/services/svc_user_rados.h +++ b/src/rgw/services/svc_user_rados.h @@ -20,6 +20,7 @@ #include "svc_meta_be.h" #include "svc_user.h" +#include "rgw_bucket.h" class RGWSI_RADOS; class RGWSI_Zone; @@ -31,8 +32,6 @@ class RGWSI_MetaBackend_Handler; struct rgw_cache_entry_info; -class RGWUserBuckets; - class RGWGetUserHeader_CB; class RGWGetUserStats_CB; -- 2.39.5