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 /codecs | |
| 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 'codecs')
| -rw-r--r-- | codecs/codec_dahdi.c | 4 | ||||
| -rw-r--r-- | codecs/codec_g722.c | 4 | ||||
| -rw-r--r-- | codecs/codec_resample.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 76661e6c4..f570584fa 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -466,7 +466,7 @@ static int reload(void) static int unload_module(void) { - ast_cli_unregister_multiple(cli, sizeof(cli) / sizeof(cli[0])); + ast_cli_unregister_multiple(cli, ARRAY_LEN(cli)); unregister_translators(); return 0; @@ -477,7 +477,7 @@ static int load_module(void) if (parse_config(0)) return AST_MODULE_LOAD_DECLINE; find_transcoders(); - ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0])); + ast_cli_register_multiple(cli, ARRAY_LEN(cli)); return AST_MODULE_LOAD_SUCCESS; } diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 02f4720cd..acca1fc87 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -166,7 +166,7 @@ static struct ast_frame *lintog722_sample (void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR, .datalen = sizeof(slin_g722_ex), - .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), + .samples = ARRAY_LEN(slin_g722_ex), .src = __PRETTY_FUNCTION__, .data = slin_g722_ex, }; @@ -180,7 +180,7 @@ static struct ast_frame *lin16tog722_sample (void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR16, .datalen = sizeof(slin_g722_ex), - .samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]), + .samples = ARRAY_LEN(slin_g722_ex), .src = __PRETTY_FUNCTION__, .data = slin_g722_ex, }; diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index 251d99c23..988384af4 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -166,7 +166,7 @@ static struct ast_frame *slin16_to_slin8_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR16, .datalen = sizeof(slin16_slin8_ex), - .samples = sizeof(slin16_slin8_ex) / sizeof(slin16_slin8_ex[0]), + .samples = ARRAY_LEN(slin16_slin8_ex), .src = __PRETTY_FUNCTION__, .data = slin16_slin8_ex, }; @@ -180,7 +180,7 @@ static struct ast_frame *slin8_to_slin16_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_SLINEAR, .datalen = sizeof(slin8_slin16_ex), - .samples = sizeof(slin8_slin16_ex) / sizeof(slin8_slin16_ex[0]), + .samples = ARRAY_LEN(slin8_slin16_ex), .src = __PRETTY_FUNCTION__, .data = slin8_slin16_ex, }; |