Merged revisions 253538 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines

  Resolve compiler warnings on FreeBSD.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@253612 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 1d8ea91b0a26398f2934aad5faff9e7233482be7..44acc35f8afd5fb9e3d68cbf4d0f5ae66a495452 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1497,12 +1497,12 @@ static void end_bridge_callback(void *data)
 
        ast_channel_lock(chan);
        if (chan->cdr->answer.tv_sec) {
-               snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+               snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
                pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
        }
 
        if (chan->cdr->start.tv_sec) {
-               snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+               snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
                pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
        }
        ast_channel_unlock(chan);

diff --git a/apps/app_followme.c b/apps/app_followme.c
index b1d708b138774e12bdbe12554a9331166e7aad18..e79b6cf082039ae002b8bbc36e20de9cb91d66e7 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -984,12 +984,12 @@ static void end_bridge_callback(void *data)
 
        ast_channel_lock(chan);
        if (chan->cdr->answer.tv_sec) {
-               snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+               snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
                pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
        }
 
        if (chan->cdr->start.tv_sec) {
-               snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+               snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
                pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
        }
        ast_channel_unlock(chan);