rgw: add editor directive comments to rgw services source files

So that both vi and emacs help to correctly format the source files,
add the directives to each of the source files. In addition, use
`#pragma once` in the header files instead of the macro work-around.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

diff --git a/src/rgw/services/svc_finisher.cc b/src/rgw/services/svc_finisher.cc
index d239ff3c4fa2b648ba9297c07da224fa963c0b92..9e8bee0bf7a1868b99dbfddfca15a22a731466c8 100644 (file)
--- a/src/rgw/services/svc_finisher.cc
+++ b/src/rgw/services/svc_finisher.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "common/Finisher.h"
 
 #include "svc_finisher.h"

diff --git a/src/rgw/services/svc_finisher.h b/src/rgw/services/svc_finisher.h
index 116fd8fded07d87ddd5f1c9acd51e9be9ac9567d..c6c25f5a349dfa93ec4f37725e3ee31af8b8c573 100644 (file)
--- a/src/rgw/services/svc_finisher.h
+++ b/src/rgw/services/svc_finisher.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_FINISHER_H
-#define CEPH_RGW_SERVICES_FINISHER_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -41,5 +42,3 @@ public:
 
   void schedule_context(Context *c);
 };
-
-#endif

diff --git a/src/rgw/services/svc_notify.cc b/src/rgw/services/svc_notify.cc
index f48b497b7fb91f4d4198aee48c1fedd59b18f065..bf61d13783924822ae2546e71e3038d275176e87 100644 (file)
--- a/src/rgw/services/svc_notify.cc
+++ b/src/rgw/services/svc_notify.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "include/random.h"
 #include "common/errno.h"
 

diff --git a/src/rgw/services/svc_notify.h b/src/rgw/services/svc_notify.h
index 306a5f337a4f2b69a1cf27bebb2ad81f452f4db7..85780d36617b05c8743ded413274d773a3802e28 100644 (file)
--- a/src/rgw/services/svc_notify.h
+++ b/src/rgw/services/svc_notify.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_NOTIFY_H
-#define CEPH_RGW_SERVICES_NOTIFY_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -96,6 +97,3 @@ public:
 
   void register_watch_cb(CB *cb);
 };
-
-#endif
-

diff --git a/src/rgw/services/svc_quota.cc b/src/rgw/services/svc_quota.cc
index f2baac36b452ad80408d17e786b4658d32a492c3..38f68ccae36afb473c5c18f37a07ed77c49660cb 100644 (file)
--- a/src/rgw/services/svc_quota.cc
+++ b/src/rgw/services/svc_quota.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_quota.h"
 #include "svc_zone.h"
 

diff --git a/src/rgw/services/svc_quota.h b/src/rgw/services/svc_quota.h
index 7dfbf19b612b4197c62afde317e166ea7e492c5e..01030e723844e186eef0b8b5338d7d410826a6f4 100644 (file)
--- a/src/rgw/services/svc_quota.h
+++ b/src/rgw/services/svc_quota.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_QUOTA_H
-#define CEPH_RGW_SERVICES_QUOTA_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -19,5 +20,3 @@ public:
   const RGWQuotaInfo& get_bucket_quota() const;
   const RGWQuotaInfo& get_user_quota() const;
 };
-
-#endif

diff --git a/src/rgw/services/svc_rados.cc b/src/rgw/services/svc_rados.cc
index 713068f4a9303ecda360f3cca0de4371987b1af3..6ec7376ff8368332a11adb3b194ddd678a9d06a2 100644 (file)
--- a/src/rgw/services/svc_rados.cc
+++ b/src/rgw/services/svc_rados.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_rados.h"
 
 #include "include/rados/librados.hpp"

diff --git a/src/rgw/services/svc_rados.h b/src/rgw/services/svc_rados.h
index 89817f317b0b8c5430a2632f5c7073849aac1332..ae9c2dcf91ba6f43eaf5b2c2743478e37a1fdf0f 100644 (file)
--- a/src/rgw/services/svc_rados.h
+++ b/src/rgw/services/svc_rados.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_RADOS_H
-#define CEPH_RGW_SERVICES_RADOS_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -173,5 +174,3 @@ public:
   friend Pool;
   friend Pool::List;
 };
-
-#endif

diff --git a/src/rgw/services/svc_sync_modules.cc b/src/rgw/services/svc_sync_modules.cc
index ca6a7a303506a048b8157454924c33db97f6fb18..252bfa1b282d6739c65a45593351315f03510706 100644 (file)
--- a/src/rgw/services/svc_sync_modules.cc
+++ b/src/rgw/services/svc_sync_modules.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_sync_modules.h"
 
 #include "rgw/rgw_sync_module.h"

diff --git a/src/rgw/services/svc_sync_modules.h b/src/rgw/services/svc_sync_modules.h
index 19c4ec57f7a78aa23f5ef62c800376004ad305d3..6b5b224eaf72f86de114f19f576021ee66a88126 100644 (file)
--- a/src/rgw/services/svc_sync_modules.h
+++ b/src/rgw/services/svc_sync_modules.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_SYNC_MODULES_H
-#define CEPH_RGW_SERVICES_SYNC_MODULES_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -21,6 +22,3 @@ public:
 
   void init();
 };
-
-#endif
-

diff --git a/src/rgw/services/svc_sys_obj.cc b/src/rgw/services/svc_sys_obj.cc
index 8fd8530cc4b5702c7ed29e93829d64491cf47b86..998dd2181e5af22ec595ca2c5841c5895b98313f 100644 (file)
--- a/src/rgw/services/svc_sys_obj.cc
+++ b/src/rgw/services/svc_sys_obj.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_sys_obj.h"
 #include "svc_sys_obj_core.h"
 #include "svc_rados.h"

