From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 27 Nov 2007 20:21:57 +0000 (+0000)
Subject: Merged revisions 89709 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~634
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6efa075aed70522030183ae17236d2f44ad6b8;p=thirdparty%2Fasterisk.git

Merged revisions 89709 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89709 | kpfleming | 2007-11-27 14:16:56 -0600 (Tue, 27 Nov 2007) | 2 lines

on second thought... revert all the other changes i've made in app options parsing leaving only one: if an empty argument is supplied for an option, set that argument pointer to point to an empty string rather than NULL, so that the application can do normal checks on it without worrying about it being NULL

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/app.c b/main/app.c
index 13250f0456..696b22c6fb 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1622,11 +1622,7 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
 				break;
 			}
 		} else if (argloc) {
-			args[argloc - 1] = NULL;
-		}
-		if (argloc && ast_strlen_zero(args[argloc - 1])) {
-			ast_log(LOG_WARNING, "Argument supplied for option '%c' was empty, option ignored.\n", curarg);
-			continue;
+			args[argloc - 1] = "";
 		}
 		ast_set_flag(flags, options[curarg].flag);
 	}