summaryrefslogtreecommitdiff
path: root/apps/app_directory.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2005-10-26 19:48:14 +0000
committerRussell Bryant <russell@russellbryant.com>2005-10-26 19:48:14 +0000
commit5187de9ab6e5abc33ee6de4c4b16dbd3e3a5a7a7 (patch)
treecc336d91bb85ce45338470c9de5c8fd8717c9c73 /apps/app_directory.c
parentdbc5c06c94d4472730e25c77f9b4e3d59db6b6ee (diff)
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
Diffstat (limited to 'apps/app_directory.c')
-rwxr-xr-xapps/app_directory.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c
index fd31be965..8c54d74cc 100755
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -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