From 19d4d65b1add3ba5d1bb233612cd01586afe0206 Mon Sep 17 00:00:00 2001
From: Patrick Kappl <kappl.pa@gmail.com>
Date: Sun, 17 Dec 2023 14:41:05 +0000
Subject: [PATCH] Update naming scheme for Result<T> variables, part 2

---
 Sts1CobcSw/EduListenerThread.cpp              |  4 +--
 .../EduCommandTests/EduCommands.test.cpp      | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Sts1CobcSw/EduListenerThread.cpp b/Sts1CobcSw/EduListenerThread.cpp
index 2759509a..6957af34 100644
--- a/Sts1CobcSw/EduListenerThread.cpp
+++ b/Sts1CobcSw/EduListenerThread.cpp
@@ -100,8 +100,8 @@ class EduListenerThread : public RODOS::StaticThread<>
                             // Edu wants to send result file
                             // Send return result to Edu, Communicate, and interpret the results to
                             // update the S&H Entry from 3 or 4 to 5.
-                            auto resultInfoResult = edu::ReturnResult();
-                            if(resultInfoResult.has_error())
+                            auto returnResultResult = edu::ReturnResult();
+                            if(returnResultResult.has_error())
                             {
                                 /*
                                 RODOS::PRINTF(
diff --git a/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp b/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp
index 7315c313..ad222ef4 100644
--- a/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp
+++ b/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp
@@ -63,10 +63,11 @@ class EduCommandsTest : public RODOS::StaticThread<>
                 {
                     auto currentTime = utility::GetUnixUtc();
                     PRINTF("Sending UpdateTime(currentTime = %d)\n", static_cast<int>(currentTime));
-                    auto result = edu::UpdateTime({.currentTime = currentTime});
-                    if(result.has_error())
+                    auto updateTimeResult = edu::UpdateTime({.currentTime = currentTime});
+                    if(updateTimeResult.has_error())
                     {
-                        PRINTF("Returned error code: %d\n", static_cast<int>(result.error()));
+                        PRINTF("Returned error code: %d\n",
+                               static_cast<int>(updateTimeResult.error()));
                     }
                     else
                     {
@@ -99,12 +100,13 @@ class EduCommandsTest : public RODOS::StaticThread<>
                            programId,
                            startTime,
                            timeout);
-                    auto result = edu::ExecuteProgram(
+                    auto executeProgramResult = edu::ExecuteProgram(
                         {.programId = programId, .startTime = startTime, .timeout = timeout});
                     // TODO: Fix naming
-                    if(result.has_error())
+                    if(executeProgramResult.has_error())
                     {
-                        PRINTF("Returned error code: %d\n", static_cast<int>(result.error()));
+                        PRINTF("Returned error code: %d\n",
+                               static_cast<int>(executeProgramResult.error()));
                     }
                     else
                     {
@@ -115,15 +117,15 @@ class EduCommandsTest : public RODOS::StaticThread<>
                 case 'g':
                 {
                     PRINTF("Sending GetStatus()\n");
-                    auto result = edu::GetStatus();
+                    auto getStatusResult = edu::GetStatus();
                     PRINTF("Returned status:\n");
-                    if(result.has_error())
+                    if(getStatusResult.has_error())
                     {
-                        PRINTF("  error code = %d\n", static_cast<int>(result.error()));
+                        PRINTF("  error code = %d\n", static_cast<int>(getStatusResult.error()));
                     }
                     else
                     {
-                        auto status = result.value();
+                        auto status = getStatusResult.value();
                         PRINTF("  type       = %d\n", static_cast<int>(status.statusType));
                         PRINTF("  program ID = %d\n", static_cast<int>(status.programId));
                         PRINTF("  startTime  = %d\n", static_cast<int>(status.startTime));
@@ -134,15 +136,17 @@ class EduCommandsTest : public RODOS::StaticThread<>
                 case 'r':
                 {
                     PRINTF("Sending ReturnResult()\n");
-                    auto result = edu::ReturnResult();
+                    auto returnResultResult = edu::ReturnResult();
                     PRINTF("Returned result info:\n");
-                    if(result.has_error())
+                    if(returnResultResult.has_error())
                     {
-                        PRINTF("  error code  = %d\n", static_cast<int>(result.error()));
+                        PRINTF("  error code  = %d\n",
+                               static_cast<int>(returnResultResult.error()));
                     }
                     else
                     {
-                        PRINTF("  result size = %d\n", static_cast<int>(result.value().resultSize));
+                        PRINTF("  result size = %d\n",
+                               static_cast<int>(returnResultResult.value().resultSize));
                     }
                     break;
                 }