Merged revisions 107019 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r107019 | murf | 2008-03-10 08:55:21 -0600 (Mon, 10 Mar 2008) | 1 line

way back in July, in r.75706, a fix was made ot the strftime usages, which was good, but in this case, the check for a nil time was accidentally removed, and now it is restored, to keep timevals like '1969-12-31 17:00:00' from showing up in the cdrs. No idea what databases will do with this. No bugs filed as yet, but it felt like a bug.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Steve Murphy 17 years ago
parent 109b374629
commit e261ad9b4c

@ -200,11 +200,13 @@ 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 {
struct ast_tm tm;
ast_localtime(&tv, &tm, NULL);
ast_strftime(buf, bufsize, fmt, &tm);
} else {
if (tv.tv_sec) {
struct ast_tm tm;
ast_localtime(&tv, &tm, NULL);
ast_strftime(buf, bufsize, fmt, &tm);
}
}
}

Loading…
Cancel
Save