From fa41b106abbf2471576661c4a2ad9b60f7b83799 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Mon, 11 Oct 2021 22:54:20 -0700
Subject: [PATCH] [glass, wpiutil] Add missing format args (#3626)

These were caught by compile-time format string parsing in C++20.
---
 glass/src/libnt/native/cpp/NTSpeedController.cpp   | 2 +-
 wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/glass/src/libnt/native/cpp/NTSpeedController.cpp b/glass/src/libnt/native/cpp/NTSpeedController.cpp
index a4fc1cab2f..3dc351a188 100644
--- a/glass/src/libnt/native/cpp/NTSpeedController.cpp
+++ b/glass/src/libnt/native/cpp/NTSpeedController.cpp
@@ -17,7 +17,7 @@ NTSpeedControllerModel::NTSpeedControllerModel(NT_Inst instance,
     : m_nt(instance),
       m_value(m_nt.GetEntry(fmt::format("{}/Value", path))),
       m_name(m_nt.GetEntry(fmt::format("{}/.name", path))),
-      m_controllable(m_nt.GetEntry(fmt::format("{}/.controllable"))),
+      m_controllable(m_nt.GetEntry(fmt::format("{}/.controllable", path))),
       m_valueData(fmt::format("NT_SpdCtrl:{}", path)),
       m_nameValue(wpi::rsplit(path, '/').second) {
   m_nt.AddListener(m_value);
diff --git a/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp b/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
index 8e522c4193..22ae63638f 100644
--- a/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
+++ b/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
@@ -88,7 +88,7 @@ void wpi::report_fatal_error(std::string_view Reason, bool GenCrashDiag) {
   if (handler) {
     handler(handlerData, std::string{Reason}, GenCrashDiag);
   } else {
-    fmt::print(stderr, "LLVM ERROR: {}\n");
+    fmt::print(stderr, "LLVM ERROR: {}\n", Reason);
   }
 
   exit(1);