sts: add STS_UNREACHABLE_DEFAULT_CASE()

stratosphere/libstratosphere/source/updater/updater_api.cpp

@@ -72,8 +72,7 @@ namespace sts::updater {
                     return true;
                 case BootImageUpdateType::Mariko:
                     return false;
-                default:
-                    std::abort();
+                STS_UNREACHABLE_DEFAULT_CASE();
             }
         }
 
@@ -83,8 +82,7 @@ namespace sts::updater {
                     return true;
                 case BootImageUpdateType::Mariko:
                     return false;
-                default:
-                    std::abort();
+                STS_UNREACHABLE_DEFAULT_CASE();
             }
         }
 
@@ -94,8 +92,7 @@ namespace sts::updater {
                     return NcmContentMetaType_BootImagePackage;
                 case BootModeType::Safe:
                     return NcmContentMetaType_BootImagePackageSafe;
-                default:
-                    std::abort();
+                STS_UNREACHABLE_DEFAULT_CASE();
             }
         }
 
@@ -185,8 +182,7 @@ namespace sts::updater {
                     return VerifyBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type);
                 case BootModeType::Safe:
                     return VerifyBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type);
-                default:
-                    std::abort();
+                STS_UNREACHABLE_DEFAULT_CASE();
             }
         }
 
@@ -311,8 +307,7 @@ namespace sts::updater {
                     return UpdateBootImagesNormal(data_id, work_buffer, work_buffer_size, boot_image_update_type);
                 case BootModeType::Safe:
                     return UpdateBootImagesSafe(data_id, work_buffer, work_buffer_size, boot_image_update_type);
-                default:
-                    std::abort();
+                STS_UNREACHABLE_DEFAULT_CASE();
             }
         }
 
@@ -505,8 +500,7 @@ namespace sts::updater {
             case spl::HardwareType::Hoag:
             case spl::HardwareType::Iowa:
                 return BootImageUpdateType::Mariko;
-            default:
-                std::abort();
+            STS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 

stratosphere/libstratosphere/source/updater/updater_bis_management.hpp

@@ -130,12 +130,16 @@ namespace sts::updater {
             PartitionAccessor(FsBisStorageId id) : BisAccessor(id) { }
         private:
             constexpr const OffsetSizeType *FindEntry(EnumType which) {
+                const OffsetSizeType *entry = nullptr;
                 for (size_t i = 0; i < Meta::NumEntries; i++) {
                     if (Meta::Entries[i].which == which) {
-                        return &Meta::Entries[i];
+                        entry = &Meta::Entries[i];
+                        break;
                     }
                 }
-                std::abort();
+
+                STS_ASSERT(entry != nullptr);
+                return entry;
             }
         public:
             Result Read(size_t *out_size, void *dst, size_t size, EnumType which) {
@@ -194,8 +198,7 @@ namespace sts::updater {
                 return FsBisStorageId_BootConfigAndPackage2RepairMain;
             case Package2Type::RepairSub:
                 return FsBisStorageId_BootConfigAndPackage2RepairSub;
-            default:
-                std::abort();
+            STS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 

stratosphere/libstratosphere/source/updater/updater_paths.cpp

@@ -72,8 +72,7 @@ namespace sts::updater {
                     constexpr const char *candidates[] = {BctPathA, BctPathNx};
                     return ChooseCandidatePath(candidates, util::size(candidates));
                 }
-            default:
-                std::abort();
+            STS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 
@@ -89,8 +88,7 @@ namespace sts::updater {
                     constexpr const char *candidates[] = {Package1PathA, Package1PathNx};
                     return ChooseCandidatePath(candidates, util::size(candidates));
                 }
-            default:
-                std::abort();
+            STS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 
@@ -106,8 +104,7 @@ namespace sts::updater {
                     constexpr const char *candidates[] = {Package2PathA, Package2PathNx};
                     return ChooseCandidatePath(candidates, util::size(candidates));
                 }
-            default:
-                std::abort();
+            STS_UNREACHABLE_DEFAULT_CASE();;
         }
     }