mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	remove unnecessary checks before calls to ast_strlen_zero
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -293,7 +293,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
 | 
			
		||||
	int lastuserchoice = 0;
 | 
			
		||||
	char *start, *pos, *conv,*stringp=NULL;
 | 
			
		||||
 | 
			
		||||
	if (!context || ast_strlen_zero(context)) {
 | 
			
		||||
	if (ast_strlen_zero(context)) {
 | 
			
		||||
		ast_log(LOG_WARNING,
 | 
			
		||||
			"Directory must be called with an argument "
 | 
			
		||||
			"(context in which to interpret extensions)\n");
 | 
			
		||||
@@ -410,7 +410,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
 | 
			
		||||
	int last = 1;
 | 
			
		||||
	char *context, *dialcontext, *dirintro, *options;
 | 
			
		||||
 | 
			
		||||
	if (!data || ast_strlen_zero(data)) {
 | 
			
		||||
	if (ast_strlen_zero(data)) {
 | 
			
		||||
		ast_log(LOG_WARNING, "Directory requires an argument (context[,dialcontext])\n");
 | 
			
		||||
		return -1;
 | 
			
		||||
	}
 | 
			
		||||
@@ -439,9 +439,9 @@ static int directory_exec(struct ast_channel *chan, void *data)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	dirintro = ast_variable_retrieve(cfg, context, "directoryintro");
 | 
			
		||||
	if (!dirintro || ast_strlen_zero(dirintro))
 | 
			
		||||
	if (ast_strlen_zero(dirintro))
 | 
			
		||||
		dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
 | 
			
		||||
	if (!dirintro || ast_strlen_zero(dirintro)) {
 | 
			
		||||
	if (ast_strlen_zero(dirintro)) {
 | 
			
		||||
		if (last)
 | 
			
		||||
			dirintro = "dir-intro";	
 | 
			
		||||
		else
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user