d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ISO C99 integer types instead of the BSD-specific u_int*_t.

Browse Source 
Approved by: rrs (mentor)
This commit is contained in:
Rebecca Cran 2010-07-04 08:09:33 +00:00
parent 2a08b0b7a1
commit 3d36ac9877
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209684
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/net/sctp_recvmsg.3
View File

@ -146,14 +146,14 @@ The
argument is defined as follows.
.Bd -literal
struct sctp_sndrcvinfo {
u_int16_t sinfo_stream; /* Stream arriving on */
u_int16_t sinfo_ssn; /* Stream Sequence Number */
u_int16_t sinfo_flags; /* Flags on the incoming message */
u_int32_t sinfo_ppid; /* The ppid field */
u_int32_t sinfo_context; /* context field */
u_int32_t sinfo_timetolive; /* not used by sctp_recvmsg */
u_int32_t sinfo_tsn; /* The transport sequence number */
u_int32_t sinfo_cumtsn; /* The cumulative acknowledgment point */
uint16_t sinfo_stream; /* Stream arriving on */
uint16_t sinfo_ssn; /* Stream Sequence Number */
uint16_t sinfo_flags; /* Flags on the incoming message */
uint32_t sinfo_ppid; /* The ppid field */
uint32_t sinfo_context; /* context field */
uint32_t sinfo_timetolive; /* not used by sctp_recvmsg */
uint32_t sinfo_tsn; /* The transport sequence number */
uint32_t sinfo_cumtsn; /* The cumulative acknowledgment point */
sctp_assoc_t sinfo_assoc_id; /* The association id of the peer */
};
.Ed

16
lib/libc/net/sctp_send.3
View File

@ -94,14 +94,14 @@ structure is used to control various SCTP features
and has the following format:
.Bd -literal
struct sctp_sndrcvinfo {
u_int16_t sinfo_stream; /* Stream sending to */
u_int16_t sinfo_ssn; /* valid for recv only */
u_int16_t sinfo_flags; /* flags to control sending */
u_int32_t sinfo_ppid; /* ppid field */
u_int32_t sinfo_context; /* context field */
u_int32_t sinfo_timetolive; /* timetolive for PR-SCTP */
u_int32_t sinfo_tsn; /* valid for recv only */
u_int32_t sinfo_cumtsn; /* valid for recv only */
uint16_t sinfo_stream; /* Stream sending to */
uint16_t sinfo_ssn; /* valid for recv only */
uint16_t sinfo_flags; /* flags to control sending */
uint32_t sinfo_ppid; /* ppid field */
uint32_t sinfo_context; /* context field */
uint32_t sinfo_timetolive; /* timetolive for PR-SCTP */
uint32_t sinfo_tsn; /* valid for recv only */
uint32_t sinfo_cumtsn; /* valid for recv only */
sctp_assoc_t sinfo_assoc_id; /* The association id */
};
.Ed

26
lib/libc/net/sctp_sys_calls.c
View File

@ -49,9 +49,9 @@ __FBSDID("$FreeBSD$");
#ifndef IN6_IS_ADDR_V4MAPPED
#define IN6_IS_ADDR_V4MAPPED(a) \
((*(const u_int32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
(*(const u_int32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
(*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
(*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
(*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
#endif
@ -533,11 +533,11 @@ sctp_sendmsg(int s,
size_t len,
const struct sockaddr *to,
socklen_t tolen,
u_int32_t ppid,
u_int32_t flags,
u_int16_t stream_no,
u_int32_t timetolive,
u_int32_t context)
uint32_t ppid,
uint32_t flags,
uint16_t stream_no,
uint32_t timetolive,
uint32_t context)
{
#ifdef SYS_sctp_generic_sendmsg
struct sctp_sndrcvinfo sinfo;
@ -814,11 +814,11 @@ sctp_sendmsgx(int sd,
size_t len,
struct sockaddr *addrs,
int addrcnt,
u_int32_t ppid,
u_int32_t flags,
u_int16_t stream_no,
u_int32_t timetolive,
u_int32_t context)
uint32_t ppid,
uint32_t flags,
uint16_t stream_no,
uint32_t timetolive,
uint32_t context)
{
struct sctp_sndrcvinfo sinfo;