From a4e781a2312ae1af2636183c1fee3b51e3ddb520 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Wed, 23 Aug 2017 22:07:46 -0700
Subject: [PATCH] Fixed spacing and comment annotations around namespace and
 extern declarations (#587)

---
 hal/src/main/native/athena/AnalogAccumulator.cpp | 4 +++-
 hal/src/main/native/athena/AnalogGyro.cpp        | 8 ++++++--
 hal/src/main/native/athena/AnalogInput.cpp       | 4 +++-
 hal/src/main/native/athena/AnalogInternal.cpp    | 2 ++
 hal/src/main/native/athena/AnalogInternal.h      | 2 ++
 hal/src/main/native/athena/AnalogOutput.cpp      | 7 +++++--
 hal/src/main/native/athena/AnalogTrigger.cpp     | 7 +++++--
 hal/src/main/native/athena/Compressor.cpp        | 1 +
 hal/src/main/native/athena/Constants.cpp         | 4 +++-
 hal/src/main/native/athena/ConstantsInternal.h   | 4 +++-
 hal/src/main/native/athena/Counter.cpp           | 8 ++++++--
 hal/src/main/native/athena/DIO.cpp               | 3 ++-
 hal/src/main/native/athena/DigitalInternal.cpp   | 2 ++
 hal/src/main/native/athena/DigitalInternal.h     | 2 ++
 hal/src/main/native/athena/Encoder.cpp           | 3 ++-
 hal/src/main/native/athena/EncoderInternal.h     | 2 ++
 hal/src/main/native/athena/FPGAEncoder.cpp       | 8 ++++++--
 hal/src/main/native/athena/FPGAEncoder.h         | 4 +++-
 hal/src/main/native/athena/FRCDriverStation.cpp  | 1 +
 hal/src/main/native/athena/I2C.cpp               | 4 +++-
 hal/src/main/native/athena/Interrupts.cpp        | 1 +
 hal/src/main/native/athena/Notifier.cpp          | 2 ++
 hal/src/main/native/athena/OSSerialPort.cpp      | 3 ++-
 hal/src/main/native/athena/PCMInternal.cpp       | 2 ++
 hal/src/main/native/athena/PCMInternal.h         | 2 ++
 hal/src/main/native/athena/PWM.cpp               | 3 ++-
 hal/src/main/native/athena/Ports.cpp             | 4 +++-
 hal/src/main/native/athena/PortsInternal.h       | 2 ++
 hal/src/main/native/athena/Relay.cpp             | 8 ++++++--
 hal/src/main/native/athena/SPI.cpp               | 3 ++-
 hal/src/main/native/athena/Solenoid.cpp          | 4 +++-
 hal/src/main/native/athena/Threads.cpp           | 4 +++-
 hal/src/main/native/athena/cpp/SerialHelper.cpp  | 1 +
 wpilibc/src/main/native/include/Threads.h        | 1 +
 34 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/hal/src/main/native/athena/AnalogAccumulator.cpp b/hal/src/main/native/athena/AnalogAccumulator.cpp
index 4365c9d7ae..e887975a33 100644
--- a/hal/src/main/native/athena/AnalogAccumulator.cpp
+++ b/hal/src/main/native/athena/AnalogAccumulator.cpp
@@ -13,6 +13,7 @@
 using namespace hal;
 
 extern "C" {
+
 /**
  * Is the channel attached to an accumulator.
  *
@@ -193,4 +194,5 @@ void HAL_GetAccumulatorOutput(HAL_AnalogInputHandle analogPortHandle,
   *value = output.Value;
   *count = output.Count;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/AnalogGyro.cpp b/hal/src/main/native/athena/AnalogGyro.cpp
index b0f2f0c3cc..ff57127918 100644
--- a/hal/src/main/native/athena/AnalogGyro.cpp
+++ b/hal/src/main/native/athena/AnalogGyro.cpp
@@ -15,13 +15,15 @@
 #include "HAL/handles/IndexedHandleResource.h"
 
 namespace {
+
 struct AnalogGyro {
   HAL_AnalogInputHandle handle;
   double voltsPerDegreePerSecond;
   double offset;
   int32_t center;
 };
-}
+
+}  // namespace
 
 static constexpr uint32_t kOversampleBits = 10;
 static constexpr uint32_t kAverageBits = 0;
@@ -41,6 +43,7 @@ static void Wait(double seconds) {
 }
 
 extern "C" {
+
 HAL_GyroHandle HAL_InitializeAnalogGyro(HAL_AnalogInputHandle analogHandle,
                                         int32_t* status) {
   if (!HAL_IsAccumulatorChannel(analogHandle, status)) {
@@ -238,4 +241,5 @@ int32_t HAL_GetAnalogGyroCenter(HAL_GyroHandle handle, int32_t* status) {
   }
   return gyro->center;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/AnalogInput.cpp b/hal/src/main/native/athena/AnalogInput.cpp
index 1975f94d31..03d95e40ab 100644
--- a/hal/src/main/native/athena/AnalogInput.cpp
+++ b/hal/src/main/native/athena/AnalogInput.cpp
@@ -20,6 +20,7 @@
 using namespace hal;
 
 extern "C" {
+
 /**
  * Initialize the analog input port using the given port object.
  *
@@ -382,4 +383,5 @@ int32_t HAL_GetAnalogOffset(HAL_AnalogInputHandle analogPortHandle,
       0, port->channel, status);  // XXX: aiSystemIndex == 0?
   return offset;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/AnalogInternal.cpp b/hal/src/main/native/athena/AnalogInternal.cpp
index 858ae6ccfa..87e7933bfa 100644
--- a/hal/src/main/native/athena/AnalogInternal.cpp
+++ b/hal/src/main/native/athena/AnalogInternal.cpp
@@ -15,6 +15,7 @@
 #include "PortsInternal.h"
 
 namespace hal {
+
 priority_recursive_mutex analogRegisterWindowMutex;
 std::unique_ptr<tAI> analogInputSystem;
 std::unique_ptr<tAO> analogOutputSystem;
@@ -118,4 +119,5 @@ void setAnalogSampleRate(double samplesPerSecond, int32_t* status) {
 void setAnalogNumChannelsToActivate(int32_t channels) {
   analogNumChannelsToActivate = channels;
 }
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/AnalogInternal.h b/hal/src/main/native/athena/AnalogInternal.h
index 176a85552a..567c1b9a0a 100644
--- a/hal/src/main/native/athena/AnalogInternal.h
+++ b/hal/src/main/native/athena/AnalogInternal.h
@@ -18,6 +18,7 @@
 #include "PortsInternal.h"
 
 namespace hal {
+
 constexpr int32_t kTimebase = 40000000;  ///< 40 MHz clock
 constexpr int32_t kDefaultOversampleBits = 0;
 constexpr int32_t kDefaultAverageBits = 7;
@@ -43,4 +44,5 @@ int32_t getAnalogNumChannelsToActivate(int32_t* status);
 void setAnalogNumChannelsToActivate(int32_t channels);
 void setAnalogSampleRate(double samplesPerSecond, int32_t* status);
 void initializeAnalog(int32_t* status);
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/AnalogOutput.cpp b/hal/src/main/native/athena/AnalogOutput.cpp
index b470ae4999..a8e5ba53a3 100644
--- a/hal/src/main/native/athena/AnalogOutput.cpp
+++ b/hal/src/main/native/athena/AnalogOutput.cpp
@@ -16,10 +16,12 @@
 using namespace hal;
 
 namespace {
+
 struct AnalogOutput {
   uint8_t channel;
 };
-}
+
+}  // namespace
 
 static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
                              kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>
@@ -103,4 +105,5 @@ double HAL_GetAnalogOutput(HAL_AnalogOutputHandle analogOutputHandle,
 
   return rawValue * 5.0 / 0x1000;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/AnalogTrigger.cpp b/hal/src/main/native/athena/AnalogTrigger.cpp
index 331380c1f7..4c77f2d6f0 100644
--- a/hal/src/main/native/athena/AnalogTrigger.cpp
+++ b/hal/src/main/native/athena/AnalogTrigger.cpp
@@ -17,12 +17,14 @@
 using namespace hal;
 
 namespace {
+
 struct AnalogTrigger {
   std::unique_ptr<tAnalogTrigger> trigger;
   HAL_AnalogInputHandle analogHandle;
   uint8_t index;
 };
-}
+
+}  // namespace
 
 static LimitedHandleResource<HAL_AnalogTriggerHandle, AnalogTrigger,
                              kNumAnalogTriggers, HAL_HandleEnum::AnalogTrigger>
@@ -203,4 +205,5 @@ HAL_Bool HAL_GetAnalogTriggerOutput(HAL_AnalogTriggerHandle analogTriggerHandle,
   }
   return result;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/Compressor.cpp b/hal/src/main/native/athena/Compressor.cpp
index 2a0103eddb..947ea5400f 100644
--- a/hal/src/main/native/athena/Compressor.cpp
+++ b/hal/src/main/native/athena/Compressor.cpp
@@ -190,4 +190,5 @@ HAL_Bool HAL_GetCompressorNotConnectedFault(
 
   return value;
 }
+
 }  // extern "C"
diff --git a/hal/src/main/native/athena/Constants.cpp b/hal/src/main/native/athena/Constants.cpp
index 070dba2d94..736369138e 100644
--- a/hal/src/main/native/athena/Constants.cpp
+++ b/hal/src/main/native/athena/Constants.cpp
@@ -12,7 +12,9 @@
 using namespace hal;
 
 extern "C" {
+
 int32_t HAL_GetSystemClockTicksPerMicrosecond(void) {
   return kSystemClockTicksPerMicrosecond;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/ConstantsInternal.h b/hal/src/main/native/athena/ConstantsInternal.h
index dec1227e8a..bba5cd0f7e 100644
--- a/hal/src/main/native/athena/ConstantsInternal.h
+++ b/hal/src/main/native/athena/ConstantsInternal.h
@@ -10,5 +10,7 @@
 #include <stdint.h>
 
 namespace hal {
+
 constexpr int32_t kSystemClockTicksPerMicrosecond = 40;
-}
+
+}  // namespace hal
diff --git a/hal/src/main/native/athena/Counter.cpp b/hal/src/main/native/athena/Counter.cpp
index a7404b6870..6565ad29de 100644
--- a/hal/src/main/native/athena/Counter.cpp
+++ b/hal/src/main/native/athena/Counter.cpp
@@ -16,17 +16,20 @@
 using namespace hal;
 
 namespace {
+
 struct Counter {
   std::unique_ptr<tCounter> counter;
   uint8_t index;
 };
-}
+
+}  // namespace
 
 static LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
                              HAL_HandleEnum::Counter>
     counterHandles;
 
 extern "C" {
+
 HAL_CounterHandle HAL_InitializeCounter(HAL_Counter_Mode mode, int32_t* index,
                                         int32_t* status) {
   auto handle = counterHandles.Allocate();
@@ -463,4 +466,5 @@ void HAL_SetCounterReverseDirection(HAL_CounterHandle counterHandle,
       HAL_SetCounterDownSourceEdge(counterHandle, false, true, status);
   }
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/DIO.cpp b/hal/src/main/native/athena/DIO.cpp
index 66f47a9530..72863cbbfe 100644
--- a/hal/src/main/native/athena/DIO.cpp
+++ b/hal/src/main/native/athena/DIO.cpp
@@ -529,4 +529,5 @@ int64_t HAL_GetFilterPeriod(int32_t filterIndex, int32_t* status) {
   }
   return hdrPeriod;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/DigitalInternal.cpp b/hal/src/main/native/athena/DigitalInternal.cpp
index 43c279922f..e3b65255a7 100644
--- a/hal/src/main/native/athena/DigitalInternal.cpp
+++ b/hal/src/main/native/athena/DigitalInternal.cpp
@@ -21,6 +21,7 @@
 #include "PortsInternal.h"
 
 namespace hal {
+
 // Create a mutex to protect changes to the DO PWM config
 priority_recursive_mutex digitalPwmMutex;
 
@@ -157,4 +158,5 @@ bool remapDigitalSource(HAL_Handle digitalSourceHandle,
     return false;
   }
 }
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/DigitalInternal.h b/hal/src/main/native/athena/DigitalInternal.h
index 39cb952691..f17168e31e 100644
--- a/hal/src/main/native/athena/DigitalInternal.h
+++ b/hal/src/main/native/athena/DigitalInternal.h
@@ -20,6 +20,7 @@
 #include "PortsInternal.h"
 
 namespace hal {
+
 /**
  * MXP channels when used as digital output PWM are offset from actual value
  */
@@ -86,4 +87,5 @@ bool remapDigitalSource(HAL_Handle digitalSourceHandle,
 int32_t remapSPIChannel(int32_t channel);
 int32_t remapMXPPWMChannel(int32_t channel);
 int32_t remapMXPChannel(int32_t channel);
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/Encoder.cpp b/hal/src/main/native/athena/Encoder.cpp
index fe1065fb6f..9aaef493fb 100644
--- a/hal/src/main/native/athena/Encoder.cpp
+++ b/hal/src/main/native/athena/Encoder.cpp
@@ -445,4 +445,5 @@ int32_t HAL_GetEncoderFPGAIndex(HAL_EncoderHandle encoderHandle,
   }
   return encoder->GetFPGAIndex();
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/EncoderInternal.h b/hal/src/main/native/athena/EncoderInternal.h
index c1c8af1279..2ffd0151c3 100644
--- a/hal/src/main/native/athena/EncoderInternal.h
+++ b/hal/src/main/native/athena/EncoderInternal.h
@@ -12,6 +12,7 @@
 #include "HAL/Encoder.h"
 
 namespace hal {
+
 class Encoder {
  public:
   Encoder(HAL_Handle digitalSourceHandleA,
@@ -73,4 +74,5 @@ class Encoder {
 
   int32_t m_encodingScale;
 };
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/FPGAEncoder.cpp b/hal/src/main/native/athena/FPGAEncoder.cpp
index a7f9be9805..c938850c38 100644
--- a/hal/src/main/native/athena/FPGAEncoder.cpp
+++ b/hal/src/main/native/athena/FPGAEncoder.cpp
@@ -16,11 +16,13 @@
 using namespace hal;
 
 namespace {
+
 struct Encoder {
   std::unique_ptr<tEncoder> encoder;
   uint8_t index;
 };
-}
+
+}  // namespace
 
 static const double DECODING_SCALING_FACTOR = 0.25;
 
@@ -29,6 +31,7 @@ static LimitedHandleResource<HAL_FPGAEncoderHandle, Encoder, kNumEncoders,
     fpgaEncoderHandles;
 
 extern "C" {
+
 HAL_FPGAEncoderHandle HAL_InitializeFPGAEncoder(
     HAL_Handle digitalSourceHandleA, HAL_AnalogTriggerType analogTriggerTypeA,
     HAL_Handle digitalSourceHandleB, HAL_AnalogTriggerType analogTriggerTypeB,
@@ -293,4 +296,5 @@ void HAL_SetFPGAEncoderIndexSource(HAL_FPGAEncoderHandle fpgaEncoderHandle,
   encoder->encoder->writeConfig_IndexActiveHigh(activeHigh, status);
   encoder->encoder->writeConfig_IndexEdgeSensitive(edgeSensitive, status);
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/FPGAEncoder.h b/hal/src/main/native/athena/FPGAEncoder.h
index 9d8406e660..5264c55441 100644
--- a/hal/src/main/native/athena/FPGAEncoder.h
+++ b/hal/src/main/native/athena/FPGAEncoder.h
@@ -13,6 +13,7 @@
 #include "HAL/Types.h"
 
 extern "C" {
+
 HAL_FPGAEncoderHandle HAL_InitializeFPGAEncoder(
     HAL_Handle digitalSourceHandleA, HAL_AnalogTriggerType analogTriggerTypeA,
     HAL_Handle digitalSourceHandleB, HAL_AnalogTriggerType analogTriggerTypeB,
@@ -44,4 +45,5 @@ void HAL_SetFPGAEncoderIndexSource(HAL_FPGAEncoderHandle fpgaEncoderHandle,
                                    HAL_AnalogTriggerType analogTriggerType,
                                    HAL_Bool activeHigh, HAL_Bool edgeSensitive,
                                    int32_t* status);
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp
index 59e9a7df55..b2a96adf53 100644
--- a/hal/src/main/native/athena/FRCDriverStation.cpp
+++ b/hal/src/main/native/athena/FRCDriverStation.cpp
@@ -31,6 +31,7 @@ static hal::priority_mutex newDSDataAvailableMutex;
 static int newDSDataAvailableCounter{0};
 
 extern "C" {
+
 int32_t HAL_SetErrorData(const char* errors, int32_t errorsLength,
                          int32_t waitMs) {
   return setErrorData(errors, errorsLength, waitMs);
diff --git a/hal/src/main/native/athena/I2C.cpp b/hal/src/main/native/athena/I2C.cpp
index 6f756afc85..dac920cc19 100644
--- a/hal/src/main/native/athena/I2C.cpp
+++ b/hal/src/main/native/athena/I2C.cpp
@@ -26,6 +26,7 @@ static HAL_DigitalHandle i2CMXPDigitalHandle1 = HAL_kInvalidHandle;
 static HAL_DigitalHandle i2CMXPDigitalHandle2 = HAL_kInvalidHandle;
 
 extern "C" {
+
 /*
  * Initialize the I2C port. Opens the port if necessary and saves the handle.
  * If opening the MXP port, also sets up the channel functions appropriately
@@ -180,4 +181,5 @@ void HAL_CloseI2C(HAL_I2CPort port) {
   }
   return;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/Interrupts.cpp b/hal/src/main/native/athena/Interrupts.cpp
index c717540de6..6e4de9a027 100644
--- a/hal/src/main/native/athena/Interrupts.cpp
+++ b/hal/src/main/native/athena/Interrupts.cpp
@@ -21,6 +21,7 @@
 using namespace hal;
 
 namespace {
+
 struct Interrupt {
   std::unique_ptr<tInterrupt> anInterrupt;
   std::unique_ptr<tInterruptManager> manager;
diff --git a/hal/src/main/native/athena/Notifier.cpp b/hal/src/main/native/athena/Notifier.cpp
index 90e9e82adc..2f0e3fe71c 100644
--- a/hal/src/main/native/athena/Notifier.cpp
+++ b/hal/src/main/native/athena/Notifier.cpp
@@ -34,6 +34,7 @@ static std::unique_ptr<tInterruptManager> notifierManager;
 static uint64_t closestTrigger = UINT64_MAX;
 
 namespace {
+
 struct Notifier {
   std::shared_ptr<Notifier> prev, next;
   void* param;
@@ -87,6 +88,7 @@ class NotifierThreadOwner : public wpi::SafeThreadOwner<NotifierThread> {
 
   void* m_param;
 };
+
 }  // namespace
 
 static std::shared_ptr<Notifier> notifiers;
diff --git a/hal/src/main/native/athena/OSSerialPort.cpp b/hal/src/main/native/athena/OSSerialPort.cpp
index c824639bc4..d939818b8a 100644
--- a/hal/src/main/native/athena/OSSerialPort.cpp
+++ b/hal/src/main/native/athena/OSSerialPort.cpp
@@ -229,4 +229,5 @@ void HAL_ClearOSSerial(HAL_SerialPort port, int32_t* status) {
 void HAL_CloseOSSerial(HAL_SerialPort port, int32_t* status) {
   close(portHandles[port]);
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/PCMInternal.cpp b/hal/src/main/native/athena/PCMInternal.cpp
index 2a94cd66be..42a2756c3f 100644
--- a/hal/src/main/native/athena/PCMInternal.cpp
+++ b/hal/src/main/native/athena/PCMInternal.cpp
@@ -13,6 +13,7 @@
 #include "PortsInternal.h"
 
 namespace hal {
+
 std::unique_ptr<PCM> PCM_modules[kNumPCMModules];
 
 void initializePCM(int32_t module, int32_t* status) {
@@ -24,4 +25,5 @@ void initializePCM(int32_t module, int32_t* status) {
     PCM_modules[module] = std::make_unique<PCM>(module);
   }
 }
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/PCMInternal.h b/hal/src/main/native/athena/PCMInternal.h
index 42f4905fb9..0025587479 100644
--- a/hal/src/main/native/athena/PCMInternal.h
+++ b/hal/src/main/native/athena/PCMInternal.h
@@ -18,6 +18,7 @@
 #include "ctre/PCM.h"
 
 namespace hal {
+
 extern std::unique_ptr<PCM> PCM_modules[kNumPCMModules];
 
 static inline bool checkPCMInit(int32_t module, int32_t* status) {
@@ -33,4 +34,5 @@ static inline bool checkPCMInit(int32_t module, int32_t* status) {
 }
 
 void initializePCM(int32_t module, int32_t* status);
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/PWM.cpp b/hal/src/main/native/athena/PWM.cpp
index 07b085cebe..34c8d096a2 100644
--- a/hal/src/main/native/athena/PWM.cpp
+++ b/hal/src/main/native/athena/PWM.cpp
@@ -449,4 +449,5 @@ int32_t HAL_GetLoopTiming(int32_t* status) {
   if (*status != 0) return 0;
   return pwmSystem->readLoopTiming(status);
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/Ports.cpp b/hal/src/main/native/athena/Ports.cpp
index 615d42b9c2..a9b2abfa73 100644
--- a/hal/src/main/native/athena/Ports.cpp
+++ b/hal/src/main/native/athena/Ports.cpp
@@ -12,6 +12,7 @@
 using namespace hal;
 
 extern "C" {
+
 int32_t HAL_GetNumAccumulators(void) { return kNumAccumulators; }
 int32_t HAL_GetNumAnalogTriggers(void) { return kNumAnalogTriggers; }
 int32_t HAL_GetNumAnalogInputs(void) { return kNumAnalogInputs; }
@@ -30,4 +31,5 @@ int32_t HAL_GetNumPCMModules(void) { return kNumPCMModules; }
 int32_t HAL_GetNumSolenoidChannels(void) { return kNumSolenoidChannels; }
 int32_t HAL_GetNumPDPModules(void) { return kNumPDPModules; }
 int32_t HAL_GetNumPDPChannels(void) { return kNumPDPChannels; }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/PortsInternal.h b/hal/src/main/native/athena/PortsInternal.h
index 56b1010a28..731f6c4abf 100644
--- a/hal/src/main/native/athena/PortsInternal.h
+++ b/hal/src/main/native/athena/PortsInternal.h
@@ -12,6 +12,7 @@
 #include "HAL/ChipObject.h"
 
 namespace hal {
+
 constexpr int32_t kNumAccumulators = tAccumulator::kNumSystems;
 constexpr int32_t kNumAnalogTriggers = tAnalogTrigger::kNumSystems;
 constexpr int32_t kNumAnalogInputs = 8;
@@ -34,4 +35,5 @@ constexpr int32_t kNumPCMModules = 63;
 constexpr int32_t kNumSolenoidChannels = 8;
 constexpr int32_t kNumPDPModules = 63;
 constexpr int32_t kNumPDPChannels = 16;
+
 }  // namespace hal
diff --git a/hal/src/main/native/athena/Relay.cpp b/hal/src/main/native/athena/Relay.cpp
index f46d8c2483..6ca9e39cbc 100644
--- a/hal/src/main/native/athena/Relay.cpp
+++ b/hal/src/main/native/athena/Relay.cpp
@@ -14,11 +14,13 @@
 using namespace hal;
 
 namespace {
+
 struct Relay {
   uint8_t channel;
   bool fwd;
 };
-}
+
+}  // namespace
 
 static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
                              HAL_HandleEnum::Relay>
@@ -28,6 +30,7 @@ static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
 static priority_recursive_mutex digitalRelayMutex;
 
 extern "C" {
+
 HAL_RelayHandle HAL_InitializeRelayPort(HAL_PortHandle portHandle, HAL_Bool fwd,
                                         int32_t* status) {
   initializeDigital(status);
@@ -131,4 +134,5 @@ HAL_Bool HAL_GetRelay(HAL_RelayHandle relayPortHandle, int32_t* status) {
 
   return (relays & (1 << port->channel)) != 0;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/SPI.cpp b/hal/src/main/native/athena/SPI.cpp
index c9a07530fc..9e41166267 100644
--- a/hal/src/main/native/athena/SPI.cpp
+++ b/hal/src/main/native/athena/SPI.cpp
@@ -670,4 +670,5 @@ void HAL_GetSPIAccumulatorOutput(HAL_SPIPort port, int64_t* value,
   *value = accum->value;
   *count = accum->count;
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/Solenoid.cpp b/hal/src/main/native/athena/Solenoid.cpp
index d19a30fe70..8cde386790 100644
--- a/hal/src/main/native/athena/Solenoid.cpp
+++ b/hal/src/main/native/athena/Solenoid.cpp
@@ -18,11 +18,13 @@
 #include "ctre/PCM.h"
 
 namespace {
+
 struct Solenoid {
   uint8_t module;
   uint8_t channel;
 };
-}
+
+}  // namespace
 
 using namespace hal;
 
diff --git a/hal/src/main/native/athena/Threads.cpp b/hal/src/main/native/athena/Threads.cpp
index ef45ad0070..6d972e9a98 100644
--- a/hal/src/main/native/athena/Threads.cpp
+++ b/hal/src/main/native/athena/Threads.cpp
@@ -13,6 +13,7 @@
 #include "HAL/Errors.h"
 
 extern "C" {
+
 /**
  * Get the thread priority for the specified thread.
  *
@@ -119,4 +120,5 @@ HAL_Bool HAL_SetCurrentThreadPriority(HAL_Bool realTime, int32_t priority,
   auto thread = pthread_self();
   return HAL_SetThreadPriority(&thread, realTime, priority, status);
 }
-}
+
+}  // extern "C"
diff --git a/hal/src/main/native/athena/cpp/SerialHelper.cpp b/hal/src/main/native/athena/cpp/SerialHelper.cpp
index a73d4056ec..22743effc9 100644
--- a/hal/src/main/native/athena/cpp/SerialHelper.cpp
+++ b/hal/src/main/native/athena/cpp/SerialHelper.cpp
@@ -22,6 +22,7 @@ constexpr const char* OnboardResourceOS = "/dev/ttyS0";
 constexpr const char* MxpResourceOS = "/dev/ttyS1";
 
 namespace hal {
+
 std::string SerialHelper::m_usbNames[2]{"", ""};
 
 priority_mutex SerialHelper::m_nameMutex;
diff --git a/wpilibc/src/main/native/include/Threads.h b/wpilibc/src/main/native/include/Threads.h
index f4046697d4..1aa624fb54 100644
--- a/wpilibc/src/main/native/include/Threads.h
+++ b/wpilibc/src/main/native/include/Threads.h
@@ -15,4 +15,5 @@ int GetThreadPriority(std::thread& thread, bool* isRealTime);
 int GetCurrentThreadPriority(bool* isRealTime);
 bool SetThreadPriority(std::thread& thread, bool realTime, int priority);
 bool SetCurrentThreadPriority(bool realTime, int priority);
+
 }  // namespace frc