aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'codecs')
-rw-r--r--codecs/codec_dahdi.c4
-rw-r--r--codecs/codec_g722.c4
-rw-r--r--codecs/codec_resample.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index bc13d787c..2de40f996 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 19e6b33b1..b221ab20f 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.ptr = 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.ptr = slin_g722_ex,
};
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index f0ae03307..023b9b60d 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.ptr = 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.ptr = slin8_slin16_ex,
};