moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed usage of u_int and u_char

This commit is contained in:
Dominick Meglio 2005-04-09 23:46:31 +00:00
parent f09e479fd6
commit bee198def5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ares/bitncmp.c
View File

@ -36,7 +36,7 @@
*/ */
int int
ares_bitncmp(const void *l, const void *r, int n) { ares_bitncmp(const void *l, const void *r, int n) {
u_int lb, rb; unsigned int lb, rb;
int x, b; int x, b;
b = n / 8; b = n / 8;
@ -44,8 +44,8 @@ ares_bitncmp(const void *l, const void *r, int n) {
if (x) if (x)
return (x); return (x);
lb = ((const u_char *)l)[b]; lb = ((const unsigned char *)l)[b];
rb = ((const u_char *)r)[b]; rb = ((const unsigned char *)r)[b];
for (b = n % 8; b > 0; b--) { for (b = n % 8; b > 0; b--) {
if ((lb & 0x80) != (rb & 0x80)) { if ((lb & 0x80) != (rb & 0x80)) {
if (lb & 0x80) if (lb & 0x80)

30
ares/inet_net_pton.c
View File

@ -67,11 +67,11 @@
* Paul Vixie (ISC), June 1996 * Paul Vixie (ISC), June 1996
*/ */
static int static int
inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) { inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size) {
static const char xdigits[] = "0123456789abcdef"; static const char xdigits[] = "0123456789abcdef";
static const char digits[] = "0123456789"; static const char digits[] = "0123456789";
int n, ch, tmp = 0, dirty, bits; int n, ch, tmp = 0, dirty, bits;
const u_char *odst = dst; const unsigned char *odst = dst;
ch = *src++; ch = *src++;
if (ch == '0' && (src[0] == 'x' || src[0] == 'X') if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
@ -93,14 +93,14 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
if (++dirty == 2) { if (++dirty == 2) {
if (size-- <= 0U) if (size-- <= 0U)
goto emsgsize; goto emsgsize;
*dst++ = (u_char) tmp; *dst++ = (unsigned char) tmp;
dirty = 0; dirty = 0;
} }
} }
if (dirty) { /* Odd trailing nybble? */ if (dirty) { /* Odd trailing nybble? */
if (size-- <= 0U) if (size-- <= 0U)
goto emsgsize; goto emsgsize;
*dst++ = (u_char) (tmp << 4); *dst++ = (unsigned char) (tmp << 4);
} }
} else if (isascii(ch) && isdigit(ch)) { } else if (isascii(ch) && isdigit(ch)) {
/* Decimal: eat dotted digit string. */ /* Decimal: eat dotted digit string. */
@ -116,7 +116,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
isascii(ch) && isdigit(ch)); isascii(ch) && isdigit(ch));
if (size-- <= 0U) if (size-- <= 0U)
goto emsgsize; goto emsgsize;
*dst++ = (u_char) tmp; *dst++ = (unsigned char) tmp;
if (ch == '\0' || ch == '/') if (ch == '\0' || ch == '/')
break; break;
if (ch != '.') if (ch != '.')
@ -222,11 +222,11 @@ getbits(const char *src, int *bitsp) {
} }
static int static int
getv4(const char *src, u_char *dst, int *bitsp) { getv4(const char *src, unsigned char *dst, int *bitsp) {
static const char digits[] = "0123456789"; static const char digits[] = "0123456789";
u_char *odst = dst; unsigned char *odst = dst;
int n; int n;
u_int val; unsigned int val;
char ch; char ch;
val = 0; val = 0;
@ -265,13 +265,13 @@ getv4(const char *src, u_char *dst, int *bitsp) {
} }
static int static int
inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) { inet_net_pton_ipv6(const char *src, unsigned char *dst, size_t size) {
static const char xdigits_l[] = "0123456789abcdef", static const char xdigits_l[] = "0123456789abcdef",
xdigits_u[] = "0123456789ABCDEF"; xdigits_u[] = "0123456789ABCDEF";
u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
const char *xdigits, *curtok; const char *xdigits, *curtok;
int ch, saw_xdigit; int ch, saw_xdigit;
u_int val; unsigned int val;
int digits; int digits;
int bits; int bits;
size_t bytes; size_t bytes;
@ -315,8 +315,8 @@ inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) {
goto enoent; goto enoent;
if (tp + NS_INT16SZ > endp) if (tp + NS_INT16SZ > endp)
return (0); return (0);
*tp++ = (u_char) (val >> 8) & 0xff; *tp++ = (unsigned char) (val >> 8) & 0xff;
*tp++ = (u_char) val & 0xff; *tp++ = (unsigned char) val & 0xff;
saw_xdigit = 0; saw_xdigit = 0;
digits = 0; digits = 0;
val = 0; val = 0;
@ -336,8 +336,8 @@ inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) {
if (saw_xdigit) { if (saw_xdigit) {
if (tp + NS_INT16SZ > endp) if (tp + NS_INT16SZ > endp)
goto enoent; goto enoent;
*tp++ = (u_char) (val >> 8) & 0xff; *tp++ = (unsigned char) (val >> 8) & 0xff;
*tp++ = (u_char) val & 0xff; *tp++ = (unsigned char) val & 0xff;
} }
if (bits == -1) if (bits == -1)
bits = 128; bits = 128;