Comment: | Do not use implicit method return types
Instead, explicitly declare them, as OF_ASSUME_NONNULL_{BEGIN,END} does |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2f4e0df8be4b47505020d55cc6670434 |
User & Date: | js on 2017-10-17 00:33:37 |
Other Links: | manifest | tags |
2017-10-17
| ||
21:02 | OFMutableSet: Add missing override for -[copy] check-in: 7dfb3c2c89 user: js tags: trunk | |
00:33 | Do not use implicit method return types check-in: 2f4e0df8be user: js tags: trunk | |
2017-10-16
| ||
22:59 | Finally make modules work properly check-in: 3a06dc7def user: js tags: trunk | |
Modified configure.ac from [15204dd6eb] to [64f9cbaf6c].
︙ | ︙ | |||
183 184 185 186 187 188 189 190 191 192 193 194 195 196 | [OBJCFLAGS="$OBJCFLAGS -Wshorten-64-to-32"]) AX_CHECK_COMPILER_FLAGS([-Wundeclared-selector -Werror], [OBJCFLAGS="$OBJCFLAGS -Wundeclared-selector"]) AX_CHECK_COMPILER_FLAGS([-Wsemicolon-before-method-body -Werror], [OBJCFLAGS="$OBJCFLAGS -Wsemicolon-before-method-body"]) AX_CHECK_COMPILER_FLAGS([-Wobjc-missing-property-synthesis -Werror], [OBJCFLAGS="$OBJCFLAGS -Wobjc-missing-property-synthesis"]) AC_MSG_CHECKING(whether Objective C compiler supports properties) AC_TRY_COMPILE([ #ifdef __has_attribute # if __has_attribute(objc_root_class) __attribute__((__objc_root_class__)) # endif | > > | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | [OBJCFLAGS="$OBJCFLAGS -Wshorten-64-to-32"]) AX_CHECK_COMPILER_FLAGS([-Wundeclared-selector -Werror], [OBJCFLAGS="$OBJCFLAGS -Wundeclared-selector"]) AX_CHECK_COMPILER_FLAGS([-Wsemicolon-before-method-body -Werror], [OBJCFLAGS="$OBJCFLAGS -Wsemicolon-before-method-body"]) AX_CHECK_COMPILER_FLAGS([-Wobjc-missing-property-synthesis -Werror], [OBJCFLAGS="$OBJCFLAGS -Wobjc-missing-property-synthesis"]) AX_CHECK_COMPILER_FLAGS([-Wmissing-method-return-type -Werror], [OBJCFLAGS="$OBJCFLAGS -Wmissing-method-return-type"]) AC_MSG_CHECKING(whether Objective C compiler supports properties) AC_TRY_COMPILE([ #ifdef __has_attribute # if __has_attribute(objc_root_class) __attribute__((__objc_root_class__)) # endif |
︙ | ︙ |
Modified src/OFApplication.h from [e7e5df2d5d] to [45023093c6].
︙ | ︙ | |||
200 201 202 203 204 205 206 | * This is only available if `OF_HAVE_SANDBOX` is defined. * * @param sandbox The sandbox to activate */ + (void)activateSandbox: (OFSandbox *)sandbox; #endif | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | * This is only available if `OF_HAVE_SANDBOX` is defined. * * @param sandbox The sandbox to activate */ + (void)activateSandbox: (OFSandbox *)sandbox; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Gets argc and argv. * * @param argc A pointer where a pointer to argc should be stored * @param argv A pointer where a pointer to argv should be stored */ |
︙ | ︙ |
Modified src/OFApplication.m from [f12746971d] to [c080ac0fe6].
︙ | ︙ | |||
201 202 203 204 205 206 207 | #ifdef OF_HAVE_SANDBOX + (void)activateSandbox: (OFSandbox *)sandbox { [app activateSandbox: sandbox]; } #endif | | | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | #ifdef OF_HAVE_SANDBOX + (void)activateSandbox: (OFSandbox *)sandbox { [app activateSandbox: sandbox]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_init { self = [super init]; @try { _environment = [[OFMutableDictionary alloc] init]; atexit(atexitHandler); |
︙ | ︙ |
Modified src/OFArray.h from [ef2bf9920b] to [0a6a732f59].
︙ | ︙ | |||
137 138 139 140 141 142 143 | /*! * @brief Initializes an OFArray with the specified object. * * @param object An object * @return An initialized OFArray */ | | | | | | | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | /*! * @brief Initializes an OFArray with the specified object. * * @param object An object * @return An initialized OFArray */ - (instancetype)initWithObject: (ObjectType)object; /*! * @brief Initializes an OFArray with the specified objects. * * @param firstObject The first object * @return An initialized OFArray */ - (instancetype)initWithObjects: (ObjectType)firstObject, ... OF_SENTINEL; /*! * @brief Initializes an OFArray with the specified object and a va_list. * * @param firstObject The first object * @param arguments A va_list * @return An initialized OFArray */ - (instancetype)initWithObject: (ObjectType)firstObject arguments: (va_list)arguments; /*! * @brief Initializes an OFArray with the objects from the specified array. * * @param array An array * @return An initialized OFArray */ - (instancetype)initWithArray: (OFArray OF_GENERIC(ObjectType) *)array; /*! * @brief Initializes an OFArray with the objects from the specified C array of * the specified length. * * @param objects A C array of objects * @param count The length of the C array * @return An initialized OFArray */ - (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects count: (size_t)count; /*! * @brief Returns the object at the specified index in the array. * * @warning The returned object is *not* retained and autoreleased for * performance reasons! * |
︙ | ︙ | |||
510 511 512 513 514 515 516 | OFArray *_array; size_t _count; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; size_t _position; } | | | | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 | OFArray *_array; size_t _count; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; size_t _position; } - (instancetype)initWithArray: (OFArray *)data mutationsPtr: (nullable unsigned long *)mutationsPtr; @end OF_ASSUME_NONNULL_END #import "OFMutableArray.h" #if !defined(NSINTEGER_DEFINED) && !__has_feature(modules) /* Required for array literals to work */ @compatibility_alias NSArray OFArray; #endif |
Modified src/OFArray.m from [1c7667e82c] to [5414c26349].
︙ | ︙ | |||
42 43 44 45 46 47 48 | depth: (size_t)depth; @end @interface OFArray_placeholder: OFArray @end @implementation OFArray_placeholder | | | | | | | | | | | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | depth: (size_t)depth; @end @interface OFArray_placeholder: OFArray @end @implementation OFArray_placeholder - (instancetype)init { return (id)[[OFArray_adjacent alloc] init]; } - (instancetype)initWithObject: (id)object { return (id)[[OFArray_adjacent alloc] initWithObject: object]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFArray_adjacent alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFArray_adjacent alloc] initWithObject: firstObject arguments: arguments]; } - (instancetype)initWithArray: (OFArray *)array { return (id)[[OFArray_adjacent alloc] initWithArray: array]; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFArray_adjacent alloc] initWithObjects: objects count: count]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFArray_adjacent alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
116 117 118 119 120 121 122 | @implementation OFArray + (void)initialize { if (self == [OFArray class]) placeholder.isa = [OFArray_placeholder class]; } | | | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | @implementation OFArray + (void)initialize { if (self == [OFArray class]) placeholder.isa = [OFArray_placeholder class]; } + (instancetype)alloc { if (self == [OFArray class]) return (id)&placeholder; return [super alloc]; } |
︙ | ︙ | |||
159 160 161 162 163 164 165 | + (instancetype)arrayWithObjects: (id const *)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } | | | | | | > > > > > | > < < < < < < | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | + (instancetype)arrayWithObjects: (id const *)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } - (instancetype)init { if (object_getClass(self) == [OFArray class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; } abort(); } return [super init]; } - (instancetype)initWithObject: (id)object { if (object == nil) { [self release]; @throw [OFInvalidArgumentException exception]; } return [self initWithObjects: object, nil]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [self initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } - (instancetype)initWithArray: (OFArray *)array { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { OF_INVALID_INIT_METHOD } - (instancetype)initWithSerialization: (OFXMLElement *)element { OF_INVALID_INIT_METHOD } - (size_t)count { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
249 250 251 252 253 254 255 | [self getObjects: buffer inRange: of_range(0, count)]; return buffer; } | | | | 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | [self getObjects: buffer inRange: of_range(0, count)]; return buffer; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableArray alloc] initWithArray: self]; } - (id)objectAtIndex: (size_t)index { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
944 945 946 947 948 949 950 | return [current autorelease]; } #endif @end @implementation OFArrayEnumerator | | | | 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 | return [current autorelease]; } #endif @end @implementation OFArrayEnumerator - (instancetype)initWithArray: (OFArray *)array mutationsPtr: (unsigned long *)mutationsPtr { self = [super init]; _array = [array retain]; _count = [array count]; _mutations = (mutationsPtr != NULL ? *mutationsPtr : 0); _mutationsPtr = mutationsPtr; |
︙ | ︙ |
Modified src/OFArray_adjacent.m from [45617fcf1b] to [c6a82f0db4].
︙ | ︙ | |||
26 27 28 29 30 31 32 | #import "OFXMLElement.h" #import "OFEnumerationMutationException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" @implementation OFArray_adjacent | | | | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | #import "OFXMLElement.h" #import "OFEnumerationMutationException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" @implementation OFArray_adjacent - (instancetype)init { self = [super init]; @try { _array = [[OFMutableData alloc] initWithItemSize: sizeof(id)]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)object { self = [self init]; @try { if (object == nil) @throw [OFInvalidArgumentException exception]; [_array addItem: &object]; [object retain]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { self = [self init]; @try { id object; [_array addItem: &firstObject]; |
︙ | ︙ | |||
81 82 83 84 85 86 87 | [self release]; @throw e; } return self; } | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | [self release]; @throw e; } return self; } - (instancetype)initWithArray: (OFArray *)array { id const *objects; size_t count; self = [super init]; if (array == nil) |
︙ | ︙ | |||
123 124 125 126 127 128 129 | [self release]; @throw e; } return self; } | | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { self = [self init]; @try { bool ok = true; for (size_t i = 0; i < count; i++) { |
︙ | ︙ | |||
154 155 156 157 158 159 160 | [self release]; @throw e; } return self; } | | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [self init]; @try { void *pool = objc_autoreleasePoolPush(); if ((![[element name] isEqual: @"OFArray"] && |
︙ | ︙ |
Modified src/OFArray_subarray.h from [716934f439] to [17169ca2bb].
︙ | ︙ | |||
22 23 24 25 26 27 28 | { OFArray *_array; of_range_t _range; } + (instancetype)arrayWithArray: (OFArray *)array range: (of_range_t)range; | | | | 22 23 24 25 26 27 28 29 30 31 32 33 | { OFArray *_array; of_range_t _range; } + (instancetype)arrayWithArray: (OFArray *)array range: (of_range_t)range; - (instancetype)initWithArray: (OFArray *)array range: (of_range_t)range; @end OF_ASSUME_NONNULL_END |
Modified src/OFArray_subarray.m from [b087bc3ca0] to [25410c7619].
︙ | ︙ | |||
24 25 26 27 28 29 30 | + (instancetype)arrayWithArray: (OFArray *)array range: (of_range_t)range { return [[[self alloc] initWithArray: array range: range] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | + (instancetype)arrayWithArray: (OFArray *)array range: (of_range_t)range { return [[[self alloc] initWithArray: array range: range] autorelease]; } - (instancetype)initWithArray: (OFArray *)array range: (of_range_t)range { self = [super init]; @try { /* Should usually be retain, as it's useless with a copy */ _array = [array copy]; _range = range; |
︙ | ︙ |
Modified src/OFAutoreleasePool.m from [e9bf9ceb4f] to [ae2a82f384].
︙ | ︙ | |||
44 45 46 47 48 49 50 | if (!of_tlskey_new(&cacheKey)) @throw [OFInitializationFailedException exceptionWithClass: self]; } #endif | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | if (!of_tlskey_new(&cacheKey)) @throw [OFInitializationFailedException exceptionWithClass: self]; } #endif + (instancetype)alloc { #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS) OFAutoreleasePool **cache = of_tlskey_get(cacheKey); #endif if (cache != NULL) { for (size_t i = 0; i < MAX_CACHE_SIZE; i++) { |
︙ | ︙ | |||
83 84 85 86 87 88 89 | [cache[i] of_super_dealloc]; free(cache); cache = NULL; } } | | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | [cache[i] of_super_dealloc]; free(cache); cache = NULL; } } - (instancetype)init { self = [super init]; @try { _pool = objc_autoreleasePoolPush(); _objc_rootAutorelease(self); |
︙ | ︙ | |||
166 167 168 169 170 171 172 | } } } [super dealloc]; } | | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | } } } [super dealloc]; } - (instancetype)retain { OF_UNRECOGNIZED_SELECTOR } - (instancetype)autorelease { OF_UNRECOGNIZED_SELECTOR } @end |
Modified src/OFBlock.h from [6289b76304] to [b550d02e6f].
︙ | ︙ | |||
22 23 24 25 26 27 28 | /*! * @class OFBlock OFBlock.h ObjFW/OFBlock.h * * @brief The class for all blocks, since all blocks are also objects. */ @interface OFBlock: OFObject | | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | /*! * @class OFBlock OFBlock.h ObjFW/OFBlock.h * * @brief The class for all blocks, since all blocks are also objects. */ @interface OFBlock: OFObject + (instancetype)alloc OF_UNAVAILABLE; - (instancetype)init OF_UNAVAILABLE; @end @interface OFStackBlock: OFBlock @end @interface OFGlobalBlock: OFBlock @end |
︙ | ︙ |
Modified src/OFBlock.m from [bc6ad5b4e9] to [a2a5089265].
︙ | ︙ | |||
60 61 62 63 64 65 66 | OF_BLOCK_FIELD_IS_BLOCK = 7, OF_BLOCK_FIELD_IS_BYREF = 8, OF_BLOCK_FIELD_IS_WEAK = 16, OF_BLOCK_BYREF_CALLER = 128 }; @protocol RetainRelease | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | OF_BLOCK_FIELD_IS_BLOCK = 7, OF_BLOCK_FIELD_IS_BYREF = 8, OF_BLOCK_FIELD_IS_WEAK = 16, OF_BLOCK_BYREF_CALLER = 128 }; @protocol RetainRelease - (instancetype)retain; - (void)release; @end #ifdef OF_OBJFW_RUNTIME /* Begin of ObjC module */ static struct objc_abi_class _NSConcreteStackBlock_metaclass = { (struct objc_abi_class *)(void *)"OFBlock", "OFBlock", "OFStackBlock", |
︙ | ︙ | |||
421 422 423 424 425 426 427 | memcpy(&_NSConcreteMallocBlock, tmp, sizeof(_NSConcreteMallocBlock)); free(tmp); objc_registerClassPair((Class)&_NSConcreteMallocBlock); # endif #endif } | | | | 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | memcpy(&_NSConcreteMallocBlock, tmp, sizeof(_NSConcreteMallocBlock)); free(tmp); objc_registerClassPair((Class)&_NSConcreteMallocBlock); # endif #endif } + (instancetype)alloc { OF_UNRECOGNIZED_SELECTOR } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void *)allocMemoryWithSize: (size_t)size { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
460 461 462 463 464 465 466 | } - (void)freeMemory: (void *)ptr { OF_UNRECOGNIZED_SELECTOR } | | | | | 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | } - (void)freeMemory: (void *)ptr { OF_UNRECOGNIZED_SELECTOR } - (instancetype)retain { if (object_getClass(self) == (Class)&_NSConcreteMallocBlock) return Block_copy(self); return self; } - (id)copy { return Block_copy(self); } - (instancetype)autorelease { if (object_getClass(self) == (Class)&_NSConcreteMallocBlock) return [super autorelease]; return self; } |
︙ | ︙ |
Modified src/OFCondition.m from [c3c05a120f] to [c139f6bdf6].
︙ | ︙ | |||
27 28 29 30 31 32 33 | @implementation OFCondition + (instancetype)condition { return [[[self alloc] init] autorelease]; } | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | @implementation OFCondition + (instancetype)condition { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; if (!of_condition_new(&_condition)) { Class c = [self class]; [self release]; @throw [OFInitializationFailedException exceptionWithClass: c]; |
︙ | ︙ |
Modified src/OFConstantString.m from [58b7594810] to [aaf59fe08c].
︙ | ︙ | |||
44 45 46 47 48 49 50 | } _OFConstantStringClassReference; #endif @interface OFString_const: OFString_UTF8 @end @implementation OFString_const | | < | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | } _OFConstantStringClassReference; #endif @interface OFString_const: OFString_UTF8 @end @implementation OFString_const + (instancetype)alloc { OF_UNRECOGNIZED_SELECTOR } - (void *)allocMemoryWithSize: (size_t)size { OF_UNRECOGNIZED_SELECTOR } - (void *)allocMemoryWithSize: (size_t)size |
︙ | ︙ | |||
79 80 81 82 83 84 85 | } - (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } | | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | } - (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (unsigned int)retainCount { return OF_RETAIN_COUNT_MAX; |
︙ | ︙ | |||
161 162 163 164 165 166 167 | } _cString = (char *)ivars; object_setClass(self, [OFString_const class]); } } | | | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | } _cString = (char *)ivars; object_setClass(self, [OFString_const class]); } } + (instancetype)alloc { OF_UNRECOGNIZED_SELECTOR } - (void *)allocMemoryWithSize: (size_t)size { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
195 196 197 198 199 200 201 | } - (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } | | | | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | } - (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (unsigned int)retainCount { return OF_RETAIN_COUNT_MAX; |
︙ | ︙ | |||
225 226 227 228 229 230 231 | /* * In all following methods, the constant string is converted to an * OFString_UTF8 and the message sent again. */ /* From protocol OFCopying */ | | | | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | /* * In all following methods, the constant string is converted to an * OFString_UTF8 and the message sent again. */ /* From protocol OFCopying */ - (id)copy { [self finishInitialization]; return [self copy]; } /* From protocol OFMutableCopying */ - (id)mutableCopy { [self finishInitialization]; return [self mutableCopy]; } /* From protocol OFComparing */ |
︙ | ︙ |
Modified src/OFCountedSet.m from [917f8ad622] to [5a24ff85a6].
︙ | ︙ | |||
28 29 30 31 32 33 34 | Class isa; } placeholder; @interface OFCountedSet_placeholder: OFCountedSet @end @implementation OFCountedSet_placeholder | | | | | | | | | | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | Class isa; } placeholder; @interface OFCountedSet_placeholder: OFCountedSet @end @implementation OFCountedSet_placeholder - (instancetype)init { return (id)[[OFCountedSet_hashtable alloc] init]; } - (instancetype)initWithSet: (OFSet *)set { return (id)[[OFCountedSet_hashtable alloc] initWithSet: set]; } - (instancetype)initWithArray: (OFArray *)array { return (id)[[OFCountedSet_hashtable alloc] initWithArray: array]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFCountedSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFCountedSet_hashtable alloc] initWithObjects: objects count: count]; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFCountedSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFCountedSet_hashtable alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
103 104 105 106 107 108 109 | @implementation OFCountedSet + (void)initialize { if (self == [OFCountedSet class]) placeholder.isa = [OFCountedSet_placeholder class]; } | | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | @implementation OFCountedSet + (void)initialize { if (self == [OFCountedSet class]) placeholder.isa = [OFCountedSet_placeholder class]; } + (instancetype)alloc { if (self == [OFCountedSet class]) return (id)&placeholder; return [super alloc]; } - (instancetype)init { if (object_getClass(self) == [OFCountedSet class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; |
︙ | ︙ | |||
168 169 170 171 172 173 174 | [ret makeImmutable]; objc_autoreleasePoolPop(pool); return ret; } | | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | [ret makeImmutable]; objc_autoreleasePoolPop(pool); return ret; } - (id)copy { return [[OFCountedSet alloc] initWithSet: self]; } - (id)mutableCopy { return [[OFCountedSet alloc] initWithSet: self]; } - (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ |
Modified src/OFCountedSet_hashtable.m from [0205b4710b] to [534eb57128].
︙ | ︙ | |||
32 33 34 35 36 37 38 | @implementation OFCountedSet_hashtable + (void)initialize { if (self == [OFCountedSet_hashtable class]) [self inheritMethodsFromClass: [OFMutableSet_hashtable class]]; } | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | @implementation OFCountedSet_hashtable + (void)initialize { if (self == [OFCountedSet_hashtable class]) [self inheritMethodsFromClass: [OFMutableSet_hashtable class]]; } - (instancetype)initWithSet: (OFSet *)set { self = [self init]; @try { void *pool = objc_autoreleasePoolPush(); if ([set isKindOfClass: [OFCountedSet class]]) { |
︙ | ︙ | |||
62 63 64 65 66 67 68 | [self release]; @throw e; } return self; } | | | | | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | [self release]; @throw e; } return self; } - (instancetype)initWithArray: (OFArray *)array { self = [self init]; @try { id const *objects = [array objects]; size_t count = [array count]; for (size_t i = 0; i < count; i++) [self addObject: objects[i]]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { self = [self init]; @try { for (size_t i = 0; i < count; i++) [self addObject: objects[i]]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { self = [self init]; @try { id object; [self addObject: firstObject]; while ((object = va_arg(arguments, id)) != nil) [self addObject: object]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [self init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: @"OFCountedSet"] || |
︙ | ︙ |
Modified src/OFData.h from [9086a3be08] to [3a6c360dd5].
︙ | ︙ | |||
133 134 135 136 137 138 139 | * the Base64-encoded string. * * @param string The string with the Base64-encoded data * @return A new autoreleased OFData */ + (instancetype)dataWithBase64EncodedString: (OFString *)string; | | | | | | | | | | | | | | | | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | * the Base64-encoded string. * * @param string The string with the Base64-encoded data * @return A new autoreleased OFData */ + (instancetype)dataWithBase64EncodedString: (OFString *)string; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initialized an already allocated OFData with the specified `count` * items of size 1. * * @param items The items to store in the OFData * @param count The number of items * @return An initialized OFData */ - (instancetype)initWithItems: (const void *)items count: (size_t)count; /*! * @brief Initialized an already allocated OFData with the specified `count` * items of the specified size. * * @param items The items to store in the OFData * @param itemSize The item size of a single item in bytes * @param count The number of items * @return An initialized OFData */ - (instancetype)initWithItems: (const void *)items itemSize: (size_t)itemSize count: (size_t)count; /*! * @brief Initializes an already allocated OFData with the specified `count` * items of size 1 by taking over ownership of the specified items * pointer. * * @param items The items to store in the OFData * @param count The number of items * @param freeWhenDone Whether to free the pointer when it is no longer needed * by the OFData * @return An initialized OFData */ - (instancetype)initWithItemsNoCopy: (const void *)items count: (size_t)count freeWhenDone: (bool)freeWhenDone; /*! * @brief Initializes an already allocated OFData with the specified `count` * items of the specified size by taking ownership of the specified * items pointer. * * @param items The items to store in the OFData * @param itemSize The item size of a single item in bytes * @param count The number of items * @param freeWhenDone Whether to free the pointer when it is no longer needed * by the OFData * @return An initialized OFData */ - (instancetype)initWithItemsNoCopy: (const void *)items itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone; #ifdef OF_HAVE_FILES /*! * @brief Initializes an already allocated OFData with an item size of 1, * containing the data of the specified file. * * @param path The path of the file * @return An initialized OFData */ - (instancetype)initWithContentsOfFile: (OFString *)path; #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) /*! * @brief Initializes an already allocated OFData with an item size of 1, * containing the data of the specified URL. * * @param URL The URL to the contents for the OFData * @return A new autoreleased OFData */ - (instancetype)initWithContentsOfURL: (OFURL *)URL; #endif /*! * @brief Initializes an already allocated OFData with an item size of 1, * containing the data of the string representation. * * @param string The string representation of the data * @return A new autoreleased OFData */ - (instancetype)initWithStringRepresentation: (OFString *)string; /*! * @brief Initializes an already allocated OFData with an item size of 1, * containing the data of the Base64-encoded string. * * @param string The string with the Base64-encoded data * @return An initialized OFData */ - (instancetype)initWithBase64EncodedString: (OFString *)string; /*! * @brief Returns the number of items in the OFData. * * @return The number of items in the OFData */ - (size_t)count; |
︙ | ︙ |
Modified src/OFData.m from [74dd1893f5] to [15a4b9e206].
︙ | ︙ | |||
110 111 112 113 114 115 116 | } + (instancetype)dataWithBase64EncodedString: (OFString *)string { return [[[self alloc] initWithBase64EncodedString: string] autorelease]; } | | | | | | | | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | } + (instancetype)dataWithBase64EncodedString: (OFString *)string { return [[[self alloc] initWithBase64EncodedString: string] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_init { return [super init]; } - (instancetype)initWithItems: (const void *)items count: (size_t)count { return [self initWithItems: items itemSize: 1 count: count]; } - (instancetype)initWithItems: (const void *)items itemSize: (size_t)itemSize count: (size_t)count { self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
152 153 154 155 156 157 158 | [self release]; @throw e; } return self; } | | | | | | | | | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | [self release]; @throw e; } return self; } - (instancetype)initWithItemsNoCopy: (const void *)items count: (size_t)count freeWhenDone: (bool)freeWhenDone { return [self initWithItemsNoCopy: items itemSize: 1 count: count freeWhenDone: freeWhenDone]; } - (instancetype)initWithItemsNoCopy: (const void *)items itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone { self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; _items = (unsigned char *)items; _itemSize = itemSize; _count = count; _freeWhenDone = freeWhenDone; } @catch (id e) { [self release]; @throw e; } return self; } #ifdef OF_HAVE_FILES - (instancetype)initWithContentsOfFile: (OFString *)path { @try { of_offset_t size = [[OFFileManager defaultManager] sizeOfFileAtPath: path]; char *buffer; if (sizeof(of_offset_t) > sizeof(size_t) && |
︙ | ︙ | |||
229 230 231 232 233 234 235 | } return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) | | | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | } return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { void *pool; OFString *scheme; pool = objc_autoreleasePoolPush(); scheme = [URL scheme]; |
︙ | ︙ | |||
251 252 253 254 255 256 257 | objc_autoreleasePoolPop(pool); return self; } #endif | | | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | objc_autoreleasePoolPop(pool); return self; } #endif - (instancetype)initWithStringRepresentation: (OFString *)string { self = [super init]; @try { size_t count = [string cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII]; const char *cString; |
︙ | ︙ | |||
305 306 307 308 309 310 311 | [self release]; @throw e; } return self; } | | | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | [self release]; @throw e; } return self; } - (instancetype)initWithBase64EncodedString: (OFString *)string { bool mutable = [self isKindOfClass: [OFMutableData class]]; if (!mutable) { [self release]; self = [OFMutableData alloc]; } |
︙ | ︙ | |||
333 334 335 336 337 338 339 | if (!mutable) [(OFMutableData *)self makeImmutable]; return self; } | | | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | if (!mutable) [(OFMutableData *)self makeImmutable]; return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { @try { void *pool = objc_autoreleasePoolPush(); OFString *stringValue; if (![[element name] isEqual: [self className]] || ![[element namespace] isEqual: OF_SERIALIZATION_NS]) |
︙ | ︙ | |||
398 399 400 401 402 403 404 | { if (_items == NULL || _count == 0) return NULL; return _items + (_count - 1) * _itemSize; } | | | | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 | { if (_items == NULL || _count == 0) return NULL; return _items + (_count - 1) * _itemSize; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableData alloc] initWithItems: _items itemSize: _itemSize count: _count]; } - (bool)isEqual: (id)object |
︙ | ︙ |
Modified src/OFDate.h from [29c60ccceb] to [728f213f2d].
︙ | ︙ | |||
114 115 116 117 118 119 120 | /*! * @brief Initializes an already allocated OFDate with the specified date and * time since 1970-01-01T00:00:00Z. * * @param seconds The seconds since 1970-01-01T00:00:00Z * @return An initialized OFDate with the specified date and time */ | | | | | | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | /*! * @brief Initializes an already allocated OFDate with the specified date and * time since 1970-01-01T00:00:00Z. * * @param seconds The seconds since 1970-01-01T00:00:00Z * @return An initialized OFDate with the specified date and time */ - (instancetype)initWithTimeIntervalSince1970: (of_time_interval_t)seconds; /*! * @brief Initializes an already allocated OFDate with the specified date and * time since now. * * @param seconds The seconds since now * @return An initialized OFDate with the specified date and time */ - (instancetype)initWithTimeIntervalSinceNow: (of_time_interval_t)seconds; /*! * @brief Initializes an already allocated OFDate with the specified string in * the specified format. * * The time zone used is UTC. If a time zone is specified anyway, an * OFInvalidFormatException is thrown. See @ref initWithLocalDateString:format: * if you want to specify a time zone. * * See the man page for `strftime` for information on the format. * * @warning The format is currently limited to the following format specifiers: * %%d, %%e, %%H, %%m, %%M, %%S, %%y, %%Y, %%, %%n and %%t. * * @param string The string describing the date * @param format The format of the string describing the date * @return An initialized OFDate with the specified date and time */ - (instancetype)initWithDateString: (OFString *)string format: (OFString *)format; /*! * @brief Initializes an already allocated OFDate with the specified string in * the specified format. * * If no time zone is specified, local time is assumed. * * See the man page for `strftime` for information on the format. * * @warning The format is currently limited to the following format specifiers: * %%d, %%e, %%H, %%m, %%M, %%S, %%y, %%Y, %%, %%n and %%t. * * @param string The string describing the date * @param format The format of the string describing the date * @return An initialized OFDate with the specified date and time */ - (instancetype)initWithLocalDateString: (OFString *)string format: (OFString *)format; /*! * @brief Returns the microsecond of the date. * * @return The microsecond of the date */ - (uint32_t)microsecond; |
︙ | ︙ |
Modified src/OFDate.m from [618922b043] to [f5a435fe1e].
︙ | ︙ | |||
227 228 229 230 231 232 233 | + (instancetype)distantPast { return [[[self alloc] initWithTimeIntervalSince1970: -62167219200.0] autorelease]; } | | | | | | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | + (instancetype)distantPast { return [[[self alloc] initWithTimeIntervalSince1970: -62167219200.0] autorelease]; } - (instancetype)init { struct timeval t; self = [super init]; OF_ENSURE(gettimeofday(&t, NULL) == 0); _seconds = t.tv_sec; _seconds += (of_time_interval_t)t.tv_usec / 1000000; return self; } - (instancetype)initWithTimeIntervalSince1970: (of_time_interval_t)seconds { self = [super init]; _seconds = seconds; return self; } - (instancetype)initWithTimeIntervalSinceNow: (of_time_interval_t)seconds { self = [self init]; _seconds += seconds; return self; } - (instancetype)initWithDateString: (OFString *)string format: (OFString *)format { self = [super init]; @try { const char *UTF8String = [string UTF8String]; struct tm tm = { 0 }; int16_t tz = 0; |
︙ | ︙ | |||
284 285 286 287 288 289 290 | [self release]; @throw e; } return self; } | | | | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 | [self release]; @throw e; } return self; } - (instancetype)initWithLocalDateString: (OFString *)string format: (OFString *)format { self = [super init]; @try { const char *UTF8String = [string UTF8String]; struct tm tm = { 0 }; /* |
︙ | ︙ | |||
323 324 325 326 327 328 329 | [self release]; @throw e; } return self; } | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); union { double d; |
︙ | ︙ | |||
385 386 387 388 389 390 391 | OF_HASH_ADD(hash, d.b[i]); OF_HASH_FINALIZE(hash); return hash; } | | | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 | OF_HASH_ADD(hash, d.b[i]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [self retain]; } - (of_comparison_result_t)compare: (id <OFComparing>)object { OFDate *otherDate; |
︙ | ︙ |
Modified src/OFDictionary.h from [085a75867d] to [72d79ae93c].
︙ | ︙ | |||
120 121 122 123 124 125 126 | /*! * @brief Initializes an already allocated OFDictionary with the specified * OFDictionary. * * @param dictionary An OFDictionary * @return An initialized OFDictionary */ | | | | | | | | | | | | | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | /*! * @brief Initializes an already allocated OFDictionary with the specified * OFDictionary. * * @param dictionary An OFDictionary * @return An initialized OFDictionary */ - (instancetype)initWithDictionary: (OFDictionary OF_GENERIC(KeyType, ObjectType) *)dictionary; /*! * @brief Initializes an already allocated OFDictionary with the specified key * and object. * * @param key The key * @param object The object * @return An initialized OFDictionary */ - (instancetype)initWithObject: (ObjectType)object forKey: (KeyType)key; /*! * @brief Initializes an already allocated OFDictionary with the specified keys * and objects. * * @param keys An array of keys * @param objects An array of objects * @return An initialized OFDictionary */ - (instancetype)initWithObjects: (OFArray OF_GENERIC(ObjectType) *)objects forKeys: (OFArray OF_GENERIC(KeyType) *)keys; /*! * @brief Initializes an already allocated OFDictionary with the specified keys * and objects. * * @param keys An array of keys * @param objects An array of objects * @param count The number of objects in the arrays * @return An initialized OFDictionary */ - (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects forKeys: (KeyType const _Nonnull *_Nonnull)keys count: (size_t)count; /*! * @brief Initializes an already allocated OFDictionary with the specified keys * and objects. * * @param firstKey The first key * @return An initialized OFDictionary */ - (instancetype)initWithKeysAndObjects: (KeyType)firstKey, ... OF_SENTINEL; /*! * @brief Initializes an already allocated OFDictionary with the specified key * and va_list. * * @param firstKey The first key * @param arguments A va_list of the other arguments * @return An initialized OFDictionary */ - (instancetype)initWithKey: (KeyType)firstKey arguments: (va_list)arguments; /*! * @brief Returns the object for the given key or `nil` if the key was not * found. * * @warning The returned object is *not* retained and autoreleased for * performance reasons! |
︙ | ︙ |
Modified src/OFDictionary.m from [bd2dcff559] to [21f0c3f7c0].
︙ | ︙ | |||
40 41 42 43 44 45 46 | depth: (size_t)depth; @end @interface OFDictionary_placeholder: OFDictionary @end @implementation OFDictionary_placeholder | | | | | | | | | | | | | | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | depth: (size_t)depth; @end @interface OFDictionary_placeholder: OFDictionary @end @implementation OFDictionary_placeholder - (instancetype)init { return (id)[[OFDictionary_hashtable alloc] init]; } - (instancetype)initWithDictionary: (OFDictionary *)dictionary { return (id)[[OFDictionary_hashtable alloc] initWithDictionary: dictionary]; } - (instancetype)initWithObject: (id)object forKey: (id)key { return (id)[[OFDictionary_hashtable alloc] initWithObject: object forKey: key]; } - (instancetype)initWithObjects: (OFArray *)objects forKeys: (OFArray *)keys { return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects forKeys: keys]; } - (instancetype)initWithObjects: (id const *)objects forKeys: (id const *)keys count: (size_t)count { return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects forKeys: keys count: count]; } - (instancetype)initWithKeysAndObjects: (id <OFCopying>)firstKey, ... { id ret; va_list arguments; va_start(arguments, firstKey); ret = [[OFDictionary_hashtable alloc] initWithKey: firstKey arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithKey: (id <OFCopying>)firstKey arguments: (va_list)arguments { return (id)[[OFDictionary_hashtable alloc] initWithKey: firstKey arguments: arguments]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFDictionary_hashtable alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
127 128 129 130 131 132 133 | @implementation OFDictionary + (void)initialize { if (self == [OFDictionary class]) placeholder.isa = [OFDictionary_placeholder class]; } | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | @implementation OFDictionary + (void)initialize { if (self == [OFDictionary class]) placeholder.isa = [OFDictionary_placeholder class]; } + (instancetype)alloc { if (self == [OFDictionary class]) return (id)&placeholder; return [super alloc]; } |
︙ | ︙ | |||
181 182 183 184 185 186 187 | ret = [[[self alloc] initWithKey: firstKey arguments: arguments] autorelease]; va_end(arguments); return ret; } | | | | | | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | ret = [[[self alloc] initWithKey: firstKey arguments: arguments] autorelease]; va_end(arguments); return ret; } - (instancetype)init { if (object_getClass(self) == [OFDictionary class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; } abort(); } return [super init]; } - (instancetype)initWithDictionary: (OFDictionary *)dictionary { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object forKey: (id)key { if (key == nil || object == nil) @throw [OFInvalidArgumentException exception]; return [self initWithKeysAndObjects: key, object, nil]; } - (instancetype)initWithObjects: (OFArray *)objects_ forKeys: (OFArray *)keys_ { id const *objects, *keys; size_t count; @try { count = [objects_ count]; |
︙ | ︙ | |||
235 236 237 238 239 240 241 | } return [self initWithObjects: objects forKeys: keys count: count]; } | | | | | | | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | } return [self initWithObjects: objects forKeys: keys count: count]; } - (instancetype)initWithObjects: (id const *)objects forKeys: (id const *)keys count: (size_t)count { OF_INVALID_INIT_METHOD } - (instancetype)initWithKeysAndObjects: (id)firstKey, ... { id ret; va_list arguments; va_start(arguments, firstKey); ret = [self initWithKey: firstKey arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } - (instancetype)initWithSerialization: (OFXMLElement *)element { OF_INVALID_INIT_METHOD } - (id)objectForKey: (id)key { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
321 322 323 324 325 326 327 | } - (size_t)count { OF_UNRECOGNIZED_SELECTOR } | | | | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | } - (size_t)count { OF_UNRECOGNIZED_SELECTOR } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableDictionary alloc] initWithDictionary: self]; } - (bool)isEqual: (id)object { OFDictionary *otherDictionary; |
︙ | ︙ |
Modified src/OFDictionary_hashtable.h from [2dabff3043] to [a2db9eb8be].
︙ | ︙ | |||
22 23 24 25 26 27 28 | @class OFMapTableEnumerator; @interface OFDictionary_hashtable: OFDictionary { OFMapTable *_mapTable; } | | | 22 23 24 25 26 27 28 29 30 31 32 | @class OFMapTableEnumerator; @interface OFDictionary_hashtable: OFDictionary { OFMapTable *_mapTable; } - (instancetype)initWithCapacity: (size_t)capacity; @end OF_ASSUME_NONNULL_END |
Modified src/OFDictionary_hashtable.m from [6d5e327cda] to [4b2eb176eb].
︙ | ︙ | |||
70 71 72 73 74 75 76 | .retain = retain, .release = release, .hash = hash, .equal = equal }; @implementation OFDictionary_hashtable | | | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | .retain = retain, .release = release, .hash = hash, .equal = equal }; @implementation OFDictionary_hashtable - (instancetype)init { return [self initWithCapacity: 0]; } - (instancetype)initWithCapacity: (size_t)capacity { self = [super init]; @try { _mapTable = [[OFMapTable alloc] initWithKeyFunctions: keyFunctions objectFunctions: objectFunctions capacity: capacity]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithDictionary: (OFDictionary *)dictionary { size_t count; if (dictionary == nil) return [self init]; if ([dictionary isKindOfClass: [OFDictionary_hashtable class]] || |
︙ | ︙ | |||
146 147 148 149 150 151 152 | [self release]; @throw e; } return self; } | | | | | | | | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)object forKey: (id)key { self = [self initWithCapacity: 1]; @try { [_mapTable setObject: object forKey: key]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (id const *)objects forKeys: (id const *)keys count: (size_t)count { self = [self initWithCapacity: count]; @try { size_t i; for (i = 0; i < count; i++) [_mapTable setObject: objects[i] forKey: keys[i]]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments { self = [super init]; @try { va_list argumentsCopy; id key, object; size_t i, count; |
︙ | ︙ | |||
236 237 238 239 240 241 242 | [self release]; @throw e; } return self; } | | | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); OFArray *keys, *objects; OFEnumerator *keyEnumerator, *objectEnumerator; |
︙ | ︙ |
Modified src/OFEnumerator.m from [73c62897f9] to [eea750ef77].
︙ | ︙ | |||
18 19 20 21 22 23 24 | #include <stdlib.h> #import "OFEnumerator.h" #import "OFArray.h" @implementation OFEnumerator | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #include <stdlib.h> #import "OFEnumerator.h" #import "OFArray.h" @implementation OFEnumerator - (instancetype)init { if (object_getClass(self) == [OFEnumerator class]) { @try { [self doesNotRecognizeSelector: _cmd]; abort(); } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/OFFile.h from [cba6c42a3b] to [a78b15002c].
︙ | ︙ | |||
68 69 70 71 72 73 74 | * @param handle A native file handle. If OF_FILE_HANDLE_IS_FD is defined, this * is a file descriptor. The handle is closed when the OFFile * object is deallocated! * @return A new autoreleased OFFile */ + (instancetype)fileWithHandle: (of_file_handle_t)handle; | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | * @param handle A native file handle. If OF_FILE_HANDLE_IS_FD is defined, this * is a file descriptor. The handle is closed when the OFFile * object is deallocated! * @return A new autoreleased OFFile */ + (instancetype)fileWithHandle: (of_file_handle_t)handle; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFFile. * * @param path The path to the file to open as a string * @param mode The mode in which the file should be opened.@n * Possible modes are: |
︙ | ︙ | |||
92 93 94 95 96 97 98 | * `wb+` or `w+b` | read-write, create, truncate, binary * `a` | write-only, create, append * `ab` | write-only, create, append, binary * `a+` | read-write, create, append * `ab+` or `a+b` | read-write, create, append, binary * @return An initialized OFFile */ | | | | > | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | * `wb+` or `w+b` | read-write, create, truncate, binary * `a` | write-only, create, append * `ab` | write-only, create, append, binary * `a+` | read-write, create, append * `ab+` or `a+b` | read-write, create, append, binary * @return An initialized OFFile */ - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode; /*! * @brief Initializes an already allocated OFFile. * * @param handle A native file handle. If OF_FILE_HANDLE_IS_FD is defined, this * is a file descriptor. The handle is closed when the OFFile * object is deallocated! * @return An initialized OFFile */ - (instancetype)initWithHandle: (of_file_handle_t)handle OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFFile.m from [cd9a853dd9] to [3ace3f34b9].
︙ | ︙ | |||
184 185 186 187 188 189 190 | } + (instancetype)fileWithHandle: (of_file_handle_t)handle { return [[[self alloc] initWithHandle: handle] autorelease]; } | | | | | 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | } + (instancetype)fileWithHandle: (of_file_handle_t)handle { return [[[self alloc] initWithHandle: handle] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode { of_file_handle_t handle; @try { void *pool = objc_autoreleasePoolPush(); int flags; |
︙ | ︙ | |||
298 299 300 301 302 303 304 | closeHandle(handle); @throw e; } return self; } | | | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | closeHandle(handle); @throw e; } return self; } - (instancetype)initWithHandle: (of_file_handle_t)handle { self = [super init]; _handle = handle; return self; } |
︙ | ︙ |
Modified src/OFGZIPStream.h from [150ed8cd99] to [8e5bebccb2].
︙ | ︙ | |||
87 88 89 90 91 92 93 | * @param mode The mode for the OFGZIPStream. Valid modes are "r" for reading * and "w" for writing. * @return A new, autoreleased OFGZIPStream */ + (instancetype)streamWithStream: (OFStream *)stream mode: (OFString *)mode; | | | | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | * @param mode The mode for the OFGZIPStream. Valid modes are "r" for reading * and "w" for writing. * @return A new, autoreleased OFGZIPStream */ + (instancetype)streamWithStream: (OFStream *)stream mode: (OFString *)mode; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFGZIPStream with the specified * underlying stream. * * @param stream The underlying stream for the OFGZIPStream * @param mode The mode for the OFGZIPStream. Valid modes are "r" for reading * and "w" for writing. * @return An initialized OFGZIPStream */ - (instancetype)initWithStream: (OFStream *)stream mode: (OFString *)mode OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFGZIPStream.m from [99b0bbcaa7] to [4ca40a79fe].
︙ | ︙ | |||
32 33 34 35 36 37 38 | + (instancetype)streamWithStream: (OFStream *)stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | + (instancetype)streamWithStream: (OFStream *)stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OFStream *)stream mode: (OFString *)mode { self = [super init]; @try { if (![mode isEqual: @"r"]) @throw [OFNotImplementedException exceptionWithSelector: _cmd |
︙ | ︙ |
Modified src/OFHMAC.h from [10fea24a9c] to [aaa867eca5].
︙ | ︙ | |||
39 40 41 42 43 44 45 | * @brief Returns a new OFHMAC with the specified hashing algorithm. * * @param hashClass The class of the hashing algorithm * @return A new, autoreleased OFHMAC */ + (instancetype)HMACWithHashClass: (Class <OFCryptoHash>)hashClass; | | | > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | * @brief Returns a new OFHMAC with the specified hashing algorithm. * * @param hashClass The class of the hashing algorithm * @return A new, autoreleased OFHMAC */ + (instancetype)HMACWithHashClass: (Class <OFCryptoHash>)hashClass; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initialized an already allocated OFHMAC with the specified hashing * algorithm. * * @param hashClass The class of the hashing algorithm * @return An initialized OFHMAC */ - (instancetype)initWithHashClass: (Class <OFCryptoHash>)hashClass OF_DESIGNATED_INITIALIZER; /*! * @brief Sets the key for the HMAC. * * @note This resets the HMAC! * * @warning This invalidates any pointer previously returned by @ref digest. If |
︙ | ︙ |
Modified src/OFHMAC.m from [298535fc6e] to [7f94007b12].
︙ | ︙ | |||
25 26 27 28 29 30 31 | @synthesize hashClass = _hashClass; + (instancetype)HMACWithHashClass: (Class <OFCryptoHash>)class { return [[[self alloc] initWithHashClass: class] autorelease]; } | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | @synthesize hashClass = _hashClass; + (instancetype)HMACWithHashClass: (Class <OFCryptoHash>)class { return [[[self alloc] initWithHashClass: class] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithHashClass: (Class <OFCryptoHash>)class { self = [super init]; _hashClass = class; return self; } |
︙ | ︙ |
Modified src/OFHTTPClient.m from [3385dc4745] to [901849c7c7].
︙ | ︙ | |||
52 53 54 55 56 57 58 | id _context; bool _firstLine; OFString *_version; int _status; OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders; } | | | | | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | id _context; bool _firstLine; OFString *_version; int _status; OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders; } - (instancetype)initWithClient: (OFHTTPClient *)client request: (OFHTTPRequest *)request redirects: (unsigned int)redirects context: (id)context; - (void)start; - (void)closeAndReconnect; @end @interface OFHTTPClientResponse: OFHTTPResponse { OFTCPSocket *_socket; bool _hasContentLength, _chunked, _keepAlive, _atEndOfStream; size_t _toRead; } @property (nonatomic, setter=of_setKeepAlive:) bool of_keepAlive; - (instancetype)initWithSocket: (OFTCPSocket *)socket; @end static OFString * constructRequestString(OFHTTPRequest *request) { void *pool = objc_autoreleasePoolPush(); of_http_request_method_t method = [request method]; |
︙ | ︙ | |||
201 202 203 204 205 206 207 | firstLetter = false; str++; } } @implementation OFHTTPClientRequestHandler | | | | | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 | firstLetter = false; str++; } } @implementation OFHTTPClientRequestHandler - (instancetype)initWithClient: (OFHTTPClient *)client request: (OFHTTPRequest *)request redirects: (unsigned int)redirects context: (id)context { self = [super init]; @try { _client = [client retain]; _request = [request retain]; _redirects = redirects; |
︙ | ︙ | |||
726 727 728 729 730 731 732 | context: nil]; } @end @implementation OFHTTPClientResponse @synthesize of_keepAlive = _keepAlive; | | | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 | context: nil]; } @end @implementation OFHTTPClientResponse @synthesize of_keepAlive = _keepAlive; - (instancetype)initWithSocket: (OFTCPSocket *)socket { self = [super init]; _socket = [socket retain]; return self; } |
︙ | ︙ |
Modified src/OFHTTPCookie.h from [947333b8e3] to [3e83910dd6].
︙ | ︙ | |||
108 109 110 111 112 113 114 | * @param domain The domain for the cookie * @return A new, autoreleased OFHTTPCookie */ + (instancetype)cookieWithName: (OFString *)name value: (OFString *)value domain: (OFString *)domain; | | | | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | * @param domain The domain for the cookie * @return A new, autoreleased OFHTTPCookie */ + (instancetype)cookieWithName: (OFString *)name value: (OFString *)value domain: (OFString *)domain; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated new cookie with the specified name * and value. * * @param name The name of the cookie * @param value The value of the cookie * @param domain The domain for the cookie * @return An initialized OFHTTPCookie */ - (instancetype)initWithName: (OFString *)name value: (OFString *)value domain: (OFString *)domain OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFHTTPCookie.m from [13073ad757] to [e5c1061662].
︙ | ︙ | |||
287 288 289 290 291 292 293 | domain: (OFString *)domain { return [[[self alloc] initWithName: name value: value domain: domain] autorelease]; } | | | | | | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | domain: (OFString *)domain { return [[[self alloc] initWithName: name value: value domain: domain] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithName: (OFString *)name value: (OFString *)value domain: (OFString *)domain { self = [super init]; @try { _name = [name copy]; _value = [value copy]; _domain = [domain copy]; |
︙ | ︙ | |||
372 373 374 375 376 377 378 | OF_HASH_ADD(hash, _HTTPOnly); OF_HASH_ADD_HASH(hash, [_extensions hash]); OF_HASH_FINALIZE(hash); return hash; } | | | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | OF_HASH_ADD(hash, _HTTPOnly); OF_HASH_ADD_HASH(hash, [_extensions hash]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { OFHTTPCookie *copy = [[OFHTTPCookie alloc] initWithName: _name value: _value domain: _domain]; @try { copy->_path = [_path copy]; |
︙ | ︙ |
Modified src/OFHTTPCookieManager.m from [7266c82110] to [69c2e4795d].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @implementation OFHTTPCookieManager + (instancetype)manager { return [[[self alloc] init] autorelease]; } | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | @implementation OFHTTPCookieManager + (instancetype)manager { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { _cookies = [[OFMutableArray alloc] init]; } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/OFHTTPRequest.h from [bae740e132] to [c4033f68e4].
︙ | ︙ | |||
119 120 121 122 123 124 125 | /*! * @brief Initializes an already allocated OFHTTPRequest with the specified URL. * * @param URL The URL for the request * @return An initialized OFHTTPRequest */ | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | /*! * @brief Initializes an already allocated OFHTTPRequest with the specified URL. * * @param URL The URL for the request * @return An initialized OFHTTPRequest */ - (instancetype)initWithURL: (OFURL *)URL; /*! * @brief Sets the protocol version of the HTTP request. * * @param protocolVersion The protocol version of the HTTP request */ - (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion; |
︙ | ︙ |
Modified src/OFHTTPRequest.m from [a914d1de62] to [33eb5fdd58].
︙ | ︙ | |||
87 88 89 90 91 92 93 | } + (instancetype)requestWithURL: (OFURL *)URL { return [[[self alloc] initWithURL: URL] autorelease]; } | | | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | } + (instancetype)requestWithURL: (OFURL *)URL { return [[[self alloc] initWithURL: URL] autorelease]; } - (instancetype)init { self = [super init]; _method = OF_HTTP_REQUEST_METHOD_GET; _protocolVersion.major = 1; _protocolVersion.minor = 1; return self; } - (instancetype)initWithURL: (OFURL *)URL { self = [self init]; @try { _URL = [URL copy]; } @catch (id e) { [self release]; |
︙ | ︙ | |||
122 123 124 125 126 127 128 | [_headers release]; [_body release]; [_remoteAddress release]; [super dealloc]; } | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | [_headers release]; [_body release]; [_remoteAddress release]; [super dealloc]; } - (id)copy { OFHTTPRequest *copy = [[OFHTTPRequest alloc] init]; @try { copy->_method = _method; copy->_protocolVersion = _protocolVersion; [copy setURL: _URL]; |
︙ | ︙ |
Modified src/OFHTTPResponse.m from [78fcbe257c] to [f46d462637].
︙ | ︙ | |||
134 135 136 137 138 139 140 | return ret; } @implementation OFHTTPResponse @synthesize statusCode = _statusCode, headers = _headers; | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | return ret; } @implementation OFHTTPResponse @synthesize statusCode = _statusCode, headers = _headers; - (instancetype)init { self = [super init]; @try { _protocolVersion.major = 1; _protocolVersion.minor = 1; _headers = [[OFDictionary alloc] init]; |
︙ | ︙ |
Modified src/OFHTTPServer.m from [1e27dfeb94] to [339d905a8d].
︙ | ︙ | |||
176 177 178 179 180 181 182 | { OFTCPSocket *_socket; OFHTTPServer *_server; OFHTTPRequest *_request; bool _chunked, _headersSent; } | | | | | | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | { OFTCPSocket *_socket; OFHTTPServer *_server; OFHTTPRequest *_request; bool _chunked, _headersSent; } - (instancetype)initWithSocket: (OFTCPSocket *)socket server: (OFHTTPServer *)server request: (OFHTTPRequest *)request; @end @implementation OFHTTPServerResponse - (instancetype)initWithSocket: (OFTCPSocket *)socket server: (OFHTTPServer *)server request: (OFHTTPRequest *)request { self = [super init]; _statusCode = 500; _socket = [socket retain]; _server = [server retain]; _request = [request retain]; |
︙ | ︙ | |||
337 338 339 340 341 342 343 | OFString *_host, *_path; uint16_t _port; OFMutableDictionary *_headers; size_t _contentLength; OFMutableData *_body; } | | | | | | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | OFString *_host, *_path; uint16_t _port; OFMutableDictionary *_headers; size_t _contentLength; OFMutableData *_body; } - (instancetype)initWithSocket: (OFTCPSocket *)socket server: (OFHTTPServer *)server; - (bool)socket: (OFTCPSocket *)socket didReadLine: (OFString *)line context: (id)context exception: (id)exception; - (bool)parseProlog: (OFString *)line; - (bool)parseHeaders: (OFString *)line; - (bool)socket: (OFTCPSocket *)socket didReadIntoBuffer: (char *)buffer length: (size_t)length context: (id)context exception: (id)exception; - (bool)sendErrorAndClose: (short)statusCode; - (void)createResponse; @end @implementation OFHTTPServer_Connection - (instancetype)initWithSocket: (OFTCPSocket *)socket server: (OFHTTPServer *)server { self = [super init]; @try { _socket = [socket retain]; _server = [server retain]; _timer = [[OFTimer |
︙ | ︙ | |||
693 694 695 696 697 698 699 | @synthesize host = _host, port = _port, delegate = _delegate, name = _name; + (instancetype)server { return [[[self alloc] init] autorelease]; } | | | 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 | @synthesize host = _host, port = _port, delegate = _delegate, name = _name; + (instancetype)server { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; _name = @"OFHTTPServer (ObjFW's HTTP server class " @"<https://heap.zone/objfw/>)"; return self; |
︙ | ︙ |
Modified src/OFINICategory.h from [34c49be172] to [729eb91da7].
︙ | ︙ | |||
34 35 36 37 38 39 40 | } /*! * The name of the INI category */ @property (copy, nonatomic) OFString *name; | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | } /*! * The name of the INI category */ @property (copy, nonatomic) OFString *name; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Returns the string value for the specified key, or `nil` if it does * not exist. * * If the specified key is a multi-key (see @ref arrayForKey:), the value of * the first key/value pair found is returned. |
︙ | ︙ |
Modified src/OFINICategory.m from [95cd2a6086] to [707902fb61].
︙ | ︙ | |||
132 133 134 135 136 137 138 | [self release]; @throw e; } return self; } | | | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | [self release]; @throw e; } return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_name release]; |
︙ | ︙ |
Modified src/OFINIFile.h from [80cc8bd83f] to [40d24517e7].
︙ | ︙ | |||
49 50 51 52 53 54 55 | * @param encoding The encoding of the specified file * * @return A new, autoreleased OFINIFile with the contents of the specified file */ + (instancetype)fileWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding; | | | | | > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | * @param encoding The encoding of the specified file * * @return A new, autoreleased OFINIFile with the contents of the specified file */ + (instancetype)fileWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFINIFile with the contents of the * specified file. * * @param path The path to the file whose contents the OFINIFile should contain * * @return An initialized OFINIFile with the contents of the specified file */ - (instancetype)initWithPath: (OFString *)path; /*! * @brief Initializes an already allocated OFINIFile with the contents of the * specified file in the specified encoding. * * @param path The path to the file whose contents the OFINIFile should contain * @param encoding The encoding of the specified file * * @return An initialized OFINIFile with the contents of the specified file */ - (instancetype)initWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding OF_DESIGNATED_INITIALIZER; /*! * @brief Returns an @ref OFINICategory for the category with the specified * name. * * @param name The name of the category for which an @ref OFINICategory should * be returned |
︙ | ︙ |
Modified src/OFINIFile.m from [01663115e7] to [5ec2ba6da2].
︙ | ︙ | |||
55 56 57 58 59 60 61 | + (instancetype)fileWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithPath: path encoding: encoding] autorelease]; } | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | + (instancetype)fileWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithPath: path encoding: encoding] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path { return [self initWithPath: path encoding: OF_STRING_ENCODING_UTF_8]; } - (instancetype)initWithPath: (OFString *)path encoding: (of_string_encoding_t)encoding { self = [super init]; @try { _categories = [[OFMutableArray alloc] init]; [self of_parseFile: path |
︙ | ︙ |
Modified src/OFInflateStream.h from [d858471aa3] to [e064c26fb9].
︙ | ︙ | |||
74 75 76 77 78 79 80 | * * @param stream The underlying stream to which compressed data is written or * from which compressed data is read * @return A new, autoreleased OFInflateStream */ + (instancetype)streamWithStream: (OFStream *)stream; | | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | * * @param stream The underlying stream to which compressed data is written or * from which compressed data is read * @return A new, autoreleased OFInflateStream */ + (instancetype)streamWithStream: (OFStream *)stream; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFInflateStream with the specified * underlying stream. * * @param stream The underlying stream to which compressed data is written or * from which compressed data is read * @return A initialized OFInflateStream */ - (instancetype)initWithStream: (OFStream *)stream OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFInflateStream.m from [fc22c7448d] to [360414f679].
︙ | ︙ | |||
277 278 279 280 281 282 283 | #ifndef INFLATE64 + (instancetype)streamWithStream: (OFStream *)stream { return [[[self alloc] initWithStream: stream] autorelease]; } | | | | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | #ifndef INFLATE64 + (instancetype)streamWithStream: (OFStream *)stream { return [[[self alloc] initWithStream: stream] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OFStream *)stream { self = [super init]; _stream = [stream retain]; /* 0-7 address the bit, 8 means fetch next byte */ _bitIndex = 8; |
︙ | ︙ |
Modified src/OFIntrospection.h from [69d1f3e9bd] to [5b3e73bb9a].
︙ | ︙ | |||
58 59 60 61 62 63 64 | @property (readonly, nonatomic) OFString *name; /*! * The type encoding for the method. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) const char *typeEncoding; | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | @property (readonly, nonatomic) OFString *name; /*! * The type encoding for the method. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) const char *typeEncoding; - (instancetype)init OF_UNAVAILABLE; @end /*! * @class OFProperty OFIntrospection.h ObjFW/OFIntrospection.h * * @brief A class for describing a property. */ |
︙ | ︙ | |||
107 108 109 110 111 112 113 | @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *getter; /*! * @return The name of the setter. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *setter; | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *getter; /*! * @return The name of the setter. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *setter; - (instancetype)init OF_UNAVAILABLE; @end /*! * @class OFInstanceVariable OFIntrospection.h ObjFW/OFIntrospection.h * * @brief A class for describing an instance variable. */ |
︙ | ︙ | |||
137 138 139 140 141 142 143 | @property (readonly, nonatomic) ptrdiff_t offset; /*! * The type encoding for the instance variable. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) const char *typeEncoding; | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | @property (readonly, nonatomic) ptrdiff_t offset; /*! * The type encoding for the instance variable. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) const char *typeEncoding; - (instancetype)init OF_UNAVAILABLE; @end /*! * @class OFIntrospection OFIntrospection.h ObjFW/OFIntrospection.h * * @brief A class for introspecting classes. */ |
︙ | ︙ | |||
200 201 202 203 204 205 206 | /*! * @brief Creates a new introspection for the specified class. * * @return A new, autoreleased introspection for the specified class */ + (instancetype)introspectionWithClass: (Class)class_; | | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 | /*! * @brief Creates a new introspection for the specified class. * * @return A new, autoreleased introspection for the specified class */ + (instancetype)introspectionWithClass: (Class)class_; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFIntrospection with the specified * class. * * @return An initialized OFIntrospection */ - (instancetype)initWithClass: (Class)class_ OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFIntrospection.m from [952618548a] to [045afb68a1].
︙ | ︙ | |||
23 24 25 26 27 28 29 | #import "OFArray.h" #import "OFInitializationFailedException.h" @implementation OFMethod @synthesize selector = _selector, name = _name, typeEncoding = _typeEncoding; | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFArray.h" #import "OFInitializationFailedException.h" @implementation OFMethod @synthesize selector = _selector, name = _name, typeEncoding = _typeEncoding; - (instancetype)init { OF_INVALID_INIT_METHOD } #if defined(OF_OBJFW_RUNTIME) - (instancetype)of_initWithMethod: (struct objc_method *)method { |
︙ | ︙ | |||
130 131 132 133 134 135 136 | } @end @implementation OFProperty @synthesize name = _name, attributes = _attributes; @synthesize getter = _getter, setter = _setter; | | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | } @end @implementation OFProperty @synthesize name = _name, attributes = _attributes; @synthesize getter = _getter, setter = _setter; - (instancetype)init { OF_INVALID_INIT_METHOD } #if defined(OF_OBJFW_RUNTIME) - (instancetype)of_initWithProperty: (struct objc_property *)property { |
︙ | ︙ | |||
356 357 358 359 360 361 362 | return hash; } @end @implementation OFInstanceVariable @synthesize name = _name, offset = _offset, typeEncoding = _typeEncoding; | | | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | return hash; } @end @implementation OFInstanceVariable @synthesize name = _name, offset = _offset, typeEncoding = _typeEncoding; - (instancetype)init { OF_INVALID_INIT_METHOD } #if defined(OF_OBJFW_RUNTIME) - (instancetype)of_initWithIvar: (struct objc_ivar *)ivar { |
︙ | ︙ | |||
428 429 430 431 432 433 434 | @synthesize properties = _properties, instanceVariables = _instanceVariables; + (instancetype)introspectionWithClass: (Class)class { return [[[self alloc] initWithClass: class] autorelease]; } | | | | 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | @synthesize properties = _properties, instanceVariables = _instanceVariables; + (instancetype)introspectionWithClass: (Class)class { return [[[self alloc] initWithClass: class] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithClass: (Class)class { self = [super init]; @try { #if defined(OF_OBJFW_RUNTIME) struct objc_method_list *methodList; struct objc_property_list *propertyList; |
︙ | ︙ |
Modified src/OFInvocation.h from [123d15423c] to [045df89640].
︙ | ︙ | |||
62 63 64 65 66 67 68 | /*! * @brief Initializes an already allocated invocation with the specified method * signature. * * @param signature The method signature for the invocation * @return An initialized OFInvocation */ | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | /*! * @brief Initializes an already allocated invocation with the specified method * signature. * * @param signature The method signature for the invocation * @return An initialized OFInvocation */ - (instancetype)initWithMethodSignature: (OFMethodSignature *)signature; /*! * @brief Sets the argument for the specified index. * * @param buffer The buffer in which the argument is stored * @param index The index of the argument to set */ |
︙ | ︙ |
Modified src/OFInvocation.m from [a554855707] to [de7b955371].
︙ | ︙ | |||
31 32 33 34 35 36 37 | @synthesize methodSignature = _methodSignature; + (instancetype)invocationWithMethodSignature: (OFMethodSignature *)signature { return [[[self alloc] initWithMethodSignature: signature] autorelease]; } | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | @synthesize methodSignature = _methodSignature; + (instancetype)invocationWithMethodSignature: (OFMethodSignature *)signature { return [[[self alloc] initWithMethodSignature: signature] autorelease]; } - (instancetype)initWithMethodSignature: (OFMethodSignature *)signature { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); size_t numberOfArguments = [signature numberOfArguments]; const char *typeEncoding; |
︙ | ︙ |
Modified src/OFKernelEventObserver.m from [c21bd55fb9] to [10e66eceba].
︙ | ︙ | |||
76 77 78 79 80 81 82 | } + (instancetype)observer { return [[[self alloc] init] autorelease]; } | | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | } + (instancetype)observer { return [[[self alloc] init] autorelease]; } + (instancetype)alloc { if (self == [OFKernelEventObserver class]) #if defined(HAVE_KQUEUE) return [OFKernelEventObserver_kqueue alloc]; #elif defined(HAVE_EPOLL) return [OFKernelEventObserver_epoll alloc]; #elif defined(HAVE_POLL) return [OFKernelEventObserver_poll alloc]; #elif defined(HAVE_SELECT) return [OFKernelEventObserver_select alloc]; #else # error No kqueue / epoll / poll / select found! #endif return [super alloc]; } - (instancetype)init { self = [super init]; @try { #if !defined(OF_HAVE_PIPE) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS) socklen_t cancelAddrLen; #endif |
︙ | ︙ |
Modified src/OFKernelEventObserver_epoll.m from [72b75e858f] to [8df1c9cf76].
︙ | ︙ | |||
40 41 42 43 44 45 46 | #import "OFObserveFailedException.h" #define EVENTLIST_SIZE 64 static const of_map_table_functions_t mapFunctions = { NULL }; @implementation OFKernelEventObserver_epoll | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #import "OFObserveFailedException.h" #define EVENTLIST_SIZE 64 static const of_map_table_functions_t mapFunctions = { NULL }; @implementation OFKernelEventObserver_epoll - (instancetype)init { self = [super init]; @try { struct epoll_event event; #ifdef HAVE_EPOLL_CREATE1 |
︙ | ︙ |
Modified src/OFKernelEventObserver_kqueue.m from [f3719ede63] to [a4cb76e207].
︙ | ︙ | |||
40 41 42 43 44 45 46 | #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #import "OFOutOfRangeException.h" #define EVENTLIST_SIZE 64 @implementation OFKernelEventObserver_kqueue | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #import "OFOutOfRangeException.h" #define EVENTLIST_SIZE 64 @implementation OFKernelEventObserver_kqueue - (instancetype)init { self = [super init]; @try { struct kevent event; #ifdef HAVE_KQUEUE1 |
︙ | ︙ |
Modified src/OFKernelEventObserver_poll.m from [5ae2fd3232] to [5cc8f8bde7].
︙ | ︙ | |||
37 38 39 40 41 42 43 | #ifdef OF_WII # define pollfd pollsd # define fd socket #endif @implementation OFKernelEventObserver_poll | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #ifdef OF_WII # define pollfd pollsd # define fd socket #endif @implementation OFKernelEventObserver_poll - (instancetype)init { self = [super init]; @try { struct pollfd p = { _cancelFD[0], POLLIN, 0 }; _FDs = [[OFMutableData alloc] initWithItemSize: |
︙ | ︙ |
Modified src/OFKernelEventObserver_select.m from [ab8bd97091] to [e0ca96b99e].
︙ | ︙ | |||
39 40 41 42 43 44 45 | #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #import "OFOutOfRangeException.h" #import "socket_helpers.h" @implementation OFKernelEventObserver_select | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | #import "OFInitializationFailedException.h" #import "OFObserveFailedException.h" #import "OFOutOfRangeException.h" #import "socket_helpers.h" @implementation OFKernelEventObserver_select - (instancetype)init { self = [super init]; #ifndef OF_WINDOWS if (_cancelFD[0] >= (int)FD_SETSIZE) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; |
︙ | ︙ |
Modified src/OFList.h from [2bcd2e7a45] to [9a9431e042].
︙ | ︙ | |||
186 187 188 189 190 191 192 | { OFList *_list; of_list_object_t *_Nullable _current; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; } | | | | 186 187 188 189 190 191 192 193 194 195 196 197 | { OFList *_list; of_list_object_t *_Nullable _current; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; } - (instancetype)initWithList: (OFList *)list mutationsPointer: (unsigned long *)mutationsPtr; @end OF_ASSUME_NONNULL_END |
Modified src/OFList.m from [e2872c89cd] to [8973979249].
︙ | ︙ | |||
32 33 34 35 36 37 38 | @synthesize lastListObject = _lastListObject; + (instancetype)list { return [[[self alloc] init] autorelease]; } | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | @synthesize lastListObject = _lastListObject; + (instancetype)list { return [[[self alloc] init] autorelease]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [self init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ | |||
264 265 266 267 268 269 270 | [iter->object release]; [self freeMemory: iter]; } _firstListObject = _lastListObject = NULL; } | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | [iter->object release]; [self freeMemory: iter]; } _firstListObject = _lastListObject = NULL; } - (id)copy { OFList *copy = [[[self class] alloc] init]; of_list_object_t *listObject, *previous; listObject = NULL; previous = NULL; |
︙ | ︙ | |||
400 401 402 403 404 405 406 | return [[[OFListEnumerator alloc] initWithList: self mutationsPointer: &_mutations] autorelease]; } @end @implementation OFListEnumerator | | | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | return [[[OFListEnumerator alloc] initWithList: self mutationsPointer: &_mutations] autorelease]; } @end @implementation OFListEnumerator - (instancetype)initWithList: (OFList *)list mutationsPointer: (unsigned long *)mutationsPtr { self = [super init]; _list = [list retain]; _current = [list firstListObject]; _mutations = *mutationsPtr; _mutationsPtr = mutationsPtr; |
︙ | ︙ |
Modified src/OFLocalization.h from [03379b10b1] to [d21618db7e].
︙ | ︙ | |||
135 136 137 138 139 140 141 | * @warning This sets the locale via `setlocale()`! * * @warning You should never call this yourself, except if you do not use * @ref OFApplication. In this case, you need to allocate exactly one * instance of OFLocalization, which will be come the singleton, and * call this method. */ | | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | * @warning This sets the locale via `setlocale()`! * * @warning You should never call this yourself, except if you do not use * @ref OFApplication. In this case, you need to allocate exactly one * instance of OFLocalization, which will be come the singleton, and * call this method. */ - (instancetype)init; #ifdef OF_HAVE_FILES /*! * @brief Adds a directory to scan for language files. * * @param path The path to the directory to scan for language files */ |
︙ | ︙ |
Modified src/OFLocalization.m from [1e6c9574a4] to [e4a754b9ab].
︙ | ︙ | |||
114 115 116 117 118 119 120 | #ifdef OF_HAVE_FILES + (void)addLanguageDirectory: (OFString *)path { [sharedLocalization addLanguageDirectory: path]; } #endif | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | #ifdef OF_HAVE_FILES + (void)addLanguageDirectory: (OFString *)path { [sharedLocalization addLanguageDirectory: path]; } #endif - (instancetype)init { self = [super init]; @try { #ifndef OF_MORPHOS char *locale, *messagesLocale = NULL; |
︙ | ︙ |
Modified src/OFMD5Hash.m from [5fa8ef5288] to [2136f8a2ba].
︙ | ︙ | |||
130 131 132 133 134 135 136 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } | | | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; [self of_resetState]; return self; } - (void)dealloc { [self reset]; [super dealloc]; } - (id)copy { OFMD5Hash *copy = [[OFMD5Hash alloc] init]; memcpy(copy->_state, _state, sizeof(_state)); copy->_bits = _bits; memcpy(©->_buffer, &_buffer, sizeof(_buffer)); copy->_bufferLength = _bufferLength; |
︙ | ︙ |
Modified src/OFMapTable+Private.h from [4526b06ac3] to [2f8c365706].
︙ | ︙ | |||
20 21 22 23 24 25 26 | @interface OFMapTable_EnumeratorWrapper: OFEnumerator { OFMapTableEnumerator *_enumerator; id _object; } | | | | 20 21 22 23 24 25 26 27 28 29 30 31 | @interface OFMapTable_EnumeratorWrapper: OFEnumerator { OFMapTableEnumerator *_enumerator; id _object; } - (instancetype)initWithEnumerator: (OFMapTableEnumerator *)enumerator object: (id)object; @end OF_ASSUME_NONNULL_END |
Modified src/OFMapTable.h from [975babca81] to [df99b8af7c].
︙ | ︙ | |||
110 111 112 113 114 115 116 | * @return A new autoreleased OFMapTable */ + (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t) objectFunctions capacity: (size_t)capacity; | | | | | | | > | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | * @return A new autoreleased OFMapTable */ + (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t) objectFunctions capacity: (size_t)capacity; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFMapTable with the specified key * and object functions. * * @param keyFunctions A structure of functions for handling keys * @param objectFunctions A structure of functions for handling objects * @return An initialized OFMapTable */ - (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t)objectFunctions; /*! * @brief Initializes an already allocated OFMapTable with the specified key * functions, object functions and capacity. * * @param keyFunctions A structure of functions for handling keys * @param objectFunctions A structure of functions for handling objects * @param capacity A hint about the count of elements expected to be in the map * table * @return An initialized OFMapTable */ - (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t)objectFunctions capacity: (size_t)capacity OF_DESIGNATED_INITIALIZER; /*! * @brief Returns the number of objects in the map table. * * @return The number of objects in the map table */ - (size_t)count; |
︙ | ︙ | |||
242 243 244 245 246 247 248 | struct of_map_table_bucket *_Nonnull *_Nullable _buckets; uint32_t _capacity; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; uint32_t _position; } | | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | struct of_map_table_bucket *_Nonnull *_Nullable _buckets; uint32_t _capacity; unsigned long _mutations; unsigned long *_Nullable _mutationsPtr; uint32_t _position; } - (instancetype)init OF_UNAVAILABLE; /*! * @brief Returns a pointer to the next object, or NULL if the enumeration * finished. * * @return The next object */ |
︙ | ︙ |
Modified src/OFMapTable.m from [2c59c12f0d] to [18b269539e].
︙ | ︙ | |||
99 100 101 102 103 104 105 | { return [[[self alloc] initWithKeyFunctions: keyFunctions objectFunctions: objectFunctions capacity: capacity] autorelease]; } | | | | | | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | { return [[[self alloc] initWithKeyFunctions: keyFunctions objectFunctions: objectFunctions capacity: capacity] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t)objectFunctions { return [self initWithKeyFunctions: keyFunctions objectFunctions: objectFunctions capacity: 0]; } - (instancetype)initWithKeyFunctions: (of_map_table_functions_t)keyFunctions objectFunctions: (of_map_table_functions_t)objectFunctions capacity: (size_t)capacity { self = [super init]; @try { _keyFunctions = keyFunctions; _objectFunctions = objectFunctions; |
︙ | ︙ | |||
231 232 233 234 235 236 237 | hash += _objectFunctions.hash(_buckets[i]->object); } } return hash; } | | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | hash += _objectFunctions.hash(_buckets[i]->object); } } return hash; } - (id)copy { OFMapTable *copy = [[OFMapTable alloc] initWithKeyFunctions: _keyFunctions objectFunctions: _objectFunctions capacity: _capacity]; @try { |
︙ | ︙ | |||
657 658 659 660 661 662 663 | } } } #endif @end @implementation OFMapTableEnumerator | | | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 | } } } #endif @end @implementation OFMapTableEnumerator - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_initWithMapTable: (OFMapTable *)mapTable buckets: (struct of_map_table_bucket **)buckets capacity: (uint32_t)capacity |
︙ | ︙ | |||
735 736 737 738 739 740 741 | return &_buckets[_position++]->object; else return NULL; } @end @implementation OFMapTable_EnumeratorWrapper | | | | 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | return &_buckets[_position++]->object; else return NULL; } @end @implementation OFMapTable_EnumeratorWrapper - (instancetype)initWithEnumerator: (OFMapTableEnumerator *)enumerator object: (id)object { self = [super init]; _enumerator = [enumerator retain]; _object = [object retain]; return self; |
︙ | ︙ |
Modified src/OFMessagePackExtension.h from [8e4fd57b89] to [c032ad54fa].
︙ | ︙ | |||
51 52 53 54 55 56 57 | * @param type The MessagePack extension type * @param data The data for the extension * @return A new, autoreleased OFMessagePackRepresentation */ + (instancetype)extensionWithType: (int8_t)type data: (OFData *)data; | | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | * @param type The MessagePack extension type * @param data The data for the extension * @return A new, autoreleased OFMessagePackRepresentation */ + (instancetype)extensionWithType: (int8_t)type data: (OFData *)data; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFMessagePackRepresentation with the * specified type and data. * * @param type The MessagePack extension type * @param data The data for the extension * @return An initialized OFMessagePackRepresentation */ - (instancetype)initWithType: (int8_t)type data: (OFData *)data OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/OFMessagePackExtension.m from [2b45f06590] to [67186a8de4].
︙ | ︙ | |||
28 29 30 31 32 33 34 | + (instancetype)extensionWithType: (int8_t)type data: (OFData *)data { return [[[self alloc] initWithType: type data: data] autorelease]; } | | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | + (instancetype)extensionWithType: (int8_t)type data: (OFData *)data { return [[[self alloc] initWithType: type data: data] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithType: (int8_t)type data: (OFData *)data { self = [super init]; @try { if (data == nil || [data itemSize] != 1) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
183 184 185 186 187 188 189 | OF_HASH_ADD_HASH(hash, [_data hash]); OF_HASH_FINALIZE(hash); return hash; } | | | 183 184 185 186 187 188 189 190 191 192 193 194 | OF_HASH_ADD_HASH(hash, [_data hash]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [self retain]; } @end |
Modified src/OFMethodSignature.h from [c54083e3fd] to [4e07660cca].
︙ | ︙ | |||
59 60 61 62 63 64 65 | /*! * @brief Initializes an already allocated OFMethodSignature with the specified * ObjC types. * * @param types The ObjC types of the method * @return An Initialized OFMethodSignature */ | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | /*! * @brief Initializes an already allocated OFMethodSignature with the specified * ObjC types. * * @param types The ObjC types of the method * @return An Initialized OFMethodSignature */ - (instancetype)initWithObjCTypes: (const char *)types; /*! * @brief Returns the ObjC type for the argument at the specified index. * * @param index The index of the argument for which to return the ObjC type * @return The ObjC type for the argument at the specified index */ |
︙ | ︙ |
Modified src/OFMethodSignature.m from [459569951b] to [8c5f408f1b].
︙ | ︙ | |||
522 523 524 525 526 527 528 | @implementation OFMethodSignature + (instancetype)signatureWithObjCTypes: (const char*)types { return [[[self alloc] initWithObjCTypes: types] autorelease]; } | | | 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 | @implementation OFMethodSignature + (instancetype)signatureWithObjCTypes: (const char*)types { return [[[self alloc] initWithObjCTypes: types] autorelease]; } - (instancetype)initWithObjCTypes: (const char *)types { self = [super init]; @try { size_t length; const char *last; |
︙ | ︙ |
Modified src/OFMutableArray.h from [8b66863b27] to [9bb82b7b0e].
︙ | ︙ | |||
53 54 55 56 57 58 59 | /*! * @brief Initializes an already allocated OFMutableArray with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableArray * @return An initialized OFMutableArray */ | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | /*! * @brief Initializes an already allocated OFMutableArray with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableArray * @return An initialized OFMutableArray */ - (instancetype)initWithCapacity: (size_t)capacity; /*! * @brief Adds an object to the end of the array. * * @param object An object to add */ - (void)addObject: (ObjectType)object; |
︙ | ︙ |
Modified src/OFMutableArray.m from [706da4f76f] to [d9547cea8c].
︙ | ︙ | |||
134 135 136 137 138 139 140 | left = i + 1; } } #endif @implementation OFMutableArray_placeholder | | | | | | | | | | | | | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | left = i + 1; } } #endif @implementation OFMutableArray_placeholder - (instancetype)init { return (id)[[OFMutableArray_adjacent alloc] init]; } - (instancetype)initWithCapacity: (size_t)capacity { return (id)[[OFMutableArray_adjacent alloc] initWithCapacity: capacity]; } - (instancetype)initWithObject: (id)object { return (id)[[OFMutableArray_adjacent alloc] initWithObject: object]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFMutableArray_adjacent alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFMutableArray_adjacent alloc] initWithObject: firstObject arguments: arguments]; } - (instancetype)initWithArray: (OFArray *)array { return (id)[[OFMutableArray_adjacent alloc] initWithArray: array]; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFMutableArray_adjacent alloc] initWithObjects: objects count: count]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFMutableArray_adjacent alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
214 215 216 217 218 219 220 | @implementation OFMutableArray + (void)initialize { if (self == [OFMutableArray class]) placeholder.isa = [OFMutableArray_placeholder class]; } | | | | | | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | @implementation OFMutableArray + (void)initialize { if (self == [OFMutableArray class]) placeholder.isa = [OFMutableArray_placeholder class]; } + (instancetype)alloc { if (self == [OFMutableArray class]) return (id)&placeholder; return [super alloc]; } + (instancetype)arrayWithCapacity: (size_t)capacity { return [[[self alloc] initWithCapacity: capacity] autorelease]; } - (instancetype)init { if (object_getClass(self) == [OFMutableArray class]) { @try { [self doesNotRecognizeSelector: _cmd]; abort(); } @catch (id e) { [self release]; @throw e; } } return [super init]; } - (instancetype)initWithCapacity: (size_t)capacity { OF_INVALID_INIT_METHOD } - (id)copy { return [[OFArray alloc] initWithArray: self]; } - (void)addObject: (id)object { [self insertObject: object |
︙ | ︙ |
Modified src/OFMutableArray_adjacent.m from [72511012c6] to [5cf73c1314].
︙ | ︙ | |||
29 30 31 32 33 34 35 | @implementation OFMutableArray_adjacent + (void)initialize { if (self == [OFMutableArray_adjacent class]) [self inheritMethodsFromClass: [OFArray_adjacent class]]; } | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @implementation OFMutableArray_adjacent + (void)initialize { if (self == [OFMutableArray_adjacent class]) [self inheritMethodsFromClass: [OFArray_adjacent class]]; } - (instancetype)initWithCapacity: (size_t)capacity { self = [super init]; @try { _array = [[OFMutableData alloc] initWithItemSize: sizeof(id) capacity: capacity]; } @catch (id e) { |
︙ | ︙ |
Modified src/OFMutableData.h from [0dca48a207] to [f022240c55].
︙ | ︙ | |||
76 77 78 79 80 81 82 | freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFMutableData with an item size of 1. * * @return An initialized OFMutableData */ | | | | | | | | | | | | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFMutableData with an item size of 1. * * @return An initialized OFMutableData */ - (instancetype)init; /*! * @brief Initializes an already allocated OFMutableData whose items all have * the same size. * * @param itemSize The size of a single element in the OFMutableData * @return An initialized OFMutableData */ - (instancetype)initWithItemSize: (size_t)itemSize; /*! * @brief Initializes an already allocated OFMutableData with enough memory to * hold the the specified number of items which all have an item size of * 1. * * @param capacity The initial capacity for the OFMutableData * @return An initialized OFMutableData */ - (instancetype)initWithCapacity: (size_t)capacity; /*! * @brief Initializes an already allocated OFMutableData with enough memory to * hold the the specified number of items which all have the same * specified size. * * @param itemSize The size of a single element in the OFMutableData * @param capacity The initial capacity for the OFMutableData * @return An initialized OFMutableData */ - (instancetype)initWithItemSize: (size_t)itemSize capacity: (size_t)capacity; - (instancetype)initWithItemsNoCopy: (const void *)items count: (size_t)count freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE; - (instancetype)initWithItemsNoCopy: (const void *)items itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE; /*! * @brief Adds an item to the OFMutableData. * * @param item A pointer to an arbitrary item */ - (void)addItem: (const void *)item; |
︙ | ︙ |
Modified src/OFMutableData.m from [511512b3be] to [1ec47eeb35].
︙ | ︙ | |||
62 63 64 65 66 67 68 | itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone { OF_UNRECOGNIZED_SELECTOR } | | | | | | | | | | | | | | | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone { OF_UNRECOGNIZED_SELECTOR } - (instancetype)init { self = [super of_init]; _itemSize = 1; return self; } - (instancetype)initWithItemSize: (size_t)itemSize { self = [super of_init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; _itemSize = itemSize; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithCapacity: (size_t)capacity { return [self initWithItemSize: 1 capacity: capacity]; } - (instancetype)initWithItemSize: (size_t)itemSize capacity: (size_t)capacity { self = [super of_init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; _items = [self allocMemoryWithSize: itemSize count: capacity]; _itemSize = itemSize; _capacity = capacity; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithItems: (const void *)items itemSize: (size_t)itemSize count: (size_t)count { self = [super initWithItems: items itemSize: itemSize count: count]; _capacity = _count; return self; } - (instancetype)initWithItemsNoCopy: (const void *)items count: (size_t)count freeWhenDone: (bool)freeWhenDone { OF_INVALID_INIT_METHOD } - (instancetype)initWithItemsNoCopy: (const void *)items itemSize: (size_t)itemSize count: (size_t)count freeWhenDone: (bool)freeWhenDone { OF_INVALID_INIT_METHOD } - (instancetype)initWithStringRepresentation: (OFString *)string { self = [super initWithStringRepresentation: string]; _capacity = _count; return self; } |
︙ | ︙ | |||
283 284 285 286 287 288 289 | [self freeMemory: _items]; _items = NULL; _count = 0; _capacity = 0; } | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | [self freeMemory: _items]; _items = NULL; _count = 0; _capacity = 0; } - (id)copy { return [[OFData alloc] initWithItems: _items itemSize: _itemSize count: _count]; } - (void)makeImmutable { object_setClass(self, [OFData class]); } @end |
Modified src/OFMutableDictionary.h from [6a5236f2f3] to [432341193d].
︙ | ︙ | |||
54 55 56 57 58 59 60 | /*! * @brief Initializes an already allocated OFMutableDictionary with enough * memory to hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableDictionary * @return An initialized OFMutableDictionary */ | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | /*! * @brief Initializes an already allocated OFMutableDictionary with enough * memory to hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableDictionary * @return An initialized OFMutableDictionary */ - (instancetype)initWithCapacity: (size_t)capacity; /*! * @brief Sets an object for a key. * * A key can be any object that conforms to the OFCopying protocol. * * @param key The key to set |
︙ | ︙ |
Modified src/OFMutableDictionary.m from [d718ec6322] to [04d26872af].
︙ | ︙ | |||
26 27 28 29 30 31 32 | Class isa; } placeholder; @interface OFMutableDictionary_placeholder: OFDictionary @end @implementation OFMutableDictionary_placeholder | | | | | | | | | | | | | | | | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | Class isa; } placeholder; @interface OFMutableDictionary_placeholder: OFDictionary @end @implementation OFMutableDictionary_placeholder - (instancetype)init { return (id)[[OFMutableDictionary_hashtable alloc] init]; } - (instancetype)initWithDictionary: (OFDictionary *)dictionary { return (id)[[OFMutableDictionary_hashtable alloc] initWithDictionary: dictionary]; } - (instancetype)initWithObject: (id)object forKey: (id)key { return (id)[[OFMutableDictionary_hashtable alloc] initWithObject: object forKey: key]; } - (instancetype)initWithObjects: (OFArray *)objects forKeys: (OFArray *)keys { return (id)[[OFMutableDictionary_hashtable alloc] initWithObjects: objects forKeys: keys]; } - (instancetype)initWithObjects: (id const *)objects forKeys: (id const *)keys count: (size_t)count { return (id)[[OFMutableDictionary_hashtable alloc] initWithObjects: objects forKeys: keys count: count]; } - (instancetype)initWithKeysAndObjects: (id)firstKey, ... { id ret; va_list arguments; va_start(arguments, firstKey); ret = (id)[[OFMutableDictionary_hashtable alloc] initWithKey: firstKey arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments { return (id)[[OFMutableDictionary_hashtable alloc] initWithKey: firstKey arguments: arguments]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFMutableDictionary_hashtable alloc] initWithSerialization: element]; } - (instancetype)initWithCapacity: (size_t)capacity { return (id)[[OFMutableDictionary_hashtable alloc] initWithCapacity: capacity]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
123 124 125 126 127 128 129 | @implementation OFMutableDictionary + (void)initialize { if (self == [OFMutableDictionary class]) placeholder.isa = [OFMutableDictionary_placeholder class]; } | | | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | @implementation OFMutableDictionary + (void)initialize { if (self == [OFMutableDictionary class]) placeholder.isa = [OFMutableDictionary_placeholder class]; } + (instancetype)alloc { if (self == [OFMutableDictionary class]) return (id)&placeholder; return [super alloc]; } + (instancetype)dictionaryWithCapacity: (size_t)capacity { return [[[self alloc] initWithCapacity: capacity] autorelease]; } - (instancetype)init { if (object_getClass(self) == [OFMutableDictionary class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; } abort(); } return [super init]; } - (instancetype)initWithCapacity: (size_t)capacity { OF_INVALID_INIT_METHOD } - (void)setObject: (id)object forKey: (id)key { |
︙ | ︙ | |||
185 186 187 188 189 190 191 | for (id key in [self allKeys]) [self removeObjectForKey: key]; objc_autoreleasePoolPop(pool); } | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | for (id key in [self allKeys]) [self removeObjectForKey: key]; objc_autoreleasePoolPop(pool); } - (id)copy { return [[OFDictionary alloc] initWithDictionary: self]; } - (void)addEntriesFromDictionary: (OFDictionary *)dictionary { void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ |
Modified src/OFMutablePair.m from [fd16e0b90e] to [ce5e567f88].
︙ | ︙ | |||
31 32 33 34 35 36 37 | - (void)setSecondObject: (id)secondObject { id old = _secondObject; _secondObject = [secondObject retain]; [old release]; } | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | - (void)setSecondObject: (id)secondObject { id old = _secondObject; _secondObject = [secondObject retain]; [old release]; } - (id)copy { OFMutablePair *copy = [self mutableCopy]; [copy makeImmutable]; return copy; } |
︙ | ︙ |
Modified src/OFMutableSet.h from [e31e233b6e] to [46407560c3].
︙ | ︙ | |||
39 40 41 42 43 44 45 | /*! * @brief Initializes an already allocated OFMutableSet with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return An initialized OFMutableSet */ | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | /*! * @brief Initializes an already allocated OFMutableSet with enough memory to * hold the specified number of objects. * * @param capacity The initial capacity for the OFMutableSet * @return An initialized OFMutableSet */ - (instancetype)initWithCapacity: (size_t)capacity; /*! * @brief Adds the specified object to the set. * * @param object The object to add to the set */ - (void)addObject: (ObjectType)object; |
︙ | ︙ |
Modified src/OFMutableSet.m from [c759b99c57] to [1df07a3c74].
︙ | ︙ | |||
27 28 29 30 31 32 33 | Class isa; } placeholder; @interface OFMutableSet_placeholder: OFMutableSet @end @implementation OFMutableSet_placeholder | | | | | | | | | | | | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | Class isa; } placeholder; @interface OFMutableSet_placeholder: OFMutableSet @end @implementation OFMutableSet_placeholder - (instancetype)init { return (id)[[OFMutableSet_hashtable alloc] init]; } - (instancetype)initWithSet: (OFSet *)set { return (id)[[OFMutableSet_hashtable alloc] initWithSet: set]; } - (instancetype)initWithArray: (OFArray *)array { return (id)[[OFMutableSet_hashtable alloc] initWithArray: array]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFMutableSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFMutableSet_hashtable alloc] initWithObjects: objects count: count]; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFMutableSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFMutableSet_hashtable alloc] initWithSerialization: element]; } - (instancetype)initWithCapacity: (size_t)capacity { return (id)[[OFMutableSet_hashtable alloc] initWithCapacity: capacity]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
107 108 109 110 111 112 113 | @implementation OFMutableSet + (void)initialize { if (self == [OFMutableSet class]) placeholder.isa = [OFMutableSet_placeholder class]; } | | | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | @implementation OFMutableSet + (void)initialize { if (self == [OFMutableSet class]) placeholder.isa = [OFMutableSet_placeholder class]; } + (instancetype)alloc { if (self == [OFMutableSet class]) return (id)&placeholder; return [super alloc]; } + (instancetype)setWithCapacity: (size_t)capacity { return [[[self alloc] initWithCapacity: capacity] autorelease]; } - (instancetype)init { if (object_getClass(self) == [OFMutableSet class]) { @try { [self doesNotRecognizeSelector: _cmd]; abort(); } @catch (id e) { [self release]; @throw e; } } return [super init]; } - (instancetype)initWithCapacity: (size_t)capacity { OF_INVALID_INIT_METHOD } - (void)addObject: (id)object { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ |
Modified src/OFMutableString.m from [7b8005c3d9] to [8288a048e9].
︙ | ︙ | |||
34 35 36 37 38 39 40 | Class isa; } placeholder; @interface OFMutableString_placeholder: OFMutableString @end @implementation OFMutableString_placeholder | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | Class isa; } placeholder; @interface OFMutableString_placeholder: OFMutableString @end @implementation OFMutableString_placeholder - (instancetype)init { return (id)[[OFMutableString_UTF8 alloc] init]; } - (instancetype)initWithUTF8String: (const char *)UTF8String { return (id)[[OFMutableString_UTF8 alloc] initWithUTF8String: UTF8String]; } - (instancetype)initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { return (id)[[OFMutableString_UTF8 alloc] initWithUTF8String: UTF8String length: UTF8StringLength]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { return (id)[[OFMutableString_UTF8 alloc] initWithCString: cString encoding: encoding]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { return (id)[[OFMutableString_UTF8 alloc] initWithCString: cString encoding: encoding length: cStringLength]; } - (instancetype)initWithString: (OFString *)string { return (id)[[OFMutableString_UTF8 alloc] initWithString: string]; } - (instancetype)initWithCharacters: (const of_unichar_t *)characters length: (size_t)length { return (id)[[OFMutableString_UTF8 alloc] initWithCharacters: characters length: length]; } - (instancetype)initWithUTF16String: (const char16_t *)string { return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length { return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string length: length]; } - (instancetype)initWithUTF16String: (const char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string byteOrder: byteOrder]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFMutableString_UTF8 alloc] initWithUTF16String: string length: length byteOrder: byteOrder]; } - (instancetype)initWithUTF32String: (const char32_t *)string { return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length { return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string length: length]; } - (instancetype)initWithUTF32String: (const char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string byteOrder: byteOrder]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFMutableString_UTF8 alloc] initWithUTF32String: string length: length byteOrder: byteOrder]; } - (instancetype)initWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); ret = [[OFMutableString_UTF8 alloc] initWithFormat: format arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { return (id)[[OFMutableString_UTF8 alloc] initWithFormat: format arguments: arguments]; } #ifdef OF_HAVE_FILES - (instancetype)initWithContentsOfFile: (OFString *)path { return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfFile: path]; } - (instancetype)initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfFile: path encoding: encoding]; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfURL: URL]; } - (instancetype)initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { return (id)[[OFMutableString_UTF8 alloc] initWithContentsOfURL: URL encoding: encoding]; } #endif - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFMutableString_UTF8 alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
225 226 227 228 229 230 231 | @implementation OFMutableString + (void)initialize { if (self == [OFMutableString class]) placeholder.isa = [OFMutableString_placeholder class]; } | | | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | @implementation OFMutableString + (void)initialize { if (self == [OFMutableString class]) placeholder.isa = [OFMutableString_placeholder class]; } + (instancetype)alloc { if (self == [OFMutableString class]) return (id)&placeholder; return [super alloc]; } |
︙ | ︙ | |||
588 589 590 591 592 593 594 | - (void)deleteEnclosingWhitespaces { [self deleteLeadingWhitespaces]; [self deleteTrailingWhitespaces]; } | | | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | - (void)deleteEnclosingWhitespaces { [self deleteLeadingWhitespaces]; [self deleteTrailingWhitespaces]; } - (id)copy { return [[OFString alloc] initWithString: self]; } - (void)makeImmutable { } @end |
Modified src/OFMutableString_UTF8.m from [4a3385c744] to [4eb8ccee47].
︙ | ︙ | |||
37 38 39 40 41 42 43 | @implementation OFMutableString_UTF8 + (void)initialize { if (self == [OFMutableString_UTF8 class]) [self inheritMethodsFromClass: [OFString_UTF8 class]]; } | | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | @implementation OFMutableString_UTF8 + (void)initialize { if (self == [OFMutableString_UTF8 class]) [self inheritMethodsFromClass: [OFString_UTF8 class]]; } - (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { @try { self = [self initWithUTF8String: UTF8String]; } @finally { if (freeWhenDone) free(UTF8String); } |
︙ | ︙ |
Modified src/OFMutableTarArchiveEntry.m from [f0f930a3ee] to [a4dc22b0d5].
︙ | ︙ | |||
20 21 22 23 24 25 26 | #import "OFString.h" #import "OFDate.h" @implementation OFMutableTarArchiveEntry @dynamic fileName, mode, UID, GID, size, modificationDate, type, targetFileName; @dynamic owner, group, deviceMajor, deviceMinor; | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFString.h" #import "OFDate.h" @implementation OFMutableTarArchiveEntry @dynamic fileName, mode, UID, GID, size, modificationDate, type, targetFileName; @dynamic owner, group, deviceMajor, deviceMinor; - (id)copy { OFMutableTarArchiveEntry *copy = [self mutableCopy]; [copy makeImmutable]; return copy; } |
︙ | ︙ |
Modified src/OFMutableTriple.m from [d48b052c76] to [4592e90254].
︙ | ︙ | |||
38 39 40 41 42 43 44 | - (void)setThirdObject: (id)thirdObject { id old = _thirdObject; _thirdObject = [thirdObject retain]; [old release]; } | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | - (void)setThirdObject: (id)thirdObject { id old = _thirdObject; _thirdObject = [thirdObject retain]; [old release]; } - (id)copy { OFMutableTriple *copy = [self mutableCopy]; [copy makeImmutable]; return copy; } |
︙ | ︙ |
Modified src/OFMutableURL.h from [8fd67661ad] to [d41b6f1dcf].
︙ | ︙ | |||
78 79 80 81 82 83 84 | + (instancetype)URL; /*! * @brief Initializes an already allocated OFMutableURL. * * @return An initialized OFMutableURL */ | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | + (instancetype)URL; /*! * @brief Initializes an already allocated OFMutableURL. * * @return An initialized OFMutableURL */ - (instancetype)init; /*! * @brief Converts the mutable URL to an immutable URL. */ - (void)makeImmutable; @end |
︙ | ︙ |
Modified src/OFMutableURL.m from [d83d33a394] to [aa49ba568a].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @dynamic scheme, host, port, user, password, path, parameters, query, fragment; + (instancetype)URL { return [[[self alloc] init] autorelease]; } | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | @dynamic scheme, host, port, user, password, path, parameters, query, fragment; + (instancetype)URL { return [[[self alloc] init] autorelease]; } - (instancetype)init { return [super of_init]; } - (void)setScheme: (OFString *)scheme { OFString *old = _scheme; |
︙ | ︙ | |||
90 91 92 93 94 95 96 | - (void)setFragment: (OFString *)fragment { OFString *old = _fragment; _fragment = [fragment copy]; [old release]; } | | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | - (void)setFragment: (OFString *)fragment { OFString *old = _fragment; _fragment = [fragment copy]; [old release]; } - (id)copy { OFMutableURL *copy = [self mutableCopy]; [copy makeImmutable]; return copy; } - (void)makeImmutable { object_setClass(self, [OFURL class]); } @end |
Modified src/OFMutableZIPArchiveEntry.m from [fd0258d247] to [4990b8b9d2].
︙ | ︙ | |||
27 28 29 30 31 32 33 | @implementation OFMutableZIPArchiveEntry @dynamic fileName, fileComment, extraField, versionMadeBy, minVersionNeeded; @dynamic modificationDate, compressionMethod, compressedSize, uncompressedSize; @dynamic CRC32, versionSpecificAttributes, generalPurposeBitFlag; @dynamic of_localFileHeaderOffset; | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | @implementation OFMutableZIPArchiveEntry @dynamic fileName, fileComment, extraField, versionMadeBy, minVersionNeeded; @dynamic modificationDate, compressionMethod, compressedSize, uncompressedSize; @dynamic CRC32, versionSpecificAttributes, generalPurposeBitFlag; @dynamic of_localFileHeaderOffset; - (id)copy { OFMutableZIPArchiveEntry *copy = [self mutableCopy]; [copy makeImmutable]; return copy; } |
︙ | ︙ |
Modified src/OFMutex.m from [fcee48ecda] to [454d70b9af].
︙ | ︙ | |||
28 29 30 31 32 33 34 | @synthesize name = _name; + (instancetype)mutex { return [[[self alloc] init] autorelease]; } | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize name = _name; + (instancetype)mutex { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; if (!of_mutex_new(&_mutex)) { Class c = [self class]; [self release]; @throw [OFInitializationFailedException exceptionWithClass: c]; |
︙ | ︙ |
Modified src/OFNull.m from [80f6393652] to [48127745a8].
︙ | ︙ | |||
37 38 39 40 41 42 43 | } + (OFNull *)null { return null; } | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | } + (OFNull *)null { return null; } - (instancetype)initWithSerialization: (OFXMLElement *)element { void *pool; [self release]; pool = objc_autoreleasePoolPush(); |
︙ | ︙ | |||
59 60 61 62 63 64 65 | } - (OFString *)description { return @"<null>"; } | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | } - (OFString *)description { return @"<null>"; } - (id)copy { return self; } - (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ | |||
105 106 107 108 109 110 111 | { uint8_t type = 0xC0; return [OFData dataWithItems: &type count: 1]; } | | | | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | { uint8_t type = 0xC0; return [OFData dataWithItems: &type count: 1]; } - (instancetype)autorelease { return self; } - (instancetype)retain { return self; } - (void)release { } |
︙ | ︙ |
Modified src/OFNumber.h from [b4280b6f63] to [92dadecb01].
︙ | ︙ | |||
376 377 378 379 380 381 382 | * @brief Creates a new OFNumber with the specified double. * * @param double_ A double which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithDouble: (double)double_; | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | * @brief Creates a new OFNumber with the specified double. * * @param double_ A double which the OFNumber should contain * @return A new autoreleased OFNumber */ + (instancetype)numberWithDouble: (double)double_; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFNumber with the specified bool. * * @param bool_ A bool which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithBool: (bool)bool_; /*! * @brief Initializes an already allocated OFNumber with the specified signed * char. * * @param schar A signed char which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithChar: (signed char)schar; /*! * @brief Initializes an already allocated OFNumber with the specified signed * short. * * @param sshort A signed short which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithShort: (signed short)sshort; /*! * @brief Initializes an already allocated OFNumber with the specified signed * int. * * @param sint A signed int which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithInt: (signed int)sint; /*! * @brief Initializes an already allocated OFNumber with the specified signed * long. * * @param slong A signed long which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithLong: (signed long)slong; /*! * @brief Initializes an already allocated OFNumber with the specified signed * long long. * * @param slonglong A signed long long which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithLongLong: (signed long long)slonglong; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * char. * * @param uchar An unsigned char which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUnsignedChar: (unsigned char)uchar; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * short. * * @param ushort An unsigned short which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUnsignedShort: (unsigned short)ushort; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * int. * * @param uint An unsigned int which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUnsignedInt: (unsigned int)uint; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * long. * * @param ulong An unsigned long which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUnsignedLong: (unsigned long)ulong; /*! * @brief Initializes an already allocated OFNumber with the specified unsigned * long long. * * @param ulonglong An unsigned long long which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUnsignedLongLong: (unsigned long long)ulonglong; /*! * @brief Initializes an already allocated OFNumber with the specified int8_t. * * @param int8 An int8_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithInt8: (int8_t)int8; /*! * @brief Initializes an already allocated OFNumber with the specified int16_t. * * @param int16 An int16_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithInt16: (int16_t)int16; /*! * @brief Initializes an already allocated OFNumber with the specified int32_t. * * @param int32 An int32_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithInt32: (int32_t)int32; /*! * @brief Initializes an already allocated OFNumber with the specified int64_t. * * @param int64 An int64_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithInt64: (int64_t)int64; /*! * @brief Initializes an already allocated OFNumber with the specified uint8_t. * * @param uint8 A uint8_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUInt8: (uint8_t)uint8; /*! * @brief Initializes an already allocated OFNumber with the specified uint16_t. * * @param uint16 A uint16_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUInt16: (uint16_t)uint16; /*! * @brief Initializes an already allocated OFNumber with the specified uint32_t. * * @param uint32 A uint32_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUInt32: (uint32_t)uint32; /*! * @brief Initializes an already allocated OFNumber with the specified uint64_t. * * @param uint64 A uint64_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUInt64: (uint64_t)uint64; /*! * @brief Initializes an already allocated OFNumber with the specified size_t. * * @param size A size_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithSize: (size_t)size; /*! * @brief Initializes an already allocated OFNumber with the specified ssize_t. * * @param ssize An ssize_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithSSize: (ssize_t)ssize; /*! * @brief Initializes an already allocated OFNumber with the specified intmax_t. * * @param intmax An intmax_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithIntMax: (intmax_t)intmax; /*! * @brief Initializes an already allocated OFNumber with the specified * uintmax_t. * * @param uintmax A uintmax_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUIntMax: (uintmax_t)uintmax; /*! * @brief Initializes an already allocated OFNumber with the specified * ptrdiff_t. * * @param ptrdiff A ptrdiff_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithPtrDiff: (ptrdiff_t)ptrdiff; /*! * @brief Initializes an already allocated OFNumber with the specified intptr_t. * * @param intptr An intptr_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithIntPtr: (intptr_t)intptr; /*! * @brief Initializes an already allocated OFNumber with the specified * uintptr_t. * * @param uintptr A uintptr_t which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithUIntPtr: (uintptr_t)uintptr; /*! * @brief Initializes an already allocated OFNumber with the specified float. * * @param float_ A float which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithFloat: (float)float_; /*! * @brief Initializes an already allocated OFNumber with the specified double. * * @param double_ A double which the OFNumber should contain * @return An initialized OFNumber */ - (instancetype)initWithDouble: (double)double_; /*! * @brief Returns the OFNumber as a bool. * * @return The OFNumber as a bool */ - (bool)boolValue; |
︙ | ︙ |
Modified src/OFNumber.m from [3d97fc0b3e] to [2a910136b7].
︙ | ︙ | |||
235 236 237 238 239 240 241 | } + (instancetype)numberWithDouble: (double)double_ { return [[[self alloc] initWithDouble: double_] autorelease]; } | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | } + (instancetype)numberWithDouble: (double)double_ { return [[[self alloc] initWithDouble: double_] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithBool: (bool)bool_ { self = [super init]; _value.bool_ = bool_; _type = OF_NUMBER_TYPE_BOOL; return self; } - (instancetype)initWithChar: (signed char)schar { self = [super init]; _value.schar = schar; _type = OF_NUMBER_TYPE_CHAR; return self; } - (instancetype)initWithShort: (signed short)sshort { self = [super init]; _value.sshort = sshort; _type = OF_NUMBER_TYPE_SHORT; return self; } - (instancetype)initWithInt: (signed int)sint { self = [super init]; _value.sint = sint; _type = OF_NUMBER_TYPE_INT; return self; } - (instancetype)initWithLong: (signed long)slong { self = [super init]; _value.slong = slong; _type = OF_NUMBER_TYPE_LONG; return self; } - (instancetype)initWithLongLong: (signed long long)slonglong { self = [super init]; _value.slonglong = slonglong; _type = OF_NUMBER_TYPE_LONGLONG; return self; } - (instancetype)initWithUnsignedChar: (unsigned char)uchar { self = [super init]; _value.uchar = uchar; _type = OF_NUMBER_TYPE_UCHAR; return self; } - (instancetype)initWithUnsignedShort: (unsigned short)ushort { self = [super init]; _value.ushort = ushort; _type = OF_NUMBER_TYPE_USHORT; return self; } - (instancetype)initWithUnsignedInt: (unsigned int)uint { self = [super init]; _value.uint = uint; _type = OF_NUMBER_TYPE_UINT; return self; } - (instancetype)initWithUnsignedLong: (unsigned long)ulong { self = [super init]; _value.ulong = ulong; _type = OF_NUMBER_TYPE_ULONG; return self; } - (instancetype)initWithUnsignedLongLong: (unsigned long long)ulonglong { self = [super init]; _value.ulonglong = ulonglong; _type = OF_NUMBER_TYPE_ULONGLONG; return self; } - (instancetype)initWithInt8: (int8_t)int8 { self = [super init]; _value.int8 = int8; _type = OF_NUMBER_TYPE_INT8; return self; } - (instancetype)initWithInt16: (int16_t)int16 { self = [super init]; _value.int16 = int16; _type = OF_NUMBER_TYPE_INT16; return self; } - (instancetype)initWithInt32: (int32_t)int32 { self = [super init]; _value.int32 = int32; _type = OF_NUMBER_TYPE_INT32; return self; } - (instancetype)initWithInt64: (int64_t)int64 { self = [super init]; _value.int64 = int64; _type = OF_NUMBER_TYPE_INT64; return self; } - (instancetype)initWithUInt8: (uint8_t)uint8 { self = [super init]; _value.uint8 = uint8; _type = OF_NUMBER_TYPE_UINT8; return self; } - (instancetype)initWithUInt16: (uint16_t)uint16 { self = [super init]; _value.uint16 = uint16; _type = OF_NUMBER_TYPE_UINT16; return self; } - (instancetype)initWithUInt32: (uint32_t)uint32 { self = [super init]; _value.uint32 = uint32; _type = OF_NUMBER_TYPE_UINT32; return self; } - (instancetype)initWithUInt64: (uint64_t)uint64 { self = [super init]; _value.uint64 = uint64; _type = OF_NUMBER_TYPE_UINT64; return self; } - (instancetype)initWithSize: (size_t)size { self = [super init]; _value.size = size; _type = OF_NUMBER_TYPE_SIZE; return self; } - (instancetype)initWithSSize: (ssize_t)ssize { self = [super init]; _value.ssize = ssize; _type = OF_NUMBER_TYPE_SSIZE; return self; } - (instancetype)initWithIntMax: (intmax_t)intmax { self = [super init]; _value.intmax = intmax; _type = OF_NUMBER_TYPE_INTMAX; return self; } - (instancetype)initWithUIntMax: (uintmax_t)uintmax { self = [super init]; _value.uintmax = uintmax; _type = OF_NUMBER_TYPE_UINTMAX; return self; } - (instancetype)initWithPtrDiff: (ptrdiff_t)ptrdiff { self = [super init]; _value.ptrdiff = ptrdiff; _type = OF_NUMBER_TYPE_PTRDIFF; return self; } - (instancetype)initWithIntPtr: (intptr_t)intptr { self = [super init]; _value.intptr = intptr; _type = OF_NUMBER_TYPE_INTPTR; return self; } - (instancetype)initWithUIntPtr: (uintptr_t)uintptr { self = [super init]; _value.uintptr = uintptr; _type = OF_NUMBER_TYPE_UINTPTR; return self; } - (instancetype)initWithFloat: (float)float_ { self = [super init]; _value.float_ = float_; _type = OF_NUMBER_TYPE_FLOAT; return self; } - (instancetype)initWithDouble: (double)double_ { self = [super init]; _value.double_ = double_; _type = OF_NUMBER_TYPE_DOUBLE; return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); OFString *typeString; |
︙ | ︙ | |||
862 863 864 865 866 867 868 | } OF_HASH_FINALIZE(hash); return hash; } | | | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | } OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [self retain]; } - (OFString *)description { OFMutableString *ret; |
︙ | ︙ |
Modified src/OFObject.h from [cbc749740e] to [39e5e50197].
︙ | ︙ | |||
354 355 356 357 358 359 360 | /*! * @brief Increases the retain count. * * Each time an object is released, the retain count gets decreased and the * object deallocated if it reaches 0. */ | | | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | /*! * @brief Increases the retain count. * * Each time an object is released, the retain count gets decreased and the * object deallocated if it reaches 0. */ - (instancetype)retain; /*! * @brief Returns the retain count. * * @return The retain count */ - (unsigned int)retainCount; |
︙ | ︙ | |||
377 378 379 380 381 382 383 | /*! * @brief Adds the object to the topmost OFAutoreleasePool of the thread's * autorelease pool stack. * * @return The object */ | | | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | /*! * @brief Adds the object to the topmost OFAutoreleasePool of the thread's * autorelease pool stack. * * @return The object */ - (instancetype)autorelease; /*! * @brief Returns the receiver. * * @return The receiver */ - (instancetype)self; /*! * @brief Returns whether the object is a proxy object. * * @return A boolean whether the object is a proxy object */ - (bool)isProxy; |
︙ | ︙ | |||
467 468 469 470 471 472 473 | * pool for the object. * * This method will never return `nil`, instead, it will throw an * @ref OFAllocFailedException. * * @return The allocated object */ | | | | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | * pool for the object. * * This method will never return `nil`, instead, it will throw an * @ref OFAllocFailedException. * * @return The allocated object */ + (instancetype)alloc; /*! * @brief Allocates memory for a new instance and calls @ref init on it. * @return An allocated and initialized object */ + (instancetype)new; /*! * @brief Returns the class. * * @return The class */ + (Class)class; |
︙ | ︙ | |||
622 623 624 625 626 627 628 | * @brief Returns the class. * * This method exists so that classes can be used in collections requiring * conformance to the OFCopying protocol. * * @return The class of the object */ | | | | 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 | * @brief Returns the class. * * This method exists so that classes can be used in collections requiring * conformance to the OFCopying protocol. * * @return The class of the object */ + (id)copy; /*! * @brief Initializes an already allocated object. * * Derived classes may override this, but need to do * @code * self = [super init] * @endcode * before they do any initialization themselves. @ref init may never return * `nil`, instead an exception (for example @ref * OFInitializationFailedException) should be thrown. * * @return An initialized object */ - (instancetype)init; /*! * @brief Returns the method signature for the specified selector. * * @param selector The selector for which the method signature should be * returned * @return The method signature for the specified selector |
︙ | ︙ | |||
1114 1115 1116 1117 1118 1119 1120 | * * For classes which can be immutable or mutable, this returns an immutable * copy. If only a mutable version of the class exists, it creates a mutable * copy. * * @return A copy of the object */ | | | | 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 | * * For classes which can be immutable or mutable, this returns an immutable * copy. If only a mutable version of the class exists, it creates a mutable * copy. * * @return A copy of the object */ - (id)copy; @end /*! * @protocol OFMutableCopying OFObject.h ObjFW/OFObject.h * * @brief A protocol for the creation of mutable copies. * * This protocol is implemented by objects that can be mutable and immutable * and allows returning a mutable copy. */ @protocol OFMutableCopying /*! * @brief Creates a mutable copy of the object. * * @return A mutable copy of the object */ - (id)mutableCopy; @end /*! * @protocol OFComparing OFObject.h ObjFW/OFObject.h * * @brief A protocol for comparing objects. * |
︙ | ︙ |
Modified src/OFObject.m from [d94672b28e] to [fdaee34133].
︙ | ︙ | |||
276 277 278 279 280 281 282 | { } + (void)initialize { } | | | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | { } + (void)initialize { } + (instancetype)alloc { return of_alloc_object(self, 0, 0, NULL); } + (instancetype)new { return [[self alloc] init]; } + (Class)class { return self; |
︙ | ︙ | |||
473 474 475 476 477 478 479 | } + (BOOL)resolveInstanceMethod: (SEL)selector { return NO; } | | | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | } + (BOOL)resolveInstanceMethod: (SEL)selector { return NO; } - (instancetype)init { return self; } - (Class)class { return object_getClass(self); |
︙ | ︙ | |||
1153 1154 1155 1156 1157 1158 1159 | - (void)doesNotRecognizeSelector: (SEL)selector { @throw [OFNotImplementedException exceptionWithSelector: selector object: self]; } | | | 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 | - (void)doesNotRecognizeSelector: (SEL)selector { @throw [OFNotImplementedException exceptionWithSelector: selector object: self]; } - (instancetype)retain { #if defined(OF_HAVE_ATOMIC_OPS) of_atomic_int_inc(&PRE_IVARS->retainCount); #else OF_ENSURE(of_spinlock_lock(&PRE_IVARS->retainCountSpinlock)); PRE_IVARS->retainCount++; OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock)); |
︙ | ︙ | |||
1194 1195 1196 1197 1198 1199 1200 | OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock)); if (c == 0) [self dealloc]; #endif } | | | | 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 | OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock)); if (c == 0) [self dealloc]; #endif } - (instancetype)autorelease { return _objc_rootAutorelease(self); } - (instancetype)self { return self; } - (bool)isProxy { return false; |
︙ | ︙ | |||
1246 1247 1248 1249 1250 1251 1252 | iter = next; } free((char *)self - PRE_IVARS_ALIGN); } /* Required to use properties with the Apple runtime */ | | | | 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 | iter = next; } free((char *)self - PRE_IVARS_ALIGN); } /* Required to use properties with the Apple runtime */ - (id)copyWithZone: (void *)zone { if OF_UNLIKELY (zone != NULL) { [self doesNotRecognizeSelector: _cmd]; abort(); } return [(id)self copy]; } - (id)mutableCopyWithZone: (void *)zone { if OF_UNLIKELY (zone != NULL) { [self doesNotRecognizeSelector: _cmd]; abort(); } return [(id)self mutableCopy]; |
︙ | ︙ | |||
1299 1300 1301 1302 1303 1304 1305 | } + (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } | | | | | | | 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 | } + (void)freeMemory: (void *)pointer { OF_UNRECOGNIZED_SELECTOR } + (id)retain { return self; } + (id)autorelease { return self; } + (unsigned int)retainCount { return OF_RETAIN_COUNT_MAX; } + (void)release { } + (void)dealloc { OF_UNRECOGNIZED_SELECTOR } + (id)copy { return self; } + (id)mutableCopyWithZone: (void *)zone { OF_UNRECOGNIZED_SELECTOR } /* Required to use ObjFW from Swift */ + (instancetype)allocWithZone: (void *)zone { if OF_UNLIKELY (zone != NULL) { [self doesNotRecognizeSelector: _cmd]; abort(); } return [self alloc]; } @end |
Modified src/OFOptionsParser.h from [b57dc17fb3] to [77474cff80].
︙ | ︙ | |||
116 117 118 119 120 121 122 | * accepted options, terminated with an option whose short * option is `\0` and long option is `nil`. * * @return A new, autoreleased OFOptionsParser */ + (instancetype)parserWithOptions: (const of_options_parser_option_t *)options; | | | | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | * accepted options, terminated with an option whose short * option is `\0` and long option is `nil`. * * @return A new, autoreleased OFOptionsParser */ + (instancetype)parserWithOptions: (const of_options_parser_option_t *)options; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFOptionsParser so that it accepts * the specified options. * * @param options An array of @ref of_options_parser_option_t specifying all * accepted options, terminated with an option whose short * option is `\0` and long option is `nil`. * * @return An initialized OFOptionsParser */ - (instancetype)initWithOptions: (const of_options_parser_option_t *)options OF_DESIGNATED_INITIALIZER; /*! * @brief Returns the next option. * * If the option is only available as a long option, `-` is returned. * Otherwise, the short option is returned, even if it was specified as a long |
︙ | ︙ |
Modified src/OFOptionsParser.m from [f1e270d342] to [652b61f6f7].
︙ | ︙ | |||
40 41 42 43 44 45 46 | @synthesize argument = _argument; + (instancetype)parserWithOptions: (const of_options_parser_option_t *)options { return [[[self alloc] initWithOptions: options] autorelease]; } | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | @synthesize argument = _argument; + (instancetype)parserWithOptions: (const of_options_parser_option_t *)options { return [[[self alloc] initWithOptions: options] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithOptions: (const of_options_parser_option_t *)options { self = [super init]; @try { size_t count = 0; const of_options_parser_option_t *iter; of_options_parser_option_t *iter2; |
︙ | ︙ |
Modified src/OFPair.h from [e6ee23e713] to [2a7841384c].
︙ | ︙ | |||
59 60 61 62 63 64 65 | /*! * @brief Initializes an already allocated OFPair with the specified objects. * * @param firstObject The first object for the pair * @param secondObject The second object for the pair * @return An initialized OFPair */ | | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | /*! * @brief Initializes an already allocated OFPair with the specified objects. * * @param firstObject The first object for the pair * @param secondObject The second object for the pair * @return An initialized OFPair */ - (instancetype)initWithFirstObject: (nullable FirstType)firstObject secondObject: (nullable SecondType)secondObject; #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # undef FirstType # undef SecondType #endif @end OF_ASSUME_NONNULL_END |
︙ | ︙ |
Modified src/OFPair.m from [2880b7d607] to [e5cb38f069].
︙ | ︙ | |||
23 24 25 26 27 28 29 | + (instancetype)pairWithFirstObject: (id)firstObject secondObject: (id)secondObject { return [[[self alloc] initWithFirstObject: firstObject secondObject: secondObject] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | + (instancetype)pairWithFirstObject: (id)firstObject secondObject: (id)secondObject { return [[[self alloc] initWithFirstObject: firstObject secondObject: secondObject] autorelease]; } - (instancetype)initWithFirstObject: (id)firstObject secondObject: (id)secondObject { self = [super init]; @try { _firstObject = [firstObject retain]; _secondObject = [secondObject retain]; } @catch (id e) { |
︙ | ︙ | |||
91 92 93 94 95 96 97 | OF_HASH_ADD_HASH(hash, [_secondObject hash]); OF_HASH_FINALIZE(hash); return hash; } | | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | OF_HASH_ADD_HASH(hash, [_secondObject hash]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutablePair alloc] initWithFirstObject: _firstObject secondObject: _secondObject]; } - (OFString *)description { return [OFString stringWithFormat: @"<<%@, %@>>", _firstObject, _secondObject]; } @end |
Modified src/OFPlugin.m from [5fa3fa154b] to [89bdff5a7e].
︙ | ︙ | |||
90 91 92 93 94 95 96 | exceptionWithClass: self]; } plugin->_handle = handle; return plugin; } | | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | exceptionWithClass: self]; } plugin->_handle = handle; return plugin; } - (instancetype)init { if (object_getClass(self) == [OFPlugin class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; |
︙ | ︙ |
Modified src/OFProcess.h from [b8f13557bc] to [b0f7aa5681].
︙ | ︙ | |||
114 115 116 117 118 119 120 | + (instancetype) processWithProgram: (OFString *)program programName: (OFString *)programName arguments: (nullable OFArray OF_GENERIC(OFString *) *)arguments environment: (nullable OFDictionary OF_GENERIC(OFString *, OFString *) *)environment; | | | > | | > | | | > | | | | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | + (instancetype) processWithProgram: (OFString *)program programName: (OFString *)programName arguments: (nullable OFArray OF_GENERIC(OFString *) *)arguments environment: (nullable OFDictionary OF_GENERIC(OFString *, OFString *) *)environment; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFProcess with the specified program * and invokes the program. * * @param program The program to execute. If it does not start with a slash, the * search path specified in PATH is used. * @return An initialized OFProcess. */ - (instancetype)initWithProgram: (OFString *)program; /*! * @brief Initializes an already allocated OFProcess with the specified program * and arguments and invokes the program. * * @param program The program to execute. If it does not start with a slash, the * search path specified in PATH is used. * @param arguments The arguments to pass to the program, or `nil` * @return An initialized OFProcess. */ - (instancetype) initWithProgram: (OFString *)program arguments: (nullable OFArray OF_GENERIC(OFString *) *)arguments; /*! * @brief Initializes an already allocated OFProcess with the specified program, * program name and arguments and invokes the program. * * @param program The program to execute. If it does not start with a slash, the * search path specified in PATH is used. * @param programName The program name for the program to invoke (argv[0]). * Usually, this is equal to program. * @param arguments The arguments to pass to the program, or `nil` * @return An initialized OFProcess. */ - (instancetype) initWithProgram: (OFString *)program programName: (OFString *)programName arguments: (nullable OFArray OF_GENERIC(OFString *) *)arguments; /*! * @brief Initializes an already allocated OFProcess with the specified program, * program name, arguments and environment and invokes the program. * * @param program The program to execute. If it does not start with a slash, the * search path specified in PATH is used. * @param programName The program name for the program to invoke (argv[0]). * Usually, this is equal to program. * @param arguments The arguments to pass to the program, or `nil` * @param environment The environment to pass to the program, or `nil`. If it * is not `nil`, the passed dictionary will be used to * override the environment. If you want to add to the * existing environment, you need to get the existing * environment first, copy it, modify it and then pass it. * @return An initialized OFProcess. */ - (instancetype) initWithProgram: (OFString *)program programName: (OFString *)programName arguments: (nullable OFArray OF_GENERIC(OFString *) *)arguments environment: (nullable OFDictionary OF_GENERIC(OFString *, OFString *) *)environment OF_DESIGNATED_INITIALIZER; /*! * @brief Closes the write direction of the process. * * This method needs to be called for some programs before data can be read, * since some programs don't start processing before the write direction is * closed. */ - (void)closeForWriting; @end OF_ASSUME_NONNULL_END |
Modified src/OFProcess.m from [7459e546ae] to [47e26e30a9].
︙ | ︙ | |||
91 92 93 94 95 96 97 | { return [[[self alloc] initWithProgram: program programName: programName arguments: arguments environment: environment] autorelease]; } | | | | | | | | | | | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | { return [[[self alloc] initWithProgram: program programName: programName arguments: arguments environment: environment] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithProgram: (OFString *)program { return [self initWithProgram: program programName: program arguments: nil environment: nil]; } - (instancetype)initWithProgram: (OFString *)program arguments: (OFArray *)arguments { return [self initWithProgram: program programName: program arguments: arguments environment: nil]; } - (instancetype)initWithProgram: (OFString *)program programName: (OFString *)programName arguments: (OFArray *)arguments { return [self initWithProgram: program programName: program arguments: arguments environment: nil]; } - (instancetype)initWithProgram: (OFString *)program programName: (OFString *)programName arguments: (OFArray *)arguments environment: (OFDictionary *)environment { self = [super init]; @try { #ifndef OF_WINDOWS void *pool = objc_autoreleasePoolPush(); const char *path; |
︙ | ︙ |
Modified src/OFRIPEMD160Hash.m from [9e827ae911] to [717962a6c4].
︙ | ︙ | |||
144 145 146 147 148 149 150 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } | | | | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; [self of_resetState]; return self; } - (void)dealloc { [self reset]; [super dealloc]; } - (id)copy { OFRIPEMD160Hash *copy = [[OFRIPEMD160Hash alloc] init]; memcpy(copy->_state, _state, sizeof(_state)); copy->_bits = _bits; memcpy(©->_buffer, &_buffer, sizeof(_buffer)); copy->_bufferLength = _bufferLength; |
︙ | ︙ |
Modified src/OFRecursiveMutex.m from [5791a36f8a] to [ed38788e90].
︙ | ︙ | |||
28 29 30 31 32 33 34 | @synthesize name = _name; + (instancetype)mutex { return [[[self alloc] init] autorelease]; } | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize name = _name; + (instancetype)mutex { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; if (!of_rmutex_new(&_rmutex)) { Class c = [self class]; [self release]; @throw [OFInitializationFailedException exceptionWithClass: c]; |
︙ | ︙ |
Modified src/OFRunLoop.m from [2cf7056bd3] to [03e94e120d].
︙ | ︙ | |||
754 755 756 757 758 759 760 | [runLoop->_readQueues removeObjectForKey: object]; } objc_autoreleasePoolPop(pool); } #endif | | | 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 | [runLoop->_readQueues removeObjectForKey: object]; } objc_autoreleasePoolPop(pool); } #endif - (instancetype)init { self = [super init]; @try { _timersQueue = [[OFSortedList alloc] init]; #ifdef OF_HAVE_THREADS _timersQueueLock = [[OFMutex alloc] init]; |
︙ | ︙ |
Modified src/OFSHA1Hash.m from [cd2db0fc50] to [f22e843ed9].
︙ | ︙ | |||
104 105 106 107 108 109 110 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } | | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; [self of_resetState]; return self; } - (void)dealloc { [self reset]; [super dealloc]; } - (id)copy { OFSHA1Hash *copy = [[OFSHA1Hash alloc] init]; memcpy(copy->_state, _state, sizeof(_state)); copy->_bits = _bits; memcpy(©->_buffer, &_buffer, sizeof(_buffer)); copy->_bufferLength = _bufferLength; |
︙ | ︙ |
Modified src/OFSHA224Or256Hash.m from [280841ab34] to [223f1ca854].
︙ | ︙ | |||
126 127 128 129 130 131 132 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { if ([self class] == [OFSHA224Or256Hash class]) { [self doesNotRecognizeSelector: _cmd]; abort(); |
︙ | ︙ | |||
152 153 154 155 156 157 158 | - (void)dealloc { [self reset]; [super dealloc]; } | | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | - (void)dealloc { [self reset]; [super dealloc]; } - (id)copy { OFSHA224Or256Hash *copy = [[[self class] alloc] init]; memcpy(copy->_state, _state, sizeof(_state)); copy->_bits = _bits; memcpy(©->_buffer, &_buffer, sizeof(_buffer)); copy->_bufferLength = _bufferLength; |
︙ | ︙ |
Modified src/OFSHA384Or512Hash.m from [6ff07dab9e] to [7ebbc5c21e].
︙ | ︙ | |||
137 138 139 140 141 142 143 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | } + (instancetype)cryptoHash { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { if ([self class] == [OFSHA384Or512Hash class]) { [self doesNotRecognizeSelector: _cmd]; abort(); |
︙ | ︙ | |||
163 164 165 166 167 168 169 | - (void)dealloc { [self reset]; [super dealloc]; } | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | - (void)dealloc { [self reset]; [super dealloc]; } - (id)copy { OFSHA384Or512Hash *copy = [[[self class] alloc] init]; memcpy(copy->_state, _state, sizeof(_state)); memcpy(copy->_bits, _bits, sizeof(_bits)); memcpy(©->_buffer, &_buffer, sizeof(_buffer)); copy->_bufferLength = _bufferLength; |
︙ | ︙ |
Modified src/OFSandbox.m from [0482993709] to [aa77760050].
︙ | ︙ | |||
302 303 304 305 306 307 308 | } - (bool)allowsBPF { return _allowsBPF; } | | | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | } - (bool)allowsBPF { return _allowsBPF; } - (id)copy { OFSandbox *copy = [[OFSandbox alloc] init]; copy->_allowsStdIO = _allowsStdIO; copy->_allowsReadingFiles = _allowsReadingFiles; copy->_allowsWritingFiles = _allowsWritingFiles; copy->_allowsCreatingFiles = _allowsCreatingFiles; |
︙ | ︙ |
Modified src/OFSeekableStream.m from [5b2fde875e] to [b98ac3f694].
︙ | ︙ | |||
20 21 22 23 24 25 26 | #include <stdlib.h> #include <stdio.h> #import "OFSeekableStream.h" @implementation OFSeekableStream | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #include <stdlib.h> #include <stdio.h> #import "OFSeekableStream.h" @implementation OFSeekableStream - (instancetype)init { if (object_getClass(self) == [OFSeekableStream class]) { @try { [self doesNotRecognizeSelector: _cmd]; abort(); } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/OFSerialization.h from [140cf6aa4f] to [678a1fbe4d].
︙ | ︙ | |||
30 31 32 33 34 35 36 | @protocol OFSerialization /*! * @brief Initializes the object with the specified XML element serialization. * * @param element An OFXMLElement with the serialized object * @return An initialized object */ | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | @protocol OFSerialization /*! * @brief Initializes the object with the specified XML element serialization. * * @param element An OFXMLElement with the serialized object * @return An initialized object */ - (instancetype)initWithSerialization: (OFXMLElement *)element; /*! * @brief Serializes the object into an XML element. * * @return The object serialized into an XML element */ - (OFXMLElement *)XMLElementBySerializing; |
︙ | ︙ |
Modified src/OFSet.h from [28701b2ea5] to [6c82eb5230].
︙ | ︙ | |||
108 109 110 111 112 113 114 | /*! * @brief Initializes an already allocated set with the specified set. * * @param set The set to initialize the set with * @return An initialized set with the specified set */ | | | | | | | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | /*! * @brief Initializes an already allocated set with the specified set. * * @param set The set to initialize the set with * @return An initialized set with the specified set */ - (instancetype)initWithSet: (OFSet OF_GENERIC(ObjectType) *)set; /*! * @brief Initializes an already allocated set with the specified array. * * @param array The array to initialize the set with * @return An initialized set with the specified array */ - (instancetype)initWithArray: (OFArray OF_GENERIC(ObjectType) *)array; /*! * @brief Initializes an already allocated set with the specified objects. * * @param firstObject The first object for the set * @return An initialized set with the specified objects */ - (instancetype)initWithObjects: (ObjectType)firstObject, ...; /*! * @brief Initializes an already allocated set with the specified objects. * * @param objects An array of objects for the set * @param count The number of objects in the specified array * @return An initialized set with the specified objects */ - (instancetype)initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects count: (size_t)count; /*! * @brief Initializes an already allocated set with the specified object and * va_list. * * @param firstObject The first object for the set * @param arguments A va_list with the other objects * @return An initialized set with the specified object and va_list */ - (instancetype)initWithObject: (ObjectType)firstObject arguments: (va_list)arguments; /*! * @brief Returns whether the receiver is a subset of the specified set. * * @return Whether the receiver is a subset of the specified set */ - (bool)isSubsetOfSet: (OFSet OF_GENERIC(ObjectType) *)set; |
︙ | ︙ |
Modified src/OFSet.m from [9a3d14535d] to [3a024855e7].
︙ | ︙ | |||
29 30 31 32 33 34 35 | Class isa; } placeholder; @interface OFSet_placeholder: OFSet @end @implementation OFSet_placeholder | | | | | | | | | | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | Class isa; } placeholder; @interface OFSet_placeholder: OFSet @end @implementation OFSet_placeholder - (instancetype)init { return (id)[[OFSet_hashtable alloc] init]; } - (instancetype)initWithSet: (OFSet *)set { return (id)[[OFSet_hashtable alloc] initWithSet: set]; } - (instancetype)initWithArray: (OFArray *)array { return (id)[[OFSet_hashtable alloc] initWithArray: array]; } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [[OFSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { return (id)[[OFSet_hashtable alloc] initWithObjects: objects count: count]; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { return (id)[[OFSet_hashtable alloc] initWithObject: firstObject arguments: arguments]; } - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFSet_hashtable alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
103 104 105 106 107 108 109 | @implementation OFSet + (void)initialize { if (self == [OFSet class]) placeholder.isa = [OFSet_placeholder class]; } | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | @implementation OFSet + (void)initialize { if (self == [OFSet class]) placeholder.isa = [OFSet_placeholder class]; } + (instancetype)alloc { if (self == [OFSet class]) return (id)&placeholder; return [super alloc]; } |
︙ | ︙ | |||
146 147 148 149 150 151 152 | + (instancetype)setWithObjects: (id const *)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } | | | | | | | | | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | + (instancetype)setWithObjects: (id const *)objects count: (size_t)count { return [[[self alloc] initWithObjects: objects count: count] autorelease]; } - (instancetype)init { if (object_getClass(self) == [OFSet class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; } abort(); } return [super init]; } - (instancetype)initWithSet: (OFSet *)set { OF_INVALID_INIT_METHOD } - (instancetype)initWithArray: (OFArray *)array { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { OF_INVALID_INIT_METHOD } - (instancetype)initWithObjects: (id)firstObject, ... { id ret; va_list arguments; va_start(arguments, firstObject); ret = [self initWithObject: firstObject arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } - (instancetype)initWithSerialization: (OFXMLElement *)element { OF_INVALID_INIT_METHOD } - (size_t)count { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
335 336 337 338 339 340 341 | [ret makeImmutable]; objc_autoreleasePoolPop(pool); return ret; } | | | | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | [ret makeImmutable]; objc_autoreleasePoolPop(pool); return ret; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableSet alloc] initWithSet: self]; } - (bool)isSubsetOfSet: (OFSet *)set { for (id object in self) |
︙ | ︙ |
Modified src/OFSet_hashtable.h from [1b1cdb3cf6] to [c639f48f81].
︙ | ︙ | |||
21 22 23 24 25 26 27 | @class OFMapTable; @interface OFSet_hashtable: OFSet { OFMapTable *_mapTable; } | | | 21 22 23 24 25 26 27 28 29 30 31 | @class OFMapTable; @interface OFSet_hashtable: OFSet { OFMapTable *_mapTable; } - (instancetype)initWithCapacity: (size_t)capacity; @end OF_ASSUME_NONNULL_END |
Modified src/OFSet_hashtable.m from [dab1aab8a3] to [59c9aa82a8].
︙ | ︙ | |||
57 58 59 60 61 62 63 | .release = release, .hash = hash, .equal = equal }; static const of_map_table_functions_t objectFunctions = { NULL }; @implementation OFSet_hashtable | | | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | .release = release, .hash = hash, .equal = equal }; static const of_map_table_functions_t objectFunctions = { NULL }; @implementation OFSet_hashtable - (instancetype)init { return [self initWithCapacity: 0]; } - (instancetype)initWithCapacity: (size_t)capacity { self = [super init]; @try { _mapTable = [[OFMapTable alloc] initWithKeyFunctions: keyFunctions objectFunctions: objectFunctions capacity: capacity]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSet: (OFSet *)set { size_t count; if (set == nil) return [self init]; @try { |
︙ | ︙ | |||
107 108 109 110 111 112 113 | [self release]; @throw e; } return self; } | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | [self release]; @throw e; } return self; } - (instancetype)initWithArray: (OFArray *)array { size_t count; if (array == nil) return self; @try { |
︙ | ︙ | |||
135 136 137 138 139 140 141 | [self release]; @throw e; } return self; } | | | | | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { self = [self initWithCapacity: count]; @try { for (size_t i = 0; i < count; i++) [_mapTable setObject: (void *)1 forKey: objects[i]]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments { self = [super init]; @try { id object; va_list argumentsCopy; size_t count; |
︙ | ︙ | |||
185 186 187 188 189 190 191 | [self release]; @throw e; } return self; } | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [self init]; @try { void *pool = objc_autoreleasePoolPush(); if ((![[element name] isEqual: @"OFSet"] && |
︙ | ︙ |
Modified src/OFSettings.h from [92ccb51f12] to [92c168909f].
︙ | ︙ | |||
48 49 50 51 52 53 54 | * * @param applicationName The name of the application whose settings should be * accessed * @return A new, autoreleased OFSettings instance */ + (instancetype)settingsWithApplicationName: (OFString *)applicationName; | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | * * @param applicationName The name of the application whose settings should be * accessed * @return A new, autoreleased OFSettings instance */ + (instancetype)settingsWithApplicationName: (OFString *)applicationName; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFSettings instance with the * specified application name. * * @param applicationName The name of the application whose settings should be * accessed * @return An initialized OFSettings instance */ - (instancetype)initWithApplicationName: (OFString *)applicationName OF_DESIGNATED_INITIALIZER; /*! * @brief Sets the specified path to the specified string. * * @param string The string to set * @param path The path to store the string at |
︙ | ︙ |
Modified src/OFSettings.m from [a8dee6588b] to [5a9246138a].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "OFSettings.h" #import "OFSettings_INIFile.h" #import "OFString.h" @implementation OFSettings @synthesize applicationName = _applicationName; | | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #import "OFSettings.h" #import "OFSettings_INIFile.h" #import "OFString.h" @implementation OFSettings @synthesize applicationName = _applicationName; + (instancetype)alloc { if (self == [OFSettings class]) return [OFSettings_INIFile alloc]; return [super alloc]; } + (instancetype)settingsWithApplicationName: (OFString *)applicationName { return [[[self alloc] initWithApplicationName: applicationName] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithApplicationName: (OFString *)applicationName { self = [super init]; @try { _applicationName = [applicationName copy]; } @catch (id e) { @throw e; |
︙ | ︙ |
Modified src/OFSettings_INIFile.m from [458ae98147] to [8cfaeaee2d].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "OFSettings_INIFile.h" #import "OFString.h" #import "OFArray.h" #import "OFINIFile.h" #import "OFSystemInfo.h" @implementation OFSettings_INIFile | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #import "OFSettings_INIFile.h" #import "OFString.h" #import "OFArray.h" #import "OFINIFile.h" #import "OFSystemInfo.h" @implementation OFSettings_INIFile - (instancetype)initWithApplicationName: (OFString *)applicationName { self = [super initWithApplicationName: applicationName]; @try { void *pool = objc_autoreleasePoolPush(); OFString *fileName; |
︙ | ︙ |
Modified src/OFStdIOStream.h from [791f773daf] to [4a5715f270].
︙ | ︙ | |||
42 43 44 45 46 47 48 | #else BPTR _handle; bool _closable; #endif bool _atEndOfStream; } | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | #else BPTR _handle; bool _closable; #endif bool _atEndOfStream; } - (instancetype)init OF_UNAVAILABLE; /*! * @brief Query the underlying terminal for the number of columns. * * @return The number of columns, or -1 if there is no underlying terminal or * the number of columns could not be queried */ |
︙ | ︙ |
Modified src/OFStdIOStream.m from [f210109307] to [3619228f8c].
︙ | ︙ | |||
126 127 128 129 130 131 132 | closable: outputClosable]; of_stderr = [[OFStdIOStream alloc] of_initWithHandle: error closable: errorClosable]; # endif } #endif | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | closable: outputClosable]; of_stderr = [[OFStdIOStream alloc] of_initWithHandle: error closable: errorClosable]; # endif } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } #ifndef OF_MORPHOS - (instancetype)of_initWithFileDescriptor: (int)fd { |
︙ | ︙ | |||
292 293 294 295 296 297 298 | _handle = 0; #endif [super close]; } | | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | _handle = 0; #endif [super close]; } - (instancetype)autorelease { return self; } - (instancetype)retain { return self; } - (void)release { } |
︙ | ︙ |
Modified src/OFStream.m from [815f2dd728] to [313554e809].
︙ | ︙ | |||
63 64 65 66 67 68 69 | + (void)initialize { if (self == [OFStream class]) signal(SIGPIPE, SIG_IGN); } #endif | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | + (void)initialize { if (self == [OFStream class]) signal(SIGPIPE, SIG_IGN); } #endif - (instancetype)init { if (object_getClass(self) == [OFStream class]) { @try { [self doesNotRecognizeSelector: _cmd]; abort(); } @catch (id e) { [self release]; |
︙ | ︙ | |||
99 100 101 102 103 104 105 | - (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length { OF_UNRECOGNIZED_SELECTOR } | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | - (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length { OF_UNRECOGNIZED_SELECTOR } - (id)copy { return [self retain]; } - (bool)isAtEndOfStream { if (_readBufferLength > 0) |
︙ | ︙ |
Modified src/OFString.h from [bb11f44cdb] to [54b5ea6d82].
︙ | ︙ | |||
363 364 365 366 367 368 369 | /*! * @brief Initializes an already allocated OFString from a UTF-8 encoded C * string. * * @param UTF8String A UTF-8 encoded C string to initialize the OFString with * @return An initialized OFString */ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | /*! * @brief Initializes an already allocated OFString from a UTF-8 encoded C * string. * * @param UTF8String A UTF-8 encoded C string to initialize the OFString with * @return An initialized OFString */ - (instancetype)initWithUTF8String: (const char *)UTF8String; /*! * @brief Initializes an already allocated OFString from a UTF-8 encoded C * string with the specified length. * * @param UTF8String A UTF-8 encoded C string to initialize the OFString with * @param UTF8StringLength The length of the UTF-8 encoded C string * @return An initialized OFString */ - (instancetype)initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength; /*! * @brief Initializes an already allocated OFString from an UTF-8 encoded C * string without copying it, if possible. * * @note Mutable versions always create a copy! * * @param UTF8String A UTF-8 encoded C string to initialize the OFString with * @param freeWhenDone Whether to free the C string when it is not needed * anymore * @return An initialized OFString */ - (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone; /*! * @brief Initializes an already allocated OFString from a C string with the * specified encoding. * * @param cString A C string to initialize the OFString with * @param encoding The encoding of the C string * @return An initialized OFString */ - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding; /*! * @brief Initializes an already allocated OFString from a C string with the * specified encoding and length. * * @param cString A C string to initialize the OFString with * @param encoding The encoding of the C string * @param cStringLength The length of the C string * @return An initialized OFString */ - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength; /*! * @brief Initializes an already allocated OFString from OFData with the * specified encoding. * * @param data OFData with the contents of the string * @param encoding The encoding in which the string is stored in the OFData * @return An initialized OFString */ - (instancetype)initWithData: (OFData *)data encoding: (of_string_encoding_t)encoding; /*! * @brief Initializes an already allocated OFString with another string. * * @param string A string to initialize the OFString with * @return An initialized OFString */ - (instancetype)initWithString: (OFString *)string; /*! * @brief Initializes an already allocated OFString with a Unicode string with * the specified length. * * @param characters An array of Unicode characters * @param length The length of the Unicode character array * @return An initialized OFString */ - (instancetype)initWithCharacters: (const of_unichar_t *)characters length: (size_t)length; /*! * @brief Initializes an already allocated OFString with a UTF-16 string. * * @param string The UTF-16 string * @return An initialized OFString */ - (instancetype)initWithUTF16String: (const char16_t *)string; /*! * @brief Initializes an already allocated OFString with a UTF-16 string with * the specified length. * * @param string The UTF-16 string * @param length The length of the UTF-16 string * @return An initialized OFString */ - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length; /*! * @brief Initializes an already allocated OFString with a UTF-16 string, * assuming the specified byte order if no byte order mark is found. * * @param string The UTF-16 string * @param byteOrder The byte order to assume if there is no byte order mark * @return An initialized OFString */ - (instancetype)initWithUTF16String: (const char16_t *)string byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a UTF-16 string with * the specified length, assuming the specified byte order if no byte * order mark is found. * * @param string The UTF-16 string * @param length The length of the UTF-16 string * @param byteOrder The byte order to assume if there is no byte order mark * @return An initialized OFString */ - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a UTF-32 string. * * @param string The UTF-32 string * @return An initialized OFString */ - (instancetype)initWithUTF32String: (const char32_t *)string; /*! * @brief Initializes an already allocated OFString with a UTF-32 string with * the specified length * * @param string The UTF-32 string * @param length The length of the UTF-32 string * @return An initialized OFString */ - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length; /*! * @brief Initializes an already allocated OFString with a UTF-32 string, * assuming the specified byte order if no byte order mark is found. * * @param string The UTF-32 string * @param byteOrder The byte order to assume if there is no byte order mark * @return An initialized OFString */ - (instancetype)initWithUTF32String: (const char32_t *)string byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a UTF-32 string with * the specified length, assuming the specified byte order if no byte * order mark is found. * * @param string The UTF-32 string * @param length The length of the UTF-32 string * @param byteOrder The byte order to assume if there is no byte order mark * @return An initialized OFString */ - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a format string. * * See printf for the format syntax. As an addition, `%@` is available as * format specifier for objects, `%C` for `of_unichar_t` and `%S` for * `const of_unichar_t *`. * * @param format A string used as format to initialize the OFString * @return An initialized OFString */ - (instancetype)initWithFormat: (OFConstantString *)format, ...; /*! * @brief Initializes an already allocated OFString with a format string. * * See printf for the format syntax. As an addition, `%@` is available as * format specifier for objects, `%C` for `of_unichar_t` and `%S` for * `const of_unichar_t *`. * * @param format A string used as format to initialize the OFString * @param arguments The arguments used in the format string * @return An initialized OFString */ - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments; #ifdef OF_HAVE_FILES /*! * @brief Initializes an already allocated OFString with the contents of the * specified file in the specified encoding. * * @param path The path to the file * @return An initialized OFString */ - (instancetype)initWithContentsOfFile: (OFString *)path; /*! * @brief Initializes an already allocated OFString with the contents of the * specified file in the specified encoding. * * @param path The path to the file * @param encoding The encoding of the file * @return An initialized OFString */ - (instancetype)initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding; #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) /*! * @brief Initializes an already allocated OFString with the contents of the * specified URL. * * If the URL's scheme is file, it tries UTF-8 encoding. * * If the URL's scheme is http(s), it tries to detect the encoding from the HTTP * headers. If it could not detect the encoding using the HTTP headers, it tries * UTF-8. * * @param URL The URL to the contents for the string * @return An initialized OFString */ - (instancetype)initWithContentsOfURL: (OFURL *)URL; /*! * @brief Initializes an already allocated OFString with the contents of the * specified URL in the specified encoding. * * @param URL The URL to the contents for the string * @param encoding The encoding to assume * @return An initialized OFString */ - (instancetype)initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding; #endif /*! * @brief Writes the OFString into the specified C string with the specified * encoding. * * @param cString The C string to write into |
︙ | ︙ |
Modified src/OFString.m from [661e4352a9] to [0cbd68fca6].
︙ | ︙ | |||
374 375 376 377 378 379 380 | Class isa; } placeholder; @interface OFString_placeholder: OFString @end @implementation OFString_placeholder | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 | Class isa; } placeholder; @interface OFString_placeholder: OFString @end @implementation OFString_placeholder - (instancetype)init { return (id)[[OFString_UTF8 alloc] init]; } - (instancetype)initWithUTF8String: (const char *)UTF8String { id string; size_t length; void *storage; length = strlen(UTF8String); string = of_alloc_object([OFString_UTF8 class], length + 1, 1, &storage); return (id)[string of_initWithUTF8String: UTF8String length: length storage: storage]; } - (instancetype)initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { id string; void *storage; string = of_alloc_object([OFString_UTF8 class], UTF8StringLength + 1, 1, &storage); return (id)[string of_initWithUTF8String: UTF8String length: UTF8StringLength storage: storage]; } - (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { return (id)[[OFString_UTF8 alloc] initWithUTF8StringNoCopy: UTF8String freeWhenDone: freeWhenDone]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { if (encoding == OF_STRING_ENCODING_UTF_8) { id string; size_t length; void *storage; length = strlen(cString); string = of_alloc_object([OFString_UTF8 class], length + 1, 1, &storage); return (id)[string of_initWithUTF8String: cString length: length storage: storage]; } return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { if (encoding == OF_STRING_ENCODING_UTF_8) { id string; void *storage; string = of_alloc_object([OFString_UTF8 class], cStringLength + 1, 1, &storage); return (id)[string of_initWithUTF8String: cString length: cStringLength storage: storage]; } return (id)[[OFString_UTF8 alloc] initWithCString: cString encoding: encoding length: cStringLength]; } - (instancetype)initWithData: (OFData *)data encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithData: data encoding: encoding]; } - (instancetype)initWithString: (OFString *)string { return (id)[[OFString_UTF8 alloc] initWithString: string]; } - (instancetype)initWithCharacters: (const of_unichar_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithCharacters: string length: length]; } - (instancetype)initWithUTF16String: (const char16_t *)string { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string length: length]; } - (instancetype)initWithUTF16String: (const char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string byteOrder: byteOrder]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF16String: string length: length byteOrder: byteOrder]; } - (instancetype)initWithUTF32String: (const char32_t *)string { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string length: length]; } - (instancetype)initWithUTF32String: (const char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string byteOrder: byteOrder]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { return (id)[[OFString_UTF8 alloc] initWithUTF32String: string length: length byteOrder: byteOrder]; } - (instancetype)initWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); ret = [[OFString_UTF8 alloc] initWithFormat: format arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { return (id)[[OFString_UTF8 alloc] initWithFormat: format arguments: arguments]; } #ifdef OF_HAVE_FILES - (instancetype)initWithContentsOfFile: (OFString *)path { return (id)[[OFString_UTF8 alloc] initWithContentsOfFile: path]; } - (instancetype)initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithContentsOfFile: path encoding: encoding]; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { return (id)[[OFString_UTF8 alloc] initWithContentsOfURL: URL]; } - (instancetype)initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { return (id)[[OFString_UTF8 alloc] initWithContentsOfURL: URL encoding: encoding]; } #endif - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFString_UTF8 alloc] initWithSerialization: element]; } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (void)release { } |
︙ | ︙ | |||
621 622 623 624 625 626 627 | #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) if ((cLocale = newlocale(LC_ALL_MASK, "C", NULL)) == NULL) @throw [OFInitializationFailedException exceptionWithClass: self]; #endif } | | | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 | #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) if ((cLocale = newlocale(LC_ALL_MASK, "C", NULL)) == NULL) @throw [OFInitializationFailedException exceptionWithClass: self]; #endif } + (instancetype)alloc { if (self == [OFString class]) return (id)&placeholder; return [super alloc]; } |
︙ | ︙ | |||
804 805 806 807 808 809 810 | first = false; } return ret; } | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 | first = false; } return ret; } - (instancetype)init { if (object_getClass(self) == [OFString class]) { @try { [self doesNotRecognizeSelector: _cmd]; } @catch (id e) { [self release]; @throw e; } abort(); } return [super init]; } - (instancetype)initWithUTF8String: (const char *)UTF8String { return [self initWithCString: UTF8String encoding: OF_STRING_ENCODING_UTF_8 length: strlen(UTF8String)]; } - (instancetype)initWithUTF8String: (const char *)UTF8String length: (size_t)UTF8StringLength { return [self initWithCString: UTF8String encoding: OF_STRING_ENCODING_UTF_8 length: UTF8StringLength]; } - (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { return [self initWithUTF8String: UTF8String]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding { return [self initWithCString: cString encoding: encoding length: strlen(cString)]; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { OF_INVALID_INIT_METHOD } - (instancetype)initWithData: (OFData *)data encoding: (of_string_encoding_t)encoding { @try { if ([data itemSize] != 1) @throw [OFInvalidArgumentException exception]; self = [self initWithCString: [data items] encoding: encoding length: [data count]]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithString: (OFString *)string { OF_INVALID_INIT_METHOD } - (instancetype)initWithCharacters: (const of_unichar_t *)string length: (size_t)length { OF_INVALID_INIT_METHOD } - (instancetype)initWithUTF16String: (const char16_t *)string { return [self initWithUTF16String: string length: of_string_utf16_length(string) byteOrder: OF_BYTE_ORDER_NATIVE]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length { return [self initWithUTF16String: string length: length byteOrder: OF_BYTE_ORDER_NATIVE]; } - (instancetype)initWithUTF16String: (const char16_t *)string byteOrder: (of_byte_order_t)byteOrder { return [self initWithUTF16String: string length: of_string_utf16_length(string) byteOrder: byteOrder]; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { OF_INVALID_INIT_METHOD } - (instancetype)initWithUTF32String: (const char32_t *)string { return [self initWithUTF32String: string length: of_string_utf32_length(string) byteOrder: OF_BYTE_ORDER_NATIVE]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length { return [self initWithUTF32String: string length: length byteOrder: OF_BYTE_ORDER_NATIVE]; } - (instancetype)initWithUTF32String: (const char32_t *)string byteOrder: (of_byte_order_t)byteOrder { return [self initWithUTF32String: string length: of_string_utf32_length(string) byteOrder: byteOrder]; } - (instancetype)initWithUTF32String: (const char32_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { OF_INVALID_INIT_METHOD } - (instancetype)initWithFormat: (OFConstantString *)format, ... { id ret; va_list arguments; va_start(arguments, format); ret = [self initWithFormat: format arguments: arguments]; va_end(arguments); return ret; } - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { OF_INVALID_INIT_METHOD } #ifdef OF_HAVE_FILES - (instancetype)initWithContentsOfFile: (OFString *)path { return [self initWithContentsOfFile: path encoding: OF_STRING_ENCODING_UTF_8]; } - (instancetype)initWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding { char *tmp; of_offset_t fileSize; @try { OFFile *file; |
︙ | ︙ | |||
1020 1021 1022 1023 1024 1025 1026 | [self freeMemory: tmp]; return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) | | | | | 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 | [self freeMemory: tmp]; return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { return [self initWithContentsOfURL: URL encoding: OF_STRING_ENCODING_AUTODETECT]; } - (instancetype)initWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding { void *pool = objc_autoreleasePoolPush(); OFString *scheme = [URL scheme]; # ifdef OF_HAVE_FILES if ([scheme isEqual: @"file"]) { if (encoding == OF_STRING_ENCODING_AUTODETECT) |
︙ | ︙ | |||
1049 1050 1051 1052 1053 1054 1055 | objc_autoreleasePoolPop(pool); return self; } #endif | | | 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 | objc_autoreleasePoolPop(pool); return self; } #endif - (instancetype)initWithSerialization: (OFXMLElement *)element { @try { void *pool = objc_autoreleasePoolPush(); if (![[element namespace] isEqual: OF_SERIALIZATION_NS]) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
1496 1497 1498 1499 1500 1501 1502 | } objc_autoreleasePoolPop(pool); return true; } | | | | 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 | } objc_autoreleasePoolPop(pool); return true; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableString alloc] initWithString: self]; } - (of_comparison_result_t)compare: (id <OFComparing>)object { void *pool; |
︙ | ︙ |
Modified src/OFString_UTF8.m from [62af83b584] to [3425587555].
︙ | ︙ | |||
168 169 170 171 172 173 174 | if (++index > length) return OF_NOT_FOUND; return index; } @implementation OFString_UTF8 | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | if (++index > length) return OF_NOT_FOUND; return index; } @implementation OFString_UTF8 - (instancetype)init { self = [super init]; @try { _s = &_storage; _s->cString = [self allocMemoryWithSize: 1]; |
︙ | ︙ | |||
222 223 224 225 226 227 228 | [self release]; @throw e; } return self; } | | | | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | [self release]; @throw e; } return self; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength { self = [super init]; @try { const char16_t *table; size_t tableOffset, j; |
︙ | ︙ | |||
386 387 388 389 390 391 392 | [self release]; @throw e; } return self; } | | | | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | [self release]; @throw e; } return self; } - (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String freeWhenDone: (bool)freeWhenDone { self = [super init]; @try { size_t UTF8StringLength = strlen(UTF8String); if (UTF8StringLength >= 3 && |
︙ | ︙ | |||
424 425 426 427 428 429 430 | [self release]; @throw e; } return self; } | | | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 | [self release]; @throw e; } return self; } - (instancetype)initWithString: (OFString *)string { self = [super init]; @try { _s = &_storage; _s->cStringLength = [string UTF8StringLength]; |
︙ | ︙ | |||
451 452 453 454 455 456 457 | [self release]; @throw e; } return self; } | | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | [self release]; @throw e; } return self; } - (instancetype)initWithCharacters: (const of_unichar_t *)characters length: (size_t)length { self = [super init]; @try { size_t j; _s = &_storage; |
︙ | ︙ | |||
495 496 497 498 499 500 501 | [self release]; @throw e; } return self; } | | | | | 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | [self release]; @throw e; } return self; } - (instancetype)initWithUTF16String: (const char16_t *)string length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { size_t j; bool swap = false; |
︙ | ︙ | |||
580 581 582 583 584 585 586 | [self release]; @throw e; } return self; } | | | | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | [self release]; @throw e; } return self; } - (instancetype)initWithUTF32String: (const char32_t *)characters length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { size_t j; bool swap = false; |
︙ | ︙ | |||
647 648 649 650 651 652 653 | [self release]; @throw e; } return self; } | | | | 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 | [self release]; @throw e; } return self; } - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { self = [super init]; @try { char *tmp; int cStringLength; |
︙ | ︙ |
Modified src/OFSystemInfo.m from [254f78a8f6] to [5a19cbf413].
︙ | ︙ | |||
127 128 129 130 131 132 133 | # if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) if ((numberOfCPUs = sysconf(_SC_NPROCESSORS_CONF)) < 1) # endif numberOfCPUs = 1; #endif } | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | # if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) if ((numberOfCPUs = sysconf(_SC_NPROCESSORS_CONF)) < 1) # endif numberOfCPUs = 1; #endif } + (instancetype)alloc { OF_UNRECOGNIZED_SELECTOR } + (size_t)pageSize { return pageSize; |
︙ | ︙ |
Modified src/OFTCPSocket.m from [bfcab86676] to [f8b1b83a89].
︙ | ︙ | |||
77 78 79 80 81 82 83 | id _context; # ifdef OF_HAVE_BLOCKS of_tcp_socket_async_connect_block_t _block; # endif id _exception; } | | | | | | | | | | | | | > | | | | | | | | | | | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | id _context; # ifdef OF_HAVE_BLOCKS of_tcp_socket_async_connect_block_t _block; # endif id _exception; } - (instancetype)initWithSourceThread: (OFThread *)sourceThread socket: (OFTCPSocket *)socket host: (OFString *)host port: (uint16_t)port target: (id)target selector: (SEL)selector context: (id)context; # ifdef OF_HAVE_BLOCKS - (instancetype)initWithSourceThread: (OFThread *)sourceThread socket: (OFTCPSocket *)socket host: (OFString *)host port: (uint16_t)port block: (of_tcp_socket_async_connect_block_t) block; # endif @end @implementation OFTCPSocket_ConnectThread - (instancetype)initWithSourceThread: (OFThread *)sourceThread socket: (OFTCPSocket *)socket host: (OFString *)host port: (uint16_t)port target: (id)target selector: (SEL)selector context: (id)context { self = [super init]; @try { _sourceThread = [sourceThread retain]; _socket = [socket retain]; _host = [host copy]; _port = port; _target = [target retain]; _selector = selector; _context = [context retain]; } @catch (id e) { [self release]; @throw e; } return self; } # ifdef OF_HAVE_BLOCKS - (instancetype)initWithSourceThread: (OFThread *)sourceThread socket: (OFTCPSocket *)socket host: (OFString *)host port: (uint16_t)port block: (of_tcp_socket_async_connect_block_t)block { self = [super init]; @try { _sourceThread = [sourceThread retain]; _socket = [socket retain]; _host = [host copy]; |
︙ | ︙ | |||
225 226 227 228 229 230 231 | } + (uint16_t)SOCKS5Port { return defaultSOCKS5Port; } | | | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | } + (uint16_t)SOCKS5Port { return defaultSOCKS5Port; } - (instancetype)init { self = [super init]; @try { _socket = INVALID_SOCKET; _SOCKS5Host = [defaultSOCKS5Host copy]; _SOCKS5Port = defaultSOCKS5Port; |
︙ | ︙ |
Modified src/OFTLSSocket.h from [ece0928c2a] to [19564dc0db].
︙ | ︙ | |||
89 90 91 92 93 94 95 | /*! * @brief Initializes the TLS socket with the specified TCP socket as its * underlying socket. * * @param socket The TCP socket to use as underlying socket */ | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | /*! * @brief Initializes the TLS socket with the specified TCP socket as its * underlying socket. * * @param socket The TCP socket to use as underlying socket */ - (instancetype)initWithSocket: (OFTCPSocket *)socket; /*! * @brief Initiates the TLS handshake. * * @note This is only useful if you used @ref initWithSocket: to start TLS on * a TCP socket which is already connected! * |
︙ | ︙ |
Modified src/OFTarArchive.h from [1f7bc982dd] to [c8036d2b06].
︙ | ︙ | |||
72 73 74 75 76 77 78 | * @param stream A stream from which the tar archive will be read. * For append mode, this needs to be an OFSeekableStream. * @param mode The mode for the tar file. Valid modes are "r" for reading, * "w" for creating a new file and "a" for appending to an existing * archive. * @return An initialized OFTarArchive */ | | | | | | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | * @param stream A stream from which the tar archive will be read. * For append mode, this needs to be an OFSeekableStream. * @param mode The mode for the tar file. Valid modes are "r" for reading, * "w" for creating a new file and "a" for appending to an existing * archive. * @return An initialized OFTarArchive */ - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode OF_DESIGNATED_INITIALIZER; #ifdef OF_HAVE_FILES /*! * @brief Initializes an already allocated OFTarArchive object with the * specified file. * * @param path The path to the tar archive * @param mode The mode for the tar file. Valid modes are "r" for reading, * "w" for creating a new file and "a" for appending to an existing * archive. * @return An initialized OFTarArchive */ - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode; #endif /*! * @brief Returns the next entry from the tar archive or `nil` if all entries * have been read. * * @note This is only available in read mode. |
︙ | ︙ |
Modified src/OFTarArchive.m from [4f6abee812] to [deb3b00a60].
︙ | ︙ | |||
37 38 39 40 41 42 43 | { OFTarArchiveEntry *_entry; OF_KINDOF(OFStream *) _stream; uint64_t _toRead; bool _atEndOfStream; } | | | | | | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | { OFTarArchiveEntry *_entry; OF_KINDOF(OFStream *) _stream; uint64_t _toRead; bool _atEndOfStream; } - (instancetype)initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry; - (void)of_skip; @end @interface OFTarArchive_FileWriteStream: OFStream { OFTarArchiveEntry *_entry; OFStream *_stream; uint64_t _toWrite; } - (instancetype)initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry; @end @implementation OFTarArchive: OFObject + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } #ifdef OF_HAVE_FILES + (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode { return [[[self alloc] initWithPath: path mode: mode] autorelease]; } #endif - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { self = [super init]; @try { _stream = [stream retain]; if ([mode isEqual: @"r"]) |
︙ | ︙ | |||
121 122 123 124 125 126 127 | @throw e; } return self; } #ifdef OF_HAVE_FILES | | | | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | @throw e; } return self; } #ifdef OF_HAVE_FILES - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode { OFFile *file; if ([mode isEqual: @"a"]) file = [[OFFile alloc] initWithPath: path mode: @"r+"]; else |
︙ | ︙ | |||
258 259 260 261 262 263 264 | [_stream release]; _stream = nil; } @end @implementation OFTarArchive_FileReadStream | | | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | [_stream release]; _stream = nil; } @end @implementation OFTarArchive_FileReadStream - (instancetype)initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry { self = [super init]; @try { _entry = [entry copy]; _stream = [stream retain]; _toRead = [entry size]; |
︙ | ︙ | |||
380 381 382 383 384 385 386 | [_stream readIntoBuffer: buffer exactLength: 512 - (size % 512)]; } } @end @implementation OFTarArchive_FileWriteStream | | | | 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 | [_stream readIntoBuffer: buffer exactLength: 512 - (size % 512)]; } } @end @implementation OFTarArchive_FileWriteStream - (instancetype)initWithStream: (OFStream *)stream entry: (OFTarArchiveEntry *)entry { self = [super init]; @try { _entry = [entry copy]; _stream = [stream retain]; _toWrite = [entry size]; |
︙ | ︙ |
Modified src/OFTarArchiveEntry.h from [1927c987a7] to [7281b80cf5].
︙ | ︙ | |||
127 128 129 130 131 132 133 | * @brief Creates a new OFTarArchiveEntry with the specified file name. * * @param fileName The file name for the OFTarArchiveEntry * @return A new, autoreleased OFTarArchiveEntry */ + (instancetype)entryWithFileName: (OFString *)fileName; | | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | * @brief Creates a new OFTarArchiveEntry with the specified file name. * * @param fileName The file name for the OFTarArchiveEntry * @return A new, autoreleased OFTarArchiveEntry */ + (instancetype)entryWithFileName: (OFString *)fileName; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFTarArchiveEntry with the specified * file name. * * @param fileName The file name for the OFTarArchiveEntry * @return An initialized OFTarArchiveEntry */ - (instancetype)initWithFileName: (OFString *)fileName; @end OF_ASSUME_NONNULL_END #import "OFMutableTarArchiveEntry.h" |
Modified src/OFTarArchiveEntry.m from [7043b6c404] to [77919567f7].
︙ | ︙ | |||
72 73 74 75 76 77 78 | @implementation OFTarArchiveEntry + (instancetype)entryWithFileName: (OFString *)fileName { return [[[self alloc] initWithFileName: fileName] autorelease]; } | | | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | @implementation OFTarArchiveEntry + (instancetype)entryWithFileName: (OFString *)fileName { return [[[self alloc] initWithFileName: fileName] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_initWithHeader: (unsigned char [512])header { self = [super init]; |
︙ | ︙ | |||
137 138 139 140 141 142 143 | [self release]; @throw e; } return self; } | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | [self release]; @throw e; } return self; } - (instancetype)initWithFileName: (OFString *)fileName { self = [super init]; @try { _fileName = [fileName copy]; _type = OF_TAR_ARCHIVE_ENTRY_TYPE_FILE; _mode = 0644; |
︙ | ︙ | |||
164 165 166 167 168 169 170 | [_targetFileName release]; [_owner release]; [_group release]; [super dealloc]; } | | | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | [_targetFileName release]; [_owner release]; [_group release]; [super dealloc]; } - (id)copy { return [self retain]; } - (id)mutableCopy { OFTarArchiveEntry *copy = [[OFMutableTarArchiveEntry alloc] initWithFileName: _fileName]; @try { copy->_mode = _mode; copy->_size = _size; |
︙ | ︙ |
Modified src/OFThread.h from [2fd0087f7e] to [42f39cebaf].
︙ | ︙ | |||
189 190 191 192 193 194 195 | # ifdef OF_HAVE_BLOCKS /*! * @brief Initializes an already allocated thread with the specified block. * * @param threadBlock A block which is executed by the thread * @return An initialized OFThread. */ | | | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | # ifdef OF_HAVE_BLOCKS /*! * @brief Initializes an already allocated thread with the specified block. * * @param threadBlock A block which is executed by the thread * @return An initialized OFThread. */ - (instancetype)initWithThreadBlock: (of_thread_block_t)threadBlock; # endif /*! * @brief The main routine of the thread. You need to reimplement this! * * @return The object the join method should return when called for this thread */ |
︙ | ︙ | |||
266 267 268 269 270 271 272 | * * @note This has to be set before the thread is started! * * @param stackSize The stack size for the thread */ - (void)setStackSize: (size_t)stackSize; #else | | | 266 267 268 269 270 271 272 273 274 275 276 277 | * * @note This has to be set before the thread is started! * * @param stackSize The stack size for the thread */ - (void)setStackSize: (size_t)stackSize; #else - (instancetype)init OF_UNAVAILABLE; #endif @end OF_ASSUME_NONNULL_END |
Modified src/OFThread.m from [41a9132f9a] to [2b6b7f737c].
︙ | ︙ | |||
303 304 305 306 307 308 309 | mainThread->_thread = of_thread_current(); if (!of_tlskey_set(threadSelfKey, mainThread)) @throw [OFInitializationFailedException exceptionWithClass: self]; } | | | | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 | mainThread->_thread = of_thread_current(); if (!of_tlskey_set(threadSelfKey, mainThread)) @throw [OFInitializationFailedException exceptionWithClass: self]; } - (instancetype)init { self = [super init]; @try { if (!of_thread_attr_init(&_attr)) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } @catch (id e) { [self release]; @throw e; } return self; } # ifdef OF_HAVE_BLOCKS - (instancetype)initWithThreadBlock: (of_thread_block_t)threadBlock { self = [self init]; @try { _threadBlock = [threadBlock copy]; } @catch (id e) { [self release]; |
︙ | ︙ | |||
383 384 385 386 387 388 389 | @throw [OFThreadJoinFailedException exceptionWithThread: self]; _running = OF_THREAD_NOT_RUNNING; return _returnValue; } | | | 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 | @throw [OFThreadJoinFailedException exceptionWithThread: self]; _running = OF_THREAD_NOT_RUNNING; return _returnValue; } - (id)copy { return [self retain]; } - (OFRunLoop *)runLoop { # if defined(OF_HAVE_ATOMIC_OPS) && !defined(__clang_analyzer__) |
︙ | ︙ | |||
456 457 458 459 460 461 462 | # ifdef OF_HAVE_BLOCKS [_threadBlock release]; # endif [super dealloc]; } #else | | | 456 457 458 459 460 461 462 463 464 465 466 467 468 | # ifdef OF_HAVE_BLOCKS [_threadBlock release]; # endif [super dealloc]; } #else - (instancetype)init { OF_INVALID_INIT_METHOD } #endif @end |
Modified src/OFThreadPool.h from [5da8ae2890] to [eee48469e5].
︙ | ︙ | |||
73 74 75 76 77 78 79 | /*! * @brief Initializes an already allocated OFThreadPool with the specified * number of threads. * * @param size The number of threads for the pool * @return An initialized OFThreadPool with the specified number of threads */ | | | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | /*! * @brief Initializes an already allocated OFThreadPool with the specified * number of threads. * * @param size The number of threads for the pool * @return An initialized OFThreadPool with the specified number of threads */ - (instancetype)initWithSize: (size_t)size OF_DESIGNATED_INITIALIZER; /*! * @brief Execute the specified selector on the specified target with the * specified object as soon as a thread is ready. * * @param target The target on which to perform the selector * @param selector The selector to perform on the target |
︙ | ︙ |
Modified src/OFThreadPool.m from [2aa1978876] to [aa9af4f131].
︙ | ︙ | |||
29 30 31 32 33 34 35 | SEL _selector; id _object; #ifdef OF_HAVE_BLOCKS of_thread_pool_block_t _block; #endif } | | | | | | | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | SEL _selector; id _object; #ifdef OF_HAVE_BLOCKS of_thread_pool_block_t _block; #endif } - (instancetype)initWithTarget: (id)target selector: (SEL)selector object: (id)object; #ifdef OF_HAVE_BLOCKS - (instancetype)initWithBlock: (of_thread_pool_block_t)block; #endif - (void)perform; @end @implementation OFThreadPoolJob - (instancetype)initWithTarget: (id)target selector: (SEL)selector object: (id)object { self = [super init]; @try { _target = [target retain]; _selector = selector; _object = [object retain]; } @catch (id e) { [self release]; @throw e; } return self; } #ifdef OF_HAVE_BLOCKS - (instancetype)initWithBlock: (of_thread_pool_block_t)block { self = [super init]; @try { _block = [block copy]; } @catch (id e) { [self release]; |
︙ | ︙ | |||
106 107 108 109 110 111 112 | OFCondition *_queueCondition, *_countCondition; @public volatile bool _terminate; volatile int *_doneCount; } + (instancetype)threadWithThreadPool: (OFThreadPool *)threadPool; | | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | OFCondition *_queueCondition, *_countCondition; @public volatile bool _terminate; volatile int *_doneCount; } + (instancetype)threadWithThreadPool: (OFThreadPool *)threadPool; - (instancetype)initWithThreadPool: (OFThreadPool *)threadPool; @end @implementation OFThreadPoolThread + (instancetype)threadWithThreadPool: (OFThreadPool *)threadPool { return [[[self alloc] initWithThreadPool: threadPool] autorelease]; } - (instancetype)initWithThreadPool: (OFThreadPool *)threadPool { self = [super init]; @try { _queue = [threadPool->_queue retain]; _queueCondition = [threadPool->_queueCondition retain]; _countCondition = [threadPool->_countCondition retain]; |
︙ | ︙ | |||
224 225 226 227 228 229 230 | } + (instancetype)threadPoolWithSize: (size_t)size { return [[[self alloc] initWithSize: size] autorelease]; } | | | | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | } + (instancetype)threadPoolWithSize: (size_t)size { return [[[self alloc] initWithSize: size] autorelease]; } - (instancetype)init { return [self initWithSize: [OFSystemInfo numberOfCPUs]]; } - (instancetype)initWithSize: (size_t)size { self = [super init]; @try { _size = size; _threads = [[OFMutableArray alloc] init]; _queue = [[OFList alloc] init]; |
︙ | ︙ |
Modified src/OFTimer.h from [5422596386] to [47d5c258ad].
︙ | ︙ | |||
299 300 301 302 303 304 305 | * @return A new, autoreleased timer */ + (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval repeats: (bool)repeats block: (of_timer_block_t)block; #endif | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | * @return A new, autoreleased timer */ + (instancetype)timerWithTimeInterval: (of_time_interval_t)timeInterval repeats: (bool)repeats block: (of_timer_block_t)block; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is * a repeating timer * @param target The target on which to call the selector * @param selector The selector to call on the target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector repeats: (bool)repeats; /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is * a repeating timer * @param target The target on which to call the selector * @param selector The selector to call on the target * @param object An object to pass when calling the selector on the target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (nullable id)object repeats: (bool)repeats; /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is * a repeating timer * @param target The target on which to call the selector * @param selector The selector to call on the target * @param object1 The first object to pass when calling the selector on the * target * @param object2 The second object to pass when calling the selector on the * target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (nullable id)object1 object: (nullable id)object2 repeats: (bool)repeats; /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is * a repeating timer * @param target The target on which to call the selector * @param selector The selector to call on the target * @param object1 The first object to pass when calling the selector on the * target * @param object2 The second object to pass when calling the selector on the * target * @param object3 The third object to pass when calling the selector on the * target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (nullable id)object1 object: (nullable id)object2 object: (nullable id)object3 repeats: (bool)repeats; /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is |
︙ | ︙ | |||
410 411 412 413 414 415 416 | * @param object3 The third object to pass when calling the selector on the * target * @param object4 The fourth object to pass when calling the selector on the * target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ | | | | | | | | | | | | | | | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 | * @param object3 The third object to pass when calling the selector on the * target * @param object4 The fourth object to pass when calling the selector on the * target * @param repeats Whether the timer repeats after it has been executed * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (nullable id)object1 object: (nullable id)object2 object: (nullable id)object3 object: (nullable id)object4 repeats: (bool)repeats; #ifdef OF_HAVE_BLOCKS /*! * @brief Initializes an already allocated timer with the specified time * interval. * * @param fireDate The date at which the timer should fire * @param interval The time interval after which to repeat the timer, if it is * a repeating timer * @param repeats Whether the timer repeats after it has been executed * @param block The block to invoke when the timer fires * @return An initialized timer */ - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval repeats: (bool)repeats block: (of_timer_block_t)block; #endif /*! * @brief Fires the timer, meaning it will execute the specified selector on the * target. */ - (void)fire; |
︙ | ︙ |
Modified src/OFTimer.m from [c9ab85ab8c] to [a3b64a1457].
︙ | ︙ | |||
311 312 313 314 315 316 317 | [timer retain]; objc_autoreleasePoolPop(pool); return [timer autorelease]; } #endif | | | 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 | [timer retain]; objc_autoreleasePoolPop(pool); return [timer autorelease]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target |
︙ | ︙ | |||
352 353 354 355 356 357 358 | [self release]; @throw e; } return self; } | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | [self release]; @throw e; } return self; } - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector repeats: (bool)repeats { return [self of_initWithFireDate: fireDate interval: interval target: target selector: selector object: nil object: nil object: nil object: nil arguments: 0 repeats: repeats]; } - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object repeats: (bool)repeats { return [self of_initWithFireDate: fireDate interval: interval target: target selector: selector object: object object: nil object: nil object: nil arguments: 1 repeats: repeats]; } - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 repeats: (bool)repeats { return [self of_initWithFireDate: fireDate interval: interval target: target selector: selector object: object1 object: object2 object: nil object: nil arguments: 2 repeats: repeats]; } - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 object: (id)object3 repeats: (bool)repeats { return [self of_initWithFireDate: fireDate interval: interval target: target selector: selector object: object1 object: object2 object: object3 object: nil arguments: 3 repeats: repeats]; } - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval target: (id)target selector: (SEL)selector object: (id)object1 object: (id)object2 object: (id)object3 object: (id)object4 repeats: (bool)repeats { return [self of_initWithFireDate: fireDate interval: interval target: target selector: selector object: object1 object: object2 object: object3 object: object4 arguments: 4 repeats: repeats]; } #ifdef OF_HAVE_BLOCKS - (instancetype)initWithFireDate: (OFDate *)fireDate interval: (of_time_interval_t)interval repeats: (bool)repeats block: (of_timer_block_t)block { self = [super init]; @try { _fireDate = [fireDate retain]; _interval = interval; _repeats = repeats; |
︙ | ︙ |
Modified src/OFTriple.h from [7b5e9acbc5] to [5e36a777ce].
︙ | ︙ | |||
70 71 72 73 74 75 76 | * @brief Initializes an already allocated OFTriple with the specified objects. * * @param firstObject The first object for the triple * @param secondObject The second object for the triple * @param thirdObject The second object for the triple * @return An initialized OFTriple */ | | | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | * @brief Initializes an already allocated OFTriple with the specified objects. * * @param firstObject The first object for the triple * @param secondObject The second object for the triple * @param thirdObject The second object for the triple * @return An initialized OFTriple */ - (instancetype)initWithFirstObject: (nullable FirstType)firstObject secondObject: (nullable SecondType)secondObject thirdObject: (nullable ThirdType)thirdObject; #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # undef FirstType # undef SecondType # undef ThirdType #endif @end |
︙ | ︙ |
Modified src/OFTriple.m from [8c78490503] to [2e7a2cddf4].
︙ | ︙ | |||
25 26 27 28 29 30 31 | thirdObject: (id)thirdObject { return [[[self alloc] initWithFirstObject: firstObject secondObject: secondObject thirdObject: thirdObject] autorelease]; } | | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | thirdObject: (id)thirdObject { return [[[self alloc] initWithFirstObject: firstObject secondObject: secondObject thirdObject: thirdObject] autorelease]; } - (instancetype)initWithFirstObject: (id)firstObject secondObject: (id)secondObject thirdObject: (id)thirdObject { self = [super init]; @try { _firstObject = [firstObject retain]; _secondObject = [secondObject retain]; _thirdObject = [thirdObject retain]; |
︙ | ︙ | |||
106 107 108 109 110 111 112 | OF_HASH_ADD_HASH(hash, [_thirdObject hash]); OF_HASH_FINALIZE(hash); return hash; } | | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | OF_HASH_ADD_HASH(hash, [_thirdObject hash]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [self retain]; } - (id)mutableCopy { return [[OFMutableTriple alloc] initWithFirstObject: _firstObject secondObject: _secondObject thirdObject: _thirdObject]; } - (OFString *)description { return [OFString stringWithFormat: @"<<%@, %@, %@>>", _firstObject, _secondObject, _thirdObject]; } @end |
Modified src/OFUDPSocket.m from [35a4b455a8] to [8a3b636da1].
︙ | ︙ | |||
55 56 57 58 59 60 61 | # ifdef OF_HAVE_BLOCKS of_udp_socket_async_resolve_block_t _block; # endif of_udp_socket_address_t _address; id _exception; } | | | | | | | | | | | > | | | | | | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | # ifdef OF_HAVE_BLOCKS of_udp_socket_async_resolve_block_t _block; # endif of_udp_socket_address_t _address; id _exception; } - (instancetype)initWithSourceThread: (OFThread *)sourceThread host: (OFString *)host port: (uint16_t)port target: (id)target selector: (SEL)selector context: (id)context; # ifdef OF_HAVE_BLOCKS - (instancetype)initWithSourceThread: (OFThread *)sourceThread host: (OFString *)host port: (uint16_t)port block: (of_udp_socket_async_resolve_block_t) block; # endif @end @implementation OFUDPSocket_ResolveThread - (instancetype)initWithSourceThread: (OFThread *)sourceThread host: (OFString *)host port: (uint16_t)port target: (id)target selector: (SEL)selector context: (id)context { self = [super init]; @try { _sourceThread = [sourceThread retain]; _host = [host retain]; _port = port; _target = [target retain]; _selector = selector; _context = [context retain]; } @catch (id e) { [self release]; @throw e; } return self; } # ifdef OF_HAVE_BLOCKS - (instancetype)initWithSourceThread: (OFThread *)sourceThread host: (OFString *)host port: (uint16_t)port block: (of_udp_socket_async_resolve_block_t)block { self = [super init]; @try { _sourceThread = [sourceThread retain]; _host = [host copy]; _port = port; |
︙ | ︙ | |||
366 367 368 369 370 371 372 | andPort: (uint16_t *)port forAddress: (of_udp_socket_address_t *)address { of_address_to_string_and_port( (struct sockaddr *)&address->address, address->length, host, port); } | | | | 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | andPort: (uint16_t *)port forAddress: (of_udp_socket_address_t *)address { of_address_to_string_and_port( (struct sockaddr *)&address->address, address->length, host, port); } - (instancetype)init { self = [super init]; _socket = INVALID_SOCKET; return self; } - (void)dealloc { if (_socket != INVALID_SOCKET) [self close]; [super dealloc]; } - (id)copy { return [self retain]; } - (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port { |
︙ | ︙ |
Modified src/OFURL.h from [1961d082fb] to [c55211ca68].
︙ | ︙ | |||
103 104 105 106 107 108 109 | * @brief Creates a new URL with the specified local file path. * * @param path The local file path * @return A new, autoreleased OFURL */ + (instancetype)fileURLWithPath: (OFString *)path; | | | | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | * @brief Creates a new URL with the specified local file path. * * @param path The local file path * @return A new, autoreleased OFURL */ + (instancetype)fileURLWithPath: (OFString *)path; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFURL with the specified string. * * @param string A string describing a URL * @return An initialized OFURL */ - (instancetype)initWithString: (OFString *)string; /*! * @brief Initializes an already allocated OFURL with the specified string and * relative URL. * * @param string A string describing a URL * @param URL A URL to which the string is relative * @return An initialized OFURL */ - (instancetype)initWithString: (OFString *)string relativeToURL: (OFURL *)URL; /*! * @brief Returns the URL as a string. * * @return The URL as a string */ - (OFString *)string; |
︙ | ︙ |
Modified src/OFURL.m from [2082375f0b] to [bc22950fc0].
︙ | ︙ | |||
58 59 60 61 62 63 64 | [URL makeImmutable]; objc_autoreleasePoolPop(pool); return URL; } | | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | [URL makeImmutable]; objc_autoreleasePoolPop(pool); return URL; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)of_init { return [super init]; } - (instancetype)initWithString: (OFString *)string { char *UTF8String, *UTF8String2 = NULL; self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ | |||
202 203 204 205 206 207 208 | } @finally { free(UTF8String2); } return self; } | | | | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | } @finally { free(UTF8String2); } return self; } - (instancetype)initWithString: (OFString *)string relativeToURL: (OFURL *)URL { char *UTF8String, *UTF8String2 = NULL; if ([string containsString: @"://"]) return [self initWithString: string]; self = [super init]; |
︙ | ︙ | |||
276 277 278 279 280 281 282 | } @finally { free(UTF8String2); } return self; } | | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | } @finally { free(UTF8String2); } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || ![[element namespace] isEqual: OF_SERIALIZATION_NS]) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
412 413 414 415 416 417 418 | } - (OFString *)fragment { return _fragment; } | | | | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | } - (OFString *)fragment { return _fragment; } - (id)copy { return [self retain]; } - (id)mutableCopy { OFMutableURL *copy = [[OFMutableURL alloc] init]; @try { [copy setScheme: _scheme]; [copy setHost: _host]; [copy setPort: _port]; |
︙ | ︙ |
Modified src/OFXMLAttribute.h from [30a9d4482b] to [1c90397046].
︙ | ︙ | |||
71 72 73 74 75 76 77 | /*! * @brief Initializes an already allocated OFXMLAttribute. * * @param name The name of the attribute * @param stringValue The string value of the attribute * @return An initialized OFXMLAttribute with the specified parameters */ | | | | | | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | /*! * @brief Initializes an already allocated OFXMLAttribute. * * @param name The name of the attribute * @param stringValue The string value of the attribute * @return An initialized OFXMLAttribute with the specified parameters */ - (instancetype)initWithName: (OFString *)name stringValue: (OFString *)stringValue; /*! * @brief Initializes an already allocated OFXMLAttribute. * * @param name The name of the attribute * @param namespace_ The namespace of the attribute * @param stringValue The string value of the attribute * @return An initialized OFXMLAttribute with the specified parameters */ - (instancetype)initWithName: (OFString *)name namespace: (nullable OFString *)namespace_ stringValue: (OFString *)stringValue; - (instancetype)initWithSerialization: (OFXMLElement *)element; @end OF_ASSUME_NONNULL_END |
Modified src/OFXMLAttribute.m from [464c2003f8] to [3298ffe82d].
︙ | ︙ | |||
39 40 41 42 43 44 45 | + (instancetype)attributeWithName: (OFString *)name stringValue: (OFString *)stringValue { return [[[self alloc] initWithName: name stringValue: stringValue] autorelease]; } | | | | | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | + (instancetype)attributeWithName: (OFString *)name stringValue: (OFString *)stringValue { return [[[self alloc] initWithName: name stringValue: stringValue] autorelease]; } - (instancetype)initWithName: (OFString *)name stringValue: (OFString *)stringValue { return [self initWithName: name namespace: nil stringValue: stringValue]; } - (instancetype)initWithName: (OFString *)name namespace: (OFString *)namespace stringValue: (OFString *)stringValue { self = [super of_init]; @try { _name = [name copy]; _namespace = [namespace copy]; _stringValue = [stringValue copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ |
Modified src/OFXMLCDATA.h from [180a9b9155] to [6e6e36905e].
︙ | ︙ | |||
38 39 40 41 42 43 44 | /*! * @brief Initializes an already allocated OFXMLCDATA with the specified string. * * @param string The string value for the CDATA * @return An initialized OFXMLCDATA */ | | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 | /*! * @brief Initializes an already allocated OFXMLCDATA with the specified string. * * @param string The string value for the CDATA * @return An initialized OFXMLCDATA */ - (instancetype)initWithString: (OFString *)string; - (instancetype)initWithSerialization: (OFXMLElement *)element; @end OF_ASSUME_NONNULL_END |
Modified src/OFXMLCDATA.m from [c06dfedaeb] to [ad2bdf844e].
︙ | ︙ | |||
25 26 27 28 29 30 31 | @implementation OFXMLCDATA + (instancetype)CDATAWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | @implementation OFXMLCDATA + (instancetype)CDATAWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super of_init]; @try { _CDATA = [string copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ |
Modified src/OFXMLCharacters.h from [03693d3314] to [cda4ae2199].
︙ | ︙ | |||
39 40 41 42 43 44 45 | /*! * @brief Initializes an already allocated OFXMLCharacters with the specified * string. * * @param string The string value for the characters * @return An initialized OFXMLCharacters */ | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated OFXMLCharacters with the specified * string. * * @param string The string value for the characters * @return An initialized OFXMLCharacters */ - (instancetype)initWithString: (OFString *)string; - (instancetype)initWithSerialization: (OFXMLElement *)element; @end OF_ASSUME_NONNULL_END |
Modified src/OFXMLCharacters.m from [366dd6ac23] to [7fa5226ce0].
︙ | ︙ | |||
25 26 27 28 29 30 31 | @implementation OFXMLCharacters + (instancetype)charactersWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | @implementation OFXMLCharacters + (instancetype)charactersWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super of_init]; @try { _characters = [string copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ |
Modified src/OFXMLComment.h from [a0ed4a3c91] to [955209304a].
︙ | ︙ | |||
39 40 41 42 43 44 45 | /*! * @brief Initializes an already allocated OFXMLComment with the specified * string. * * @param string The string for the comment * @return An initialized OFXMLComment */ | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated OFXMLComment with the specified * string. * * @param string The string for the comment * @return An initialized OFXMLComment */ - (instancetype)initWithString: (OFString *)string; - (instancetype)initWithSerialization: (OFXMLElement *)element; @end OF_ASSUME_NONNULL_END |
Modified src/OFXMLComment.m from [f4e7bbcd6f] to [cedcad6c16].
︙ | ︙ | |||
27 28 29 30 31 32 33 | @implementation OFXMLComment + (instancetype)commentWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } | | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | @implementation OFXMLComment + (instancetype)commentWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super of_init]; @try { _comment = [string copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ |
Modified src/OFXMLElement.h from [4cdf8539f9] to [0e0aeff41f].
︙ | ︙ | |||
127 128 129 130 131 132 133 | * @param path The path to the file * @return A new autoreleased OFXMLElement with the contents of the specified * file */ + (instancetype)elementWithFile: (OFString *)path; #endif | | | | | | | | | | | | | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | * @param path The path to the file * @return A new autoreleased OFXMLElement with the contents of the specified * file */ + (instancetype)elementWithFile: (OFString *)path; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFXMLElement with the specified name. * * @param name The name for the element * @return An initialized OFXMLElement with the specified element name */ - (instancetype)initWithName: (OFString *)name; /*! * @brief Initializes an already allocated OFXMLElement with the specified name * and string value. * * @param name The name for the element * @param stringValue The value for the element * @return An initialized OFXMLElement with the specified element name and * value */ - (instancetype)initWithName: (OFString *)name stringValue: (nullable OFString *)stringValue; /*! * @brief Initializes an already allocated OFXMLElement with the specified name * and namespace. * * @param name The name for the element * @param namespace_ The namespace for the element * @return An initialized OFXMLElement with the specified element name and * namespace */ - (instancetype)initWithName: (OFString *)name namespace: (nullable OFString *)namespace_; /*! * @brief Initializes an already allocated OFXMLElement with the specified name, * namespace and value. * * @param name The name for the element * @param namespace_ The namespace for the element * @param stringValue The value for the element * @return An initialized OFXMLElement with the specified element name, * namespace and value */ - (instancetype)initWithName: (OFString *)name namespace: (nullable OFString *)namespace_ stringValue: (nullable OFString *)stringValue; /*! * @brief Initializes an already allocated OFXMLElement with the specified * element. * * @param element An OFXMLElement to initialize the OFXMLElement with * @return A new autoreleased OFXMLElement with the contents of the specified * element */ - (instancetype)initWithElement: (OFXMLElement *)element; /*! * @brief Parses the string and initializes an already allocated OFXMLElement * with it. * * @param string The string to parse * @return An initialized OFXMLElement with the contents of the string */ - (instancetype)initWithXMLString: (OFString *)string; #ifdef OF_HAVE_FILES /*! * @brief Parses the specified file and initializes an already allocated * OFXMLElement with it. * * @param path The path to the file * @return An initialized OFXMLElement with the contents of the specified file */ - (instancetype)initWithFile: (OFString *)path; #endif - (instancetype)initWithSerialization: (OFXMLElement *)element; /*! * @brief Sets a prefix for a namespace. * * @param prefix The prefix for the namespace * @param namespace_ The namespace for which the prefix is set */ |
︙ | ︙ |
Modified src/OFXMLElement.m from [28440d417d] to [ac132aa128].
︙ | ︙ | |||
125 126 127 128 129 130 131 | #ifdef OF_HAVE_FILES + (instancetype)elementWithFile: (OFString *)path { return [[[self alloc] initWithFile: path] autorelease]; } #endif | | | | | | | | | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | #ifdef OF_HAVE_FILES + (instancetype)elementWithFile: (OFString *)path { return [[[self alloc] initWithFile: path] autorelease]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithName: (OFString *)name { return [self initWithName: name namespace: nil stringValue: nil]; } - (instancetype)initWithName: (OFString *)name stringValue: (OFString *)stringValue { return [self initWithName: name namespace: nil stringValue: stringValue]; } - (instancetype)initWithName: (OFString *)name namespace: (OFString *)namespace { return [self initWithName: name namespace: namespace stringValue: nil]; } - (instancetype)initWithName: (OFString *)name namespace: (OFString *)namespace stringValue: (OFString *)stringValue { self = [super of_init]; @try { if (name == nil) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
181 182 183 184 185 186 187 | [self release]; @throw e; } return self; } | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | [self release]; @throw e; } return self; } - (instancetype)initWithElement: (OFXMLElement *)element { self = [super of_init]; @try { if (element == nil) @throw [OFInvalidArgumentException exception]; |
︙ | ︙ | |||
203 204 205 206 207 208 209 | [self release]; @throw e; } return self; } | | | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | [self release]; @throw e; } return self; } - (instancetype)initWithXMLString: (OFString *)string { void *pool; OFXMLParser *parser; OFXMLElementBuilder *builder; OFXMLElement_OFXMLElementBuilderDelegate *delegate; [self release]; |
︙ | ︙ | |||
238 239 240 241 242 243 244 | objc_autoreleasePoolPop(pool); return self; } #ifdef OF_HAVE_FILES | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | objc_autoreleasePoolPop(pool); return self; } #ifdef OF_HAVE_FILES - (instancetype)initWithFile: (OFString *)path { void *pool; OFXMLParser *parser; OFXMLElementBuilder *builder; OFXMLElement_OFXMLElementBuilderDelegate *delegate; [self release]; |
︙ | ︙ | |||
270 271 272 273 274 275 276 | objc_autoreleasePoolPop(pool); return self; } #endif | | | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | objc_autoreleasePoolPop(pool); return self; } #endif - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); OFXMLElement *attributesElement, *namespacesElement; OFXMLElement *childrenElement; |
︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 | OF_HASH_ADD_HASH(hash, [_children hash]); OF_HASH_FINALIZE(hash); return hash; } | | | 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 | OF_HASH_ADD_HASH(hash, [_children hash]); OF_HASH_FINALIZE(hash); return hash; } - (id)copy { return [[[self class] alloc] initWithElement: self]; } @end |
Modified src/OFXMLElementBuilder.m from [8f1f7d2342] to [a5fcb2b0c8].
︙ | ︙ | |||
32 33 34 35 36 37 38 | @synthesize delegate = _delegate; + (instancetype)elementBuilder { return [[[self alloc] init] autorelease]; } | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | @synthesize delegate = _delegate; + (instancetype)elementBuilder { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { _stack = [[OFMutableArray alloc] init]; } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/OFXMLNode.h from [96e3d4741c] to [2716730e4a].
︙ | ︙ | |||
23 24 25 26 27 28 29 | /*! * @class OFXMLNode OFXMLNode.h ObjFW/OFXMLNode.h * * @brief A class which stores an XML element. */ @interface OFXMLNode: OFObject <OFCopying, OFSerialization> | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | /*! * @class OFXMLNode OFXMLNode.h ObjFW/OFXMLNode.h * * @brief A class which stores an XML element. */ @interface OFXMLNode: OFObject <OFCopying, OFSerialization> - (instancetype)init OF_UNAVAILABLE; - (instancetype)initWithSerialization: (OFXMLElement *)element OF_UNAVAILABLE; /*! * @brief Returns the contents of the receiver as a string value. * * @return A string with the string value */ - (OFString *)stringValue; |
︙ | ︙ |
Modified src/OFXMLNode.m from [858e69720c] to [1114a90ee4].
︙ | ︙ | |||
21 22 23 24 25 26 27 | @implementation OFXMLNode - (instancetype)of_init { return [super init]; } | | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | @implementation OFXMLNode - (instancetype)of_init { return [super init]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSerialization: (OFXMLElement *)element { OF_INVALID_INIT_METHOD } - (OFString *)stringValue { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
89 90 91 92 93 94 95 | } - (OFXMLElement *)XMLElementBySerializing { OF_UNRECOGNIZED_SELECTOR } | | | 89 90 91 92 93 94 95 96 97 98 99 100 | } - (OFXMLElement *)XMLElementBySerializing { OF_UNRECOGNIZED_SELECTOR } - (id)copy { return [self retain]; } @end |
Modified src/OFXMLParser.m from [c940e346a8] to [b473f5b8df].
︙ | ︙ | |||
199 200 201 202 203 204 205 | } + (instancetype)parser { return [[[self alloc] init] autorelease]; } | | | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | } + (instancetype)parser { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { void *pool; OFMutableDictionary *dict; |
︙ | ︙ |
Modified src/OFXMLProcessingInstructions.h from [eaf57a08da] to [6eacb4bea0].
︙ | ︙ | |||
40 41 42 43 44 45 46 | /*! * @brief Initializes an already allocated OFXMLProcessingInstructions with the * specified string. * * @param string The string for the processing instructions * @return An initialized OFXMLProcessingInstructions */ | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 | /*! * @brief Initializes an already allocated OFXMLProcessingInstructions with the * specified string. * * @param string The string for the processing instructions * @return An initialized OFXMLProcessingInstructions */ - (instancetype)initWithString: (OFString *)string; - (instancetype)initWithSerialization: (OFXMLElement *)element; @end OF_ASSUME_NONNULL_END |
Modified src/OFXMLProcessingInstructions.m from [ef7508c1b7] to [4edf794475].
︙ | ︙ | |||
27 28 29 30 31 32 33 | @implementation OFXMLProcessingInstructions + (instancetype)processingInstructionsWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } | | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | @implementation OFXMLProcessingInstructions + (instancetype)processingInstructionsWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super of_init]; @try { _processingInstructions = [string copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithSerialization: (OFXMLElement *)element { self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); if (![[element name] isEqual: [self className]] || |
︙ | ︙ |
Modified src/OFZIPArchive.h from [8859760d81] to [f753feb424].
︙ | ︙ | |||
78 79 80 81 82 83 84 | * archive. * @return A new, autoreleased OFZIPArchive */ + (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode; #endif | | | | | | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | * archive. * @return A new, autoreleased OFZIPArchive */ + (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFZIPArchive object with the * specified stream. * * @param stream A stream from which the ZIP archive will be read. * For read and append mode, this needs to be an OFSeekableStream. * @param mode The mode for the ZIP file. Valid modes are "r" for reading, * "w" for creating a new file and "a" for appending to an existing * archive. * @return An initialized OFZIPArchive */ - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode OF_DESIGNATED_INITIALIZER; #ifdef OF_HAVE_FILES /*! * @brief Initializes an already allocated OFZIPArchive object with the * specified file. * * @param path The path to the ZIP file * @param mode The mode for the ZIP file. Valid modes are "r" for reading, * "w" for creating a new file and "a" for appending to an existing * archive. * @return An initialized OFZIPArchive */ - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode; #endif /*! * @brief Returns the entries of the central directory of the archive as an * array of objects of class @ref OFZIPArchiveEntry. * * The objects of the array have the same order as the entries in the central |
︙ | ︙ |
Modified src/OFZIPArchive.m from [700f57a4db] to [f82daa6eae].
︙ | ︙ | |||
64 65 66 67 68 69 70 | uint16_t _lastModifiedFileTime, _lastModifiedFileDate; uint32_t _CRC32; uint64_t _compressedSize, _uncompressedSize; OFString *_fileName; OFData *_extraField; } | | | | | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | uint16_t _lastModifiedFileTime, _lastModifiedFileDate; uint32_t _CRC32; uint64_t _compressedSize, _uncompressedSize; OFString *_fileName; OFData *_extraField; } - (instancetype)initWithStream: (OFStream *)stream; - (bool)matchesEntry: (OFZIPArchiveEntry *)entry; @end @interface OFZIPArchive_FileReadStream: OFStream { OFStream *_stream, *_decompressedStream; OFZIPArchiveEntry *_entry; uint64_t _toRead; uint32_t _CRC32; bool _atEndOfStream; } - (instancetype)initWithStream: (OFStream *)stream entry: (OFZIPArchiveEntry *)entry; @end @interface OFZIPArchive_FileWriteStream: OFStream { OFStream *_stream; uint32_t _CRC32; @public int64_t _bytesWritten; OFMutableZIPArchiveEntry *_entry; } - (instancetype)initWithStream: (OFStream *)stream entry: (OFMutableZIPArchiveEntry *)entry; @end uint32_t of_zip_archive_read_field32(const uint8_t **data, uint16_t *size) { uint32_t field = 0; |
︙ | ︙ | |||
162 163 164 165 166 167 168 | mode: (OFString *)mode { return [[[self alloc] initWithPath: path mode: mode] autorelease]; } #endif | | | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | mode: (OFString *)mode { return [[[self alloc] initWithPath: path mode: mode] autorelease]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { self = [super init]; @try { if ([mode isEqual: @"r"]) _mode = OF_ZIP_ARCHIVE_MODE_READ; else if ([mode isEqual: @"w"]) |
︙ | ︙ | |||
217 218 219 220 221 222 223 | @throw e; } return self; } #ifdef OF_HAVE_FILES | | | | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | @throw e; } return self; } #ifdef OF_HAVE_FILES - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode { OFFile *file; if ([mode isEqual: @"a"]) file = [[OFFile alloc] initWithPath: path mode: @"r+"]; else |
︙ | ︙ | |||
623 624 625 626 627 628 629 | [_stream release]; _stream = nil; } @end @implementation OFZIPArchive_LocalFileHeader | | | 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 | [_stream release]; _stream = nil; } @end @implementation OFZIPArchive_LocalFileHeader - (instancetype)initWithStream: (OFStream *)stream { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); OFMutableData *extraField = nil; uint16_t fileNameLength, extraFieldLength; |
︙ | ︙ | |||
723 724 725 726 727 728 729 | return false; return true; } @end @implementation OFZIPArchive_FileReadStream | | | | 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 | return false; return true; } @end @implementation OFZIPArchive_FileReadStream - (instancetype)initWithStream: (OFStream *)stream entry: (OFZIPArchiveEntry *)entry { self = [super init]; @try { _stream = [stream retain]; switch ([entry compressionMethod]) { |
︙ | ︙ | |||
819 820 821 822 823 824 825 | _stream = nil; [super close]; } @end @implementation OFZIPArchive_FileWriteStream | | | | 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 | _stream = nil; [super close]; } @end @implementation OFZIPArchive_FileWriteStream - (instancetype)initWithStream: (OFStream *)stream entry: (OFMutableZIPArchiveEntry *)entry { self = [super init]; _stream = [stream retain]; _entry = [entry retain]; _CRC32 = ~0; |
︙ | ︙ |
Modified src/OFZIPArchiveEntry.h from [54405d8038] to [9d05415775].
︙ | ︙ | |||
194 195 196 197 198 199 200 | * @brief Creates a new OFZIPArchiveEntry with the specified file name. * * @param fileName The file name for the OFZIPArchiveEntry * @return A new, autoreleased OFZIPArchiveEntry */ + (instancetype)entryWithFileName: (OFString *)fileName; | | | | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | * @brief Creates a new OFZIPArchiveEntry with the specified file name. * * @param fileName The file name for the OFZIPArchiveEntry * @return A new, autoreleased OFZIPArchiveEntry */ + (instancetype)entryWithFileName: (OFString *)fileName; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated OFZIPArchiveEntry with the specified * file name. * * @param fileName The file name for the OFZIPArchiveEntry * @return An initialized OFZIPArchiveEntry */ - (instancetype)initWithFileName: (OFString *)fileName; @end #ifdef __cplusplus extern "C" { #endif /*! * @brief Converts the ZIP entry version to a string |
︙ | ︙ |
Modified src/OFZIPArchiveEntry.m from [c8f541f60e] to [a552090953].
︙ | ︙ | |||
143 144 145 146 147 148 149 | @implementation OFZIPArchiveEntry + (instancetype)entryWithFileName: (OFString *)fileName { return [[[self alloc] initWithFileName: fileName] autorelease]; } | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | @implementation OFZIPArchiveEntry + (instancetype)entryWithFileName: (OFString *)fileName { return [[[self alloc] initWithFileName: fileName] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithFileName: (OFString *)fileName { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); if ([fileName UTF8StringLength] > UINT16_MAX) |
︙ | ︙ | |||
267 268 269 270 271 272 273 | [_fileName release]; [_extraField release]; [_fileComment release]; [super dealloc]; } | | | | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | [_fileName release]; [_extraField release]; [_fileComment release]; [super dealloc]; } - (id)copy { return [self retain]; } - (id)mutableCopy { OFZIPArchiveEntry *copy = [[OFMutableZIPArchiveEntry alloc] initWithFileName: _fileName]; @try { copy->_versionMadeBy = _versionMadeBy; copy->_minVersionNeeded = _minVersionNeeded; |
︙ | ︙ |
Modified src/bridge/NSArray_OFArray.h from [fa0ba160b6] to [fc39953ec6].
︙ | ︙ | |||
21 22 23 24 25 26 27 | NS_ASSUME_NONNULL_BEGIN @interface NSArray_OFArray: NSArray { OFArray *_array; } | | | 21 22 23 24 25 26 27 28 29 30 31 | NS_ASSUME_NONNULL_BEGIN @interface NSArray_OFArray: NSArray { OFArray *_array; } - (instancetype)initWithOFArray: (OFArray *)array; @end NS_ASSUME_NONNULL_END |
Modified src/bridge/NSArray_OFArray.m from [ab0fe4a97d] to [92d6803c52].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #import "NSArray_OFArray.h" #import "OFArray.h" #import "OFBridging.h" #import "OFOutOfRangeException.h" @implementation NSArray_OFArray | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #import "NSArray_OFArray.h" #import "OFArray.h" #import "OFBridging.h" #import "OFOutOfRangeException.h" @implementation NSArray_OFArray - (instancetype)initWithOFArray: (OFArray *)array { if ((self = [super init]) != nil) { @try { _array = [array retain]; } @catch (id e) { return nil; } |
︙ | ︙ |
Modified src/bridge/NSDictionary_OFDictionary.h from [a63731835d] to [bf71dfed62].
︙ | ︙ | |||
21 22 23 24 25 26 27 | NS_ASSUME_NONNULL_BEGIN @interface NSDictionary_OFDictionary: NSDictionary { OFDictionary *_dictionary; } | | | 21 22 23 24 25 26 27 28 29 30 31 | NS_ASSUME_NONNULL_BEGIN @interface NSDictionary_OFDictionary: NSDictionary { OFDictionary *_dictionary; } - (instancetype)initWithOFDictionary: (OFDictionary *)dictionary; @end NS_ASSUME_NONNULL_END |
Modified src/bridge/NSDictionary_OFDictionary.m from [8917cda49a] to [98dbb05ad2].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "NSBridging.h" #import "OFBridging.h" #import "OFOutOfRangeException.h" @implementation NSDictionary_OFDictionary | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #import "NSBridging.h" #import "OFBridging.h" #import "OFOutOfRangeException.h" @implementation NSDictionary_OFDictionary - (instancetype)initWithOFDictionary: (OFDictionary *)dictionary { if ((self = [super init]) != nil) { @try { _dictionary = [dictionary retain]; } @catch (id e) { return nil; } |
︙ | ︙ |
Modified src/bridge/OFArray_NSArray.h from [de8c239436] to [ac8674a52c].
︙ | ︙ | |||
29 30 31 32 33 34 35 | @class NSArray; @interface OFArray_NSArray: OFArray { NSArray *_array; } | | | 29 30 31 32 33 34 35 36 37 38 39 | @class NSArray; @interface OFArray_NSArray: OFArray { NSArray *_array; } - (instancetype)initWithNSArray: (NSArray *)array; @end OF_ASSUME_NONNULL_END |
Modified src/bridge/OFArray_NSArray.m from [94ceef5c3f] to [f4bf332284].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "OFArray_NSArray.h" #import "NSBridging.h" #import "OFInitializationFailedException.h" #import "OFOutOfRangeException.h" @implementation OFArray_NSArray | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #import "OFArray_NSArray.h" #import "NSBridging.h" #import "OFInitializationFailedException.h" #import "OFOutOfRangeException.h" @implementation OFArray_NSArray - (instancetype)initWithNSArray: (NSArray *)array { self = [super init]; @try { if (array == nil) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; |
︙ | ︙ |
Modified src/bridge/OFDictionary_NSDictionary.h from [c4deae7130] to [715e8090cc].
︙ | ︙ | |||
29 30 31 32 33 34 35 | @class NSDictionary; @interface OFDictionary_NSDictionary: OFDictionary { NSDictionary *_dictionary; } | | | 29 30 31 32 33 34 35 36 37 38 39 | @class NSDictionary; @interface OFDictionary_NSDictionary: OFDictionary { NSDictionary *_dictionary; } - (instancetype)initWithNSDictionary: (NSDictionary *)dictionary; @end OF_ASSUME_NONNULL_END |
Modified src/bridge/OFDictionary_NSDictionary.m from [8b7a3db643] to [eb2c9a4bcd].
︙ | ︙ | |||
20 21 22 23 24 25 26 | #import "NSBridging.h" #import "OFBridging.h" #import "OFInitializationFailedException.h" @implementation OFDictionary_NSDictionary | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "NSBridging.h" #import "OFBridging.h" #import "OFInitializationFailedException.h" @implementation OFDictionary_NSDictionary - (instancetype)initWithNSDictionary: (NSDictionary *)dictionary { self = [super init]; @try { if (dictionary == nil) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; |
︙ | ︙ |
Modified src/exceptions/OFAcceptFailedException.h from [f3f5b9898b] to [b45d336249].
︙ | ︙ | |||
52 53 54 55 56 57 58 | * @param socket The socket which could not accept a connection * @param errNo The errno for the error * @return A new, autoreleased accept failed exception */ + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo; | | | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | * @param socket The socket which could not accept a connection * @param errNo The errno for the error * @return A new, autoreleased accept failed exception */ + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated accept failed exception. * * @param socket The socket which could not accept a connection * @param errNo The errno for the error * @return An initialized accept failed exception */ - (instancetype)initWithSocket: (id)socket errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFAcceptFailedException.m from [439bad1241] to [d1a001ebd2].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithSocket: socket errNo: errNo] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithSocket: socket errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSocket: (id)socket errNo: (int)errNo { self = [super init]; _socket = [socket retain]; _errNo = errNo; return self; |
︙ | ︙ |
Modified src/exceptions/OFAddressTranslationFailedException.h from [5b1e721875] to [4e44a31efb].
︙ | ︙ | |||
54 55 56 57 58 59 60 | /*! * @brief Initializes an already allocated address translation failed exception. * * @param host The host for which translation was requested * @return An initialized address translation failed exception */ | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | /*! * @brief Initializes an already allocated address translation failed exception. * * @param host The host for which translation was requested * @return An initialized address translation failed exception */ - (instancetype)initWithHost: (nullable OFString *)host; - (instancetype)initWithError: (int)error; - (instancetype)initWithHost: (nullable OFString *)host error: (int)error OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFAddressTranslationFailedException.m from [aad664818a] to [90f36f15a1].
︙ | ︙ | |||
59 60 61 62 63 64 65 | + (instancetype)exceptionWithHost: (OFString *)host error: (int)error { return [[[self alloc] initWithHost: host error: error] autorelease]; } | | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | + (instancetype)exceptionWithHost: (OFString *)host error: (int)error { return [[[self alloc] initWithHost: host error: error] autorelease]; } - (instancetype)init { return [self initWithHost: nil error: 0]; } - (instancetype)initWithHost: (OFString *)host { return [self initWithHost: host error: 0]; } - (instancetype)initWithError: (int)error { |
︙ | ︙ |
Modified src/exceptions/OFAllocFailedException.h from [8b53870092] to [0099b45139].
︙ | ︙ | |||
33 34 35 36 37 38 39 | * This is the only exception which is not an OFException as it's special. It * does not know for which class allocation failed and it should not be handled * like other exceptions, as the exception handling code is not allowed to * allocate *any* memory. */ @interface OFAllocFailedException: OFObject + (instancetype)exception OF_UNAVAILABLE; | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | * This is the only exception which is not an OFException as it's special. It * does not know for which class allocation failed and it should not be handled * like other exceptions, as the exception handling code is not allowed to * allocate *any* memory. */ @interface OFAllocFailedException: OFObject + (instancetype)exception OF_UNAVAILABLE; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Returns a description of the exception. * * @return A description of the exception */ - (OFString *)description; |
︙ | ︙ |
Modified src/exceptions/OFAllocFailedException.m from [259e8f3f61] to [a4ecf96225].
︙ | ︙ | |||
21 22 23 24 25 26 27 | @implementation OFAllocFailedException + (instancetype)exception { OF_UNRECOGNIZED_SELECTOR } | | | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | @implementation OFAllocFailedException + (instancetype)exception { OF_UNRECOGNIZED_SELECTOR } + (instancetype)alloc { OF_UNRECOGNIZED_SELECTOR } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void *)allocMemoryWithSize: (size_t)size { OF_UNRECOGNIZED_SELECTOR |
︙ | ︙ | |||
60 61 62 63 64 65 66 | } - (void)freeMemory: (void *)ptr { OF_UNRECOGNIZED_SELECTOR } | | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | } - (void)freeMemory: (void *)ptr { OF_UNRECOGNIZED_SELECTOR } - (instancetype)retain { return self; } - (instancetype)autorelease { return self; } - (unsigned int)retainCount { return OF_RETAIN_COUNT_MAX; |
︙ | ︙ |
Modified src/exceptions/OFAlreadyConnectedException.h from [2c13417f6e] to [a11c10e218].
︙ | ︙ | |||
49 50 51 52 53 54 55 | /*! * @brief Initializes an already allocated already connected exception. * * @param socket The socket which is already connected * @return An initialized already connected exception */ | | | 49 50 51 52 53 54 55 56 57 58 59 | /*! * @brief Initializes an already allocated already connected exception. * * @param socket The socket which is already connected * @return An initialized already connected exception */ - (instancetype)initWithSocket: (nullable id)socket OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFAlreadyConnectedException.m from [2c5cb8ffaf] to [87e3797b38].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize socket = _socket; + (instancetype)exceptionWithSocket: (id)socket { return [[[self alloc] initWithSocket: socket] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize socket = _socket; + (instancetype)exceptionWithSocket: (id)socket { return [[[self alloc] initWithSocket: socket] autorelease]; } - (instancetype)init { return [self initWithSocket: nil]; } - (instancetype)initWithSocket: (id)socket { self = [super init]; _socket = [socket retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFBindFailedException.h from [abb5a72bf9] to [289285d273].
︙ | ︙ | |||
68 69 70 71 72 73 74 | * @return A new, autoreleased bind failed exception */ + (instancetype)exceptionWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; | | | | | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | * @return A new, autoreleased bind failed exception */ + (instancetype)exceptionWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated bind failed exception. * * @param host The host on which binding failed * @param port The port on which binding failed * @param socket The socket which could not be bound * @param errNo The errno of the error that occurred * @return An initialized bind failed exception */ - (instancetype)initWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFBindFailedException.m from [ab8d2f4945] to [ae1fe23608].
︙ | ︙ | |||
36 37 38 39 40 41 42 | { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } | | | | | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { self = [super init]; @try { _host = [host copy]; _port = port; _socket = [socket retain]; |
︙ | ︙ |
Modified src/exceptions/OFChangeCurrentDirectoryPathFailedException.h from [91d577cecc] to [d3901fd058].
︙ | ︙ | |||
52 53 54 55 56 57 58 | * changed * @param errNo The errno of the error that occurred * @return A new, autoreleased change current directory path failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; | | | | | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | * changed * @param errNo The errno of the error that occurred * @return A new, autoreleased change current directory path failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated change directory failed exception. * * @param path The path of the directory to which the current path could not be * changed * @param errNo The errno of the error that occurred * @return An initialized change current directory path failed exception */ - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFChangeCurrentDirectoryPathFailedException.m from [44d470ce9a] to [ad58994a19].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFChangeOwnerFailedException.h from [a7274cde75] to [047184a346].
︙ | ︙ | |||
62 63 64 65 66 67 68 | * @return A new, autoreleased change owner failed exception */ + (instancetype)exceptionWithPath: (OFString *)path owner: (nullable OFString *)owner group: (nullable OFString *)group errNo: (int)errNo; | | | | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | * @return A new, autoreleased change owner failed exception */ + (instancetype)exceptionWithPath: (OFString *)path owner: (nullable OFString *)owner group: (nullable OFString *)group errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated change owner failed exception. * * @param path The path of the item * @param owner The new owner for the item * @param group The new group for the item * @param errNo The errno of the error that occurred * @return An initialized change owner failed exception */ - (instancetype)initWithPath: (OFString *)path owner: (nullable OFString *)owner group: (nullable OFString *)group errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFChangeOwnerFailedException.m from [720452cd67] to [45d05457a0].
︙ | ︙ | |||
34 35 36 37 38 39 40 | { return [[[self alloc] initWithPath: path owner: owner group: group errNo: errNo] autorelease]; } | | | | | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | { return [[[self alloc] initWithPath: path owner: owner group: group errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path owner: (OFString *)owner group: (OFString *)group errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _owner = [owner copy]; _group = [group copy]; |
︙ | ︙ |
Modified src/exceptions/OFChangePermissionsFailedException.h from [4201269912] to [e21328b322].
︙ | ︙ | |||
58 59 60 61 62 63 64 | * @param errNo The errno of the error that occurred * @return A new, autoreleased change permissions failed exception */ + (instancetype)exceptionWithPath: (OFString *)path permissions: (uint16_t)permissions errNo: (int)errNo; | | | | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | * @param errNo The errno of the error that occurred * @return A new, autoreleased change permissions failed exception */ + (instancetype)exceptionWithPath: (OFString *)path permissions: (uint16_t)permissions errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated change permissions failed exception. * * @param path The path of the item * @param permissions The new permissions for the item * @param errNo The errno of the error that occurred * @return An initialized change permissions failed exception */ - (instancetype)initWithPath: (OFString *)path permissions: (uint16_t)permissions errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFChangePermissionsFailedException.m from [bcf2de59e3] to [63b300e4d8].
︙ | ︙ | |||
32 33 34 35 36 37 38 | errNo: (int)errNo { return [[[self alloc] initWithPath: path permissions: permissions errNo: errNo] autorelease]; } | | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | errNo: (int)errNo { return [[[self alloc] initWithPath: path permissions: permissions errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path permissions: (uint16_t)permissions errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _permissions = permissions; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFConditionBroadcastFailedException.h from [c6d8b7a920] to [48c276f516].
︙ | ︙ | |||
51 52 53 54 55 56 57 | /*! * @brief Initializes an already allocated condition broadcast failed exception. * * @param condition The condition which could not be broadcasted * @return An initialized condition broadcast failed exception */ | | | 51 52 53 54 55 56 57 58 59 60 61 62 | /*! * @brief Initializes an already allocated condition broadcast failed exception. * * @param condition The condition which could not be broadcasted * @return An initialized condition broadcast failed exception */ - (instancetype)initWithCondition: (nullable OFCondition *)condition OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFConditionBroadcastFailedException.m from [fe181a3605] to [9b937bfbc7].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } - (instancetype)init { return [self initWithCondition: nil]; } - (instancetype)initWithCondition: (OFCondition *)condition { self = [super init]; _condition = [condition retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFConditionSignalFailedException.h from [2a40e271f6] to [ce33dbc69a].
︙ | ︙ | |||
51 52 53 54 55 56 57 | /*! * @brief Initializes an already allocated condition signal failed exception. * * @param condition The condition which could not be signaled * @return An initialized condition signal failed exception */ | | | 51 52 53 54 55 56 57 58 59 60 61 62 | /*! * @brief Initializes an already allocated condition signal failed exception. * * @param condition The condition which could not be signaled * @return An initialized condition signal failed exception */ - (instancetype)initWithCondition: (nullable OFCondition *)condition OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFConditionSignalFailedException.m from [52c03f4667] to [53f9f1314d].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } - (instancetype)init { return [self initWithCondition: nil]; } - (instancetype)initWithCondition: (OFCondition *)condition { self = [super init]; _condition = [condition retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFConditionStillWaitingException.h from [e274ecefc5] to [3efd694bea].
︙ | ︙ | |||
52 53 54 55 56 57 58 | /*! * @brief Initializes an already allocated condition still waiting exception. * * @param condition The condition for which is still being waited * @return An initialized condition still waiting exception */ | | | 52 53 54 55 56 57 58 59 60 61 62 63 | /*! * @brief Initializes an already allocated condition still waiting exception. * * @param condition The condition for which is still being waited * @return An initialized condition still waiting exception */ - (instancetype)initWithCondition: (nullable OFCondition *)condition OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFConditionStillWaitingException.m from [bf32de4933] to [e2d3cc4836].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } - (instancetype)init { return [self initWithCondition: nil]; } - (instancetype)initWithCondition: (OFCondition *)condition { self = [super init]; _condition = [condition retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFConditionWaitFailedException.h from [18e49a2572] to [9b74caeeef].
︙ | ︙ | |||
51 52 53 54 55 56 57 | /*! * @brief Initializes an already allocated condition wait failed exception. * * @param condition The condition for which could not be waited * @return An initialized condition wait failed exception */ | | | 51 52 53 54 55 56 57 58 59 60 61 62 | /*! * @brief Initializes an already allocated condition wait failed exception. * * @param condition The condition for which could not be waited * @return An initialized condition wait failed exception */ - (instancetype)initWithCondition: (nullable OFCondition *)condition OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFConditionWaitFailedException.m from [6f1e6cd9f4] to [9d72b3631e].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize condition = _condition; + (instancetype)exceptionWithCondition: (OFCondition *)condition { return [[[self alloc] initWithCondition: condition] autorelease]; } - (instancetype)init { return [self initWithCondition: nil]; } - (instancetype)initWithCondition: (OFCondition *)condition { self = [super init]; _condition = [condition retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFConnectionFailedException.h from [3d845cb880] to [ecf1b8d37c].
︙ | ︙ | |||
68 69 70 71 72 73 74 | * @return A new, autoreleased connection failed exception */ + (instancetype)exceptionWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; | | | | | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | * @return A new, autoreleased connection failed exception */ + (instancetype)exceptionWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated connection failed exception. * * @param host The host to which the connection failed * @param port The port on the host to which the connection failed * @param socket The socket which could not connect * @param errNo The errno of the error that occurred * @return An initialized connection failed exception */ - (instancetype)initWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFConnectionFailedException.m from [b27bc422f6] to [3c5a633219].
︙ | ︙ | |||
36 37 38 39 40 41 42 | { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } | | | | | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithHost: (OFString *)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { self = [super init]; @try { _host = [host copy]; _socket = [socket retain]; _port = port; |
︙ | ︙ |
Modified src/exceptions/OFCopyItemFailedException.h from [686e99d584] to [236c740781].
︙ | ︙ | |||
55 56 57 58 59 60 61 | * @param errNo The errno of the error that occurred * @return A new, autoreleased copy item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * @param errNo The errno of the error that occurred * @return A new, autoreleased copy item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated copy item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error that occurred * @return An initialized copy item failed exception */ - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFCopyItemFailedException.m from [2724ad2ead] to [b180cf60f6].
︙ | ︙ | |||
33 34 35 36 37 38 39 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } | | | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFCreateDirectoryFailedException.h from [f29603b825] to [f119eab461].
︙ | ︙ | |||
50 51 52 53 54 55 56 | * created * @param errNo The errno of the error that occurred * @return A new, autoreleased create directory failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; | | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * created * @param errNo The errno of the error that occurred * @return A new, autoreleased create directory failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated create directory failed exception. * * @param path A string with the path of the directory which could not be * created * @param errNo The errno of the error that occurred * @return An initialized create directory failed exception */ - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFCreateDirectoryFailedException.m from [330ed07c9c] to [ef4b8f855c].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFCreateSymbolicLinkFailedException.h from [3eec281c64] to [5b6994b167].
︙ | ︙ | |||
56 57 58 59 60 61 62 | * @param errNo The errno of the error that occurred * @return A new, autoreleased create symbolic link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; | | | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | * @param errNo The errno of the error that occurred * @return A new, autoreleased create symbolic link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated create symbolic link failed * exception. * * @param sourcePath The source for the symbolic link * @param destinationPath The destination for the symbolic link * @param errNo The errno of the error that occurred * @return An initialized create symbolic link failed exception */ - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFCreateSymbolicLinkFailedException.m from [71facb8b37] to [650806d944].
︙ | ︙ | |||
33 34 35 36 37 38 39 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } | | | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFEnumerationMutationException.h from [fed4c58df5] to [a58b80edb6].
︙ | ︙ | |||
42 43 44 45 46 47 48 | * @brief Creates a new, autoreleased enumeration mutation exception. * * @param object The object which was mutated during enumeration * @return A new, autoreleased enumeration mutation exception */ + (instancetype)exceptionWithObject: (id)object; | | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | * @brief Creates a new, autoreleased enumeration mutation exception. * * @param object The object which was mutated during enumeration * @return A new, autoreleased enumeration mutation exception */ + (instancetype)exceptionWithObject: (id)object; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated enumeration mutation exception. * * @param object The object which was mutated during enumeration * @return An initialized enumeration mutation exception */ - (instancetype)initWithObject: (id)object OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFEnumerationMutationException.m from [2fb4ca567c] to [ad9e55bfc4].
︙ | ︙ | |||
28 29 30 31 32 33 34 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object { self = [super init]; _object = [object retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFException.m from [a4f5d8c32c] to [821a0dbd2f].
︙ | ︙ | |||
249 250 251 252 253 254 255 | @implementation OFException + (instancetype)exception { return [[[self alloc] init] autorelease]; } #ifdef HAVE_DWARF_EXCEPTIONS | | | 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | @implementation OFException + (instancetype)exception { return [[[self alloc] init] autorelease]; } #ifdef HAVE_DWARF_EXCEPTIONS - (instancetype)init { struct backtrace_ctx ctx; self = [super init]; ctx.backtrace = _backtrace; ctx.i = 0; |
︙ | ︙ |
Modified src/exceptions/OFGetOptionFailedException.h from [0308db8cf6] to [323844d58f].
︙ | ︙ | |||
50 51 52 53 54 55 56 | * @param stream The stream for which the option could not be gotten * @param errNo The errno of the error that occurred * @return A new, autoreleased get option failed exception */ + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo; | | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * @param stream The stream for which the option could not be gotten * @param errNo The errno of the error that occurred * @return A new, autoreleased get option failed exception */ + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated get option failed exception. * * @param stream The stream for which the option could not be gotten * @param errNo The errno of the error that occurred * @return An initialized get option failed exception */ - (instancetype)initWithStream: (OFStream *)stream errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFGetOptionFailedException.m from [72e358014a] to [98bfddd807].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo { return [[[self alloc] initWithStream: stream errNo: errNo] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo { return [[[self alloc] initWithStream: stream errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OFStream *)stream errNo: (int)errNo { self = [super init]; _stream = [stream retain]; _errNo = errNo; return self; |
︙ | ︙ |
Modified src/exceptions/OFHTTPRequestFailedException.h from [d6872c389b] to [1a9a49c81c].
︙ | ︙ | |||
56 57 58 59 60 61 62 | * @param request The HTTP request which failed * @param response The response for the failed HTTP request * @return A new, autoreleased HTTP request failed exception */ + (instancetype)exceptionWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response; | | | | > | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * @param request The HTTP request which failed * @param response The response for the failed HTTP request * @return A new, autoreleased HTTP request failed exception */ + (instancetype)exceptionWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated HTTP request failed exception. * * @param request The HTTP request which failed * @param response The response for the failed HTTP request * @return A new HTTP request failed exception */ - (instancetype)initWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFHTTPRequestFailedException.m from [e70088b5fe] to [647526aed7].
︙ | ︙ | |||
32 33 34 35 36 37 38 | + (instancetype)exceptionWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response { return [[[self alloc] initWithRequest: request response: response] autorelease]; } | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | + (instancetype)exceptionWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response { return [[[self alloc] initWithRequest: request response: response] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response { self = [super init]; _request = [request retain]; _response = [response retain]; return self; |
︙ | ︙ |
Modified src/exceptions/OFHashAlreadyCalculatedException.h from [c4a33a3e2f] to [354dd8d292].
︙ | ︙ | |||
41 42 43 44 45 46 47 | * @brief Creates a new, autoreleased hash already calculated exception. * * @param object The hash which has already been calculated * @return A new, autoreleased hash already calculated exception */ + (instancetype)exceptionWithObject: (id)object; | | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | * @brief Creates a new, autoreleased hash already calculated exception. * * @param object The hash which has already been calculated * @return A new, autoreleased hash already calculated exception */ + (instancetype)exceptionWithObject: (id)object; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated hash already calculated exception. * * @param object The hash which has already been calculated * @return An initialized hash already calculated exception */ - (instancetype)initWithObject: (id)object OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFHashAlreadyCalculatedException.m from [0c47500461] to [0a3cc39214].
︙ | ︙ | |||
28 29 30 31 32 33 34 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object { self = [super init]; _object = [object retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFInitializationFailedException.h from [f78e956c14] to [b799f88c6f].
︙ | ︙ | |||
45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated initialization failed exception. * * @param class_ The class for which initialization failed * @return An initialized initialization failed exception */ | | | 45 46 47 48 49 50 51 52 53 54 55 | /*! * @brief Initializes an already allocated initialization failed exception. * * @param class_ The class for which initialization failed * @return An initialized initialization failed exception */ - (instancetype)initWithClass: (nullable Class)class_ OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFInitializationFailedException.m from [a45044fb6a] to [9280686d49].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize inClass = _inClass; + (instancetype)exceptionWithClass: (Class)class { return [[[self alloc] initWithClass: class] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize inClass = _inClass; + (instancetype)exceptionWithClass: (Class)class { return [[[self alloc] initWithClass: class] autorelease]; } - (instancetype)init { return [self initWithClass: Nil]; } - (instancetype)initWithClass: (Class)class { self = [super init]; _inClass = class; return self; } |
︙ | ︙ |
Modified src/exceptions/OFInvalidJSONException.h from [0ac6dc1b4d] to [bdcf54a68b].
︙ | ︙ | |||
48 49 50 51 52 53 54 | * @param string The string containing the invalid JSON representation * @param line The line in which the parsing error was encountered * @return A new, autoreleased invalid JSON exception */ + (instancetype)exceptionWithString: (nullable OFString *)string line: (size_t)line; | | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | * @param string The string containing the invalid JSON representation * @param line The line in which the parsing error was encountered * @return A new, autoreleased invalid JSON exception */ + (instancetype)exceptionWithString: (nullable OFString *)string line: (size_t)line; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated invalid JSON exception. * * @param string The string containing the invalid JSON representation * @param line The line in which the parsing error was encountered * @return An initialized invalid JSON exception */ - (instancetype)initWithString: (nullable OFString *)string line: (size_t)line OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFInvalidJSONException.m from [532f763bed] to [f68636631d].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithString: (OFString *)string line: (size_t)line { return [[[self alloc] initWithString: string line: line] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithString: (OFString *)string line: (size_t)line { return [[[self alloc] initWithString: string line: line] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithString: (OFString *)string line: (size_t)line { self = [super init]; @try { _string = [string copy]; _line = line; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFLinkFailedException.h from [dc4516a136] to [a01a95a159].
︙ | ︙ | |||
55 56 57 58 59 60 61 | * @param errNo The errno of the error that occurred * @return A new, autoreleased link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * @param errNo The errno of the error that occurred * @return A new, autoreleased link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated link failed exception. * * @param sourcePath The source for the link * @param destinationPath The destination for the link * @param errNo The errno of the error that occurred * @return An initialized link failed exception */ - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFLinkFailedException.m from [c7dbe92309] to [569378f421].
︙ | ︙ | |||
33 34 35 36 37 38 39 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } | | | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFListenFailedException.h from [69aa18b2cb] to [9104f958e2].
︙ | ︙ | |||
59 60 61 62 63 64 65 | * @param errNo The errno of the error that occurred * @return A new, autoreleased listen failed exception */ + (instancetype)exceptionWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo; | | | | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | * @param errNo The errno of the error that occurred * @return A new, autoreleased listen failed exception */ + (instancetype)exceptionWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated listen failed exception * * @param socket The socket which failed to listen * @param backLog The requested size of the back log * @param errNo The errno of the error that occurred * @return An initialized listen failed exception */ - (instancetype)initWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFListenFailedException.m from [d70f3265c2] to [9093d440de].
︙ | ︙ | |||
32 33 34 35 36 37 38 | errNo: (int)errNo { return [[[self alloc] initWithSocket: socket backLog: backLog errNo: errNo] autorelease]; } | | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | errNo: (int)errNo { return [[[self alloc] initWithSocket: socket backLog: backLog errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo { self = [super init]; _socket = [socket retain]; _backLog = backLog; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFLockFailedException.h from [3ccea224dd] to [689016254d].
︙ | ︙ | |||
45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated lock failed exception. * * @param lock The lock which could not be locked * @return An initialized lock failed exception */ | | > | 45 46 47 48 49 50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated lock failed exception. * * @param lock The lock which could not be locked * @return An initialized lock failed exception */ - (instancetype)initWithLock: (nullable id <OFLocking>)lock OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFLockFailedException.m from [88a51a548f] to [0ed564b6e9].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - (instancetype)init { return [self initWithLock: nil]; } - (instancetype)initWithLock: (id <OFLocking>)lock { self = [super init]; _lock = [lock retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFMalformedXMLException.h from [fd5549b5bc] to [5207f028c8].
︙ | ︙ | |||
46 47 48 49 50 51 52 | /*! * @brief Initializes an already allocated malformed XML exception. * * @param parser The parser which encountered malformed XML * @return An initialized malformed XML exception */ | | > | 46 47 48 49 50 51 52 53 54 55 56 57 | /*! * @brief Initializes an already allocated malformed XML exception. * * @param parser The parser which encountered malformed XML * @return An initialized malformed XML exception */ - (instancetype)initWithParser: (nullable OFXMLParser *)parser OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFMalformedXMLException.m from [388479cf87] to [f94540986f].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize parser = _parser; + (instancetype)exceptionWithParser: (OFXMLParser *)parser { return [[[self alloc] initWithParser: parser] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize parser = _parser; + (instancetype)exceptionWithParser: (OFXMLParser *)parser { return [[[self alloc] initWithParser: parser] autorelease]; } - (instancetype)init { return [self initWithParser: nil]; } - (instancetype)initWithParser: (OFXMLParser *)parser { self = [super init]; _parser = [parser retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFMemoryNotPartOfObjectException.h from [ebaae357da] to [b7baf69af5].
︙ | ︙ | |||
49 50 51 52 53 54 55 | * @param pointer A pointer to the memory that is not part of the object * @param object The object which the memory is not part of * @return A new, autoreleased memory not part of object exception */ + (instancetype)exceptionWithPointer: (nullable void *)pointer object: (id)object; | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | * @param pointer A pointer to the memory that is not part of the object * @param object The object which the memory is not part of * @return A new, autoreleased memory not part of object exception */ + (instancetype)exceptionWithPointer: (nullable void *)pointer object: (id)object; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated memory not part of object exception. * * @param pointer A pointer to the memory that is not part of the object * @param object The object which the memory is not part of * @return An initialized memory not part of object exception */ - (instancetype)initWithPointer: (nullable void *)pointer object: (id)object OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFMemoryNotPartOfObjectException.m from [649609b5d6] to [2fe39f9049].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithPointer: (void *)pointer object: (id)object { return [[[self alloc] initWithPointer: pointer object: object] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithPointer: (void *)pointer object: (id)object { return [[[self alloc] initWithPointer: pointer object: object] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPointer: (void *)pointer object: (id)object { self = [super init]; _pointer = pointer; _object = [object retain]; return self; |
︙ | ︙ |
Modified src/exceptions/OFMoveItemFailedException.h from [f3aaa9b168] to [02a6b7d968].
︙ | ︙ | |||
55 56 57 58 59 60 61 | * @param errNo The errno of the error that occurred * @return A new, autoreleased move item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * @param errNo The errno of the error that occurred * @return A new, autoreleased move item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated move item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error that occurred * @return An initialized move item failed exception */ - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFMoveItemFailedException.m from [12cd77657e] to [265677a4a5].
︙ | ︙ | |||
33 34 35 36 37 38 39 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } | | | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSourcePath: (OFString *)sourcePath destinationPath: (OFString *)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFNotImplementedException.h from [c419382595] to [b85c9dd392].
︙ | ︙ | |||
49 50 51 52 53 54 55 | * @param selector The selector which is not or not fully implemented * @param object The object which does not (fully) implement the selector * @return A new, autoreleased not implemented exception */ + (instancetype)exceptionWithSelector: (SEL)selector object: (id)object; | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | * @param selector The selector which is not or not fully implemented * @param object The object which does not (fully) implement the selector * @return A new, autoreleased not implemented exception */ + (instancetype)exceptionWithSelector: (SEL)selector object: (id)object; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated not implemented exception. * * @param selector The selector which is not or not fully implemented * @param object The object which does not (fully) implement the selector * @return An initialized not implemented exception */ - (instancetype)initWithSelector: (SEL)selector object: (id)object OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFNotImplementedException.m from [c3dc3f6ae4] to [2e20faa1e7].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithSelector: (SEL)selector object: (id)object { return [[[self alloc] initWithSelector: selector object: object] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithSelector: (SEL)selector object: (id)object { return [[[self alloc] initWithSelector: selector object: object] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSelector: (SEL)selector object: (id)object { self = [super init]; _selector = selector; _object = [object retain]; return self; |
︙ | ︙ |
Modified src/exceptions/OFNotOpenException.h from [3a972e8265] to [69044522fc].
︙ | ︙ | |||
39 40 41 42 43 44 45 | * @brief Creates a new, autoreleased not open exception. * * @param object The object which is not open, connected or bound * @return A new, autoreleased not open exception */ + (instancetype)exceptionWithObject: (id)object; | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | * @brief Creates a new, autoreleased not open exception. * * @param object The object which is not open, connected or bound * @return A new, autoreleased not open exception */ + (instancetype)exceptionWithObject: (id)object; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated not open exception. * * @param object The object which is not open, connected or bound * @return An initialized not open exception */ - (instancetype)initWithObject: (id)object OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFNotOpenException.m from [f2f0957e2a] to [dcddd6144c].
︙ | ︙ | |||
28 29 30 31 32 33 34 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | } + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object { self = [super init]; _object = [object retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFObserveFailedException.h from [eb784e0d21] to [3b160642ed].
︙ | ︙ | |||
50 51 52 53 54 55 56 | * @param observer The observer which failed to observe * @param errNo The errno of the error that occurred * @return A new, autoreleased observe failed exception */ + (instancetype)exceptionWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo; | | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * @param observer The observer which failed to observe * @param errNo The errno of the error that occurred * @return A new, autoreleased observe failed exception */ + (instancetype)exceptionWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated observe failed exception. * * @param observer The observer which failed to observe * @param errNo The errno of the error that occurred * @return An initialized observe failed exception */ - (instancetype)initWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFObserveFailedException.m from [5ae6b31dd4] to [c64976f11a].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo { return [[[self alloc] initWithObserver: observer errNo: errNo] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo { return [[[self alloc] initWithObserver: observer errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObserver: (OFKernelEventObserver *)observer errNo: (int)errNo { self = [super init]; @try { _observer = [observer retain]; _errNo = errNo; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFOpenItemFailedException.h from [b2b63457a8] to [8cc711f5f5].
︙ | ︙ | |||
55 56 57 58 59 60 61 | * @param errNo The errno of the error that occurred * @return A new, autoreleased open item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path mode: (nullable OFString *)mode errNo: (int)errNo; | | | | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | * @param errNo The errno of the error that occurred * @return A new, autoreleased open item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path mode: (nullable OFString *)mode errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated open item failed exception. * * @param path A string with the path of the item which could not be opened * @param mode A string with the mode in which the item should have been opened * @param errNo The errno of the error that occurred * @return An initialized open item failed exception */ - (instancetype)initWithPath: (OFString *)path mode: (nullable OFString *)mode errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFOpenItemFailedException.m from [649447f7ba] to [0b9774a53f].
︙ | ︙ | |||
32 33 34 35 36 37 38 | errNo: (int)errNo { return [[[self alloc] initWithPath: path mode: mode errNo: errNo] autorelease]; } | | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | errNo: (int)errNo { return [[[self alloc] initWithPath: path mode: mode errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _mode = [mode copy]; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFOutOfMemoryException.h from [04b0c3927c] to [aeeb143f52].
︙ | ︙ | |||
44 45 46 47 48 49 50 | /*! * @brief Initializes an already allocated no memory exception. * * @param requestedSize The size of the memory that could not be allocated * @return An initialized no memory exception */ | | > | 44 45 46 47 48 49 50 51 52 53 54 55 | /*! * @brief Initializes an already allocated no memory exception. * * @param requestedSize The size of the memory that could not be allocated * @return An initialized no memory exception */ - (instancetype)initWithRequestedSize: (size_t)requestedSize OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFOutOfMemoryException.m from [3aa81f3781] to [d40c089e61].
︙ | ︙ | |||
24 25 26 27 28 29 30 | + (instancetype)exceptionWithRequestedSize: (size_t)requestedSize { return [[[self alloc] initWithRequestedSize: requestedSize] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | + (instancetype)exceptionWithRequestedSize: (size_t)requestedSize { return [[[self alloc] initWithRequestedSize: requestedSize] autorelease]; } - (instancetype)init { return [self initWithRequestedSize: 0]; } - (instancetype)initWithRequestedSize: (size_t)requestedSize { self = [super init]; _requestedSize = requestedSize; return self; } |
︙ | ︙ |
Modified src/exceptions/OFReadOrWriteFailedException.h from [76630b46c4] to [50f44143bc].
︙ | ︙ | |||
58 59 60 61 62 63 64 | * @param errNo The errno of the error that occurred * @return A new, autoreleased read or write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo; | | | | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | * @param errNo The errno of the error that occurred * @return A new, autoreleased read or write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated read or write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that could not be * read / written * @param errNo The errno of the error that occurred * @return A new open file failed exception */ - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFReadOrWriteFailedException.m from [91f716863e] to [2080a86175].
︙ | ︙ | |||
33 34 35 36 37 38 39 | errNo: (int)errNo { return [[[self alloc] initWithObject: object requestedLength: requestedLength errNo: errNo] autorelease]; } | | | | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | errNo: (int)errNo { return [[[self alloc] initWithObject: object requestedLength: requestedLength errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo { self = [super init]; _object = [object retain]; _requestedLength = requestedLength; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFRemoveItemFailedException.h from [8e15a38aea] to [f135f025df].
︙ | ︙ | |||
48 49 50 51 52 53 54 | * @param path The path of the item which could not be removed * @param errNo The errno of the error that occurred * @return A new, autoreleased remove item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; | | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | * @param path The path of the item which could not be removed * @param errNo The errno of the error that occurred * @return A new, autoreleased remove item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated remove failed exception. * * @param path The path of the item which could not be removed * @param errNo The errno of the error that occurred * @return An initialized remove item failed exception */ - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFRemoveItemFailedException.m from [5cc237476f] to [44c7b9e59e].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFSandboxActivationFailedException.h from [d372fc8333] to [1244c14808].
︙ | ︙ | |||
51 52 53 54 55 56 57 | * @param sandbox The sandbox which could not be activated * @param errNo The errno of the error that occurred * @return A new, autoreleased sandboxing failed exception */ + (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo; | | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * @param sandbox The sandbox which could not be activated * @param errNo The errno of the error that occurred * @return A new, autoreleased sandboxing failed exception */ + (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated sandboxing failed exception. * * @param sandbox The sandbox which could not be activated * @param errNo The errno of the error that occurred * @return An initialized sandboxing failed exception */ - (instancetype)initWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFSandboxActivationFailedException.m from [81ac775338] to [ab78c8b6cf].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo { return [[[self alloc] initWithSandbox: sandbox errNo: errNo] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo { return [[[self alloc] initWithSandbox: sandbox errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo { self = [super init]; _sandbox = [sandbox retain]; _errNo = errNo; return self; |
︙ | ︙ |
Modified src/exceptions/OFSeekFailedException.h from [fec6187850] to [df09a3f95e].
︙ | ︙ | |||
64 65 66 67 68 69 70 | * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; | | | | | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error that occurred * @return An initialized seek failed exception */ - (instancetype)initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFSeekFailedException.m from [61374f4d60] to [55ff0b005f].
︙ | ︙ | |||
36 37 38 39 40 41 42 | { return [[[self alloc] initWithStream: stream offset: offset whence: whence errNo: errNo] autorelease]; } | | | | | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | { return [[[self alloc] initWithStream: stream offset: offset whence: whence errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OFSeekableStream *)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { self = [super init]; _stream = [stream retain]; _offset = offset; _whence = whence; _errNo = errNo; |
︙ | ︙ |
Modified src/exceptions/OFSetOptionFailedException.h from [017f4d3212] to [c45c93c061].
︙ | ︙ | |||
50 51 52 53 54 55 56 | * @param stream The stream for which the option could not be set * @param errNo The errno of the error that occurred * @return A new, autoreleased set option failed exception */ + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo; | | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * @param stream The stream for which the option could not be set * @param errNo The errno of the error that occurred * @return A new, autoreleased set option failed exception */ + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated set option failed exception. * * @param stream The stream for which the option could not be set * @param errNo The errno of the error that occurred * @return An initialized set option failed exception */ - (instancetype)initWithStream: (OFStream *)stream errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFSetOptionFailedException.m from [d872fab5a7] to [f6f85887fb].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo { return [[[self alloc] initWithStream: stream errNo: errNo] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithStream: (OFStream *)stream errNo: (int)errNo { return [[[self alloc] initWithStream: stream errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithStream: (OFStream *)stream errNo: (int)errNo { self = [super init]; _stream = [stream retain]; _errNo = errNo; return self; |
︙ | ︙ |
Modified src/exceptions/OFStatItemFailedException.h from [1a609b0774] to [f307ae7896].
︙ | ︙ | |||
49 50 51 52 53 54 55 | * retrieved * @param errNo The errno of the error that occurred * @return A new, autoreleased stat item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * retrieved * @param errNo The errno of the error that occurred * @return A new, autoreleased stat item failed exception */ + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated stat item failed exception. * * @param path A string with the path of the item whose status could not be * retrieved * @param errNo The errno of the error that occurred * @return An initialized stat item failed exception */ - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFStatItemFailedException.m from [80e4300493] to [ded2d947a2].
︙ | ︙ | |||
30 31 32 33 34 35 36 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | + (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPath: (OFString *)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFStillLockedException.h from [b8061dbf08] to [15a545486d].
︙ | ︙ | |||
45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated still locked exception. * * @param lock The lock which is still locked * @return An initialized still locked exception */ | | > | 45 46 47 48 49 50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated still locked exception. * * @param lock The lock which is still locked * @return An initialized still locked exception */ - (instancetype)initWithLock: (nullable id <OFLocking>)lock OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFStillLockedException.m from [2fe383e098] to [92ce8777a7].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - (instancetype)init { return [self initWithLock: nil]; } - (instancetype)initWithLock: (id <OFLocking>)lock { self = [super init]; _lock = [lock retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFThreadJoinFailedException.h from [ee910d5685] to [595f61afcf].
︙ | ︙ | |||
50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated thread join failed exception. * * @param thread The thread which could not be joined * @return An initialized thread join failed exception */ | | > | 50 51 52 53 54 55 56 57 58 59 60 61 | /*! * @brief Initializes an already allocated thread join failed exception. * * @param thread The thread which could not be joined * @return An initialized thread join failed exception */ - (instancetype)initWithThread: (nullable OFThread *)thread OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFThreadJoinFailedException.m from [52418b0509] to [d9af9e39c6].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } - (instancetype)init { return [self initWithThread: nil]; } - (instancetype)initWithThread: (OFThread *)thread { self = [super init]; _thread = [thread retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFThreadStartFailedException.h from [5b62c6914b] to [fd6c478dd7].
︙ | ︙ | |||
50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated thread start failed exception. * * @param thread The thread which could not be started * @return An initialized thread start failed exception */ | | > | 50 51 52 53 54 55 56 57 58 59 60 61 | /*! * @brief Initializes an already allocated thread start failed exception. * * @param thread The thread which could not be started * @return An initialized thread start failed exception */ - (instancetype)initWithThread: (nullable OFThread *)thread OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFThreadStartFailedException.m from [15916f07c7] to [78c3ecad5d].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } - (instancetype)init { return [self initWithThread: nil]; } - (instancetype)initWithThread: (OFThread *)thread { self = [super init]; _thread = [thread retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFThreadStillRunningException.h from [f704902e73] to [00e790e6d8].
︙ | ︙ | |||
50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated thread still running exception. * * @param thread The thread which is still running * @return An initialized thread still running exception */ | | > | 50 51 52 53 54 55 56 57 58 59 60 61 | /*! * @brief Initializes an already allocated thread still running exception. * * @param thread The thread which is still running * @return An initialized thread still running exception */ - (instancetype)initWithThread: (nullable OFThread *)thread OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFThreadStillRunningException.m from [72ea85d26c] to [93abbb4a37].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | @synthesize thread = _thread; + (instancetype)exceptionWithThread: (OFThread *)thread { return [[[self alloc] initWithThread: thread] autorelease]; } - (instancetype)init { return [self initWithThread: nil]; } - (instancetype)initWithThread: (OFThread *)thread { self = [super init]; _thread = [thread retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFUnboundNamespaceException.h from [0e5c5a1bea] to [ea8e0b8705].
︙ | ︙ | |||
54 55 56 57 58 59 60 | * @param namespace_ The namespace which is unbound * @param element The element in which the namespace was not bound * @return A new, autoreleased unbound namespace exception */ + (instancetype)exceptionWithNamespace: (OFString *)namespace_ element: (OFXMLElement *)element; | | | | > | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | * @param namespace_ The namespace which is unbound * @param element The element in which the namespace was not bound * @return A new, autoreleased unbound namespace exception */ + (instancetype)exceptionWithNamespace: (OFString *)namespace_ element: (OFXMLElement *)element; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated unbound namespace exception. * * @param namespace_ The namespace which is unbound * @param element The element in which the namespace was not bound * @return An initialized unbound namespace exception */ - (instancetype)initWithNamespace: (OFString *)namespace_ element: (OFXMLElement *)element OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnboundNamespaceException.m from [c53b196b47] to [ceb4b14e35].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithNamespace: (OFString *)namespace element: (OFXMLElement *)element { return [[[self alloc] initWithNamespace: namespace element: element] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithNamespace: (OFString *)namespace element: (OFXMLElement *)element { return [[[self alloc] initWithNamespace: namespace element: element] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithNamespace: (OFString *)namespace element: (OFXMLElement *)element { self = [super init]; @try { _namespace = [namespace copy]; _element = [element retain]; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFUnboundPrefixException.h from [5e8a642c6a] to [093083acd4].
︙ | ︙ | |||
50 51 52 53 54 55 56 | * @param prefix The prefix which is unbound * @param parser The parser which encountered the unbound prefix * @return A new, autoreleased unbound prefix exception */ + (instancetype)exceptionWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser; | | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * @param prefix The prefix which is unbound * @param parser The parser which encountered the unbound prefix * @return A new, autoreleased unbound prefix exception */ + (instancetype)exceptionWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated unbound prefix exception. * * @param prefix The prefix which is unbound * @param parser The parser which encountered the unbound prefix * @return An initialized unbound prefix exception */ - (instancetype)initWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnboundPrefixException.m from [6f576c049a] to [a31ccc390b].
︙ | ︙ | |||
31 32 33 34 35 36 37 | + (instancetype)exceptionWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser { return [[[self alloc] initWithPrefix: prefix parser: parser] autorelease]; } | | | | | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | + (instancetype)exceptionWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser { return [[[self alloc] initWithPrefix: prefix parser: parser] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithPrefix: (OFString *)prefix parser: (OFXMLParser *)parser { self = [super init]; @try { _prefix = [prefix copy]; _parser = [parser retain]; } @catch (id e) { |
︙ | ︙ |
Modified src/exceptions/OFUndefinedKeyException.h from [8262adf7cd] to [2cf6faae58].
︙ | ︙ | |||
68 69 70 71 72 73 74 | * * @return A new, autoreleased undefined key exception */ + (instancetype)exceptionWithObject: (id)object key: (OFString *)key value: (nullable id)value; | | | | | | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | * * @return A new, autoreleased undefined key exception */ + (instancetype)exceptionWithObject: (id)object key: (OFString *)key value: (nullable id)value; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated undefined key exception. * * @param object The object on which the key is undefined * @param key The key which is undefined * * @return An initialized undefined key exception */ - (instancetype)initWithObject: (id)object key: (OFString *)key; /*! * @brief Initializes an already allocated undefined key exception. * * @param object The object on which the key is undefined * @param key The key which is undefined * @param value The value for the undefined key * * @return An initialized undefined key exception */ - (instancetype)initWithObject: (id)object key: (OFString *)key value: (nullable id)value OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUndefinedKeyException.m from [f82b50e599] to [52d11bb131].
︙ | ︙ | |||
39 40 41 42 43 44 45 | value: (id)value { return [[[self alloc] initWithObject: object key: key value: value] autorelease]; } | | | | | | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | value: (id)value { return [[[self alloc] initWithObject: object key: key value: value] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object key: (OFString *)key { return [self initWithObject: object key: key value: nil]; } - (instancetype)initWithObject: (id)object key: (OFString *)key value: (id)value { self = [super init]; @try { _object = [object retain]; _key = [key copy]; _value = [value retain]; |
︙ | ︙ |
Modified src/exceptions/OFUnknownXMLEntityException.h from [ed0a6b7b38] to [2b12797bb2].
︙ | ︙ | |||
39 40 41 42 43 44 45 | * @brief Creates a new, autoreleased unknown XML entity exception. * * @param entityName The name of the unknown XML entity * @return A new, autoreleased unknown XML entity exception */ + (instancetype)exceptionWithEntityName: (OFString *)entityName; | | | > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | * @brief Creates a new, autoreleased unknown XML entity exception. * * @param entityName The name of the unknown XML entity * @return A new, autoreleased unknown XML entity exception */ + (instancetype)exceptionWithEntityName: (OFString *)entityName; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated unknown XML entity exception. * * @param entityName The name of the unknown XML entity * @return An initialized unknown XML entity exception */ - (instancetype)initWithEntityName: (OFString *)entityName OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnknownXMLEntityException.m from [107f333674] to [a805c3514a].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize entityName = _entityName; + (instancetype)exceptionWithEntityName: (OFString *)entityName { return [[[self alloc] initWithEntityName: entityName] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize entityName = _entityName; + (instancetype)exceptionWithEntityName: (OFString *)entityName { return [[[self alloc] initWithEntityName: entityName] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithEntityName: (OFString *)entityName { self = [super init]; @try { _entityName = [entityName copy]; } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/exceptions/OFUnlockFailedException.h from [52fd9fc107] to [81892243b6].
︙ | ︙ | |||
45 46 47 48 49 50 51 | /*! * @brief Initializes an already allocated unlock failed exception. * * @param lock The lock which could not be unlocked * @return An initialized unlock failed exception */ | | > | 45 46 47 48 49 50 51 52 53 54 55 56 | /*! * @brief Initializes an already allocated unlock failed exception. * * @param lock The lock which could not be unlocked * @return An initialized unlock failed exception */ - (instancetype)initWithLock: (nullable id <OFLocking>)lock OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnlockFailedException.m from [2f9ac905e0] to [6d496fdb08].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | @synthesize lock = _lock; + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - (instancetype)init { return [self initWithLock: nil]; } - (instancetype)initWithLock: (id <OFLocking>)lock { self = [super init]; _lock = [lock retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFUnsupportedProtocolException.h from [3933dc08dd] to [36bb62c9cc].
︙ | ︙ | |||
44 45 46 47 48 49 50 | * @brief Creates a new, autoreleased unsupported protocol exception. * * @param URL The URL whose protocol is unsupported * @return A new, autoreleased unsupported protocol exception */ + (instancetype)exceptionWithURL: (OFURL*)URL; | | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | * @brief Creates a new, autoreleased unsupported protocol exception. * * @param URL The URL whose protocol is unsupported * @return A new, autoreleased unsupported protocol exception */ + (instancetype)exceptionWithURL: (OFURL*)URL; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated unsupported protocol exception * * @param URL The URL whose protocol is unsupported * @return An initialized unsupported protocol exception */ - (instancetype)initWithURL: (OFURL*)URL OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnsupportedProtocolException.m from [0553975a42] to [604d15bbbd].
︙ | ︙ | |||
29 30 31 32 33 34 35 | } + (instancetype)exceptionWithURL: (OFURL *)URL { return [[[self alloc] initWithURL: URL] autorelease]; } | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | } + (instancetype)exceptionWithURL: (OFURL *)URL { return [[[self alloc] initWithURL: URL] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithURL: (OFURL *)URL { self = [super init]; _URL = [URL retain]; return self; } |
︙ | ︙ |
Modified src/exceptions/OFUnsupportedVersionException.h from [cc57329772] to [57c11262a0].
︙ | ︙ | |||
41 42 43 44 45 46 47 | * @brief Creates a new, autoreleased unsupported version exception. * * @param version The version which is unsupported * @return A new, autoreleased unsupported version exception */ + (instancetype)exceptionWithVersion: (OFString *)version; | | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | * @brief Creates a new, autoreleased unsupported version exception. * * @param version The version which is unsupported * @return A new, autoreleased unsupported version exception */ + (instancetype)exceptionWithVersion: (OFString *)version; - (instancetype)init OF_UNAVAILABLE; /*! * @brief Initializes an already allocated unsupported protocol exception. * * @param version The version which is unsupported * @return An initialized unsupported version exception */ - (instancetype)initWithVersion: (OFString *)version OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFUnsupportedVersionException.m from [e260d7129f] to [4b02687dc3].
︙ | ︙ | |||
28 29 30 31 32 33 34 | } + (instancetype)exceptionWithVersion: (OFString *)version { return [[[self alloc] initWithVersion: version] autorelease]; } | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | } + (instancetype)exceptionWithVersion: (OFString *)version { return [[[self alloc] initWithVersion: version] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithVersion: (OFString *)version { self = [super init]; @try { _version = [version copy]; } @catch (id e) { [self release]; |
︙ | ︙ |
Modified src/exceptions/OFWriteFailedException.h from [63e6e7e007] to [38908fcba9].
︙ | ︙ | |||
53 54 55 56 57 58 59 | * @return A new, autoreleased write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength bytesWritten: (size_t)bytesWritten errNo: (int)errNo; | | | | | | | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | * @return A new, autoreleased write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength bytesWritten: (size_t)bytesWritten errNo: (int)errNo; - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo OF_UNAVAILABLE; /*! * @brief Initializes an already allocated write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that could not be * read / written * @param bytesWritten The amount of bytes already written before the write * failed * @param errNo The errno of the error that occurred * @return A new open file failed exception */ - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength bytesWritten: (size_t)bytesWritten errNo: (int)errNo OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Modified src/exceptions/OFWriteFailedException.m from [16fd1ae620] to [dddd9c4da4].
︙ | ︙ | |||
38 39 40 41 42 43 44 | { return [[[self alloc] initWithObject: object requestedLength: requestedLength bytesWritten: bytesWritten errNo: errNo] autorelease]; } | | | | | | | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | { return [[[self alloc] initWithObject: object requestedLength: requestedLength bytesWritten: bytesWritten errNo: errNo] autorelease]; } - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo { OF_INVALID_INIT_METHOD } - (instancetype)initWithObject: (id)object requestedLength: (size_t)requestedLength bytesWritten: (size_t)bytesWritten errNo: (int)errNo { self = [super initWithObject: object requestedLength: requestedLength errNo: errNo]; _bytesWritten = bytesWritten; |
︙ | ︙ |
Modified tests/OFArrayTests.m from [ce6bbc2cf5] to [4fabdad1e7].
︙ | ︙ | |||
43 44 45 46 47 48 49 | @interface SimpleMutableArray: OFMutableArray { OFMutableArray *_array; } @end @implementation SimpleArray | | | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | @interface SimpleMutableArray: OFMutableArray { OFMutableArray *_array; } @end @implementation SimpleArray - (instancetype)init { self = [super init]; @try { _array = [[OFMutableArray alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObject: (id)object arguments: (va_list)arguments { self = [super init]; @try { _array = [[OFMutableArray alloc] initWithObject: object arguments: arguments]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (id const *)objects count: (size_t)count { self = [super init]; @try { _array = [[OFMutableArray alloc] initWithObjects: objects count: count]; } @catch (id e) { |
︙ | ︙ |
Modified tests/OFDictionaryTests.m from [ed8d42f32f] to [ca0fda1cc3].
︙ | ︙ | |||
46 47 48 49 50 51 52 | @interface SimpleMutableDictionary: OFMutableDictionary { OFMutableDictionary *_dictionary; } @end @implementation SimpleDictionary | | | | | | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | @interface SimpleMutableDictionary: OFMutableDictionary { OFMutableDictionary *_dictionary; } @end @implementation SimpleDictionary - (instancetype)init { self = [super init]; @try { _dictionary = [[OFMutableDictionary alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithKey: (id)key arguments: (va_list)arguments { self = [super init]; @try { _dictionary = [[OFMutableDictionary alloc] initWithKey: key arguments: arguments]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithObjects: (const id *)objects forKeys: (const id *)keys_ count: (size_t)count { self = [super init]; @try { _dictionary = [[OFMutableDictionary alloc] initWithObjects: objects forKeys: keys_ |
︙ | ︙ |
Modified tests/OFHTTPClientTests.m from [76843d6944] to [551e4c55ef].
︙ | ︙ | |||
46 47 48 49 50 51 52 | { @public uint16_t _port; } @end @implementation HTTPClientTestsServer | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | { @public uint16_t _port; } @end @implementation HTTPClientTestsServer - (id)main { OFTCPSocket *listener, *client; [cond lock]; listener = [OFTCPSocket socket]; _port = [listener bindToHost: @"127.0.0.1" |
︙ | ︙ |
Modified tests/OFKernelEventObserverTests.m from [6f6df4db2e] to [a75e0308f8].
︙ | ︙ | |||
51 52 53 54 55 56 57 | int _fails; } - (void)run; @end @implementation ObserverTest | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | int _fails; } - (void)run; @end @implementation ObserverTest - (instancetype)initWithTestsAppDelegate: (TestsAppDelegate *)testsAppDelegate { self = [super init]; @try { uint16_t port; _testsAppDelegate = testsAppDelegate; |
︙ | ︙ |
Modified tests/OFStringTests.m from [addca37143] to [71dce1ac50].
︙ | ︙ | |||
63 64 65 66 67 68 69 | @interface SimpleMutableString: OFMutableString { OFMutableString *_string; } @end @implementation SimpleString | | | | | | | | | | | | | | | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | @interface SimpleMutableString: OFMutableString { OFMutableString *_string; } @end @implementation SimpleString - (instancetype)init { self = [super init]; @try { _string = [[OFMutableString alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithString: (OFString *)string { self = [super init]; @try { _string = [string mutableCopy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithCString: (const char *)cString encoding: (of_string_encoding_t)encoding length: (size_t)length { self = [super init]; @try { _string = [[OFMutableString alloc] initWithCString: cString encoding: encoding length: length]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithUTF16String: (const char16_t *)UTF16String length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { _string = [[OFMutableString alloc] initWithUTF16String: UTF16String length: length byteOrder: byteOrder]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithUTF32String: (const char32_t *)UTF32String length: (size_t)length byteOrder: (of_byte_order_t)byteOrder { self = [super init]; @try { _string = [[OFMutableString alloc] initWithUTF32String: UTF32String length: length byteOrder: byteOrder]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithFormat: (OFConstantString *)format arguments: (va_list)arguments { self = [super init]; @try { _string = [[OFMutableString alloc] initWithFormat: format arguments: arguments]; } @catch (id e) { |
︙ | ︙ |
Modified utils/ofhttp/OFHTTP.m from [19987f61b8] to [7674e4cd26].
︙ | ︙ | |||
234 235 236 237 238 239 240 | [fileName retain]; objc_autoreleasePoolPop(pool); return [fileName autorelease]; } @implementation OFHTTP | | | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | [fileName retain]; objc_autoreleasePoolPop(pool); return [fileName autorelease]; } @implementation OFHTTP - (instancetype)init { self = [super init]; @try { _method = OF_HTTP_REQUEST_METHOD_GET; _clientHeaders = [[OFMutableDictionary alloc] |
︙ | ︙ |
Modified utils/ofhttp/ProgressBar.h from [df943e83c1] to [47428227ea].
︙ | ︙ | |||
25 26 27 28 29 30 31 | OFDate *_startDate, *_lastReceivedDate; OFTimer *_drawTimer, *_BPSTimer; bool _stopped; float _BPS; double _ETA; } | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | OFDate *_startDate, *_lastReceivedDate; OFTimer *_drawTimer, *_BPSTimer; bool _stopped; float _BPS; double _ETA; } - (instancetype)initWithLength: (intmax_t)length resumedFrom: (intmax_t)resumedFrom; - (void)setReceived: (intmax_t)received; - (void)draw; - (void)calculateBPSAndETA; - (void)stop; @end |
Modified utils/ofhttp/ProgressBar.m from [509373b942] to [f1b2b790af].
︙ | ︙ | |||
28 29 30 31 32 33 34 | #define GIBIBYTE (1024 * 1024 * 1024) #define MEBIBYTE (1024 * 1024) #define KIBIBYTE (1024) #define UPDATE_INTERVAL 0.1 @implementation ProgressBar | | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #define GIBIBYTE (1024 * 1024 * 1024) #define MEBIBYTE (1024 * 1024) #define KIBIBYTE (1024) #define UPDATE_INTERVAL 0.1 @implementation ProgressBar - (instancetype)initWithLength: (intmax_t)length resumedFrom: (intmax_t)resumedFrom { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); _length = length; |
︙ | ︙ |
Modified utils/ofzip/Archive.h from [c9b737aa7a] to [ce3cd1c862].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #import "OFObject.h" #import "OFFile.h" #import "OFArray.h" @protocol Archive <OFObject> + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode; | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #import "OFObject.h" #import "OFFile.h" #import "OFArray.h" @protocol Archive <OFObject> + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode; - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode; - (void)listFiles; - (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files; - (void)printFiles: (OFArray OF_GENERIC(OFString *) *)files; @optional - (void)addFiles: (OFArray OF_GENERIC(OFString *) *)files; @end |
Modified utils/ofzip/GZIPArchive.m from [39d718e85f] to [c97ab3d19b].
︙ | ︙ | |||
48 49 50 51 52 53 54 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { self = [super init]; @try { _stream = [[OFGZIPStream alloc] initWithStream: stream mode: mode]; } @catch (id e) { |
︙ | ︙ |
Modified utils/ofzip/TarArchive.m from [e256d7b4a3] to [402b43560b].
︙ | ︙ | |||
50 51 52 53 54 55 56 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { self = [super init]; @try { _archive = [[OFTarArchive alloc] initWithStream: stream mode: mode]; } @catch (id e) { |
︙ | ︙ |
Modified utils/ofzip/ZIPArchive.m from [7af801eda1] to [6d91678c4e].
︙ | ︙ | |||
60 61 62 63 64 65 66 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } | | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | + (instancetype)archiveWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { return [[[self alloc] initWithStream: stream mode: mode] autorelease]; } - (instancetype)initWithStream: (OF_KINDOF(OFStream *))stream mode: (OFString *)mode { self = [super init]; @try { _archive = [[OFZIPArchive alloc] initWithStream: stream mode: mode]; } @catch (id e) { |
︙ | ︙ |