abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-03 21:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make xchar() a private #define of ip6_addr.c, it is not standardized in any C header

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-11-05 10:06:25 +01:00
parent de991b1158
commit a9a3d473ac
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ipv6/ip6_addr.c
View File

@ -57,9 +57,10 @@ const ip_addr_t ip6_addr_any = IPADDR6_INIT(0ul, 0ul, 0ul, 0ul);
#define isxdigit(c) (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F')) #define isxdigit(c) (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F'))
#define islower(c) in_range(c, 'a', 'z') #define islower(c) in_range(c, 'a', 'z')
#define isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') #define isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
#define xchar(i) ((char)((i) < 10 ? '0' + (i) : 'A' + (i) - 10))
#endif #endif
#define lwip_xchar(i) ((char)((i) < 10 ? '0' + (i) : 'A' + (i) - 10))
/** /**
* Check whether "cp" is a valid ascii representation * Check whether "cp" is a valid ascii representation
* of an IPv6 address and convert to a binary address. * of an IPv6 address and convert to a binary address.
@ -252,7 +253,7 @@ ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen)
if ((current_block_value & 0xf000) == 0) { if ((current_block_value & 0xf000) == 0) {
zero_flag = 1; zero_flag = 1;
} else { } else {
buf[i++] = xchar(((current_block_value & 0xf000) >> 12)); buf[i++] = lwip_xchar(((current_block_value & 0xf000) >> 12));
zero_flag = 0; zero_flag = 0;
if (i >= buflen) { if (i >= buflen) {
return NULL; return NULL;
@ -262,7 +263,7 @@ ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen)
if (((current_block_value & 0xf00) == 0) && (zero_flag)) { if (((current_block_value & 0xf00) == 0) && (zero_flag)) {
/* do nothing */ /* do nothing */
} else { } else {
buf[i++] = xchar(((current_block_value & 0xf00) >> 8)); buf[i++] = lwip_xchar(((current_block_value & 0xf00) >> 8));
zero_flag = 0; zero_flag = 0;
if (i >= buflen) { if (i >= buflen) {
return NULL; return NULL;
@ -273,14 +274,14 @@ ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen)
/* do nothing */ /* do nothing */
} }
else { else {
buf[i++] = xchar(((current_block_value & 0xf0) >> 4)); buf[i++] = lwip_xchar(((current_block_value & 0xf0) >> 4));
zero_flag = 0; zero_flag = 0;
if (i >= buflen) { if (i >= buflen) {
return NULL; return NULL;
} }
} }
buf[i++] = xchar((current_block_value & 0xf)); buf[i++] = lwip_xchar((current_block_value & 0xf));
if (i >= buflen) { if (i >= buflen) {
return NULL; return NULL;
} }