Fixed formatting

Author: Robert Bartoszewski

Samples/Common/Sources/LibraryBridge/InstallBridge.swift

@@ -78,7 +78,7 @@ public class InstallBridge: ObservableObject {
         config = .init()
         config.crashNotifyCallback = { (writer, requiresAsyncSafety) -> Void in
             Self.logger.info("User callback has requireAsyncSafety value: \(String(requiresAsyncSafety))")
-         }
+        }
 
         $basePath
             .removeDuplicates()

Samples/Tests/Core/PartialCrashReport.swift

@@ -89,7 +89,7 @@ struct PartialCrashReport: Decodable {
                 var address: UInt64?
                 var type: String?
             }
-            
+
             var index: Int
             var state: String
             var crashed: Bool

Samples/Tests/IntegrationTests.swift

@@ -93,54 +93,55 @@ final class CppTests: IntegrationTestBase {
 
 #if !os(watchOS)
 
-final class SignalTests: IntegrationTestBase {
-    func testAbort() throws {
-        try launchAndCrash(.signal_abort)
+    final class SignalTests: IntegrationTestBase {
+        func testAbort() throws {
+            try launchAndCrash(.signal_abort)
 
-        let rawReport = try readPartialCrashReport()
-        try rawReport.validate()
-        XCTAssertEqual(rawReport.crash?.error?.type, "signal")
-        XCTAssertEqual(rawReport.crash?.error?.signal?.name, "SIGABRT")
+            let rawReport = try readPartialCrashReport()
+            try rawReport.validate()
+            XCTAssertEqual(rawReport.crash?.error?.type, "signal")
+            XCTAssertEqual(rawReport.crash?.error?.signal?.name, "SIGABRT")
 
-        let appleReport = try launchAndReportCrash()
-        XCTAssertTrue(appleReport.contains("SIGABRT"))
-    }
+            let appleReport = try launchAndReportCrash()
+            XCTAssertTrue(appleReport.contains("SIGABRT"))
+        }
 
-    func testTermination() throws {
-        // Default (termination monitoring disabled)
-        try launchAndInstall()
-        try terminate()
+        func testTermination() throws {
+            // Default (termination monitoring disabled)
+            try launchAndInstall()
+            try terminate()
 
-        XCTAssertFalse(try hasCrashReport())
+            XCTAssertFalse(try hasCrashReport())
 
-        // With termination monitoring enabled
-        try launchAndInstall { config in
-            config.isSigTermMonitoringEnabled = true
-        }
-        try terminate()
+            // With termination monitoring enabled
+            try launchAndInstall { config in
+                config.isSigTermMonitoringEnabled = true
+            }
+            try terminate()
 
-        let rawReport = try readPartialCrashReport()
-        try rawReport.validate()
-        XCTAssertEqual(rawReport.crash?.error?.signal?.name, "SIGTERM")
+            let rawReport = try readPartialCrashReport()
+            try rawReport.validate()
+            XCTAssertEqual(rawReport.crash?.error?.signal?.name, "SIGTERM")
 
-        let appleReport = try launchAndReportCrash()
-        print(appleReport)
-        XCTAssertTrue(appleReport.contains("SIGTERM"))
-    }
-    
-    func testTerminationWithMemoryIntrospection() throws {
-        try launchAndInstall { config in
-            config.isSigTermMonitoringEnabled = true
-            config.isMemoryIntrospectionEnabled = true
+            let appleReport = try launchAndReportCrash()
+            print(appleReport)
+            XCTAssertTrue(appleReport.contains("SIGTERM"))
         }
-        try terminate()
 
-        let rawReport = try readPartialCrashReport()
-        try rawReport.validate()
-        XCTAssertNotNil(rawReport.crash?.threads?.first?.notable_addresses)
-        XCTAssertTrue(rawReport.crash?.threads?.first?.notable_addresses?.keys.contains { $0.hasPrefix("stack@0x") } ?? false)
+        func testTerminationWithMemoryIntrospection() throws {
+            try launchAndInstall { config in
+                config.isSigTermMonitoringEnabled = true
+                config.isMemoryIntrospectionEnabled = true
+            }
+            try terminate()
+
+            let rawReport = try readPartialCrashReport()
+            try rawReport.validate()
+            XCTAssertNotNil(rawReport.crash?.threads?.first?.notable_addresses)
+            XCTAssertTrue(
+                rawReport.crash?.threads?.first?.notable_addresses?.keys.contains { $0.hasPrefix("stack@0x") } ?? false)
+        }
     }
-}
 
 #endif
 
@@ -156,9 +157,11 @@ final class OtherTests: IntegrationTestBase {
         })
         XCTAssertNotNil(expectedFrame)
 
-        let threadStates = ["TH_STATE_RUNNING", "TH_STATE_STOPPED", "TH_STATE_WAITING",
-                            "TH_STATE_UNINTERRUPTIBLE", "TH_STATE_HALTED"]
-        for thread in rawReport.crash?.threads  ?? [] {
+        let threadStates = [
+            "TH_STATE_RUNNING", "TH_STATE_STOPPED", "TH_STATE_WAITING",
+            "TH_STATE_UNINTERRUPTIBLE", "TH_STATE_HALTED",
+        ]
+        for thread in rawReport.crash?.threads ?? [] {
             XCTAssertTrue(threadStates.contains(thread.state))
         }
 

Sources/KSCrashDiscSpaceMonitor/KSCrashMonitor_DiscSpace.m

@@ -47,8 +47,9 @@ static uint64_t getStorageSize(void)
 
 static uint64_t getFreeStorageSize(void)
 {
-    NSNumber *freeStorageSize = [[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil]
-        objectForKey:NSFileSystemFreeSize];
+    NSNumber *freeStorageSize =
+        [[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory()
+                                                                 error:nil] objectForKey:NSFileSystemFreeSize];
     return freeStorageSize.unsignedLongLongValue;
 }
 

Sources/KSCrashFilters/KSCrashReportFilterAlert.m

@@ -56,7 +56,8 @@ - (void)startWithTitle:(NSString *)title
              yesAnswer:(NSString *)yesAnswer
               noAnswer:(NSString *)noAnswer
                reports:(NSArray<id<KSCrashReport>> *)reports
-          onCompletion:(KSCrashReportFilterCompletion)onCompletion NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
+          onCompletion:(KSCrashReportFilterCompletion)onCompletion
+    NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
 
 @end
 

Sources/KSCrashInstallations/KSCrashInstallation.m

@@ -34,10 +34,10 @@
 #import "KSCrashReportFilterBasic.h"
 #import "KSCrashReportFilterDemangle.h"
 #import "KSCrashReportFilterDoctor.h"
+#import "KSDynamicLinker.h"
 #import "KSJSONCodecObjC.h"
 #import "KSLogger.h"
 #import "KSNSErrorHelper.h"
-#import "KSDynamicLinker.h"
 
 /** Max number of properties that can be defined for writing to the report */
 #define kMaxProperties 500
@@ -240,21 +240,22 @@ - (BOOL)installWithConfiguration:(KSCrashConfiguration *)configuration error:(NS
         g_crashHandlerData = self.crashHandlerData;
         ksdl_binary_images_initialize();
 
-        configuration.crashNotifyCallback = ^(const struct KSCrashReportWriter *_Nonnull writer, bool requiresAsyncSafety) {
-            CrashHandlerData *crashHandlerData = g_crashHandlerData;
-            if (crashHandlerData == NULL) {
-                return;
-            }
-            for (int i = 0; i < crashHandlerData->reportFieldsCount; i++) {
-                ReportField *field = crashHandlerData->reportFields[i];
-                if (field->key != NULL && field->value != NULL) {
-                    writer->addJSONElement(writer, field->key, field->value, true);
+        configuration.crashNotifyCallback =
+            ^(const struct KSCrashReportWriter *_Nonnull writer, bool requiresAsyncSafety) {
+                CrashHandlerData *crashHandlerData = g_crashHandlerData;
+                if (crashHandlerData == NULL) {
+                    return;
+                }
+                for (int i = 0; i < crashHandlerData->reportFieldsCount; i++) {
+                    ReportField *field = crashHandlerData->reportFields[i];
+                    if (field->key != NULL && field->value != NULL) {
+                        writer->addJSONElement(writer, field->key, field->value, true);
+                    }
+                }
+                if (crashHandlerData->userCrashCallback != NULL) {
+                    crashHandlerData->userCrashCallback(writer, requiresAsyncSafety);
                 }
-            }
-            if (crashHandlerData->userCrashCallback != NULL) {
-                crashHandlerData->userCrashCallback(writer, requiresAsyncSafety);
-            }
-        };
+            };
 
         NSError *installError = nil;
         BOOL success = [handler installWithConfiguration:configuration error:&installError];

Sources/KSCrashInstallations/include/KSCrashInstallation.h

@@ -116,7 +116,8 @@ NS_SWIFT_NAME(CrashInstallation)
 - (void)addConditionalAlertWithTitle:(NSString *)title
                              message:(nullable NSString *)message
                            yesAnswer:(NSString *)yesAnswer
-                            noAnswer:(nullable NSString *)noAnswer NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
+                            noAnswer:(nullable NSString *)noAnswer
+    NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
 
 /** Show an alert before sending any reports. Reports will be unconditionally sent
  * when the alert is dismissed.
@@ -127,7 +128,8 @@ NS_SWIFT_NAME(CrashInstallation)
  */
 - (void)addUnconditionalAlertWithTitle:(NSString *)title
                                message:(nullable NSString *)message
-                     dismissButtonText:(NSString *)dismissButtonText NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
+                     dismissButtonText:(NSString *)dismissButtonText
+    NS_EXTENSION_UNAVAILABLE_IOS("Alert Filter requires NSApplication, which is unavailable on watchOS extensions");
 
 /** Validates properties of installation.
  *

Sources/KSCrashRecording/KSCrash.m

@@ -36,10 +36,10 @@
 #import "KSCrashMonitor_System.h"
 #import "KSCrashReport.h"
 #import "KSCrashReportFields.h"
+#import "KSDynamicLinker.h"
 #import "KSJSONCodecObjC.h"
 #import "KSNSErrorHelper.h"
 #import "KSSystemCapabilities.h"
-#import "KSDynamicLinker.h"
 
 // #define KSLogger_LocalLevel TRACE
 #import "KSLogger.h"
@@ -52,7 +52,6 @@
 #import <AppKit/AppKit.h>
 #endif
 
-
 // ============================================================================
 #pragma mark - Globals -
 // ============================================================================
@@ -229,7 +228,7 @@ - (NSDictionary *)systemInfo
     COPY_PRIMITIVE(parentProcessID);
     COPY_STRING(deviceAppHash);
     COPY_STRING(buildType);
-    COPY_PRIMITIVE(storageSize);  // this field is populated in an optional monitor
+    COPY_PRIMITIVE(storageSize);      // this field is populated in an optional monitor
     COPY_PRIMITIVE(freeStorageSize);  // this field is populated in an optional monitor
     COPY_PRIMITIVE(memorySize);
     COPY_PRIMITIVE(freeMemory);

Sources/KSCrashRecording/KSCrashReportC.c

@@ -52,10 +52,10 @@
 #include "KSStackCursor_Backtrace.h"
 #include "KSStackCursor_MachineContext.h"
 #include "KSString.h"
+#include "KSStringConversion.h"
 #include "KSSystemCapabilities.h"
 #include "KSThread.h"
 #include "KSThreadCache.h"
-#include "KSStringConversion.h"
 
 // #define KSLogger_LocalLevel TRACE
 #include <errno.h>
@@ -1058,7 +1058,7 @@ static void writeThread(const KSCrashReportWriter *const writer, const char *con
 
     KSStackCursor stackCursor;
     bool hasBacktrace = getStackCursor(crash, machineContext, &stackCursor);
-    const char* state = ksthread_state_name(threadState);
+    const char *state = ksthread_state_name(threadState);
 
     writer->beginObject(writer, key);
     {
@@ -1076,8 +1076,9 @@ static void writeThread(const KSCrashReportWriter *const writer, const char *con
             // pthread_getname_np() acquires no locks if passed pthread_self() as
             // of libpthread-330.201.1 (macOS 10.14 / iOS 12)
             bool isSelfThread = thread == ksthread_self();
-            char threadName[64] = {0};
-            if (isSelfThread && !pthread_getname_np(pthread_self(), threadName, sizeof(threadName)) && threadName[0] != 0) {
+            char threadName[64] = { 0 };
+            if (isSelfThread && !pthread_getname_np(pthread_self(), threadName, sizeof(threadName)) &&
+                threadName[0] != 0) {
                 writer->addStringElement(writer, KSCrashField_Name, threadName);
             }
         }
@@ -1235,7 +1236,7 @@ static void writeError(const KSCrashReportWriter *const writer, const char *cons
 #if KSCRASH_HOST_APPLE
         writer->beginObject(writer, KSCrashField_Mach);
         {
-            char buffer[20] = {0};
+            char buffer[20] = { 0 };
             const char *machExceptionName = ksmach_exceptionName(crash->mach.type);
             const char *machCodeName = crash->mach.code == 0 ? NULL : ksmach_kernelReturnCodeName(crash->mach.code);
             writer->addUIntegerElement(writer, KSCrashField_Exception, (unsigned)crash->mach.type);
@@ -1722,7 +1723,8 @@ void kscrashreport_setUserSectionWriteCallback(const KSReportWriteCallback userS
     g_userSectionWriteCallback = userSectionWriteCallback;
 }
 
-void kscrashreport_setThreadTracingEnabled(bool threadTracingEnabled) {
+void kscrashreport_setThreadTracingEnabled(bool threadTracingEnabled)
+{
 #if KSCRASH_HAS_THREADS_API
     g_shouldRecordThreads = threadTracingEnabled;
 #else

Sources/KSCrashRecording/KSCrashReportC.h

@@ -81,7 +81,8 @@ void kscrashreport_setUserSectionWriteCallback(const KSReportWriteCallback userS
 
 /** Decide if all threads will be written to a report.
  *
- * @param threadTracingEnabled true if all threads should be recorded, if false, only the offending thread will be recorded.
+ * @param threadTracingEnabled true if all threads should be recorded, if false, only the offending thread will be
+ * recorded.
  */
 void kscrashreport_setThreadTracingEnabled(bool threadTracingEnabled);