JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Throughout Cygwin, use u_intN_t or uintN_t

Browse Source 
Don't use u_char, u_short, u_int or u_long in Cygwin, unless it refers
to the Winsock types.  Use u_intN_t in BSD-based sources, unsigned char
where strings are concerned, uintN_t otherwise.  Also:

	* net.cc: Fix comment, we're not using u_long anymore.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2016-03-24 16:39:15 +01:00
parent 6ba2b53c53
commit acc5f02ce8
16 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/libc/arc4random_stir.c
View File

@@ -19,6 +19,6 @@ arc4random_stir(void)
}
void
arc4random_addrandom(u_char *dat, int datlen)
arc4random_addrandom(u_int8_t *dat, int datlen)
{
}

8
winsup/cygwin/libc/base64.c
View File

@@ -128,10 +128,12 @@ static const char Pad64 = '=';
*/
int
b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
b64_ntop(unsigned char const *src, size_t srclength, char *target,
size_t targsize)
{
size_t datalength = 0;
u_char input[3];
u_char output[4];
unsigned char input[3];
unsigned char output[4];
size_t i;
while (2 < srclength) {

2
winsup/cygwin/libc/inet_addr.c
View File

@@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$");
*/
extern int
cygwin_inet_aton(const char *cp, struct in_addr *addr) {
u_long val;
u_int32_t val;
int base, n;
char c;
u_int8_t parts[4];

10
winsup/cygwin/libc/minires-os-if.c
View File

@@ -39,10 +39,12 @@ details. */
#define PUTDOMAIN(d,p)\
{int res = dn_comp(d, p, EndPtr - p, dnptrs, lastdnptr); p += res < 0 ? (int) strlen(d) : res; }
static u_char * write_record(unsigned char * ptr, PDNS_RECORD rr, unsigned char * EndPtr,
unsigned char ** dnptrs, unsigned char ** lastdnptr, int debug)
static unsigned char * write_record(unsigned char * ptr, PDNS_RECORD rr,
unsigned char * EndPtr,
unsigned char ** dnptrs,
unsigned char ** lastdnptr, int debug)
{
u_char * rd_length_ptr;
unsigned char * rd_length_ptr;
PUTDOMAIN(rr->pName, ptr);
@@ -70,7 +72,7 @@ static u_char * write_record(unsigned char * ptr, PDNS_RECORD rr, unsigned char
switch(rr->wType) {
case DNS_TYPE_A:
{
u_char * aptr = (u_char *) & rr->Data.A.IpAddress;
u_int8_t * aptr = (u_int8_t *) & rr->Data.A.IpAddress;
if (ptr + 4 <= EndPtr) {
ptr[0] = aptr[0];
ptr[1] = aptr[1];

18
winsup/cygwin/libc/minires.c
View File

@@ -375,7 +375,7 @@ static int get_tcp(struct sockaddr_in *CliAddr,
{
int fd, res = -1;
unsigned short ans_length;
union {short len; u_char buf[sizeof(short)];} len_buf;
union {short len; u_int8_t buf[sizeof(short)];} len_buf;
DPRINTF(debug, "retrying with TCP\n");
@@ -694,7 +694,7 @@ int res_mkquery (int op, const char * dnameptr, int qclass, int qtype,
int res_nquery( res_state statp, const char * DomName, int Class, int Type,
unsigned char * AnsPtr, int AnsLength)
{
u_char packet[PACKETSZ];
u_int8_t packet[PACKETSZ];
int len;
DPRINTF(statp->options & RES_DEBUG, "query \"%s\" type %d\n", DomName, Type);
@@ -880,12 +880,12 @@ expand_fail:
preserve the letter cases.
*****************************************************************/
int dn_comp(const char * exp_dn, u_char * comp_dn, int length,
u_char ** dnptrs, u_char ** lastdnptr)
int dn_comp(const char * exp_dn, unsigned char * comp_dn, int length,
unsigned char ** dnptrs, unsigned char ** lastdnptr)
{
u_char *cptr = comp_dn, *dptr, *lptr, *rptr;
unsigned char *cptr = comp_dn, *dptr, *lptr, *rptr;
unsigned int i, len;
u_char * const eptr = comp_dn + length - 1; /* Last valid */
unsigned char * const eptr = comp_dn + length - 1; /* Last valid */
errno = EINVAL;
@@ -904,7 +904,7 @@ int dn_comp(const char * exp_dn, u_char * comp_dn, int length,
dptr = dnptrs[i];
if (dptr >= comp_dn) /* Handle name.name */
continue;
rptr = (u_char *) exp_dn;
rptr = (unsigned char *) exp_dn;
len = *dptr++;
while (1) {
do {
@@ -941,12 +941,12 @@ int dn_comp(const char * exp_dn, u_char * comp_dn, int length,
}
/* Write label */
lptr = cptr++; /* Length byte */
rptr = (u_char *) exp_dn;
rptr = (unsigned char *) exp_dn;
do {
if (cptr <= eptr)
*cptr++ = *rptr;
} while ((*++rptr != '.') && (*rptr != 0));
len = rptr - (u_char *) exp_dn;
len = rptr - (unsigned char *) exp_dn;
if (len > MAXLABEL)
return -1;
*lptr = len;

2
winsup/cygwin/libc/rcmd.cc
View File

@@ -363,7 +363,7 @@ cygwin_rresvport_af(int *alport, int family)
{
int s;
struct sockaddr_storage ss;
u_short *sport;
u_int16_t *sport;
memset(&ss, 0, sizeof(ss));
ss.ss_family = family;

4
winsup/cygwin/libc/rexec.cc
View File

@@ -315,7 +315,7 @@ cygwin_rexec (char **ahost, unsigned short rport, char *name, char *pass,
{
struct sockaddr_in sin, sin2, from;
struct hostent *hp;
u_short port = 0;
uint16_t port = 0;
int s, timo = 1, s3;
char c;
static char ahostbuf[INTERNET_MAX_HOST_NAME_LENGTH + 1];
@@ -371,7 +371,7 @@ retry:
(void) close(s2);
goto bad;
}
port = ntohs((u_short)sin2.sin_port);
port = ntohs((uint16_t)sin2.sin_port);
(void) sprintf(num, "%u", port);
(void) write(s, num, strlen(num)+1);
{ int len = sizeof (from);

25
winsup/cygwin/libc/strptime.cc
View File

@@ -301,10 +301,11 @@ first_day (int year)
/* This simplifies the calls to conv_num enormously. */
#define ALT_DIGITS ((alt_format & ALT_O) ? *alt_digits : NULL)
static const u_char *conv_num(const unsigned char *, int *, uint, uint,
alt_digits_t *);
static const u_char *find_string(const u_char *, int *, const char * const *,
const char * const *, int);
static const unsigned char *conv_num(const unsigned char *, int *, uint, uint,
alt_digits_t *);
static const unsigned char *find_string(const unsigned char *, int *,
const char * const *,
const char * const *, int);
static char *
__strptime(const char *buf, const char *fmt, struct tm *tm,
@@ -321,7 +322,7 @@ __strptime(const char *buf, const char *fmt, struct tm *tm,
uint ulim;
int ymd = 0;
bp = (const u_char *)buf;
bp = (const unsigned char *)buf;
struct lc_time_T *_CurrentTimeLocale = __get_current_time_locale ();
while (bp != NULL && (c = *fmt++) != '\0') {
@@ -442,9 +443,9 @@ literal:
LEGAL_ALT(ALT_E);
ymd |= SET_YMD;
recurse:
bp = (const u_char *)__strptime((const char *)bp,
new_fmt, tm,
era_info, alt_digits);
bp = (const unsigned char *)
__strptime((const char *)bp, new_fmt, tm,
era_info, alt_digits);
continue;
/*
@@ -787,7 +788,7 @@ strptime (const char *__restrict buf, const char *__restrict fmt,
return ret;
}
static const u_char *
static const unsigned char *
conv_num(const unsigned char *buf, int *dest, uint llim, uint ulim,
alt_digits_t *alt_digits)
{
@@ -820,9 +821,9 @@ conv_num(const unsigned char *buf, int *dest, uint llim, uint ulim,
return buf;
}
static const u_char *
find_string(const u_char *bp, int *tgt, const char * const *n1,
const char * const *n2, int c)
static const unsigned char *
find_string(const unsigned char *bp, int *tgt, const char * const *n1,
const char * const *n2, int c)
{
int i;
unsigned int len;