From 4bc2d7664082cbe3538c55253b9eaf0bb947750b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 31 Jan 2022 08:42:07 -0800 Subject: [PATCH 27/43] df: simplify -fsanitize=leak pacification * src/df.c (print_table, main) [lint]: Omit unnecessary cleanup. (main): Use main_exit, not return. --- src/df.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/df.c b/src/df.c index b803fc73b..7d3207807 100644 --- a/src/df.c +++ b/src/df.c @@ -404,14 +404,9 @@ print_table (void) /* When ambsalign fails, output unaligned data. */ fputs (cell ? cell : table[row][col], stdout); free (cell); - - IF_LINT (free (table[row][col])); } putchar ('\n'); - IF_LINT (free (table[row])); } - - IF_LINT (free (table)); } /* Dynamically allocate a struct field_t in COLUMNS, which @@ -1600,7 +1595,7 @@ field names are: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n\ int main (int argc, char **argv) { - struct stat *stats IF_LINT ( = 0); + struct stat *stats = NULL; initialize_main (&argc, &argv); set_program_name (argv[0]); @@ -1838,7 +1833,7 @@ main (int argc, char **argv) get_field_list (); get_header (); - if (optind < argc) + if (stats) { /* Display explicitly requested empty file systems. */ show_listed_fs = true; @@ -1846,8 +1841,6 @@ main (int argc, char **argv) for (int i = optind; i < argc; ++i) if (argv[i]) get_entry (argv[i], &stats[i - optind]); - - IF_LINT (free (stats)); } else get_all_entries (); @@ -1869,7 +1862,5 @@ main (int argc, char **argv) die (EXIT_FAILURE, 0, _("no file systems processed")); } - IF_LINT (free (columns)); - - return exit_status; + main_exit (exit_status); } -- 2.32.0