From ba20910ef986e92f457c9166304100d73c4b416a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Aug 2021 15:01:33 +0200 Subject: [PATCH] dfa: Improve GCC 11 allocation-deallocation checking. * lib/dfa.h (dfamust): Declare that deallocation must happen through dfamustfree. --- ChangeLog | 6 ++++++ lib/dfa.h | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8a1f53fb5..be764cb510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-08-07 Bruno Haible + + dfa: Improve GCC 11 allocation-deallocation checking. + * lib/dfa.h (dfamust): Declare that deallocation must happen through + dfamustfree. + 2021-08-06 Paul Eggert glob: merge from glibc diff --git a/lib/dfa.h b/lib/dfa.h index 28f9f6336e..edc39dc49c 100644 --- a/lib/dfa.h +++ b/lib/dfa.h @@ -88,13 +88,16 @@ extern void dfacopysyntax (struct dfa *, struct dfa const *); /* Parse the given string of given length into the given struct dfa. */ extern void dfaparse (char const *, ptrdiff_t, struct dfa *); -/* Allocate and return a struct dfamust from a struct dfa that was - initialized by dfaparse and not yet given to dfacomp. */ -extern struct dfamust *dfamust (struct dfa const *); +struct dfamust; /* Free the storage held by the components of a struct dfamust. */ extern void dfamustfree (struct dfamust *); +/* Allocate and return a struct dfamust from a struct dfa that was + initialized by dfaparse and not yet given to dfacomp. */ +extern struct dfamust *dfamust (struct dfa const *) + _GL_ATTRIBUTE_DEALLOC (dfamustfree, 1); + /* Compile the given string of the given length into the given struct dfa. The last argument says whether to build a searching or an exact matcher. A null first argument means the struct dfa has already been -- 2.39.5