moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

changed u_int16_t to unsigned short because it is the only place within ares and curl where such a type would be used;

Browse Source 
also it broke many autobuilds. We should probably introduce an ares_port_t if we want to use a type here.
This commit is contained in:
Gunter Knauf 2009-09-05 15:12:30 +00:00
parent d5de849552
commit f3611c2773
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ares/Makefile.vc6
View File

@ -19,7 +19,7 @@ USE_WATT32 = 0
CC = cl CC = cl
CFLAGS = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi -Du_int16_t=u_short CFLAGS = -nologo -$(CFG_MODEL)$(DEBUG_MODEL) -W3 -Yd -Zi
LDFLAGS = -machine:i386 -map LDFLAGS = -machine:i386 -map
OBJ_DIR = VC6_obj OBJ_DIR = VC6_obj

6
ares/ares.h
View File

@ -323,9 +323,9 @@ struct addr6ttl {
}; };
struct srv_reply { struct srv_reply {
u_int16_t weight; unsigned short weight;
u_int16_t priority; unsigned short priority;
u_int16_t port; unsigned short port;
char *host; char *host;
}; };

6
ares/ares_parse_srv_reply.3
View File

@ -49,9 +49,9 @@ contains the following fields:
.in +4n .in +4n
.nf .nf
struct srv_reply { struct srv_reply {
u_int16_t weight; unsigned short weight;
u_int16_t priority; unsigned short priority;
u_int16_t port; unsigned short port;
char *host; char *host;
}; };
.fi .fi

12
ares/ares_parse_srv_reply.c
View File

@ -120,12 +120,12 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
break; break;
} }
srv[i].priority = ntohs (*((u_int16_t *)aptr)); srv[i].priority = ntohs (*((unsigned short *)aptr));
aptr += sizeof(u_int16_t); aptr += sizeof(unsigned short);
srv[i].weight = ntohs (*((u_int16_t *)aptr)); srv[i].weight = ntohs (*((unsigned short *)aptr));
aptr += sizeof(u_int16_t); aptr += sizeof(unsigned short);
srv[i].port = ntohs (*((u_int16_t *)aptr)); srv[i].port = ntohs (*((unsigned short *)aptr));
aptr += sizeof(u_int16_t); aptr += sizeof(unsigned short);
status = ares_expand_name (aptr, abuf, alen, &srv[i].host, &len); status = ares_expand_name (aptr, abuf, alen, &srv[i].host, &len);
if (status != ARES_SUCCESS) if (status != ARES_SUCCESS)