Differences From Artifact [50000beafa]:
- File
src/OFURL.m
— part of check-in
[b6ee372b98]
at
2020-08-11 19:45:36
on branch trunk
— OFString: Rework number parsing API
This solves the old signed vs. unsigned problem and allows for more
bases than just 8, 10 and 16, as well as auto-detection of the base (if
base is 0). (user: js, size: 24476) [annotate] [blame] [check-ins using]
To Artifact [a6ef5631a2]:
- File
src/OFURL.m
— part of check-in
[25c985fec1]
at
2020-08-25 00:11:24
on branch trunk
— OFNumber: Remove (u)int{8,16,32,64} methods
Since C guarantees minimum sizes for char, short, int, long and long
long, these can be used instead. (user: js, size: 24470) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
488 489 490 491 492 493 494 | length: UTF8String - tmp2]; if (portString.length == 0 || portString.unsignedLongLongValue > 65535) @throw [OFInvalidFormatException exception]; | | | | | | 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 |
length: UTF8String - tmp2];
if (portString.length == 0 ||
portString.unsignedLongLongValue > 65535)
@throw [OFInvalidFormatException
exception];
_port = [[OFNumber alloc] initWithUnsignedShort:
portString.unsignedLongLongValue];
} else if (*UTF8String != '\0')
@throw [OFInvalidFormatException exception];
isIPv6Host = true;
} else if ((tmp2 = strchr(UTF8String, ':')) != NULL) {
OFString *portString;
*tmp2 = '\0';
tmp2++;
_URLEncodedHost = [[OFString alloc]
initWithUTF8String: UTF8String];
portString = [OFString stringWithUTF8String: tmp2];
if (portString.unsignedLongLongValue > 65535)
@throw [OFInvalidFormatException exception];
_port = [[OFNumber alloc] initWithUnsignedShort:
portString.unsignedLongLongValue];
} else
_URLEncodedHost = [[OFString alloc]
initWithUTF8String: UTF8String];
if (!isIPv6Host)
of_url_verify_escaped(_URLEncodedHost,
[OFCharacterSet URLHostAllowedCharacterSet]);
|
| ︙ | ︙ |