Differences From Artifact [0757bca949]:
- File
src/socket.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: 20789) [annotate] [blame] [check-ins using] [more...]
To Artifact [e490baa3be]:
- File src/socket.m — part of check-in [cbc09c6e26] at 2020-09-27 00:57:30 on branch trunk — Work around bugs in Apple GCC 4.2.1 (user: js, size: 20837) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
40 41 42 43 44 45 46 | #ifdef OF_HAVE_THREADS # ifndef OF_AMIGAOS # import "mutex.h" # else # import "tlskey.h" # endif #endif | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #ifdef OF_HAVE_THREADS # ifndef OF_AMIGAOS # import "mutex.h" # else # import "tlskey.h" # endif #endif #import "once.h" #ifdef OF_AMIGAOS # include <proto/exec.h> #endif #ifdef OF_NINTENDO_3DS # include <3ds/types.h> |
| ︙ | ︙ | |||
386 387 388 389 390 391 392 | @throw [OFInvalidFormatException exception]; number = component.unsignedLongLongValue; if (number > UINT8_MAX) @throw [OFInvalidFormatException exception]; | | | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | @throw [OFInvalidFormatException exception]; number = component.unsignedLongLongValue; if (number > UINT8_MAX) @throw [OFInvalidFormatException exception]; addr = (addr << 8) | ((uint32_t)number & 0xFF); } addrIn->sin_addr.s_addr = OF_BSWAP32_IF_LE(addr); objc_autoreleasePoolPop(pool); return ret; |
| ︙ | ︙ | |||
497 498 499 500 501 502 503 504 |
return ret;
}
of_socket_address_t
of_socket_address_parse_ip(OFString *IP, uint16_t port)
{
@try {
| > > | | > > | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 |
return ret;
}
of_socket_address_t
of_socket_address_parse_ip(OFString *IP, uint16_t port)
{
of_socket_address_t ret;
@try {
ret = of_socket_address_parse_ipv6(IP, port);
} @catch (OFInvalidFormatException *e) {
ret = of_socket_address_parse_ipv4(IP, port);
}
return ret;
}
of_socket_address_t
of_socket_address_ipx(const unsigned char node[IPX_NODE_LEN], uint32_t network,
uint16_t port)
{
of_socket_address_t ret;
|
| ︙ | ︙ |