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

1 files changed, 3 insertions, 6 deletions

diff --git a/main/cdr.c b/main/cdr.c
index e5c96dbec..9a61e0a0d 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -206,13 +206,10 @@ static void cdr_get_tv(struct timeval tv, const char *fmt, char *buf, int bufsiz
 	if (fmt == NULL) {	/* raw mode */
 		snprintf(buf, bufsize, "%ld.%06ld", (long)tv.tv_sec, (long)tv.tv_usec);
 	} else {  
-		time_t t = tv.tv_sec;
-		if (t) {
-			struct tm tm;
+		struct ast_tm tm;
 
-			ast_localtime(&t, &tm, NULL);
-			strftime(buf, bufsize, fmt, &tm);
-		}
+		ast_localtime(&tv, &tm, NULL);
+		ast_strftime(buf, bufsize, fmt, &tm);
 	}
 }