From 18065a175d5012a4f1033e8c05c064007494ed3c Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Thu, 15 May 2008 10:56:29 +0000 Subject: Use casts or intermediate variables to remove a number of platform/compiler-dependent warnings when handing struct timeval fields, both reading and printing them. It is a lost battle to handle the different ways struct timeval is handled on the various platforms and compilers, so try to be pragmatic and go through int/long which are universally supported. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116557 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_timeout.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'funcs') diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 2f282b336..77d7c297e 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -84,6 +84,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, const char *value) { double x; + long sec; char timestr[64]; struct ast_tm myt; struct timeval tv; @@ -99,10 +100,12 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, if (!value) return -1; - if ((sscanf(value, "%ld%lf", (long *)&tv.tv_sec, &x) == 0) || tv.tv_sec < 0) + if ((sscanf(value, "%ld%lf", &sec, &x) == 0) || sec < 0) tv.tv_sec = 0; - else + else { + tv.tv_sec = sec; tv.tv_usec = x * 1000000; + } switch (*data) { case 'a': -- cgit v1.2.3