diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-10-31 21:29:54 -0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-10-31 21:29:54 -0200 |
| commit | 4434d8ba363900e47190f39297ee690485794c1c (patch) | |
| tree | 59cfbbcba145389a8d9354e344fdd113a5a8247e | |
| parent | e4a7352ad3c16f0b4b658218d9997e3570a70772 (diff) | |
| download | kmod-4434d8ba363900e47190f39297ee690485794c1c.tar.gz | |
modprobe: exit in one place
| -rw-r--r-- | tools/modprobe.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/modprobe.c b/tools/modprobe.c index b8a6415..d03bce6 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c @@ -937,16 +937,12 @@ static int do_modprobe(int argc, char **orig_argv) break; case 'V': puts(PACKAGE " version " VERSION); - if (argv != orig_argv) - free(argv); - free(config_paths); - return EXIT_SUCCESS; + err = EXIT_SUCCESS; + goto done; case 'h': help(basename(argv[0])); - if (argv != orig_argv) - free(argv); - free(config_paths); - return EXIT_SUCCESS; + err = EXIT_SUCCESS; + goto done; case '?': goto cmdline_failed; default: @@ -1019,6 +1015,7 @@ static int do_modprobe(int argc, char **orig_argv) if (use_syslog) closelog(); +done: if (argv != orig_argv) free(argv); |