diff options
| -rw-r--r-- | CyteKit/CyteKit.h | 2 | ||||
| -rw-r--r-- | CyteKit/CyteObject.mm | 3 | ||||
| -rw-r--r-- | CyteKit/RegEx.hpp | 4 | ||||
| -rw-r--r-- | CyteKit/stringWith.h (renamed from CyteKit/stringWithUTF8Bytes.h) | 7 | ||||
| -rw-r--r-- | CyteKit/stringWith.mm | 61 | ||||
| -rw-r--r-- | CyteKit/stringWithUTF8Bytes.mm | 36 | ||||
| -rw-r--r-- | makefile | 2 |
7 files changed, 71 insertions, 44 deletions
diff --git a/CyteKit/CyteKit.h b/CyteKit/CyteKit.h index 0d66439..085f45d 100644 --- a/CyteKit/CyteKit.h +++ b/CyteKit/CyteKit.h @@ -36,7 +36,7 @@ #include "CyteKit/countByEnumeratingWithState.h" #include "CyteKit/extern.h" -#include "CyteKit/stringWithUTF8Bytes.h" +#include "CyteKit/stringWith.h" #include "CyteKit/webScriptObjectInContext.h" #endif//CyteKit_CyteKit_H diff --git a/CyteKit/CyteObject.mm b/CyteKit/CyteObject.mm index 382b4f4..0659b51 100644 --- a/CyteKit/CyteObject.mm +++ b/CyteKit/CyteObject.mm @@ -31,6 +31,7 @@ #include "CyteKit/WebViewController.h" #include "CyteKit/countByEnumeratingWithState.h" #include "CyteKit/extern.h" +#include "CyteKit/stringWith.h" #include "iPhonePrivate.h" #include <Menes/ObjectHandle.h> @@ -371,7 +372,7 @@ static NSObject *CYIOGetValue(const char *path, NSString *property) { id values[count]; for (unsigned i(0); i != count; ++i) values[i] = [arguments objectAtIndex:i]; - return [[[NSString alloc] initWithFormat:format arguments:reinterpret_cast<va_list>(values)] autorelease]; + return [NSString stringWithFormat:format :count :values]; } - (BOOL) supports:(NSString *)feature { diff --git a/CyteKit/RegEx.hpp b/CyteKit/RegEx.hpp index 40068a7..7ff08df 100644 --- a/CyteKit/RegEx.hpp +++ b/CyteKit/RegEx.hpp @@ -25,7 +25,7 @@ #include <unicode/uregex.h> #include "CyteKit/UCPlatform.h" -#include "CyteKit/stringWithUTF8Bytes.h" +#include "CyteKit/stringWith.h" #define _rgxcall(code, args...) ({ \ UErrorCode status(U_ZERO_ERROR); \ @@ -124,7 +124,7 @@ class RegEx { id values[capture_]; for (int i(0); i != capture_; ++i) values[i] = this->operator [](i + 1); - return [[[NSString alloc] initWithFormat:format arguments:reinterpret_cast<va_list>(values)] autorelease]; + return [NSString stringWithFormat:format :capture_ :values]; } }; diff --git a/CyteKit/stringWithUTF8Bytes.h b/CyteKit/stringWith.h index bbd960a..49bf9da 100644 --- a/CyteKit/stringWithUTF8Bytes.h +++ b/CyteKit/stringWith.h @@ -19,14 +19,15 @@ **/ /* }}} */ -#ifndef CyteKit_stringWithUTF8Bytes_H -#define CyteKit_stringWithUTF8Bytes_H +#ifndef CyteKit_stringWith_H +#define CyteKit_stringWith_H #include <Foundation/Foundation.h> @interface NSString (Cyte) + (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length; + (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length; ++ (NSString *) stringWithFormat:(NSString *)format :(size_t)count :(id *)args; @end -#endif//CyteKit_stringWithUTF8Bytes_H +#endif//CyteKit_stringWith_H diff --git a/CyteKit/stringWith.mm b/CyteKit/stringWith.mm new file mode 100644 index 0000000..b3d0e72 --- /dev/null +++ b/CyteKit/stringWith.mm @@ -0,0 +1,61 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2015 Jay Freeman (saurik) +*/ + +/* GNU General Public License, Version 3 {{{ */ +/* + * Cydia is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * Cydia is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cydia. If not, see <http://www.gnu.org/licenses/>. +**/ +/* }}} */ + +#include "CyteKit/UCPlatform.h" + +#include "CyteKit/stringWith.h" + +@implementation NSString (Cyte) + ++ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length { + return [[[NSString alloc] initWithBytesNoCopy:const_cast<char *>(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease]; +} + ++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length { + return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease]; +} + ++ (NSString *) stringWithFormat:(NSString *)format :(size_t)count :(id *)args { + switch (count) { + case 0: + return [[[NSString init] initWithFormat:format] autorelease];; + case 1: + return [[[NSString init] initWithFormat:format, args[0]] autorelease];; + case 2: + return [[[NSString init] initWithFormat:format, args[0], args[1]] autorelease];; + case 3: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2]] autorelease];; + case 4: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2], args[3]] autorelease];; + case 5: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2], args[3], args[4]] autorelease];; + case 6: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2], args[3], args[4], args[5]] autorelease];; + case 7: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2], args[3], args[4], args[5], args[6]] autorelease];; + case 8: + return [[[NSString init] initWithFormat:format, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]] autorelease];; + default: + _assert(false); + } +} + +@end diff --git a/CyteKit/stringWithUTF8Bytes.mm b/CyteKit/stringWithUTF8Bytes.mm deleted file mode 100644 index 2e94dd4..0000000 --- a/CyteKit/stringWithUTF8Bytes.mm +++ /dev/null @@ -1,36 +0,0 @@ -/* Cydia - iPhone UIKit Front-End for Debian APT - * Copyright (C) 2008-2015 Jay Freeman (saurik) -*/ - -/* GNU General Public License, Version 3 {{{ */ -/* - * Cydia is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * Cydia is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Cydia. If not, see <http://www.gnu.org/licenses/>. -**/ -/* }}} */ - -#include "CyteKit/UCPlatform.h" - -#include "CyteKit/stringWithUTF8Bytes.h" - -@implementation NSString (Cyte) - -+ (NSString *) stringWithUTF8BytesNoCopy:(const char *)bytes length:(int)length { - return [[[NSString alloc] initWithBytesNoCopy:const_cast<char *>(bytes) length:length encoding:NSUTF8StringEncoding freeWhenDone:NO] autorelease]; -} - -+ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length { - return [[[NSString alloc] initWithBytes:bytes length:length encoding:NSUTF8StringEncoding] autorelease]; -} - -@end @@ -301,7 +301,7 @@ cydo: cydo.cpp $(cycc) $(plus) -o $@ $(filter %.cpp,$^) $(flag) $(link) -Wno-deprecated-writable-strings @ldid -T0 -S $@ -postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h +postinst: postinst.mm CyteKit/stringWith.mm CyteKit/stringWith.h CyteKit/UCPlatform.h $(cycc) $(plus) -o $@ $(filter %.mm,$^) $(flag) $(link) -framework CoreFoundation -framework Foundation -framework UIKit @ldid -T0 -S $@ |