Cleanup

Signed-off-by: Dave Thaler <[email protected]>
microsoft · Aug 18, 2023 · ea0d796 · ea0d796
1 parent cf34537
commit ea0d796
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cxplat/inc/winuser/cxplat_winuser.h b/cxplat/inc/winuser/cxplat_winuser.h
@@ -7,4 +7,4 @@
 #define CXPLAT_PLATFORM_STATUS_SUCCESS S_OK
 #define CXPLAT_PLATFORM_STATUS_NO_MEMORY __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY)
 
-#define CXPLAT_SUCCESS(status) SUCCEEDED((HRESULT)(status))
+#define CXPLAT_SUCCEEDED(status) SUCCEEDED((HRESULT)(status))
diff --git a/cxplat/src/cxplat_winuser/cxplat_winuser.cpp b/cxplat/src/cxplat_winuser/cxplat_winuser.cpp
@@ -96,7 +96,7 @@ cxplat_initialize()
 
         if (fault_injection_stack_depth || leak_detector) {
             cxplat_status_t status = _cxplat_symbol_decoder_initialize();
-            if (!CXPLAT_SUCCESS(status)) {
+            if (!CXPLAT_SUCCEEDED(status)) {
                 return status;
             }
         }

diff --git a/cxplat/src/cxplat_winuser/fault_injection.cpp b/cxplat/src/cxplat_winuser/fault_injection.cpp
@@ -241,7 +241,7 @@ _cxplat_fault_injection::log_stack_trace(
             break;
         }
         log_record << "# ";
-        if (CXPLAT_SUCCESS(_cxplat_decode_symbol(frame, name, displacement, line_number, file_name))) {
+        if (CXPLAT_SUCCEEDED(_cxplat_decode_symbol(frame, name, displacement, line_number, file_name))) {
             log_record << std::hex << frame << " " << name << " + " << displacement;
             string_stack_frame = name + " + " + std::to_string(displacement);
             if (line_number.has_value() && file_name.has_value()) {

diff --git a/cxplat/src/cxplat_winuser/leak_detector.cpp b/cxplat/src/cxplat_winuser/leak_detector.cpp
@@ -51,7 +51,7 @@ _cxplat_leak_detector::dump_leaks()
         std::optional<uint32_t> line_number;
         std::optional<std::string> file_name;
         for (auto address : stack) {
-            if (CXPLAT_SUCCESS(_cxplat_decode_symbol(address, name, displacement, line_number, file_name))) {
+            if (CXPLAT_SUCCEEDED(_cxplat_decode_symbol(address, name, displacement, line_number, file_name))) {
                 output << "    " << name << " + " << displacement;
                 if (line_number.has_value() && file_name.has_value()) {
                     output << " (" << file_name.value() << ":" << line_number.value() << ")";

diff --git a/src/platform.h b/src/platform.h
@@ -34,7 +34,7 @@ extern "C"
     _Pragma("warning(push)") _Pragma("warning(disable : 4189)") do \
     {                                                              \
         usersim_result_t _result = (x);                            \
-        CXPLAT_DEBUG_ASSERT(_result == STATUS_SUCCESS && #x);           \
+        CXPLAT_DEBUG_ASSERT(_result == STATUS_SUCCESS && #x);      \
     }                                                              \
     while (0)                                                      \
     _Pragma("warning(pop)")