Renamed category to avoid conflict

MugunthKumar · Nov 20, 2012 · 3a3667d · 3a3667d
1 parent eba1291
commit 3a3667d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Externals/NSData+Base64.h → Externals/NSData+MKBase64.h b/Externals/NSData+Base64.h → Externals/NSData+MKBase64.h
@@ -1,5 +1,5 @@
 //
-//  NSData+Base64.h
+//  NSData+MKNKBase64.h
 //  base64
 //
 //  Created by Matt Gallagher on 2009/06/03.
@@ -34,7 +34,7 @@ char *NewBase64Encode(
 	bool separateLines,
 	size_t *outputLength);
 
-@interface NSData (Base64)
+@interface NSData (MKNKBase64)
 
 + (NSData *)dataFromBase64String:(NSString *)aString;
 - (NSString *)base64EncodedString;

diff --git a/Externals/NSData+Base64.m → Externals/NSData+MKBase64.m b/Externals/NSData+Base64.m → Externals/NSData+MKBase64.m
@@ -1,5 +1,5 @@
 //
-//  NSData+Base64.m
+//  NSData+MKNKBase64.m
 //  base64
 //
 //  Created by Matt Gallagher on 2009/06/03.
@@ -21,7 +21,7 @@
 //     distribution.
 //
 
-#import "NSData+Base64.h"
+#import "NSData+MKBase64.h"
 
 //
 // Mapping from 6 bit pattern to ASCII character.
@@ -262,7 +262,7 @@
 	return outputBuffer;
 }
 
-@implementation NSData (Base64)
+@implementation NSData (MKNKBase64)
 
 //
 // dataFromBase64String:
@@ -296,9 +296,9 @@ + (NSData *)dataFromBase64String:(NSString *)aString
 //
 - (NSString *)base64EncodedString
 {
-	size_t outputLength;
+	size_t outputLength = 0;
 	char *outputBuffer =
-		NewBase64Encode([self bytes], [self length], true, &outputLength);
+		NewBase64Encode([self bytes], [self length], false, &outputLength);
 
 	NSString *result =
 		[[NSString alloc]

diff --git a/MKSKProduct.m b/MKSKProduct.m
@@ -31,7 +31,7 @@
 
 #import "MKSKProduct.h"
 
-#import "NSData+Base64.h"
+#import "NSData+MKBase64.h"
 
 #if ! __has_feature(objc_arc)
 #error MKStoreKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag

diff --git a/MKSKSubscriptionProduct.m b/MKSKSubscriptionProduct.m
@@ -31,7 +31,7 @@
 
 
 #import "MKSKSubscriptionProduct.h"
-#import "NSData+Base64.h"
+#import "NSData+MKBase64.h"
 #if ! __has_feature(objc_arc)
 #error MKStoreKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag
 #endif

diff --git a/MKStoreManager.m b/MKStoreManager.m
@@ -38,7 +38,7 @@
 #import "SFHFKeychainUtils.h"
 #import "MKSKSubscriptionProduct.h"
 #import "MKSKProduct.h"
-#import "NSData+Base64.h"
+#import "NSData+MKBase64.h"
 #if ! __has_feature(objc_arc)
 #error MKStoreKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag
 #endif