From: Stefan Knoblich Date: Thu, 12 Jul 2012 00:37:55 +0000 (+0200) Subject: FreeTDM: Add dumy "%s" format string to ftdm_assert() and ftdm_assert_return() to... X-Git-Tag: v1.2.0~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d299cd7af941adf97f6e0952960331c23f1e09;p=thirdparty%2Ffreeswitch.git FreeTDM: Add dumy "%s" format string to ftdm_assert() and ftdm_assert_return() to silence format string warnings. Neither of them accepts extra arguments and ftmod_sangoma_isdn is calling ftmod_assert() with a char * msg argument. Signed-off-by: Stefan Knoblich --- diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h index fa1bd233cd..d678efd8c8 100644 --- a/libs/freetdm/src/include/private/ftdm_core.h +++ b/libs/freetdm/src/include/private/ftdm_core.h @@ -695,7 +695,7 @@ FT_DECLARE(ftdm_status_t) ftdm_sigmsg_set_raw_data(ftdm_sigmsg_t *sigmsg, void * */ #define ftdm_assert(assertion, msg) \ if (!(assertion)) { \ - ftdm_log(FTDM_LOG_CRIT, msg); \ + ftdm_log(FTDM_LOG_CRIT, "%s", msg); \ if (g_ftdm_crash_policy & FTDM_CRASH_ON_ASSERT) { \ ftdm_abort(); \ } \ @@ -706,7 +706,7 @@ FT_DECLARE(ftdm_status_t) ftdm_sigmsg_set_raw_data(ftdm_sigmsg_t *sigmsg, void * */ #define ftdm_assert_return(assertion, retval, msg) \ if (!(assertion)) { \ - ftdm_log(FTDM_LOG_CRIT, msg); \ + ftdm_log(FTDM_LOG_CRIT, "%s", msg); \ if (g_ftdm_crash_policy & FTDM_CRASH_ON_ASSERT) { \ ftdm_abort(); \ } else { \