Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of _RESTRICT

Browse Source
This commit is contained in:
Ben Gras
2012-03-25 20:51:30 +02:00
parent db242ed39d
commit 23df780120
8 changed files with 69 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libc/sys-minix/accept.c
View File

@@ -21,14 +21,14 @@
#define DEBUG 0
static int _tcp_accept(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len);
static int _tcp_accept(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len);
static int _uds_accept(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len);
static int _uds_accept(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len);
int accept(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
int accept(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r;
nwio_udpopt_t udpopt;
@@ -61,8 +61,8 @@ int accept(int sock, struct sockaddr *_RESTRICT address,
return r;
}
static int _tcp_accept(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
static int _tcp_accept(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r, s1, t_errno;
tcp_cookie_t cookie;
@@ -91,8 +91,8 @@ static int _tcp_accept(int sock, struct sockaddr *_RESTRICT address,
return s1;
}
static int _uds_accept(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
static int _uds_accept(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int s1;
int r;

20
lib/libc/sys-minix/getpeername.c
View File

@@ -17,14 +17,14 @@
#define DEBUG 0
static int _tcp_getpeername(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconfp);
static int _tcp_getpeername(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconfp);
static int _uds_getpeername(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr);
static int _uds_getpeername(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr);
int getpeername(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
int getpeername(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r;
nwio_tcpconf_t tcpconf;
@@ -62,8 +62,8 @@ int getpeername(int sock, struct sockaddr *_RESTRICT address,
return -1;
}
static int _tcp_getpeername(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconfp)
static int _tcp_getpeername(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconfp)
{
socklen_t len;
struct sockaddr_in sin;
@@ -89,8 +89,8 @@ static int _tcp_getpeername(int sock, struct sockaddr *_RESTRICT address,
return 0;
}
static int _uds_getpeername(int sock, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr)
static int _uds_getpeername(int sock, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr)
{
socklen_t len;

20
lib/libc/sys-minix/getsockname.c
View File

@@ -26,14 +26,14 @@
#define DEBUG 0
*/
static int _tcp_getsockname(int fd, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconfp);
static int _tcp_getsockname(int fd, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconfp);
static int _uds_getsockname(int fd, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr);
static int _uds_getsockname(int fd, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr);
int getsockname(int fd, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
int getsockname(int fd, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r;
nwio_tcpconf_t tcpconf;
@@ -76,8 +76,8 @@ int getsockname(int fd, struct sockaddr *_RESTRICT address,
}
static int _tcp_getsockname(int fd, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconf)
static int _tcp_getsockname(int fd, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconf)
{
socklen_t len;
struct sockaddr_in sin;
@@ -105,8 +105,8 @@ static int _tcp_getsockname(int fd, struct sockaddr *_RESTRICT address,
return 0;
}
static int _uds_getsockname(int fd, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr)
static int _uds_getsockname(int fd, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr)
{
socklen_t len;

18
lib/libc/sys-minix/getsockopt.c
View File

@@ -23,16 +23,16 @@
#define DEBUG 0
static int _tcp_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
void *restrict option_value, socklen_t *restrict option_len);
static int _udp_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
void *restrict option_value, socklen_t *restrict option_len);
static int _uds_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
void *restrict option_value, socklen_t *restrict option_len);
static void getsockopt_copy(void *return_value, size_t return_len,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len);
void *restrict option_value, socklen_t *restrict option_len);
int getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
void *restrict option_value, socklen_t *restrict option_len)
{
int r;
nwio_tcpopt_t tcpopt;
@@ -84,7 +84,7 @@ int getsockopt(int sock, int level, int option_name,
}
static void getsockopt_copy(void *return_value, size_t return_len,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
void *restrict option_value, socklen_t *restrict option_len)
{
/* copy as much data as possible */
if (*option_len < return_len)
@@ -97,7 +97,7 @@ static void getsockopt_copy(void *return_value, size_t return_len,
}
static int _tcp_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
void *restrict option_value, socklen_t *restrict option_len)
{
int i, r, err;
@@ -158,7 +158,7 @@ static int _tcp_getsockopt(int sock, int level, int option_name,
}
static int _udp_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
void *restrict option_value, socklen_t *restrict option_len)
{
int i;
@@ -178,7 +178,7 @@ static int _udp_getsockopt(int sock, int level, int option_name,
}
static int _uds_getsockopt(int sock, int level, int option_name,
void *_RESTRICT option_value, socklen_t *_RESTRICT option_len)
void *restrict option_value, socklen_t *restrict option_len)
{
int i, r;
size_t size;

2
lib/libc/sys-minix/gettimeofday.c
View File

@@ -12,7 +12,7 @@ gettimeofday.c
__weak_alias(gettimeofday, _gettimeofday)
#endif
int gettimeofday(struct timeval *_RESTRICT tp, void *_RESTRICT tzp)
int gettimeofday(struct timeval *restrict tp, void *restrict tzp)
{
message m;

54
lib/libc/sys-minix/recvfrom.c
View File

@@ -23,22 +23,22 @@
#define DEBUG 0
static ssize_t _tcp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconfp);
static ssize_t _udp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_udpopt_t *udpoptp);
static ssize_t _uds_recvfrom_conn(int sock, void *_RESTRICT buffer,
size_t length, int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr);
static ssize_t _uds_recvfrom_dgram(int sock, void *_RESTRICT buffer,
size_t length, int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len);
static ssize_t _tcp_recvfrom(int sock, void *restrict buffer, size_t length,
int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconfp);
static ssize_t _udp_recvfrom(int sock, void *restrict buffer, size_t length,
int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_udpopt_t *udpoptp);
static ssize_t _uds_recvfrom_conn(int sock, void *restrict buffer,
size_t length, int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr);
static ssize_t _uds_recvfrom_dgram(int sock, void *restrict buffer,
size_t length, int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len);
ssize_t recvfrom(int sock, void *_RESTRICT buffer, size_t length,
int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
ssize_t recvfrom(int sock, void *restrict buffer, size_t length,
int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r;
nwio_tcpconf_t tcpconf;
@@ -94,9 +94,9 @@ ssize_t recvfrom(int sock, void *_RESTRICT buffer, size_t length,
return -1;
}
static ssize_t _tcp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_tcpconf_t *tcpconfp)
static ssize_t _tcp_recvfrom(int sock, void *restrict buffer, size_t length,
int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_tcpconf_t *tcpconfp)
{
int r;
size_t len;
@@ -128,9 +128,9 @@ static ssize_t _tcp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
return r;
}
static ssize_t _udp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, nwio_udpopt_t *udpoptp)
static ssize_t _udp_recvfrom(int sock, void *restrict buffer, size_t length,
int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, nwio_udpopt_t *udpoptp)
{
int r, t_errno;
size_t buflen, len;
@@ -227,9 +227,9 @@ static ssize_t _udp_recvfrom(int sock, void *_RESTRICT buffer, size_t length,
return length;
}
static ssize_t _uds_recvfrom_conn(int sock, void *_RESTRICT buffer,
size_t length, int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len, struct sockaddr_un *uds_addr)
static ssize_t _uds_recvfrom_conn(int sock, void *restrict buffer,
size_t length, int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr)
{
int r;
size_t len;
@@ -262,9 +262,9 @@ static ssize_t _uds_recvfrom_conn(int sock, void *_RESTRICT buffer,
return r;
}
static ssize_t _uds_recvfrom_dgram(int sock, void *_RESTRICT buffer,
size_t length, int flags, struct sockaddr *_RESTRICT address,
socklen_t *_RESTRICT address_len)
static ssize_t _uds_recvfrom_dgram(int sock, void *restrict buffer,
size_t length, int flags, struct sockaddr *restrict address,
socklen_t *restrict address_len)
{
int r;
size_t len;

4
lib/libc/sys-minix/setitimer.c
View File

@@ -8,8 +8,8 @@
* This is the implementation of the function to
* invoke the interval timer setting system call.
*/
int setitimer(int which, const struct itimerval *_RESTRICT value,
struct itimerval *_RESTRICT ovalue)
int setitimer(int which, const struct itimerval *restrict value,
struct itimerval *restrict ovalue)
{
message m;