From 8113a263e9905ee127b0ec73dba9f4ad6467f44b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 31 Jan 2022 08:42:07 -0800 Subject: [PATCH 29/43] env: simplify -fsanitize=leak pacification * src/env.c (unset_envvars): Remove IF_LINT code. (main): Use main_exit, not return. --- src/env.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/env.c b/src/env.c index abcd0a789..f7ef297e7 100644 --- a/src/env.c +++ b/src/env.c @@ -184,11 +184,6 @@ unset_envvars (void) die (EXIT_CANCELED, errno, _("cannot unset %s"), quote (usvars[i])); } - - IF_LINT (free (usvars)); - IF_LINT (usvars = NULL); - IF_LINT (usvars_used = 0); - IF_LINT (usvars_alloc = 0); } /* Return a pointer to the end of a valid ${VARNAME} string, or NULL. @@ -904,5 +899,5 @@ main (int argc, char **argv) if (exit_status == EXIT_ENOENT && strpbrk (argv[optind], C_ISSPACE_CHARS)) error (0, 0, _("use -[v]S to pass options in shebang lines")); - return exit_status; + main_exit (exit_status); } -- 2.32.0