diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-30 21:06:17 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-30 21:06:17 +0000 |
commit | 8c97f90d1ed2be5a761c47846ec06bd1f1d75925 (patch) | |
tree | fb6719b434b73cb2162c3582ac733d8c402b5791 | |
parent | c183be72cf2fa522943be60bb6bc163b3b021b4e (diff) |
Merged revisions 236893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r236893 | jpeeler | 2009-12-30 14:34:41 -0600 (Wed, 30 Dec 2009) | 11 lines
Fix compiling with LOW_MEMORY.
Modified handle_verbose to be LOW_MEMORY aware.
(closes issue #16381)
Reported by: michael_iedema
Patches:
ast_complete_source_filename.patch uploaded by michael iedema (license 942)
modified by me
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@236899 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/cli.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/cli.c b/main/cli.c index 1ad4a76c3..e411c0da9 100644 --- a/main/cli.c +++ b/main/cli.c @@ -377,10 +377,18 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg case CLI_INIT: e->command = "core set {debug|verbose}"; e->usage = +#if !defined(LOW_MEMORY) "Usage: core set {debug|verbose} [atleast] <level> [filename]\n" +#else + "Usage: core set {debug|verbose} [atleast] <level>\n" +#endif " core set {debug|verbose} off\n" +#if !defined(LOW_MEMORY) " Sets level of debug or verbose messages to be displayed or \n" " sets a filename to display debug messages from.\n" +#else + " Sets level of debug or verbose messages to be displayed.\n" +#endif " 0 or off means no messages should be displayed.\n" " Equivalent to -d[d[...]] or -v[v[v...]] on startup\n"; return NULL; @@ -406,8 +414,10 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg } else if (a->n == (22 - numbermatch) && a->pos == 3 && ast_strlen_zero(argv3)) { return ast_strdup("atleast"); } +#if !defined(LOW_MEMORY) } else if (a->pos == 4 || (a->pos == 5 && !strcasecmp(argv3, "atleast"))) { return ast_complete_source_filename(a->pos == 4 ? S_OR(a->argv[4], "") : S_OR(a->argv[5], ""), a->n); +#endif } return NULL; } |