Overview
Comment: | Clean up which exception is used when a little |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
3356b9940cf159832ab7bac332651717 |
User & Date: | js on 2020-04-19 10:02:51 |
Other Links: | manifest | tags |
Context
2020-04-19
| ||
14:07 | Update buildsys check-in: dcebb980d6 user: js tags: trunk | |
10:02 | Clean up which exception is used when a little check-in: 3356b9940c user: js tags: trunk | |
2020-04-18
| ||
20:43 | OFDNSResolver: Retry with TCP if TC is set check-in: 321f4c67a4 user: js tags: trunk | |
Changes
Modified src/OFDNSResourceRecord.m from [357d84f80b] to [054747ac72].
︙ | ︙ | |||
77 78 79 80 81 82 83 | string = string.uppercaseString; if ([string isEqual: @"IN"]) DNSClass = OF_DNS_CLASS_IN; else { @try { | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | string = string.uppercaseString; if ([string isEqual: @"IN"]) DNSClass = OF_DNS_CLASS_IN; else { @try { DNSClass = (of_dns_class_t)string.decimalValue; } @catch (OFInvalidFormatException *e) { @throw [OFInvalidArgumentException exception]; } } objc_autoreleasePoolPop(pool); |
︙ | ︙ | |||
122 123 124 125 126 127 128 | else if ([string isEqual: @"SRV"]) recordType = OF_DNS_RECORD_TYPE_SRV; else if ([string isEqual: @"ALL"]) recordType = OF_DNS_RECORD_TYPE_ALL; else { @try { recordType = | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | else if ([string isEqual: @"SRV"]) recordType = OF_DNS_RECORD_TYPE_SRV; else if ([string isEqual: @"ALL"]) recordType = OF_DNS_RECORD_TYPE_ALL; else { @try { recordType = (of_dns_record_type_t)string.decimalValue; } @catch (OFInvalidFormatException *e) { @throw [OFInvalidArgumentException exception]; } } objc_autoreleasePoolPop(pool); |
︙ | ︙ |
Modified src/OFHTTPResponse.m from [651e588aea] to [1abecd6ce8].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #import "OFHTTPResponse.h" #import "OFString.h" #import "OFDictionary.h" #import "OFArray.h" #import "OFData.h" | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #import "OFHTTPResponse.h" #import "OFString.h" #import "OFDictionary.h" #import "OFArray.h" #import "OFData.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #import "OFTruncatedDataException.h" #import "OFUnsupportedVersionException.h" OFString * of_http_status_code_to_string(short code) |
︙ | ︙ | |||
214 215 216 217 218 219 220 | if ([name isEqual: @"charset"]) charset = value; } @try { ret = of_string_parse_encoding(charset); | | | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | if ([name isEqual: @"charset"]) charset = value; } @try { ret = of_string_parse_encoding(charset); } @catch (OFInvalidArgumentException *e) { ret = OF_STRING_ENCODING_AUTODETECT; } return ret; } @implementation OFHTTPResponse |
︙ | ︙ |
Modified src/OFLocale.m from [54ee38ba1e] to [0b5d50eb1d].
︙ | ︙ | |||
23 24 25 26 27 28 29 | #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" | < | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFNumber.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" #ifdef OF_AMIGAOS # include <proto/dos.h> # include <proto/exec.h> # include <proto/locale.h> |
︙ | ︙ | |||
61 62 63 64 65 66 67 | *tmp++ = '\0'; @try { if (encoding != NULL) *encoding = of_string_parse_encoding( [OFString stringWithCString: tmp encoding: enc]); | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | *tmp++ = '\0'; @try { if (encoding != NULL) *encoding = of_string_parse_encoding( [OFString stringWithCString: tmp encoding: enc]); } @catch (OFInvalidArgumentException *e) { } } /* Territory */ if ((tmp = strrchr(locale, '_')) != NULL) { *tmp++ = '\0'; |
︙ | ︙ | |||
429 430 431 432 433 434 435 | # endif of_string_encoding_t ASCII = OF_STRING_ENCODING_ASCII; @try { _encoding = of_string_parse_encoding( [OFString stringWithCString: buffer encoding: ASCII]); | | | 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 | # endif of_string_encoding_t ASCII = OF_STRING_ENCODING_ASCII; @try { _encoding = of_string_parse_encoding( [OFString stringWithCString: buffer encoding: ASCII]); } @catch (OFInvalidArgumentException *e) { _encoding = OF_STRING_ENCODING_ISO_8859_1; } } else _encoding = OF_STRING_ENCODING_ISO_8859_1; /* * Get it via localeconv() instead of from the Locale struct, |
︙ | ︙ |
Modified src/OFString.h from [bdb6b2db5a] to [8801d5dd21].
︙ | ︙ | |||
172 173 174 175 176 177 178 | /*! * @brief The decimal value of the string as an `intmax_t`. * * Leading and trailing whitespaces are ignored. * * If the string contains any non-number characters, an | | | | | | | 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 | /*! * @brief The decimal value of the string as an `intmax_t`. * * Leading and trailing whitespaces are ignored. * * If the string contains any non-number characters, an * @ref OFInvalidFormatException is thrown. * * If the number is too big to fit into an `intmax_t`, an * @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) intmax_t decimalValue; /*! * @brief The hexadecimal value of the string as an `uintmax_t`. * * Leading and trailing whitespaces are ignored. * * If the string contains any non-number characters, an * @ref OFInvalidFormatException is thrown. * * If the number is too big to fit into an `uintmax_t`, an * @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) uintmax_t hexadecimalValue; /*! * @brief The octal value of the string as an `uintmax_t`. * * Leading and trailing whitespaces are ignored. * * If the string contains any non-number characters, an * @ref OFInvalidFormatException is thrown. * * If the number is too big to fit into an `uintmax_t`, an * @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) uintmax_t octalValue; /*! * @brief The float value of the string as a float. * * If the string contains any non-number characters, an * @ref OFInvalidFormatException is thrown. */ @property (readonly, nonatomic) float floatValue; /*! * @brief The double value of the string as a double. * * If the string contains any non-number characters, an * @ref OFInvalidFormatException is thrown. */ @property (readonly, nonatomic) double doubleValue; /*! * @brief The string as an array of Unicode characters. * * The result is valid until the autorelease pool is released. If you want to |
︙ | ︙ |
Modified src/OFString.m from [57dadde5e8] to [1cad4eddab].
︙ | ︙ | |||
186 187 188 189 190 191 192 | else if ([string isEqual: @"macintosh"] || [string isEqual: @"mac"]) encoding = OF_STRING_ENCODING_MAC_ROMAN; else if ([string isEqual: @"koi8-r"]) encoding = OF_STRING_ENCODING_KOI8_R; else if ([string isEqual: @"koi8-u"]) encoding = OF_STRING_ENCODING_KOI8_U; else | | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | else if ([string isEqual: @"macintosh"] || [string isEqual: @"mac"]) encoding = OF_STRING_ENCODING_MAC_ROMAN; else if ([string isEqual: @"koi8-r"]) encoding = OF_STRING_ENCODING_KOI8_R; else if ([string isEqual: @"koi8-u"]) encoding = OF_STRING_ENCODING_KOI8_U; else @throw [OFInvalidArgumentException exception]; objc_autoreleasePoolPop(pool); return encoding; } OFString * |
︙ | ︙ |
Modified src/OFXMLParser.m from [d4fd816fdb] to [7ad1f08170].
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #import "OFStream.h" #ifdef OF_HAVE_FILES # import "OFFile.h" #endif #import "OFSystemInfo.h" #import "OFInitializationFailedException.h" #import "OFInvalidFormatException.h" #import "OFMalformedXMLException.h" #import "OFOutOfRangeException.h" #import "OFUnboundPrefixException.h" typedef void (*state_function_t)(id, SEL); static SEL selectors[OF_XMLPARSER_NUM_STATES]; | > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #import "OFStream.h" #ifdef OF_HAVE_FILES # import "OFFile.h" #endif #import "OFSystemInfo.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" #import "OFMalformedXMLException.h" #import "OFOutOfRangeException.h" #import "OFUnboundPrefixException.h" typedef void (*state_function_t)(id, SEL); static SEL selectors[OF_XMLPARSER_NUM_STATES]; |
︙ | ︙ | |||
476 477 478 479 480 481 482 | if ([attribute isEqual: @"version"]) { if (![value hasPrefix: @"1."]) return false; hasVersion = true; } | | > > | > > > > > | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | if ([attribute isEqual: @"version"]) { if (![value hasPrefix: @"1."]) return false; hasVersion = true; } if ([attribute isEqual: @"encoding"]) { @try { _encoding = of_string_parse_encoding(value); } @catch (OFInvalidArgumentException *e) { @throw [OFInvalidEncodingException exception]; } } last = i + 1; PIState = 0; break; } } |
︙ | ︙ |
Modified utils/ofarc/OFArc.m from [b07849fddc] to [f2fa0ce091].
︙ | ︙ | |||
33 34 35 36 37 38 39 | #import "GZIPArchive.h" #import "LHAArchive.h" #import "TarArchive.h" #import "ZIPArchive.h" #import "OFCreateDirectoryFailedException.h" #import "OFInvalidArgumentException.h" | < | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | #import "GZIPArchive.h" #import "LHAArchive.h" #import "TarArchive.h" #import "ZIPArchive.h" #import "OFCreateDirectoryFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" #import "OFOpenItemFailedException.h" #import "OFReadFailedException.h" #import "OFSeekFailedException.h" #import "OFWriteFailedException.h" |
︙ | ︙ | |||
296 297 298 299 300 301 302 | break; } } @try { if (encodingString != nil) encoding = of_string_parse_encoding(encodingString); | | | 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | break; } } @try { if (encodingString != nil) encoding = of_string_parse_encoding(encodingString); } @catch (OFInvalidArgumentException *e) { [of_stderr writeLine: OF_LOCALIZED( @"invalid_encoding", @"%[prog]: Invalid encoding: %[encoding]", @"prog", [OFApplication programName], @"encoding", encodingString)]; [OFApplication terminateWithStatus: 1]; |
︙ | ︙ |