From 8e2b705649e294f43a8cd1ea79e4c594c0bd1d9d Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 16 Oct 2007 23:26:33 -0700 Subject: argv_split: allow argv_split to handle NULL pointer in argcp parameter gracefully It would be nice if the argv_split library function could gracefully handle a NULL pointer in the argcp parameter, so as to allow functions using it that did not care about the value of argc to not have to declare a useless variable. This patch accomplishes that. Tested by me, with successful results. Signed-off-by: Neil Horman Acked-by: Jeremy Fitzhardinge Cc: Satyam Sharma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- lib/argv_split.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/argv_split.c') diff --git a/lib/argv_split.c b/lib/argv_split.c index 4096ed42f490..fad6ce4f7b57 100644 --- a/lib/argv_split.c +++ b/lib/argv_split.c @@ -75,7 +75,9 @@ char **argv_split(gfp_t gfp, const char *str, int *argcp) if (argv == NULL) goto out; - *argcp = argc; + if (argcp) + *argcp = argc; + argvp = argv; while (*str) { -- cgit v1.2.3-59-g8ed1b