Repository: trafficserver Updated Branches: refs/heads/master bf04f7fe5 -> 4c6f15ea9
TS-3960: clang-format Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4c6f15ea Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4c6f15ea Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4c6f15ea Branch: refs/heads/master Commit: 4c6f15ea997aef1d6062df3b23cad7ebec9deab0 Parents: bf04f7f Author: Phil Sorber <[email protected]> Authored: Tue Dec 15 13:06:27 2015 -0700 Committer: Phil Sorber <[email protected]> Committed: Tue Dec 15 13:06:27 2015 -0700 ---------------------------------------------------------------------- mgmt/LocalManager.cc | 4 +--- mgmt/ProcessManager.cc | 4 +--- mgmt/ProxyConfig.h | 4 ++-- mgmt/Rollback.cc | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c6f15ea/mgmt/LocalManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc index 8481c6f..44cc63b 100644 --- a/mgmt/LocalManager.cc +++ b/mgmt/LocalManager.cc @@ -605,9 +605,7 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh) break; // Congestion Control - end case MGMT_SIGNAL_CONFIG_FILE_CHILD: { - static const MgmtMarshallType fields[] = { - MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT - }; + static const MgmtMarshallType fields[] = {MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT}; char *parent = NULL; char *child = NULL; MgmtMarshallInt options = 0; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c6f15ea/mgmt/ProcessManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc index e77b200..74f6041 100644 --- a/mgmt/ProcessManager.cc +++ b/mgmt/ProcessManager.cc @@ -91,9 +91,7 @@ ProcessManager::reconfigure() void ProcessManager::signalConfigFileChild(const char *parent, const char *child, unsigned int options) { - static const MgmtMarshallType fields[] = { - MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT - }; + static const MgmtMarshallType fields[] = {MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT}; MgmtMarshallInt mgmtopt = options; size_t len = mgmt_message_length(fields, countof(fields), &parent, &child, &mgmtopt); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c6f15ea/mgmt/ProxyConfig.h ---------------------------------------------------------------------- diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h index eaa63aa..078892d 100644 --- a/mgmt/ProxyConfig.h +++ b/mgmt/ProxyConfig.h @@ -45,8 +45,8 @@ void *config_string511_cb(void *data, void *value); void *config_string_alloc_cb(void *data, void *value); // Configuration file flags shared by proxy configuration and mgmt. -#define CONFIG_FLAG_NONE 0u -#define CONFIG_FLAG_UNVERSIONED 1u // Don't version this config file +#define CONFIG_FLAG_NONE 0u +#define CONFIG_FLAG_UNVERSIONED 1u // Don't version this config file // // Macros that spin waiting for the data to be bound http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4c6f15ea/mgmt/Rollback.cc ---------------------------------------------------------------------- diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc index e187e1b..217902c 100644 --- a/mgmt/Rollback.cc +++ b/mgmt/Rollback.cc @@ -45,8 +45,8 @@ const char *RollbackStrings[] = {"Rollback Ok", "File was not found", "Version w "Invalid Version - Version Numbers Must Increase"}; Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *parentRollback_, unsigned flags) - : configFiles(NULL), root_access_needed(root_access_needed_), parentRollback(parentRollback_), - currentVersion(0), fileLastModified(0), numVersions(0), numberBackups(0) + : configFiles(NULL), root_access_needed(root_access_needed_), parentRollback(parentRollback_), currentVersion(0), + fileLastModified(0), numVersions(0), numberBackups(0) { version_t highestSeen; // the highest backup version ExpandingArray existVer(25, true); // Exsisting versions
