diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-12 21:25:57 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-12 21:25:57 +0000 |
| commit | 21583e9453ceb90054d9b518afbb893818b30316 (patch) | |
| tree | 51d668852ed8b3d3fa73f9dbcbf098cdd1daffbd /funcs/func_strings.c | |
| parent | e6abcba2f2303cfae1315e11f5ba7b762c460569 (diff) | |
Merged revisions 82285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82285 | tilghman | 2007-09-12 15:12:06 -0500 (Wed, 12 Sep 2007) | 4 lines
Working on issue #10531 exposed a rather nasty 64-bit issue on ast_mktime, so we
updated the localtime.c file from source. Next we'll have to write ast_strptime
to match.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82290 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_strings.c')
| -rw-r--r-- | funcs/func_strings.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 5eab9930f..db14c07fd 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -659,7 +659,8 @@ static int acf_strptime(struct ast_channel *chan, const char *cmd, char *data, if (!strptime(args.timestring, args.format, &t.time)) { ast_log(LOG_WARNING, "C function strptime() output nothing?!!\n"); } else { - snprintf(buf, len, "%d", (int) ast_mktime(&t.atm, args.timezone)); + struct timeval tv = ast_mktime(&t.atm, args.timezone); + snprintf(buf, len, "%d", (int) tv.tv_sec); } return 0; |