From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14295 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Samuel Holland Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 1/2] resolve -Wrestrict warnings Date: Sat, 29 Jun 2019 16:22:43 -0500 Message-ID: <20190629212244.42963-2-samuel@sholland.org> References: <20190629212244.42963-1-samuel@sholland.org> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="75765"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Samuel Holland To: musl@lists.openwall.com Original-X-From: musl-return-14311-gllmg-musl=m.gmane.org@lists.openwall.com Sat Jun 29 23:23:12 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hhKoP-000JYQ-L9 for gllmg-musl@m.gmane.org; Sat, 29 Jun 2019 23:23:09 +0200 Original-Received: (qmail 13542 invoked by uid 550); 29 Jun 2019 21:23:00 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 13411 invoked from network); 29 Jun 2019 21:22:58 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=5SJ1RfZ3db+aI 1Vv8o83p+tm5tqrqqwKYR2VtMdQhho=; b=wt908Q5bfxd6imBcvZRR3BUlrbrUa OWxhisD1yLTblfEZx4oTgsj3EV1PedHFpsQBMsDstaH7tqFqB2pdWlRDScqei32z MdCEFaQ1ktCR+FuVBAFNcDHacfHArlii0BvMDKTtK8Juoqd8XjTpXSqtDR5Zisr6 W46IY1Qlt6HbgQLIEyiAM+grUa6nKcjHoB1vJ8A//VOexEMpHQ2IHQUlyUAERK/j Dx3V/Bj2jylyxOhRc4wJx0yBskABy46cfdd8WkBU1+4atmoLmSiFX/1XmzFZv2KX IOYNQbPhdq3rI+q/c32Xx3OXGJZvEZbk2kp7JhBwK2sEnAXglGgH9UYTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=5SJ1RfZ3db+aI1Vv8o83p+tm5tqrqqwKYR2VtMdQhho=; b=x+VbSTmU ywUpCm6ES29CghsaY7kBLlssWmaeXIANYLNOT8RMYjcopUjbyB1kqa4wzbt6cEYk jdeIWiOsuOu/Vw7aSRHiK0g2H7JFQHwvabBX9lNqI2xHkaRWYW9LJmXwoYTd+gvi 0m3pimIpGy8T9mPNIGouR1ya4ZSUfCNDWmHc0LorGFK763s7UbsJkvUELP/L0/f+ z6Dmos21a85aRu3in2M4GnuQOwvdnh20ZJd3hcZ3475PZ471ovXT4HWfPr27CSEb cQ4qoyML+5v+nyWiFkTW7+3VRGN/B3ZoVIBxvTaItAulKFWYCXD4+ZwFBgwUTZvL Ecg2gkJk1bqSlA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrvddvgdduiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepufgrmhhuvghlucfjohhllhgrnhguuceoshgrmhhuvghlsehs hhholhhlrghnugdrohhrgheqnecukfhppeejtddrudefhedrudegkedrudehudenucfrrg hrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghnugdrohhrghenucev lhhushhtvghrufhiiigvpedt X-ME-Proxy: X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190629212244.42963-1-samuel@sholland.org> Xref: news.gmane.org gmane.linux.lib.musl.general:14295 Archived-At: The old/new parameters to pthread_sigmask, sigprocmask, and setitimer are marked __restrict, so passing the same address to both is prohibited. Modify callers of these functions to use a separate object for each argument. --- src/aio/lio_listio.c | 6 +++--- src/signal/sigset.c | 8 ++++---- src/unistd/ualarm.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c index 7b6a03d3..0799c15d 100644 --- a/src/aio/lio_listio.c +++ b/src/aio/lio_listio.c @@ -113,7 +113,7 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st if (st) { pthread_attr_t a; - sigset_t set; + sigset_t set, set_old; pthread_t td; if (sev->sigev_notify == SIGEV_THREAD) { @@ -128,13 +128,13 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st } pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED); sigfillset(&set); - pthread_sigmask(SIG_BLOCK, &set, &set); + pthread_sigmask(SIG_BLOCK, &set, &set_old); if (pthread_create(&td, &a, wait_thread, st)) { free(st); errno = EAGAIN; return -1; } - pthread_sigmask(SIG_SETMASK, &set, 0); + pthread_sigmask(SIG_SETMASK, &set_old, 0); } return 0; diff --git a/src/signal/sigset.c b/src/signal/sigset.c index 0d7b4564..f3e8c407 100644 --- a/src/signal/sigset.c +++ b/src/signal/sigset.c @@ -3,7 +3,7 @@ void (*sigset(int sig, void (*handler)(int)))(int) { struct sigaction sa, sa_old; - sigset_t mask; + sigset_t mask, mask_old; sigemptyset(&mask); if (sigaddset(&mask, sig) < 0) @@ -12,7 +12,7 @@ void (*sigset(int sig, void (*handler)(int)))(int) if (handler == SIG_HOLD) { if (sigaction(sig, 0, &sa_old) < 0) return SIG_ERR; - if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0) + if (sigprocmask(SIG_BLOCK, &mask, &mask_old) < 0) return SIG_ERR; } else { sa.sa_handler = handler; @@ -20,8 +20,8 @@ void (*sigset(int sig, void (*handler)(int)))(int) sigemptyset(&sa.sa_mask); if (sigaction(sig, &sa, &sa_old) < 0) return SIG_ERR; - if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0) + if (sigprocmask(SIG_UNBLOCK, &mask, &mask_old) < 0) return SIG_ERR; } - return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler; + return sigismember(&mask_old, sig) ? SIG_HOLD : sa_old.sa_handler; } diff --git a/src/unistd/ualarm.c b/src/unistd/ualarm.c index 855504bc..2985855c 100644 --- a/src/unistd/ualarm.c +++ b/src/unistd/ualarm.c @@ -7,7 +7,7 @@ unsigned ualarm(unsigned value, unsigned interval) struct itimerval it = { .it_interval.tv_usec = interval, .it_value.tv_usec = value - }; - setitimer(ITIMER_REAL, &it, &it); - return it.it_value.tv_sec*1000000 + it.it_value.tv_usec; + }, it_old; + setitimer(ITIMER_REAL, &it, &it_old); + return it_old.it_value.tv_sec*1000000 + it_old.it_value.tv_usec; } -- 2.21.0