This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 2186c2993cf668cb5b82975b72660fef1ad35273
Author: Damian Meden <damian.me...@oath.com>
AuthorDate: Fri Feb 28 10:24:10 2020 +0000
Fix clang-format
(cherry picked from commit b118bd96b8966208e2c5306a199bee97c8b5b501)
---
mgmt/ConfigManager.cc | 5 +++--
mgmt/ConfigManager.h | 3 ++-
mgmt/FileManager.cc | 3 ++-
mgmt/FileManager.h | 3 ++-
src/traffic_manager/AddConfigFilesHere.cc | 5 ++---
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/mgmt/ConfigManager.cc b/mgmt/ConfigManager.cc
index b2dfe79..19304e0 100644
--- a/mgmt/ConfigManager.cc
+++ b/mgmt/ConfigManager.cc
@@ -42,8 +42,9 @@
#define TS_ARCHIVE_STAT_MTIME(t) ((t).st_mtime * 1000000000)
#endif
-ConfigManager::ConfigManager(const char *fileName_, const char *configName_,
bool root_access_needed_, bool isRequired_, ConfigManager *parentConfig_)
- : root_access_needed(root_access_needed_), isRequired(isRequired_),
parentConfig(parentConfig_)
+ConfigManager::ConfigManager(const char *fileName_, const char *configName_,
bool root_access_needed_, bool isRequired_,
+ ConfigManager *parentConfig_)
+ : root_access_needed(root_access_needed_), isRequired(isRequired_),
parentConfig(parentConfig_)
{
ExpandingArray existVer(25, true); // Existing versions
struct stat fileInfo;
diff --git a/mgmt/ConfigManager.h b/mgmt/ConfigManager.h
index f7b3e3e..b10a9ae 100644
--- a/mgmt/ConfigManager.h
+++ b/mgmt/ConfigManager.h
@@ -54,7 +54,8 @@ class ConfigManager
{
public:
// fileName_ should be rooted or a base file name.
- ConfigManager(const char *fileName_, const char *configName_, bool
root_access_needed, bool isRequired_, ConfigManager *parentConfig_);
+ ConfigManager(const char *fileName_, const char *configName_, bool
root_access_needed, bool isRequired_,
+ ConfigManager *parentConfig_);
~ConfigManager();
// Manual take out of lock required
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index e38f6d3..fce09a0 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -102,7 +102,8 @@ FileManager::addFile(const char *fileName, const char
*configName, bool root_acc
// caller must hold the lock
void
-FileManager::addFileHelper(const char *fileName, const char *configName, bool
root_access_needed, bool isRequired, ConfigManager *parentConfig)
+FileManager::addFileHelper(const char *fileName, const char *configName, bool
root_access_needed, bool isRequired,
+ ConfigManager *parentConfig)
{
ink_assert(fileName != nullptr);
diff --git a/mgmt/FileManager.h b/mgmt/FileManager.h
index 8d9a899..64725b6 100644
--- a/mgmt/FileManager.h
+++ b/mgmt/FileManager.h
@@ -94,7 +94,8 @@ private:
ink_mutex cbListLock; // Protects the CallBack List
DLL<callbackListable> cblist;
std::unordered_map<std::string_view, ConfigManager *> bindings;
- void addFileHelper(const char *fileName, const char *configName, bool
root_access_needed, bool isRequired, ConfigManager *parentConfig);
+ void addFileHelper(const char *fileName, const char *configName, bool
root_access_needed, bool isRequired,
+ ConfigManager *parentConfig);
};
void initializeRegistry(); // implemented in AddConfigFilesHere.cc
diff --git a/src/traffic_manager/AddConfigFilesHere.cc
b/src/traffic_manager/AddConfigFilesHere.cc
index 1f9d2da..3fdf572 100644
--- a/src/traffic_manager/AddConfigFilesHere.cc
+++ b/src/traffic_manager/AddConfigFilesHere.cc
@@ -29,9 +29,8 @@
extern FileManager *configFiles;
-
-static constexpr bool REQUIRED { true };
-static constexpr bool NOT_REQUIRED { false };
+static constexpr bool REQUIRED{true};
+static constexpr bool NOT_REQUIRED{false};
/****************************************************************************
*
* AddConfigFilesHere.cc - Structs for config files and
