kill warnings

diff --git a/main/SAPI.c b/main/SAPI.c
index c8bdf58397001cea22064efc7d9c54e8a8433625..5345827b70ac2a1bf4adaddc0a27500a37c68e89 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -186,7 +186,7 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
        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 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
                }
                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) {

diff --git a/main/main.c b/main/main.c
index 37af73c4fc82325ce4de8820cdc5e2916d22e838..87ebf6619438d2af3683ab0ddc634f0b366dcb08 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -519,7 +519,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
                        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)) {

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 6f580dc986c5cd707bda4d97c77c5b26009c178a..0c5348658b21178bd33267705c47df56a09ae5e7 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1505,8 +1505,8 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
        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 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
                                        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;