commit f3252315f364deef288bbcaebee292e94106713a
author Patrick Venture <venture@google.com> Tue Oct 30 08:42:53 2018 -0700
committer Patrick Venture <venture@google.com> Tue Oct 30 08:51:55 2018 -0700
tree 1a904bbd88eae51cb22ab24a635a6a8c49b4d06a
parent 65ea92e7ffe197920610c346e5b3a805f4005ebf

style: fixup naming of structures

Fixup naming of structures to UpperCamel.

Change-Id: I6a9bf0b954298089c85d3362e86cd95b3fc5b944
Signed-off-by: Patrick Venture <venture@google.com>

sensors/builder.cpp

diff --git a/sensors/builder.cpp b/sensors/builder.cpp
index 7927dd0..a43a731 100644
--- a/sensors/builder.cpp
+++ b/sensors/builder.cpp
@@ -36,7 +36,8 @@
 static constexpr bool deferSignals = true;
 static DbusHelper helper;
 
-SensorManager BuildSensors(const std::map<std::string, struct sensor>& config)
+SensorManager
+    BuildSensors(const std::map<std::string, struct SensorConfig>& config)
 {
     SensorManager mgmr;
     auto& HostSensorBus = mgmr.getHostBus();
@@ -48,7 +49,7 @@
         std::unique_ptr<WriteInterface> wi;
 
         std::string name = it.first;
-        const struct sensor* info = &it.second;
+        const struct SensorConfig* info = &it.second;
 
         std::cerr << "Sensor: " << name << " " << info->type << " ";
         std::cerr << info->readpath << " " << info->writepath << "\n";

sensors/builder.hpp

diff --git a/sensors/builder.hpp b/sensors/builder.hpp
index 78a578a..fdf1c9b 100644
--- a/sensors/builder.hpp
+++ b/sensors/builder.hpp
@@ -9,4 +9,5 @@
 /**
  * Build the sensors and associate them with a SensorManager.
  */
-SensorManager BuildSensors(const std::map<std::string, struct sensor>& config);
+SensorManager
+    BuildSensors(const std::map<std::string, struct SensorConfig>& config);

sensors/builderconfig.cpp

diff --git a/sensors/builderconfig.cpp b/sensors/builderconfig.cpp
index cb3fd81..f87e572 100644
--- a/sensors/builderconfig.cpp
+++ b/sensors/builderconfig.cpp
@@ -33,7 +33,7 @@
 {
     using namespace libconfig;
 
-    std::map<std::string, struct sensor> config;
+    std::map<std::string, struct SensorConfig> config;
     Config cfg;
 
     std::cerr << "entered BuildSensorsFromConfig\n";
@@ -69,7 +69,7 @@
             const Setting& sensor = sensors[i];
 
             std::string name;
-            struct sensor thisOne;
+            struct SensorConfig thisOne;
 
             /* Not a super fan of using this library for run-time configuration.
              */