From 400c5e5c8307a2ebe44ef1f203f5a15669f20347 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 6 Sep 2012 22:44:55 -0400
Subject: use restrict everywhere it's required by c99 and/or posix 2008

to deal with the fact that the public headers may be used with pre-c99
compilers, __restrict is used in place of restrict, and defined
appropriately for any supported compiler. we also avoid the form
[restrict] since older versions of gcc rejected it due to a bug in the
original c99 standard, and instead use the form *restrict.
---
 src/signal/setitimer.c    | 2 +-
 src/signal/sigaction.c    | 4 ++--
 src/signal/sigaltstack.c  | 2 +-
 src/signal/sigprocmask.c  | 2 +-
 src/signal/sigtimedwait.c | 2 +-
 src/signal/sigwait.c      | 2 +-
 src/signal/sigwaitinfo.c  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/signal')

diff --git a/src/signal/setitimer.c b/src/signal/setitimer.c
index 3b237580..21b1f45d 100644
--- a/src/signal/setitimer.c
+++ b/src/signal/setitimer.c
@@ -1,7 +1,7 @@
 #include <sys/time.h>
 #include "syscall.h"
 
-int setitimer(int which, const struct itimerval *new, struct itimerval *old)
+int setitimer(int which, const struct itimerval *restrict new, struct itimerval *restrict old)
 {
 	return syscall(SYS_setitimer, which, new, old);
 }
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index e0c58b73..2331dc93 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -11,7 +11,7 @@ void __restore(), __restore_rt();
 static pthread_t dummy(void) { return 0; }
 weak_alias(dummy, __pthread_self_def);
 
-int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
 	struct k_sigaction ksa;
 	if (sa) {
@@ -31,7 +31,7 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 	return 0;
 }
 
-int __sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
 	if (sig-32U < 3) {
 		errno = EINVAL;
diff --git a/src/signal/sigaltstack.c b/src/signal/sigaltstack.c
index 550f2f9d..62cb81ad 100644
--- a/src/signal/sigaltstack.c
+++ b/src/signal/sigaltstack.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include "syscall.h"
 
-int sigaltstack(const stack_t *ss, stack_t *old)
+int sigaltstack(const stack_t *restrict ss, stack_t *restrict old)
 {
 	if (ss) {
 		if (ss->ss_size < MINSIGSTKSZ) {
diff --git a/src/signal/sigprocmask.c b/src/signal/sigprocmask.c
index 67e2b82e..297e20c6 100644
--- a/src/signal/sigprocmask.c
+++ b/src/signal/sigprocmask.c
@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <errno.h>
 
-int sigprocmask(int how, const sigset_t *set, sigset_t *old)
+int sigprocmask(int how, const sigset_t *restrict set, sigset_t *restrict old)
 {
 	int r = pthread_sigmask(how, set, old);
 	if (!r) return r;
diff --git a/src/signal/sigtimedwait.c b/src/signal/sigtimedwait.c
index f62db2f3..4f8589b5 100644
--- a/src/signal/sigtimedwait.c
+++ b/src/signal/sigtimedwait.c
@@ -3,7 +3,7 @@
 #include "syscall.h"
 #include "libc.h"
 
-int sigtimedwait(const sigset_t *mask, siginfo_t *si, const struct timespec *timeout)
+int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict timeout)
 {
 	int ret;
 	do ret = syscall_cp(SYS_rt_sigtimedwait, mask,
diff --git a/src/signal/sigwait.c b/src/signal/sigwait.c
index 9569d6b0..48a855bb 100644
--- a/src/signal/sigwait.c
+++ b/src/signal/sigwait.c
@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <stddef.h>
 
-int sigwait(const sigset_t *mask, int *sig)
+int sigwait(const sigset_t *restrict mask, int *restrict sig)
 {
 	siginfo_t si;
 	if (sigtimedwait(mask, &si, NULL) < 0)
diff --git a/src/signal/sigwaitinfo.c b/src/signal/sigwaitinfo.c
index e79feb91..c7b164df 100644
--- a/src/signal/sigwaitinfo.c
+++ b/src/signal/sigwaitinfo.c
@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <stddef.h>
 
-int sigwaitinfo(const sigset_t *mask, siginfo_t *si)
+int sigwaitinfo(const sigset_t *restrict mask, siginfo_t *restrict si)
 {
 	return sigtimedwait(mask, si, NULL);
 }
-- 
cgit v1.2.1