提交 a2e16ce8 authored 作者: Stefan Knoblich's avatar Stefan Knoblich

ftmod_libpri: Minor cleanups in ftdm_libpri_configure_span().

Move some things around and remove 'paramindex' var (just use 'i' for that too).
Signed-off-by: 's avatarStefan Knoblich <s.knoblich@axsentis.de>
上级 9ff4cfd5
...@@ -1639,13 +1639,11 @@ static uint32_t parse_opts(const char *in) ...@@ -1639,13 +1639,11 @@ static uint32_t parse_opts(const char *in)
*/ */
static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_libpri_configure_span) static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_libpri_configure_span)
{ {
uint32_t i; ftdm_libpri_data_t *isdn_data = NULL;
//ftdm_channel_t *dchan = NULL;
uint32_t bchan_count = 0; uint32_t bchan_count = 0;
uint32_t dchan_count = 0; uint32_t dchan_count = 0;
uint32_t paramindex = 0; uint32_t i;
//ftdm_channel_t *dchan = NULL;
ftdm_libpri_data_t *isdn_data;
const char *var, *val;
if (ftdm_span_get_trunk_type(span) >= FTDM_TRUNK_NONE) { if (ftdm_span_get_trunk_type(span) >= FTDM_TRUNK_NONE) {
ftdm_log(FTDM_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", ftdm_span_get_trunk_type_str(span)); ftdm_log(FTDM_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", ftdm_span_get_trunk_type_str(span));
...@@ -1721,9 +1719,9 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_libpri_configure_span) ...@@ -1721,9 +1719,9 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_libpri_configure_span)
return FTDM_FAIL; return FTDM_FAIL;
} }
for (paramindex = 0; paramindex < 10 && ftdm_parameters[paramindex].var; paramindex++) { for (i = 0; i < 10 && ftdm_parameters[i].var; i++) {
var = ftdm_parameters[paramindex].var; const char *var = ftdm_parameters[i].var;
val = ftdm_parameters[paramindex].val; const char *val = ftdm_parameters[i].val;
if (!val) { if (!val) {
ftdm_log(FTDM_LOG_ERROR, "Parameter '%s' has no value\n", var); ftdm_log(FTDM_LOG_ERROR, "Parameter '%s' has no value\n", var);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论