commit c076bd786d09985b5fc7b82fae0a04d596ab52be
author Jason M. Bills <jason.m.bills@intel.com> Mon Jul 31 12:25:05 2023 -0700
committer Jason M. Bills <jason.m.bills@intel.com> Wed Aug 02 11:00:34 2023 -0700
tree 5e22ec3f6b6038060a9db8e3971eeace30ca3a77
parent 8b18f526772c96c785a62e3a811eacf24d3b637f

Fix build warnings

In preparation for the port to meson, fix some build warnings.

Change-Id: I8c1720c2f0dff8621bed6d1eb3df5463235d541b
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>

src/peci_pcie.cpp

diff --git a/src/peci_pcie.cpp b/src/peci_pcie.cpp
index 4f1a7eb..2ad8535 100644
--- a/src/peci_pcie.cpp
+++ b/src/peci_pcie.cpp
@@ -149,6 +149,13 @@
                     cpuBusNum1 >>= 8;
                 }
                 cpu.skipCpuBuses = true;
+                break;
+            }
+            default:
+            {
+                std::cerr << "CPU buses not found for CPU Model: 0x" << std::hex
+                          << static_cast<int>(model) << std::dec << "\n";
+                break;
             }
         }
     }
@@ -314,7 +321,7 @@
         }
         nextCapPointer = capAddress + peci_pcie::capPointerOffset;
 
-    } while (capabilityID != compareCapID);
+    } while (capabilityID != static_cast<uint32_t>(compareCapID));
     // Get capability reading.
     error = getDataFromPCIeConfig(clientAddr, bus, dev, 0,
                                   capAddress + offsetAddress, offsetLength,
@@ -332,7 +339,6 @@
     static std::unordered_set<uint32_t> linkSpeedSkipMap;
     resCode error;
     std::string res;
-    uint32_t capReading = 0;
 
     // Capability ID 0x10(16) is PCI Express
     constexpr int pcieCapID = 16;
@@ -696,8 +702,7 @@
     return false;
 }
 
-static resCode probePCIeDevice(boost::asio::io_context& io,
-                               sdbusplus::asio::object_server& objServer,
+static resCode probePCIeDevice(sdbusplus::asio::object_server& objServer,
                                size_t addr, int cpu, int bus, int dev)
 {
     bool res;
@@ -751,7 +756,7 @@
                            std::vector<CPUInfo>& cpuInfo, int cpu, int bus,
                            int dev)
 {
-    if (cpu >= cpuInfo.size())
+    if (cpu >= static_cast<int>(cpuInfo.size()))
     {
         std::cerr << "Request to scan CPU" << cpu
                   << " while CPU array has size " << cpuInfo.size() << "\n";
@@ -767,7 +772,7 @@
     }
     else
     {
-        if (probePCIeDevice(io, objServer, info.addr, cpu, bus, dev) !=
+        if (probePCIeDevice(objServer, info.addr, cpu, bus, dev) !=
             resCode::resOk)
         {
             std::cerr << "Failed to probe CPU " << cpu << " Bus " << bus
@@ -801,7 +806,7 @@
         {
             // All buses scanned, so move to the next CPU
             bus = 0;
-            if (++cpu >= cpuInfo.size())
+            if (++cpu >= static_cast<int>(cpuInfo.size()))
             {
                 // All CPUs scanned, so we're done
                 peci_pcie::scanInProgress = false;
@@ -921,11 +926,12 @@
     });
 }
 
-static void monitorOSStandby(boost::asio::io_context& io,
-                             std::shared_ptr<sdbusplus::asio::connection> conn,
-                             sdbusplus::asio::object_server& objServer,
-                             boost::asio::steady_timer& osStandbyTimer,
-                             std::vector<CPUInfo>& cpuInfo)
+[[maybe_unused]] static void
+    monitorOSStandby(boost::asio::io_context& io,
+                     std::shared_ptr<sdbusplus::asio::connection> conn,
+                     sdbusplus::asio::object_server& objServer,
+                     boost::asio::steady_timer& osStandbyTimer,
+                     std::vector<CPUInfo>& cpuInfo)
 {
     std::cerr << "Start OperatingSystemState Monitor\n";
 
@@ -1009,7 +1015,7 @@
         "OperatingSystemState");
 }
 
-int main(int argc, char* argv[])
+int main(int /*argc*/, char** /*argv*/)
 {
     // setup connection to dbus
     boost::asio::io_context io;