Remove RRFC3339DateTool

Source/KSCrash-Tests/RFC3339DateTool_Tests.m → Source/KSCrash-Tests/RFC3339UTFString_Tests.m

@@ -24,11 +24,18 @@
 
 
 #import <XCTest/XCTest.h>
-#import "RFC3339DateTool.h"
+#import "RFC3339UTFString.h"
 
 
 @interface RFC3339DateTool_Tests : XCTestCase @end
 
+NSString* stringFromDate(NSDate* date)
+{
+    char string[21];
+    time_t timestamp = (time_t)date.timeIntervalSince1970;
+    rfc3339UtcStringFromUNIXTimestamp(timestamp, string);
+    return [NSString stringWithUTF8String:string];
+}
 
 @implementation RFC3339DateTool_Tests
 
@@ -55,34 +62,10 @@ - (void) testStringFromDate
 {
     NSDate* date = [self gmtDateWithYear:2000 month:1 day:2 hour:3 minute:4 second:5];
     NSString* expected = @"2000-01-02T03:04:05Z";
-    NSString* actual = [RFC3339DateTool stringFromDate:date];
+    NSString* actual = stringFromDate(date);
 
     XCTAssertEqualObjects(actual, expected, @"");
 }
 
-- (void) testDateFromString
-{
-    NSDate* expected = [self gmtDateWithYear:2000 month:1 day:2 hour:3 minute:4 second:5];
-    NSDate* actual = [RFC3339DateTool dateFromString:@"2000-01-02T03:04:05Z"];
-
-    XCTAssertEqualObjects(actual, expected, @"");
-}
-
-- (void) testStringFromUnixTimestamp
-{
-    NSDate* date = [self gmtDateWithYear:2000 month:1 day:2 hour:3 minute:4 second:5];
-    NSString* expected = @"2000-01-02T03:04:05Z";
-    NSString* actual = [RFC3339DateTool stringFromUNIXTimestamp:(uint64_t)[date timeIntervalSince1970]];
-
-    XCTAssertEqualObjects(actual, expected, @"");
-}
-#if 0
-- (void) testUnixTimestampFromString
-{
-    uint64_t expected = (uint64_t)[[self gmtDateWithYear:2000 month:1 day:2 hour:3 minute:4 second:5] timeIntervalSince1970];
-    uint64_t actual = [RFC3339DateTool UNIXTimestampFromString:@"2000-01-02T03:04:05Z"];
-
-    XCTAssertEqual(actual, expected, @"");
-}
-#endif
 @end
+

Source/KSCrash/Recording/Tools/KSJSONCodecObjC.m

@@ -29,7 +29,7 @@
 
 #import "KSJSONCodec.h"
 #import "NSError+SimpleConstructor.h"
-#import "RFC3339DateTool.h"
+#import "RFC3339UTFString.h"
 
 
 @interface KSJSONCodec ()
@@ -500,8 +500,10 @@ int ksjsoncodecobjc_i_encodeObject(KSJSONCodec* codec,
 
     if([object isKindOfClass:[NSDate class]])
     {
-        NSData* data = [[RFC3339DateTool stringFromDate:object]
-                        dataUsingEncoding:NSUTF8StringEncoding];
+        char string[21];
+        time_t timestamp = (time_t)((NSDate*)object).timeIntervalSince1970;
+        rfc3339UtcStringFromUNIXTimestamp(timestamp, string);
+        NSData* data = [NSData dataWithBytes:string length:strnlen(string, 20)];
         return ksjson_addStringElement(context, cName, data.bytes, (int)data.length);
     }
 

Source/KSCrash/Reporting/Filters/KSCrashReportFilterAppleFmt.m

@@ -34,7 +34,6 @@
 #import "KSCrashReportFields.h"
 #import "KSJSONCodecObjC.h"
 #import "KSSystemInfo.h"
-#import "RFC3339DateTool.h"
 
 
 #if defined(__LP64__)
@@ -106,6 +105,9 @@ @implementation KSCrashReportFilterAppleFmt
 /** Date formatter for Apple date format in crash reports. */
 NSDateFormatter* g_dateFormatter;
 
+/** Date formatter for RFC3339 date format. */
+NSDateFormatter* g_rfc3339DateFormatter;
+
 /** Printing order for registers. */
 NSDictionary* g_registerOrders;
 
@@ -115,6 +117,11 @@ + (void) initialize
     [g_dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
     [g_dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss.SSS ZZZ"];
 
+    g_rfc3339DateFormatter = [[NSDateFormatter alloc] init];
+    [g_rfc3339DateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
+    [g_rfc3339DateFormatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"];
+    [g_rfc3339DateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
+
     NSArray* armOrder = [NSArray arrayWithObjects:
                          @"r0", @"r1", @"r2", @"r3", @"r4", @"r5", @"r6", @"r7",
                          @"r8", @"r9", @"r10", @"r11", @"ip",
@@ -411,7 +418,7 @@ - (NSString*) headerStringForReport:(NSDictionary*) report
     NSDictionary* system = [self systemReport:report];
     NSDictionary* reportInfo = [self infoReport:report];
     NSString *reportID = [reportInfo objectForKey:@KSCrashField_ID];
-    NSDate* crashTime = [RFC3339DateTool dateFromString:[reportInfo objectForKey:@KSCrashField_Timestamp]];
+    NSDate* crashTime = [g_rfc3339DateFormatter dateFromString:[reportInfo objectForKey:@KSCrashField_Timestamp]];
 
     return [self headerStringForSystemInfo:system reportID:reportID crashTime:crashTime];
 }