modprobe: exit in one place

diff --git a/tools/modprobe.c b/tools/modprobe.c
index b8a64153916ce1ed2d9ac8238168551f38c72bd4..d03bce655fa709b1a253f661d092120931d4b8c4 100644 (file)
--- 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);