From: "René Scharfe" <l.s.r@web.de>
To: Carlo Arenas <carenas@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
johannes.schindelin@gmx.de, avarab@gmail.com,
michal.kiedrowicz@gmail.com
Subject: [PATCH 1/2] nedmalloc: do assignments only after the declaration section
Date: Wed, 7 Aug 2019 15:08:51 +0200 [thread overview]
Message-ID: <5077f91b-958b-bf00-565f-7b96aa05a614@web.de> (raw)
In-Reply-To: <c7f08e19-88a7-ca7f-90b9-54465e621d49@web.de>
Avoid the following compiler warning:
In file included from compat/nedmalloc/nedmalloc.c:63:
compat/nedmalloc/malloc.c.h: In function ‘pthread_release_lock’:
compat/nedmalloc/malloc.c.h:1759:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
1759 | volatile unsigned int* lp = &sl->l;
| ^~~~~~~~
Signed_off-by: René Scharfe <l.s.r@web.de>
---
compat/nedmalloc/malloc.c.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index b833ff9225..88c131ca93 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -1755,10 +1755,10 @@ static FORCEINLINE void pthread_release_lock (MLOCK_T *sl) {
assert(sl->l != 0);
assert(sl->threadid == CURRENT_THREAD);
if (--sl->c == 0) {
- sl->threadid = 0;
volatile unsigned int* lp = &sl->l;
int prev = 0;
int ret;
+ sl->threadid = 0;
__asm__ __volatile__ ("lock; xchgl %0, %1"
: "=r" (ret)
: "m" (*(lp)), "0"(prev)
--
2.22.0
next prev parent reply other threads:[~2019-08-07 13:08 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 11:51 [PATCH 0/1] Fix a problem with PCRE2 and nedmalloc, found via Azure Pipelines Johannes Schindelin via GitGitGadget
2019-08-05 11:51 ` [PATCH 1/1] pcre2: allow overriding the system allocator Johannes Schindelin via GitGitGadget
2019-08-05 16:19 ` Carlo Arenas
2019-08-05 16:27 ` Carlo Arenas
2019-08-05 19:32 ` Johannes Schindelin
2019-08-05 19:26 ` Johannes Schindelin
2019-08-05 21:53 ` Junio C Hamano
2019-08-06 6:24 ` Carlo Arenas
2019-08-06 8:50 ` [PATCH 0/3] grep: no leaks (WIP) Carlo Marcelo Arenas Belón
2019-08-06 8:50 ` [PATCH 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-08 13:54 ` Johannes Schindelin
2019-08-08 15:19 ` Carlo Arenas
2019-08-06 8:50 ` [PATCH 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-08 13:56 ` Johannes Schindelin
2019-08-08 14:32 ` Carlo Arenas
2019-08-06 8:50 ` [PATCH 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-06 16:36 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Carlo Marcelo Arenas Belón
2019-08-06 16:36 ` [RFC PATCH v3 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-06 16:36 ` [RFC PATCH v3 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-07 5:38 ` René Scharfe
2019-08-07 9:49 ` Carlo Arenas
2019-08-07 13:02 ` René Scharfe
2019-08-07 13:08 ` René Scharfe [this message]
2019-08-07 13:09 ` [PATCH 2/2] nedmalloc: avoid compiler warning about unused value René Scharfe
2019-08-08 2:35 ` [RFC PATCH v3 2/3] grep: make PCRE2 aware of custom allocator Carlo Arenas
2019-08-08 7:07 ` René Scharfe
2019-08-08 12:38 ` Carlo Arenas
2019-08-08 14:29 ` René Scharfe
2019-08-08 20:18 ` Johannes Schindelin
2019-08-07 18:15 ` Junio C Hamano
2019-08-06 16:36 ` [RFC PATCH v3 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-06 16:48 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Junio C Hamano
2019-08-07 21:39 ` [RFC PATCH v4 " Carlo Marcelo Arenas Belón
2019-08-07 21:39 ` [RFC PATCH v4 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-07 21:39 ` [RFC PATCH v4 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-07 22:28 ` Junio C Hamano
2019-08-07 21:39 ` [RFC PATCH v4 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-27 9:07 ` Johannes Schindelin
2019-08-27 11:51 ` Carlo Arenas
2019-10-03 5:02 ` Junio C Hamano
2019-10-03 8:08 ` Johannes Schindelin
2019-10-03 11:17 ` Carlo Arenas
2019-10-03 18:23 ` Johannes Schindelin
2019-10-03 22:57 ` Junio C Hamano
2019-08-09 3:02 ` [RFC PATCH v5 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-09 11:24 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Arenas
2019-08-09 17:01 ` René Scharfe
2019-08-09 17:46 ` Junio C Hamano
2019-08-09 21:26 ` Johannes Schindelin
2019-08-10 3:03 ` [PATCH] SQUASH Carlo Marcelo Arenas Belón
2019-08-10 7:57 ` René Scharfe
2019-08-10 8:42 ` Carlo Arenas
2019-08-10 19:47 ` René Scharfe
2019-08-12 7:35 ` Carlo Arenas
2019-08-12 12:14 ` René Scharfe
2019-08-12 12:28 ` Carlo Arenas
2019-08-10 13:57 ` Johannes Schindelin
2019-08-10 3:05 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Arenas
2019-08-10 7:56 ` René Scharfe
2019-08-10 12:40 ` Carlo Arenas
2019-08-10 21:16 ` René Scharfe
2019-08-08 20:21 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Johannes Schindelin
2019-08-09 6:52 ` Carlo Arenas
2019-08-09 21:13 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5077f91b-958b-bf00-565f-7b96aa05a614@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=michal.kiedrowicz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).