[svn-commits] russell: branch 1.6.1 r253623 - in /branches/1.6.1: ./ apps/

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Mar 20 12:50:53 2010
New Revision: 253623

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253623
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.c
    branches/1.6.1/apps/app_followme.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=253623&r1=253622&r2=253623
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Sat Mar 20 12:50:53 2010
@@ -1301,12 +1301,12 @@
 
 	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);

Modified: branches/1.6.1/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_followme.c?view=diff&rev=253623&r1=253622&r2=253623
==============================================================================
--- branches/1.6.1/apps/app_followme.c (original)
+++ branches/1.6.1/apps/app_followme.c Sat Mar 20 12:50:53 2010
@@ -885,12 +885,12 @@
 
 	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);