[svn-commits] kpfleming: trunk r89721 - in /trunk: ./ main/app.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Nov 27 14:21:57 2007
New Revision: 89721

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89721
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/app.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?view=diff&rev=89721&r1=89720&r2=89721
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue Nov 27 14:21:57 2007
@@ -1622,11 +1622,7 @@
 				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);
 	}