From a54c2379e3008b8f2dc3827d4698fe1fea77fe6d Mon Sep 17 00:00:00 2001 From: Riccardo Tribbia Date: Thu, 5 Nov 2015 14:30:45 +0100 Subject: [PATCH] Fix issue #3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Changed “class” params name on methods declarations and implementations --- Obfuscator/Obfuscator.h | 4 ++-- Obfuscator/Obfuscator.m | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Obfuscator/Obfuscator.h b/Obfuscator/Obfuscator.h index 47585a2..74dad2a 100644 --- a/Obfuscator/Obfuscator.h +++ b/Obfuscator/Obfuscator.h @@ -41,7 +41,7 @@ * @warning The salt used to obfuscate must be exactly the same for reveal to work. * @return Obfuscator class instance. */ - + (instancetype)newWithSalt:(Class)class, ... NS_REQUIRES_NIL_TERMINATION; + + (instancetype)newWithSalt:(Class)classParam, ... NS_REQUIRES_NIL_TERMINATION; /*! * @brief Create Obfuscator class using salts stored in key-value database. @@ -130,7 +130,7 @@ * @warning Does not get bridged to Swift. Use from within Objective-C code so that the salts will become * available to Swift code by using: `+ (NSString *)reveal:UsingStoredSalt:` or `+ (instancetype)newUsingStoredSalt:`. */ - + (void)storeKey:(NSString *)key forSalt:(Class)class, ... NS_REQUIRES_NIL_TERMINATION; + + (void)storeKey:(NSString *)key forSalt:(Class)classParam, ... NS_REQUIRES_NIL_TERMINATION; /*! * @brief Converts obfuscated hard-coded C-String back to original string during run-time. diff --git a/Obfuscator/Obfuscator.m b/Obfuscator/Obfuscator.m index ef44b1d..56b675a 100644 --- a/Obfuscator/Obfuscator.m +++ b/Obfuscator/Obfuscator.m @@ -31,7 +31,7 @@ @implementation Obfuscator static NSMutableDictionary *saltDatabase; -+ (void)storeKey:(NSString *)key forSalt:(Class)class, ... ++ (void)storeKey:(NSString *)key forSalt:(Class)classParam, ... { if (saltDatabase == nil) saltDatabase = [[NSMutableDictionary alloc] init]; @@ -40,10 +40,10 @@ + (void)storeKey:(NSString *)key forSalt:(Class)class, ... id eachClass; va_list argumentList; - if (class) // The first argument isn't part of the varargs list, + if (classParam) // The first argument isn't part of the varargs list, { - classes = [[NSMutableString alloc] initWithString:NSStringFromClass(class)]; - va_start(argumentList, class); // Start scanning for arguments after class. + classes = [[NSMutableString alloc] initWithString:NSStringFromClass(classParam)]; + va_start(argumentList, classParam); // Start scanning for arguments after class. while ((eachClass = va_arg(argumentList, id))) // As many times as we can get an argument of type "id" [classes appendString:NSStringFromClass(eachClass)]; va_end(argumentList); @@ -52,16 +52,16 @@ + (void)storeKey:(NSString *)key forSalt:(Class)class, ... [saltDatabase setValue:[classes copy] forKey:key]; } -+ (instancetype)newWithSalt:(Class)class, ... ++ (instancetype)newWithSalt:(Class)classParam, ... { NSMutableString *classes; id eachClass; va_list argumentList; - if (class) // The first argument isn't part of the varargs list, + if (classParam) // The first argument isn't part of the varargs list, { - classes = [[NSMutableString alloc] initWithString:NSStringFromClass(class)]; - va_start(argumentList, class); // Start scanning for arguments after class. + classes = [[NSMutableString alloc] initWithString:NSStringFromClass(classParam)]; + va_start(argumentList, classParam); // Start scanning for arguments after class. while ((eachClass = va_arg(argumentList, id))) // As many times as we can get an argument of type "id" [classes appendString:NSStringFromClass(eachClass)]; va_end(argumentList);