aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-25 21:19:57 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-25 21:19:57 +0000
commitfc5cdc885361b6083313e0bf67aeba79ceeb5742 (patch)
treed4b72df7581c9c0bc366085879e5e55f5cc6abc7 /main
parent010f99fbc04866df4578b844abe3c04eefd59702 (diff)
Merged revisions 203381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r203381 | twilson | 2009-06-25 16:15:11 -0500 (Thu, 25 Jun 2009) | 11 lines Merged revisions 203380 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r203380 | twilson | 2009-06-25 16:13:10 -0500 (Thu, 25 Jun 2009) | 4 lines I didn't see that Mark already fixed the underlying issue! Yay for removing useless code. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@203393 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/cli.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/cli.c b/main/cli.c
index 2e26f96bb..e431cb80a 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -135,8 +135,8 @@ static char *complete_fn(const char *word, int state)
c += (strlen(ast_config_AST_MODULE_DIR) + 1);
if (c)
c = ast_strdup(c);
- if (d)
- free(d);
+
+ free(d);
return c;
}