From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Wed, 31 Oct 2012 23:29:54 +0000 (-0200)
Subject: modprobe: exit in one place
X-Git-Tag: v11~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4434d8ba363900e47190f39297ee690485794c1c;p=thirdparty%2Fkmod.git

modprobe: exit in one place
---

diff --git a/tools/modprobe.c b/tools/modprobe.c
index b8a64153..d03bce65 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);