diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 19:47:20 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-18 19:47:20 +0000 |
commit | 74c2948c2299773fd3816af43e06e3bdf714ba3a (patch) | |
tree | 540f82bac3e6105b6fc34cd4b4613c1756a7512b /main/callerid.c | |
parent | fd471b4a0cbb2abd7b4c8f30fee850cedefedaa1 (diff) |
Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75706 f38db490-d61c-443f-a65b-d21fe96a405b
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; |