diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-07-18 19:47:20 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-07-18 19:47:20 +0000 |
commit | 81bc1d7af5886089bcd065382476f202ad7cc9ea (patch) | |
tree | 540f82bac3e6105b6fc34cd4b4613c1756a7512b /main/callerid.c | |
parent | b96fde308cd75eb17e5fdb0ea6d54c0f1f593ff9 (diff) |
Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/callerid.c')
-rw-r--r-- | main/callerid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/callerid.c b/main/callerid.c index 6102d40af..6e3cb9514 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -684,15 +684,14 @@ void callerid_free(struct callerid_state *cid) static int callerid_genmsg(char *msg, int size, const char *number, const char *name, int flags) { - time_t t; - struct tm tm; + struct timeval tv = ast_tvnow(); + struct ast_tm tm; char *ptr; int res; int i, x; /* Get the time */ - time(&t); - ast_localtime(&t, &tm, NULL); + ast_localtime(&tv, &tm, NULL); ptr = msg; |