com php-src: upstream merge: phpdbg_utils.c
| From: | Bob Weinand | Date: | Wed, 25 Dec 2013 18:50:25 +0000 |
| Subject: | com php-src: upstream merge: phpdbg_utils.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75679@lists.php.net to get a copy of this message | ||
Commit: 1d3a53a18d87a9fca3cb1fc857201dd2dfc8f9d0
Author: Joe Watkins <krakjoe@php.net> Wed, 25 Dec 2013 18:50:25 +0000
Parents: 8064d8dfd6fc5a0433efcd5c38665c450f842888
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1d3a53a18d87a9fca3cb1fc857201dd2dfc8f9d0
Log:
upstream merge
Changed paths:
M phpdbg_utils.c
Diff:
diff --git a/phpdbg_utils.c b/phpdbg_utils..c
index 86c17a7..7b2000d 100644
--- a/phpdbg_utils.c
+++ b/phpdbg_utils.c
@@ -290,8 +290,9 @@ PHPDBG_API int phpdbg_rlog(FILE *fp, const char *fmt, ...) { /* {{{ */
if (gettimeofday(&tp, NULL) == SUCCESS) {
char friendly[100];
char *format = NULL, *buffer = NULL;
+ const time_t tt = tp.tv_sec;
- strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tp.tv_sec));
+ strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tt));
asprintf(
&buffer, friendly, tp.tv_usec/1000);
asprintf(