From: Masahiro Yamada <masahiroy@kernel.org>
Date: Thu, 10 Feb 2022 02:14:23 +0000 (+0900)
Subject: modprobe: remove unneeded variable str_start
X-Git-Tag: v30~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d890179b451211c506b7860f125a6ae181c9f5dc;p=thirdparty%2Fkmod.git

modprobe: remove unneeded variable str_start

The variable 'str_start' is not useful here.

Replace it with 'str'.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---

diff --git a/tools/modprobe.c b/tools/modprobe.c
index 48b1c8ce..ca372b87 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -684,7 +684,7 @@ static int options_from_array(char **args, int nargs, char **output)
 static char **prepend_options_from_env(int *p_argc, char **orig_argv)
 {
 	const char *p, *env = getenv("MODPROBE_OPTIONS");
-	char **new_argv, *str_start, *str_end, *str, *s, *quote;
+	char **new_argv, *str_end, *str, *s, *quote;
 	int i, argc = *p_argc;
 	size_t envlen, space_count = 0;
 
@@ -702,10 +702,10 @@ static char **prepend_options_from_env(int *p_argc, char **orig_argv)
 		return NULL;
 
 	new_argv[0] = orig_argv[0];
-	str_start = str = (char *) (new_argv + argc + space_count + 3);
+	str = (char *) (new_argv + argc + space_count + 3);
 	memcpy(str, env, envlen + 1);
 
-	str_end = str_start + envlen;
+	str_end = str + envlen;
 
 	quote = NULL;
 	for (i = 1, s = str; *s != '\0'; s++) {