cvs: php-src(PHP_4_3) /main SAPI.c streams.c
| From: | Sascha Schumann | Date: | Thu, 28 Aug 2003 16:04:19 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /main SAPI.c streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23444@lists.php.net to get a copy of this message | ||
sas Thu Aug 28 12:04:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main SAPI.c streams.c
Log:
fix format strings
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.155.2.12 php-src/main/SAPI.c:1.155.2.13
--- php-src/main/SAPI.c:1.155.2.12 Mon Aug 11 15:40:52 2003
+++ php-src/main/SAPI.c Thu Aug 28 12:04:18 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.155.2.12 2003/08/11 19:40:52 helly Exp $ */
+/* $Id: SAPI.c,v 1.155.2.13 2003/08/28 16:04:18 sas Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -186,7 +186,7 @@
int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
if (SG(request_info).content_length > SG(post_max_size)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "POST Content-Length of %d bytes exceeds the
limit of %d bytes",
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "POST Content-Length of %ld bytes exceeds the
limit of %ld bytes",
SG(request_info).content_length, SG(post_max_size));
return;
}
@@ -199,7 +199,7 @@
}
SG(read_post_bytes) += read_bytes;
if (SG(read_post_bytes) > SG(post_max_size)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Actual POST length does not match
Content-Length, and exceeds %d bytes", SG(post_max_size));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Actual POST length does not match
Content-Length, and exceeds %ld bytes", SG(post_max_size));
return;
}
if (read_bytes < SAPI_POST_BLOCK_SIZE) {
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.74 php-src/main/streams.c:1.125.2.75
--- php-src/main/streams.c:1.125.2.74 Tue Aug 26 21:10:25 2003
+++ php-src/main/streams.c Thu Aug 28 12:04:18 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.74 2003/08/27 01:10:25 iliaa Exp $ */
+/* $Id: streams.c,v 1.125.2.75 2003/08/28 16:04:18 sas Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2653,7 +2653,7 @@
char *tmp = estrdup(path);
php_strip_url_passwd(tmp);
php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, "could not make seekable - %s",
- tmp, strerror(errno));
+ tmp);
efree(tmp);
options ^= REPORT_ERRORS;