提交 96b0ef9c authored 作者: Stefan Knoblich's avatar Stefan Knoblich

ftmod_libpri: Use ftdm_array_len(), remove custom ARRAY_SIZE macro.

Signed-off-by: 's avatarStefan Knoblich <s.knoblich@axsentis.de>
上级 e17201bb
...@@ -34,10 +34,6 @@ ...@@ -34,10 +34,6 @@
#include "private/ftdm_core.h" #include "private/ftdm_core.h"
#include "ftmod_libpri.h" #include "ftmod_libpri.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0]))
#endif
static void _ftdm_channel_set_state_force(ftdm_channel_t *chan, const ftdm_channel_state_t state) static void _ftdm_channel_set_state_force(ftdm_channel_t *chan, const ftdm_channel_state_t state)
{ {
assert(chan); assert(chan);
...@@ -198,7 +194,7 @@ static int parse_debug(const char *in, uint32_t *flags) ...@@ -198,7 +194,7 @@ static int parse_debug(const char *in, uint32_t *flags)
return 0; return 0;
} }
for (i = 0; i < ARRAY_SIZE(ftdm_libpri_debug); i++) { for (i = 0; i < ftdm_array_len(ftdm_libpri_debug); i++) {
if (strstr(in, ftdm_libpri_debug[i].name)) { if (strstr(in, ftdm_libpri_debug[i].name)) {
*flags |= ftdm_libpri_debug[i].flags; *flags |= ftdm_libpri_debug[i].flags;
res = 0; res = 0;
...@@ -222,7 +218,7 @@ static int print_debug(uint32_t flags, char *tmp, const int size) ...@@ -222,7 +218,7 @@ static int print_debug(uint32_t flags, char *tmp, const int size)
return 0; return 0;
} }
for (i = 0; i < ARRAY_SIZE(ftdm_libpri_debug); i++) { for (i = 0; i < ftdm_array_len(ftdm_libpri_debug); i++) {
if ((flags & ftdm_libpri_debug[i].flags) == ftdm_libpri_debug[i].flags) { if ((flags & ftdm_libpri_debug[i].flags) == ftdm_libpri_debug[i].flags) {
res = snprintf(&tmp[offset], size - offset, "%s,", ftdm_libpri_debug[i].name); res = snprintf(&tmp[offset], size - offset, "%s,", ftdm_libpri_debug[i].name);
if (res <= 0 || res == (size - offset)) if (res <= 0 || res == (size - offset))
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论