Update naming scheme for Result<T> variables, part 2

SpaceTeam · Dec 17, 2023 · d70bce3 · d70bce3
1 parent 8e348d0
commit d70bce3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git 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
@@ -62,10 +62,11 @@ class EduCommandsTest : public RODOS::StaticThread<>
                 {
                     auto timestamp = utility::GetUnixUtc();
                     PRINTF("Sending UpdateTime(timestamp = %d)\n", static_cast<int>(timestamp));
-                    auto result = edu::UpdateTime({.timestamp = timestamp});
-                    if(result.has_error())
+                    auto updateTimeResult = edu::UpdateTime({.timestamp = timestamp});
+                    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
                     {
@@ -97,12 +98,13 @@ class EduCommandsTest : public RODOS::StaticThread<>
                            static_cast<int>(programId),
                            static_cast<int>(queueId),
                            static_cast<int>(timeout));
-                    auto result = edu::ExecuteProgram(
+                    auto executeProgramResult = edu::ExecuteProgram(
                         {.programId = programId, .queueId = queueId, .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
                     {
@@ -113,15 +115,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("  queue ID   = %d\n", static_cast<int>(status.queueId));
@@ -132,15 +134,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;
                 }