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

FreeTDM: Silence -Wtautological-compare warnings emitted by clang

Fixes "warning: comparison of unsigned expression >= 0 is always true".
Signed-off-by: 's avatarStefan Knoblich <stkn@openisdn.net>
上级 ae58a4c1
...@@ -222,10 +222,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span) ...@@ -222,10 +222,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span)
if (!(intval = va_arg(ap, int *))) { if (!(intval = va_arg(ap, int *))) {
break; break;
} }
wait_dialtone_timeout = *intval; wait_dialtone_timeout = ftdm_max(0, *intval);
if (wait_dialtone_timeout < 0) {
wait_dialtone_timeout = 0;
}
ftdm_log(FTDM_LOG_DEBUG, "Wait dial tone ms = %d\n", wait_dialtone_timeout); ftdm_log(FTDM_LOG_DEBUG, "Wait dial tone ms = %d\n", wait_dialtone_timeout);
} else if (!strcasecmp(var, "enable_callerid")) { } else if (!strcasecmp(var, "enable_callerid")) {
if (!(val = va_arg(ap, char *))) { if (!(val = va_arg(ap, char *))) {
......
...@@ -61,7 +61,7 @@ static struct lpwrap_pri_event_list LPWRAP_PRI_EVENT_LIST[LPWRAP_PRI_EVENT_MAX] ...@@ -61,7 +61,7 @@ static struct lpwrap_pri_event_list LPWRAP_PRI_EVENT_LIST[LPWRAP_PRI_EVENT_MAX]
const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id) const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id)
{ {
if (event_id < 0 || event_id >= LPWRAP_PRI_EVENT_MAX) if (event_id >= LPWRAP_PRI_EVENT_MAX)
return ""; return "";
return LPWRAP_PRI_EVENT_LIST[event_id].name; return LPWRAP_PRI_EVENT_LIST[event_id].name;
......
...@@ -665,7 +665,7 @@ static FIO_OPEN_FUNCTION(zt_open) ...@@ -665,7 +665,7 @@ static FIO_OPEN_FUNCTION(zt_open)
} }
} }
if (zt_globals.eclevel >= 0) { if (1) {
int len = zt_globals.eclevel; int len = zt_globals.eclevel;
if (len) { if (len) {
ftdm_log(FTDM_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, ftdmchan->span_id, ftdmchan->chan_id); ftdm_log(FTDM_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, ftdmchan->span_id, ftdmchan->chan_id);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论