diff options
author | Vitaly Buka <vitalybuka@google.com> | 2015-12-15 14:46:47 -0800 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2015-12-16 01:32:53 +0000 |
commit | 34668e731bb194b443bc0e6029d6d3583f08de28 (patch) | |
tree | 977de929eeaf54e264d1693d1a392a161ebf52f5 /examples | |
parent | c3bc82a29cdff05d67d3b583ca0bc25df96ab382 (diff) | |
download | libweave-34668e731bb194b443bc0e6029d6d3583f08de28.tar.gz |
Reformat
Change-Id: Ia98499f9ada220151b24ecb8b60b02524d700bc4
Reviewed-on: https://weave-review.googlesource.com/1967
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/daemon/common/daemon.h | 3 | ||||
-rw-r--r-- | examples/daemon/light/light.cc | 4 | ||||
-rw-r--r-- | examples/daemon/lock/lock.cc | 4 | ||||
-rw-r--r-- | examples/daemon/oven/oven.cc | 6 | ||||
-rw-r--r-- | examples/provider/curl_http_client.cc | 8 | ||||
-rw-r--r-- | examples/provider/curl_http_client.h | 3 | ||||
-rw-r--r-- | examples/provider/event_http_client.cc | 3 | ||||
-rw-r--r-- | examples/provider/event_network.cc | 2 | ||||
-rw-r--r-- | examples/provider/event_task_runner.h | 3 | ||||
-rw-r--r-- | examples/provider/file_config_store.cc | 6 |
10 files changed, 23 insertions, 19 deletions
diff --git a/examples/daemon/common/daemon.h b/examples/daemon/common/daemon.h index 5a90988..4cccff3 100644 --- a/examples/daemon/common/daemon.h +++ b/examples/daemon/common/daemon.h @@ -70,7 +70,8 @@ class Daemon { Daemon(const Options& opts) : config_store_{new weave::examples::FileConfigStore( - opts.disable_security_, opts.model_id_)}, + opts.disable_security_, + opts.model_id_)}, task_runner_{new weave::examples::EventTaskRunner}, http_client_{new weave::examples::CurlHttpClient(task_runner_.get())}, network_{new weave::examples::EventNetworkImpl(task_runner_.get())}, diff --git a/examples/daemon/light/light.cc b/examples/daemon/light/light.cc index eaf9392..035ef4e 100644 --- a/examples/daemon/light/light.cc +++ b/examples/daemon/light/light.cc @@ -159,8 +159,8 @@ class LightHandler { device->AddTraitDefinitionsFromJson(kTraits); CHECK(device->AddComponent(kComponent, {"onOff", "brightness", "colorXY"}, nullptr)); - CHECK(device->SetStatePropertiesFromJson(kComponent, kDefaultState, - nullptr)); + CHECK( + device->SetStatePropertiesFromJson(kComponent, kDefaultState, nullptr)); UpdateLightState(); device->AddCommandHandler(kComponent, "onOff.setConfig", diff --git a/examples/daemon/lock/lock.cc b/examples/daemon/lock/lock.cc index 61961f0..1137b92 100644 --- a/examples/daemon/lock/lock.cc +++ b/examples/daemon/lock/lock.cc @@ -68,8 +68,8 @@ class LockHandler { device->AddTraitDefinitionsFromJson(kTraits); CHECK(device->AddComponent(kComponent, {"lock"}, nullptr)); - CHECK(device->SetStatePropertiesFromJson(kComponent, kDefaultState, - nullptr)); + CHECK( + device->SetStatePropertiesFromJson(kComponent, kDefaultState, nullptr)); UpdateLockState(); device->AddCommandHandler(kComponent, "lock.setConfig", diff --git a/examples/daemon/oven/oven.cc b/examples/daemon/oven/oven.cc index 79fc925..151561d 100644 --- a/examples/daemon/oven/oven.cc +++ b/examples/daemon/oven/oven.cc @@ -136,7 +136,7 @@ class OvenHandler { weak_ptr_factory_.GetWeakPtr())); } -private: + private: void OnSetTempCommand(const std::weak_ptr<weave::Command>& command) { auto cmd = command.lock(); if (!cmd) @@ -158,8 +158,8 @@ private: LOG(INFO) << cmd->GetName() << " updated oven, matching temp"; if (target_temperature_ != current_temperature_ && !is_match_ticking_) { - double tickIncrement = ((target_temperature_ - current_temperature_) / - kWarmUpTime); + double tickIncrement = + ((target_temperature_ - current_temperature_) / kWarmUpTime); DoTick(tickIncrement); } return; diff --git a/examples/provider/curl_http_client.cc b/examples/provider/curl_http_client.cc index 6f0ba64..2bf10f5 100644 --- a/examples/provider/curl_http_client.cc +++ b/examples/provider/curl_http_client.cc @@ -29,8 +29,8 @@ struct ResponseImpl : public provider::HttpClient::Response { }; size_t WriteFunction(void* contents, size_t size, size_t nmemb, void* userp) { - static_cast<std::string*>(userp) - ->append(static_cast<const char*>(contents), size * nmemb); + static_cast<std::string*>(userp)->append(static_cast<const char*>(contents), + size * nmemb); return size * nmemb; } @@ -49,8 +49,8 @@ size_t HeaderFunction(void* contents, size_t size, size_t nmemb, void* userp) { header_pair.second = header.substr(pos, last_non_space - pos + 1); } - static_cast<provider::HttpClient::Headers*>(userp) - ->emplace_back(std::move(header_pair)); + static_cast<provider::HttpClient::Headers*>(userp)->emplace_back( + std::move(header_pair)); } return size * nmemb; } diff --git a/examples/provider/curl_http_client.h b/examples/provider/curl_http_client.h index c342076..8c5ccac 100644 --- a/examples/provider/curl_http_client.h +++ b/examples/provider/curl_http_client.h @@ -37,7 +37,8 @@ class CurlHttpClient : public provider::HttpClient { std::vector< std::pair<std::future<std::pair<std::unique_ptr<Response>, ErrorPtr>>, - SendRequestCallback>> pending_tasks_; + SendRequestCallback>> + pending_tasks_; provider::TaskRunner* task_runner_{nullptr}; base::WeakPtrFactory<CurlHttpClient> weak_ptr_factory_{this}; diff --git a/examples/provider/event_http_client.cc b/examples/provider/event_http_client.cc index 1931547..fbfc6d8 100644 --- a/examples/provider/event_http_client.cc +++ b/examples/provider/event_http_client.cc @@ -5,10 +5,9 @@ #include "examples/provider/event_http_client.h" #include "examples/provider/event_task_runner.h" - #include <base/bind.h> -#include <event2/bufferevent.h> #include <event2/buffer.h> +#include <event2/bufferevent.h> #include <event2/http.h> #include <weave/enum_to_string.h> diff --git a/examples/provider/event_network.cc b/examples/provider/event_network.cc index ba03e8f..0b18a0a 100644 --- a/examples/provider/event_network.cc +++ b/examples/provider/event_network.cc @@ -7,8 +7,8 @@ #include <weave/enum_to_string.h> #include <base/bind.h> -#include <event2/dns.h> #include <event2/bufferevent.h> +#include <event2/dns.h> #include "examples/provider/event_task_runner.h" #include "examples/provider/ssl_stream.h" diff --git a/examples/provider/event_task_runner.h b/examples/provider/event_task_runner.h index 7291314..97f9db9 100644 --- a/examples/provider/event_task_runner.h +++ b/examples/provider/event_task_runner.h @@ -83,7 +83,8 @@ class EventTaskRunner : public provider::TaskRunner { std::priority_queue<QueueItem, std::vector<QueueItem>, - EventTaskRunner::Greater> queue_; + EventTaskRunner::Greater> + queue_; EventPtr<event_base> base_{event_base_new()}; diff --git a/examples/provider/file_config_store.cc b/examples/provider/file_config_store.cc index 2214be8..6faa242 100644 --- a/examples/provider/file_config_store.cc +++ b/examples/provider/file_config_store.cc @@ -17,8 +17,10 @@ namespace examples { const char kSettingsDir[] = "/var/lib/weave/"; -FileConfigStore::FileConfigStore(bool disable_security, const std::string& model_id) - : disable_security_{disable_security}, model_id_{model_id}, +FileConfigStore::FileConfigStore(bool disable_security, + const std::string& model_id) + : disable_security_{disable_security}, + model_id_{model_id}, settings_path_{"/var/lib/weave/weave_settings_" + model_id + ".json"} {} bool FileConfigStore::LoadDefaults(Settings* settings) { |