oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use __restrict instead of restrict

Browse Source 
. doesn't choke gcc without -std=c99
	. also used in prototypes already
This commit is contained in:
Ben Gras 2012-03-30 17:11:01 +02:00
parent fa805ebd1e
commit 18f3961189
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -25,14 +25,14 @@
#define DEBUG 0 #define DEBUG 0
*/ */
static int _tcp_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 *tcpconfp); socklen_t *__restrict address_len, nwio_tcpconf_t *tcpconfp);
static int _uds_getsockname(int fd, struct sockaddr *restrict address, static int _uds_getsockname(int fd, struct sockaddr *__restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr); socklen_t *__restrict address_len, struct sockaddr_un *uds_addr);
int getsockname(int fd, struct sockaddr *restrict address, int getsockname(int fd, struct sockaddr *__restrict address,
socklen_t *restrict address_len) socklen_t *__restrict address_len)
{ {
int r; int r;
nwio_tcpconf_t tcpconf; nwio_tcpconf_t tcpconf;
@ -75,8 +75,8 @@ int getsockname(int fd, struct sockaddr *restrict address,
} }
static int _tcp_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) socklen_t *__restrict address_len, nwio_tcpconf_t *tcpconf)
{ {
socklen_t len; socklen_t len;
struct sockaddr_in sin; struct sockaddr_in sin;
@ -104,8 +104,8 @@ static int _tcp_getsockname(int fd, struct sockaddr *restrict address,
return 0; return 0;
} }
static int _uds_getsockname(int fd, struct sockaddr *restrict address, static int _uds_getsockname(int fd, struct sockaddr *__restrict address,
socklen_t *restrict address_len, struct sockaddr_un *uds_addr) socklen_t *__restrict address_len, struct sockaddr_un *uds_addr)
{ {
socklen_t len; socklen_t len;

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

@ -22,16 +22,16 @@
#define DEBUG 0 #define DEBUG 0
static int _tcp_getsockopt(int sock, int level, int option_name, 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, 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, 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, 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, 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; int r;
nwio_tcpopt_t tcpopt; nwio_tcpopt_t tcpopt;
@ -83,7 +83,7 @@ int getsockopt(int sock, int level, int option_name,
} }
static void getsockopt_copy(void *return_value, size_t return_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)
{ {
/* copy as much data as possible */ /* copy as much data as possible */
if (*option_len < return_len) if (*option_len < return_len)
@ -96,7 +96,7 @@ static void getsockopt_copy(void *return_value, size_t return_len,
} }
static int _tcp_getsockopt(int sock, int level, int option_name, 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; int i, r, err;
@ -157,7 +157,7 @@ static int _tcp_getsockopt(int sock, int level, int option_name,
} }
static int _udp_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; int i;
@ -177,7 +177,7 @@ static int _udp_getsockopt(int sock, int level, int option_name,
} }
static int _uds_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; int i, r;
size_t size; size_t size;

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

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

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

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

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

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