svn: /php/php-src/ branches/PHP_5_4/main/SAPI.h branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c trunk/main/SAPI.h
trunk/sapi/apache2handler/sapi_apache2.c
| From: | Rasmus Lerdorf | Date: | Mon, 16 May 2011 15:52:31 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/main/SAPI.h branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c trunk/main/SAPI.h trunk/sapi/apache2handler/sapi_apache2.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64939@lists.php.net to get a copy of this message | ||
rasmus Mon, 16 May 2011 15:52:31 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311096
Log:
Fix a couple of warnings. Use %zu to printf a time_t and get_request_time
actually returns a double, not a time_t.
Changed paths:
U php/php-src/branches/PHP_5_4/main/SAPI.h
U php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c
U php/php-src/trunk/main/SAPI.h
U php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
Modified: php/php-src/branches/PHP_5_4/main/SAPI.h
===================================================================
--- php/php-src/branches/PHP_5_4/main/SAPI.h 2011-05-16 15:52:27 UTC (rev 311095)
+++ php/php-src/branches/PHP_5_4/main/SAPI.h 2011-05-16 15:52:31 UTC (rev 311096)
@@ -241,7 +241,7 @@
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
void (*log_message)(char *message TSRMLS_DC);
- time_t (*get_request_time)(TSRMLS_D);
+ double (*get_request_time)(TSRMLS_D);
void (*terminate_process)(TSRMLS_D);
char *php_ini_path_override;
Modified: php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c 2011-05-16 15:52:27 UTC (rev
311095)
+++ php/php-src/branches/PHP_5_4/sapi/apache2handler/sapi_apache2.c 2011-05-16 15:52:31 UTC (rev
311096)
@@ -670,7 +670,7 @@
}
apr_table_set(r->notes, "mod_php_memory_usage",
- apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC)));
+ apr_psprintf(ctx->r->pool, "%zu", zend_memory_peak_usage(1 TSRMLS_CC)));
}
} zend_end_try();
Modified: php/php-src/trunk/main/SAPI.h
===================================================================
--- php/php-src/trunk/main/SAPI.h 2011-05-16 15:52:27 UTC (rev 311095)
+++ php/php-src/trunk/main/SAPI.h 2011-05-16 15:52:31 UTC (rev 311096)
@@ -241,7 +241,7 @@
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
void (*log_message)(char *message TSRMLS_DC);
- time_t (*get_request_time)(TSRMLS_D);
+ double (*get_request_time)(TSRMLS_D);
void (*terminate_process)(TSRMLS_D);
char *php_ini_path_override;
Modified: php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
===================================================================
--- php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2011-05-16 15:52:27 UTC (rev 311095)
+++ php/php-src/trunk/sapi/apache2handler/sapi_apache2.c 2011-05-16 15:52:31 UTC (rev 311096)
@@ -670,7 +670,7 @@
}
apr_table_set(r->notes, "mod_php_memory_usage",
- apr_psprintf(ctx->r->pool, "%u", zend_memory_peak_usage(1 TSRMLS_CC)));
+ apr_psprintf(ctx->r->pool, "%zu", zend_memory_peak_usage(1 TSRMLS_CC)));
}
} zend_end_try();