libiberty: pex-unix.c: Make pex_unix_cleanup signature always match body.
Checks
Commit Message
I saw this while working on something else:
pex_unix_cleanup signature doesn't always match the
body of the function in terms of ATTRIBUTE_UNUSED.
If the conditional code in the body is compiled, then
ATTRIBUTE_UNUSED isn't correct.
This change makes it always match, thereby making it
a bit cleaner IMO.
Costas
Comments
On 6/7/23 04:21, Costas Argyris via Gcc-patches wrote:
> I saw this while working on something else:
>
> pex_unix_cleanup signature doesn't always match the
> body of the function in terms of ATTRIBUTE_UNUSED.
> If the conditional code in the body is compiled, then
> ATTRIBUTE_UNUSED isn't correct.
>
> This change makes it always match, thereby making it
> a bit cleaner IMO.
ATTRIBUTE_UNUSED is meant to be a "maybe unused" decoration. I'd just
leave it as-is.
jeff
Oh OK, thanks for the clarification.
Costas
On Wed, 7 Jun 2023 at 13:59, Jeff Law <jeffreyalaw@gmail.com> wrote:
>
>
> On 6/7/23 04:21, Costas Argyris via Gcc-patches wrote:
> > I saw this while working on something else:
> >
> > pex_unix_cleanup signature doesn't always match the
> > body of the function in terms of ATTRIBUTE_UNUSED.
> > If the conditional code in the body is compiled, then
> > ATTRIBUTE_UNUSED isn't correct.
> >
> > This change makes it always match, thereby making it
> > a bit cleaner IMO.
> ATTRIBUTE_UNUSED is meant to be a "maybe unused" decoration. I'd just
> leave it as-is.
>
> jeff
>
From 4c84afd631ad09011b237790599e1c320852f82d Mon Sep 17 00:00:00 2001
From: Costas Argyris <costas.argyris@gmail.com>
Date: Wed, 7 Jun 2023 10:34:14 +0100
Subject: [PATCH] libiberty: pex-unix.c: Make pex_unix_cleanup signature always
match body.
Signed-off-by: Costas Argyris <costas.argyris@gmail.com>
---
libiberty/pex-unix.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
@@ -814,9 +814,9 @@ pex_unix_fdopenw (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
}
static void
-pex_unix_cleanup (struct pex_obj *obj ATTRIBUTE_UNUSED)
-{
#if !defined (HAVE_WAIT4) && !defined (HAVE_WAITPID)
+pex_unix_cleanup (struct pex_obj *obj)
+{
while (obj->sysdep != NULL)
{
struct status_list *this;
@@ -827,5 +827,9 @@ pex_unix_cleanup (struct pex_obj *obj ATTRIBUTE_UNUSED)
free (this);
obj->sysdep = (void *) next;
}
-#endif
}
+#else
+pex_unix_cleanup (struct pex_obj *obj ATTRIBUTE_UNUSED)
+{
+}
+#endif
--
2.30.2