diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 18:14:27 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 18:14:27 +0000 |
commit | 2ac6c4648a2723630e959aae1591629d970ac631 (patch) | |
tree | 1b13d56f53f0928bbff8aac6930b0ca9c5d682d4 /apps/app_minivm.c | |
parent | 5b469417019fcf4923e98c84a4a42f80f1170f0e (diff) |
Merged revisions 130129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r130129 | bbryant | 2008-07-11 13:09:35 -0500 (Fri, 11 Jul 2008) | 8 lines
Janitor patch to change uses of sizeof to ARRAY_LEN
(closes issue #13054)
Reported by: pabelanger
Patches:
ARRAY_LEN.patch2 uploaded by pabelanger (license 224)
Tested by: seanbright
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130130 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_minivm.c')
-rw-r--r-- | apps/app_minivm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 2b70d87e4..3eb64cda5 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1636,7 +1636,7 @@ static int minivm_notify_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); if (argc == 2 && !ast_strlen_zero(argv[1])) template = argv[1]; @@ -1706,7 +1706,7 @@ static int minivm_record_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmp, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmp, ',', argv, ARRAY_LEN(argv)); if (argc == 2) { if (ast_app_parse_options(minivm_app_options, &flags, opts, argv[1])) { return -1; @@ -1768,7 +1768,7 @@ static int minivm_greet_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); return -1; } - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); if (argc == 2) { if (ast_app_parse_options(minivm_app_options, &flags, opts, argv[1])) @@ -1987,7 +1987,7 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Out of memory\n"); error = TRUE; } else - argc = ast_app_separate_args(tmpptr, ',', argv, sizeof(argv) / sizeof(argv[0])); + argc = ast_app_separate_args(tmpptr, ',', argv, ARRAY_LEN(argv)); } if (argc <=1) { |