diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:58:23 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-22 23:58:23 +0000 |
| commit | a3fe43fbdc89aa51e266360dc93ed4a4445bebdb (patch) | |
| tree | caff43dd70af497468c3bb248d26b6c25727ae7f /funcs | |
| parent | 08a88aab159b99588bf705e3e325813c07ae5d0f (diff) | |
Fix compilations errors on 64-bit OpenBSD systems
In versiong 5.5, OpenBSD went to 64-bit time values. This requires a cast to
(long) when printing members of certain time structs.
Review: https://reviewboard.asterisk.org/r/4507
ASTERISK-24879 #close
Reported by: snuffy
Tested by: snuffy
patches:
openbsd-time64.diff uploaded by snuffy (License 5024)
........
Merged revisions 433268 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_cdr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 2d120bb90..ca54b1e42 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -284,14 +284,16 @@ static void cdr_read_callback(void *data, struct stasis_subscription *sub, struc struct timeval fmt_time; struct ast_tm tm; /* tv_usec is suseconds_t, which could be int or long */ + long int tv_sec; long int tv_usec; - if (sscanf(tempbuf, "%ld.%ld", &fmt_time.tv_sec, &tv_usec) != 2) { + if (sscanf(tempbuf, "%ld.%ld", &tv_sec, &tv_usec) != 2) { ast_log(AST_LOG_WARNING, "Unable to parse %s (%s) from the CDR for channel %s\n", args.variable, tempbuf, ast_channel_name(payload->chan)); return; } - if (fmt_time.tv_sec) { + if (tv_sec) { + fmt_time.tv_sec = tv_sec; fmt_time.tv_usec = tv_usec; ast_localtime(&fmt_time, &tm, NULL); ast_strftime(tempbuf, sizeof(tempbuf), "%Y-%m-%d %T", &tm); |