From 149199138c1792350a494aaaf7f602306cbd77d1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 23 Jan 2018 16:57:19 -0500
Subject: [PATCH] Clean up ahead of PR.

---
 Signal/test/util/OWSDatabaseConverterTest.m  |  2 +-
 SignalServiceKit/src/Util/NSData+hexString.m | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m
index dfe969417..3256b3e98 100644
--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@@ -298,7 +298,7 @@ NS_ASSUME_NONNULL_BEGIN
     XCTAssertTrue(isValid);
 }
 
-// Simulates a legacy user who needs to convert their database.
+// Simulates a legacy user who needs to convert their    database.
 - (void)testConversionWithoutYapDatabase
 {
     sqlite3 *db;
diff --git a/SignalServiceKit/src/Util/NSData+hexString.m b/SignalServiceKit/src/Util/NSData+hexString.m
index 7be40bee4..6afaa6391 100644
--- a/SignalServiceKit/src/Util/NSData+hexString.m
+++ b/SignalServiceKit/src/Util/NSData+hexString.m
@@ -1,9 +1,5 @@
 //
-//  NSData+hexString.m
-//  TextSecureKit
-//
-//  Created by Frederic Jacobs on 28/10/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "NSData+hexString.h"
@@ -13,16 +9,17 @@
 - (NSString *)hexadecimalString {
     /* Returns hexadecimal string of NSData. Empty string if data is empty. */
     const unsigned char *dataBuffer = (const unsigned char *)[self bytes];
-    if (!dataBuffer)
-        return [NSString string];
+    if (!dataBuffer) {
+        return @"";
+    }
 
-    NSUInteger dataLength      = [self length];
+    NSUInteger dataLength = [self length];
     NSMutableString *hexString = [NSMutableString stringWithCapacity:(dataLength * 2)];
 
     for (NSUInteger i = 0; i < dataLength; ++i) {
         [hexString appendFormat:@"%02x", dataBuffer[i]];
     }
-    return [NSString stringWithString:hexString];
+    return [hexString copy];
 }
 
 @end