From f745269c0e4e1efa1f78ac9579c4fe33a5b0c74c Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Tue, 16 Jan 2018 10:38:34 +0100 Subject: [PATCH] [version] 2.13 Code format was also fixed Change-Id: Iae0d214d3caeeb67cdbfe1938718863d70a15789 Signed-off-by: Piotr Kosko --- packaging/webapi-plugins.spec | 2 +- src/bluetooth/bluetooth_le_device.cc | 4 ++-- src/filesystem/filesystem_instance.cc | 3 ++- src/iotcon/iotcon_instance.cc | 12 ++++++------ src/messaging/DBus/MessageProxy.cpp | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index 545ab7d8..4cc09217 100644 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@ -10,7 +10,7 @@ %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions} Name: webapi-plugins -Version: 2.12 +Version: 2.13 Release: 0 License: Apache-2.0 and BSD-3-Clause and MIT Group: Development/Libraries diff --git a/src/bluetooth/bluetooth_le_device.cc b/src/bluetooth/bluetooth_le_device.cc index b0f6413a..62caee5b 100644 --- a/src/bluetooth/bluetooth_le_device.cc +++ b/src/bluetooth/bluetooth_le_device.cc @@ -435,9 +435,9 @@ void BluetoothLEDevice::GattConnectionState(int result, bool connected, const ch // check state change success PlatformResult operation_success = ValidateConnectionChange(result); if (operation_success) { - if (connected) { // connect success + if (connected) { // connect success le_device->is_connected_.insert(remote_address); - } else { // disconnect success + } else { // disconnect success le_device->CleanClientInfo(remote_address); } } diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc index 08c0fe5f..e32021ae 100644 --- a/src/filesystem/filesystem_instance.cc +++ b/src/filesystem/filesystem_instance.cc @@ -158,7 +158,8 @@ void FilesystemInstance::FileReadSync(const picojson::value& args, picojson::obj PrepareError(e, out); }; - FilesystemManager::GetInstance().FileRead(location, offset, length, is_string, onSuccess, onError); + FilesystemManager::GetInstance().FileRead(location, offset, length, is_string, onSuccess, + onError); } void FilesystemInstance::FileWrite(const picojson::value& args, picojson::object& out) { diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc index d6506992..705fb1f5 100644 --- a/src/iotcon/iotcon_instance.cc +++ b/src/iotcon/iotcon_instance.cc @@ -1379,12 +1379,12 @@ common::TizenResult IotconInstance::ClientFindResource(const picojson::object& a delete data; LogAndReturnTizenError(result); } else { - int timeout = 60; //default value set much bigger than default value for iotcon = 30s + int timeout = 60; // default value set much bigger than default value for iotcon = 30s auto result = IotconUtils::ConvertIotconError(iotcon_get_timeout(&timeout)); if (!result) { LoggerE("iotcon_get_timeout - function call failed, using default value %d", timeout); } else { - timeout = timeout + 10; //add 10 extra second to prevent too fast delete + timeout = timeout + 10; // add 10 extra second to prevent too fast delete } // adding listener to delete data, when find would be finished std::thread([data, timeout]() { @@ -1550,12 +1550,12 @@ common::TizenResult IotconInstance::ClientFindDeviceInfo(const picojson::object& delete data; LogAndReturnTizenError(result); } else { - int timeout = 60; //default value set much bigger than default value for iotcon = 30s + int timeout = 60; // default value set much bigger than default value for iotcon = 30s auto result = IotconUtils::ConvertIotconError(iotcon_get_timeout(&timeout)); if (!result) { LoggerE("iotcon_get_timeout - function call failed, using default value %d", timeout); } else { - timeout = timeout + 10; //add 10 extra second to prevent too fast delete + timeout = timeout + 10; // add 10 extra second to prevent too fast delete } // adding listener to delete data, when find would be finished std::thread([data, timeout]() { @@ -1656,12 +1656,12 @@ common::TizenResult IotconInstance::ClientFindPlatformInfo(const picojson::objec delete data; LogAndReturnTizenError(result); } else { - int timeout = 60; //default value set much bigger than default value for iotcon = 30s + int timeout = 60; // default value set much bigger than default value for iotcon = 30s auto result = IotconUtils::ConvertIotconError(iotcon_get_timeout(&timeout)); if (!result) { LoggerE("iotcon_get_timeout - function call failed, using default value %d", timeout); } else { - timeout = timeout + 10; //add 10 extra second to prevent too fast delete + timeout = timeout + 10; // add 10 extra second to prevent too fast delete } // adding listener to delete data, when find would be finished std::thread([data, timeout]() { diff --git a/src/messaging/DBus/MessageProxy.cpp b/src/messaging/DBus/MessageProxy.cpp index 30e17b5f..19c6253e 100644 --- a/src/messaging/DBus/MessageProxy.cpp +++ b/src/messaging/DBus/MessageProxy.cpp @@ -35,7 +35,7 @@ MessageProxy::MessageProxy(EmailManager& manager) : common::dbus::Proxy(kDBusPathEmailStorageChange, kDBusIfaceEmailStorageChange, kDBusNameSignalEmail, kDBusPathEmailStorageChange, kDBusIfaceEmailStorageChange), - email_manager_(manager) { + email_manager_(manager) { ScopeLogger(); } -- 2.34.1