sas Thu Aug 28 13:07:42 2003 EDT
Modified files:
/php-src/main SAPI.c main.c
/php-src/main/streams streams.c
Log:
kill warnings
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.176 php-src/main/SAPI.c:1.177
--- php-src/main/SAPI.c:1.176 Mon Aug 11 15:36:26 2003
+++ php-src/main/SAPI.c Thu Aug 28 13:07:40 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.176 2003/08/11 19:36:26 helly Exp $ */
+/* $Id: SAPI.c,v 1.177 2003/08/28 17:07:40 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/main.c
diff -u php-src/main/main.c:1.569 php-src/main/main.c:1.570
--- php-src/main/main.c:1.569 Mon Aug 25 16:51:40 2003
+++ php-src/main/main.c Thu Aug 28 13:07:40 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.569 2003/08/25 20:51:40 helly Exp $ */
+/* $Id: main.c,v 1.570 2003/08/28 17:07:40 sas Exp $ */
/* {{{ includes
*/
@@ -519,7 +519,7 @@
docref = get_active_function_name(TSRMLS_C);
if (!docref)
docref = "Unknown";
- php_error(type, "%s(%s): %s", class_name, space, docref,
params, buffer);
+ php_error(type, "%s%s%s(%s): %s ", class_name, space, docref,
params, buffer);
}
if (PG(track_errors) && EG(active_symbol_table)) {
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.32 php-src/main/streams/streams.c:1.33
--- php-src/main/streams/streams.c:1.32 Tue Jul 29 14:26:34 2003
+++ php-src/main/streams/streams.c Thu Aug 28 13:07:40 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.32 2003/07/29 18:26:34 iliaa Exp $ */
+/* $Id: streams.c,v 1.33 2003/08/28 17:07:40 sas Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1505,8 +1505,8 @@
php_stream *stream = NULL;
php_stream_wrapper *wrapper = NULL;
char *path_to_open;
- int persistent = options & STREAM_OPEN_PERSISTENT;
#if ZEND_DEBUG
+ int persistent = options & STREAM_OPEN_PERSISTENT;
char *copy_of_path = NULL;
#endif
@@ -1574,7 +1574,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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