diff --git a/src/rgw/services/svc_sys_obj.h b/src/rgw/services/svc_sys_obj.h
index cce06131cdb4fb5ad00b5bd744255b2e58496a37..462b94db1c6af59d45d79c7170741902c04ac3e4 100644 (file)
--- a/src/rgw/services/svc_sys_obj.h
+++ b/src/rgw/services/svc_sys_obj.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_SYS_OBJ_H
-#define CEPH_RGW_SERVICES_SYS_OBJ_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -269,6 +270,3 @@ public:
     return sysobj_svc->get_obj(*this, obj);
   }
 };
-
-#endif
-

diff --git a/src/rgw/services/svc_sys_obj_cache.cc b/src/rgw/services/svc_sys_obj_cache.cc
index e2d41bfbedc12123077ef565399840edf4ed6ad0..faa38af8d8c4de00bb83c04b50509e7411fe5ab1 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.cc
+++ b/src/rgw/services/svc_sys_obj_cache.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_sys_obj_cache.h"
 #include "svc_zone.h"
 #include "svc_notify.h"

diff --git a/src/rgw/services/svc_sys_obj_cache.h b/src/rgw/services/svc_sys_obj_cache.h
index b8ff7039c9e8a2234841e1533d50b0ce3f7dcec5..69c6e10436c61c8570ed23e3a198857cb6318208 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.h
+++ b/src/rgw/services/svc_sys_obj_cache.h
@@ -1,7 +1,7 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
-#ifndef CEPH_RGW_SERVICES_SYS_OBJ_CACHE_H
-#define CEPH_RGW_SERVICES_SYS_OBJ_CACHE_H
-
+#pragma once
 
 #include "rgw/rgw_service.h"
 #include "rgw/rgw_cache.h"
@@ -181,5 +181,3 @@ public:
     entries.clear();
   }
 }; /* RGWChainedCacheImpl */
-
-#endif

diff --git a/src/rgw/services/svc_sys_obj_core.cc b/src/rgw/services/svc_sys_obj_core.cc
index 6f715e9a655e4b92ae7b30adcb6638473ab7d7ae..18c2e0aaee81655836c0808bfa5ff6f07a359022 100644 (file)
--- a/src/rgw/services/svc_sys_obj_core.cc
+++ b/src/rgw/services/svc_sys_obj_core.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_sys_obj_core.h"
 #include "svc_rados.h"
 #include "svc_zone.h"

diff --git a/src/rgw/services/svc_sys_obj_core.h b/src/rgw/services/svc_sys_obj_core.h
index 38de7cfc8830705f29b1d8ad4c0c508ff6275bb3..fa4c7e01d1f1e46552ad872eb1bbd4e7612291e2 100644 (file)
--- a/src/rgw/services/svc_sys_obj_core.h
+++ b/src/rgw/services/svc_sys_obj_core.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_SYS_OBJ_CORE_H
-#define CEPH_RGW_SERVICES_SYS_OBJ_CORE_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -217,5 +218,3 @@ public:
     return zone_svc;
   }
 };
-
-#endif

diff --git a/src/rgw/services/svc_zone.cc b/src/rgw/services/svc_zone.cc
index d3c3b3710407f942449ecef8e12424c36b1ca760..ca8335c61ddd958662f6dbe5d44da917c5a443c3 100644 (file)
--- a/src/rgw/services/svc_zone.cc
+++ b/src/rgw/services/svc_zone.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_zone.h"
 #include "svc_rados.h"
 #include "svc_sys_obj.h"

diff --git a/src/rgw/services/svc_zone.h b/src/rgw/services/svc_zone.h
index 8c8dbebad43b3eda8314460c8d39337ff2971757..1672d6d94487c3f09c9542e178f3e1f9bfc6b3e0 100644 (file)
--- a/src/rgw/services/svc_zone.h
+++ b/src/rgw/services/svc_zone.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_ZONE_H
-#define CEPH_RGW_SERVICES_ZONE_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -130,5 +131,3 @@ public:
   int list_periods(list<string>& periods);
   int list_periods(const string& current_period, list<string>& periods);
 };
-
-#endif

diff --git a/src/rgw/services/svc_zone_utils.cc b/src/rgw/services/svc_zone_utils.cc
index ef9c9c88c33476f109c74e9bf145e8762851b285..dacc98cf10bef03c35726ac31246ad7fa308a1bc 100644 (file)
--- a/src/rgw/services/svc_zone_utils.cc
+++ b/src/rgw/services/svc_zone_utils.cc
@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "svc_zone_utils.h"
 #include "svc_rados.h"
 #include "svc_zone.h"

diff --git a/src/rgw/services/svc_zone_utils.h b/src/rgw/services/svc_zone_utils.h
index 158d2a926850d133f415ec0e0308fb22ed8cbe31..e2a2a4c32550a1cbad884ea46450ee950e3eed57 100644 (file)
--- a/src/rgw/services/svc_zone_utils.h
+++ b/src/rgw/services/svc_zone_utils.h
@@ -1,6 +1,7 @@
-#ifndef CEPH_RGW_SERVICES_ZONEUTILS_H
-#define CEPH_RGW_SERVICES_ZONEUTILS_H
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
+#pragma once
 
 #include "rgw/rgw_service.h"
 
@@ -35,5 +36,3 @@ public:
 
   string unique_trans_id(const uint64_t unique_num);
 };
-
-#endif