shill: Fix most of warnings from cpplint
Fix most cpplinter's warnings. On a few occasisions, the warnings
produced were false-positives, so added explicit // NOLINT comment
overrides.
There were a few instances of disallowed non-const reference usage
(reported as runtime/reference error by cpplint) for
"DBus::Error &error" which should potentially be changed
to pointers to comply with C++ coding style but I will let Shill
owners do that since there is quite a few of those and the
change isn't brain-dead simple...
BUG=None
TEST=platform2 still compiles and all unit tests pass.
Change-Id: Ic2e31896aa13d20eeb1a85dee74f3db8cccfde2e
Reviewed-on: https://chromium-review.googlesource.com/204164
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/dbus_adaptor.cc b/dbus_adaptor.cc
index 4a64899..753052c 100644
--- a/dbus_adaptor.cc
+++ b/dbus_adaptor.cc
@@ -43,37 +43,37 @@
Error e;
bool ret;
- if (DBusAdaptor::IsBool(value.signature()))
+ if (DBusAdaptor::IsBool(value.signature())) {
ret = store->SetBoolProperty(name, value.reader().get_bool(), &e);
- else if (DBusAdaptor::IsByte(value.signature()))
+ } else if (DBusAdaptor::IsByte(value.signature())) {
ret = store->SetUint8Property(name, value.reader().get_byte(), &e);
- else if (DBusAdaptor::IsInt16(value.signature()))
+ } else if (DBusAdaptor::IsInt16(value.signature())) {
ret = store->SetInt16Property(name, value.reader().get_int16(), &e);
- else if (DBusAdaptor::IsInt32(value.signature()))
+ } else if (DBusAdaptor::IsInt32(value.signature())) {
ret = store->SetInt32Property(name, value.reader().get_int32(), &e);
- else if (DBusAdaptor::IsPath(value.signature()))
+ } else if (DBusAdaptor::IsPath(value.signature())) {
ret = store->SetStringProperty(name, value.reader().get_path(), &e);
- else if (DBusAdaptor::IsString(value.signature()))
+ } else if (DBusAdaptor::IsString(value.signature())) {
ret = store->SetStringProperty(name, value.reader().get_string(), &e);
- else if (DBusAdaptor::IsStringmap(value.signature()))
+ } else if (DBusAdaptor::IsStringmap(value.signature())) {
ret = store->SetStringmapProperty(name,
value.operator map<string, string>(),
&e);
- else if (DBusAdaptor::IsStringmaps(value.signature())) {
+ } else if (DBusAdaptor::IsStringmaps(value.signature())) {
SLOG(DBus, 1) << " can't yet handle setting type " << value.signature();
ret = false;
e.Populate(Error::kInternalError);
- } else if (DBusAdaptor::IsStrings(value.signature()))
+ } else if (DBusAdaptor::IsStrings(value.signature())) {
ret = store->SetStringsProperty(name, value.operator vector<string>(), &e);
- else if (DBusAdaptor::IsUint16(value.signature()))
+ } else if (DBusAdaptor::IsUint16(value.signature())) {
ret = store->SetUint16Property(name, value.reader().get_uint16(), &e);
- else if (DBusAdaptor::IsUint16s(value.signature()))
+ } else if (DBusAdaptor::IsUint16s(value.signature())) {
ret = store->SetUint16sProperty(name, value.operator vector<uint16>(), &e);
- else if (DBusAdaptor::IsUint32(value.signature()))
+ } else if (DBusAdaptor::IsUint32(value.signature())) {
ret = store->SetUint32Property(name, value.reader().get_uint32(), &e);
- else if (DBusAdaptor::IsUint64(value.signature()))
+ } else if (DBusAdaptor::IsUint64(value.signature())) {
ret = store->SetUint64Property(name, value.reader().get_uint64(), &e);
- else if (DBusAdaptor::IsKeyValueStore(value.signature())) {
+ } else if (DBusAdaptor::IsKeyValueStore(value.signature())) {
SLOG(DBus, 1) << " can't yet handle setting type " << value.signature();
ret = false;
e.Populate(Error::kInternalError);