From cbf22d8a3297a10e18ba5b0d02cd1ed721aa9aac Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Fri, 10 May 2013 14:11:37 +0200 Subject: [PATCH] FreeTDM: Silence -Wtautological-compare warnings emitted by clang Fixes "warning: comparison of unsigned expression >= 0 is always true". Signed-off-by: Stefan Knoblich --- libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c | 5 +---- libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c | 2 +- libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c index fce91afdf2..c19dd86b6a 100644 --- a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c +++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c @@ -222,10 +222,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span) if (!(intval = va_arg(ap, int *))) { break; } - wait_dialtone_timeout = *intval; - if (wait_dialtone_timeout < 0) { - wait_dialtone_timeout = 0; - } + wait_dialtone_timeout = ftdm_max(0, *intval); ftdm_log(FTDM_LOG_DEBUG, "Wait dial tone ms = %d\n", wait_dialtone_timeout); } else if (!strcasecmp(var, "enable_callerid")) { if (!(val = va_arg(ap, char *))) { diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c index 44518a4496..5b3d450d6c 100644 --- a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c +++ b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c @@ -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) { - if (event_id < 0 || event_id >= LPWRAP_PRI_EVENT_MAX) + if (event_id >= LPWRAP_PRI_EVENT_MAX) return ""; return LPWRAP_PRI_EVENT_LIST[event_id].name; diff --git a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c index 5edf0b63ba..a2d4d388ef 100644 --- a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c +++ b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c @@ -665,7 +665,7 @@ static FIO_OPEN_FUNCTION(zt_open) } } - if (zt_globals.eclevel >= 0) { + if (1) { int len = zt_globals.eclevel; if (len) { ftdm_log(FTDM_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, ftdmchan->span_id, ftdmchan->chan_id);