use php_error_docref()

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index ecfbc067be3db432e7e837ad34bc454a1cb81cda..807df676d92d851e5a5ee589a2dbb98eb2af0b8f 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -161,7 +161,7 @@ PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
 
                        ptr = end;
                }
-               php_error(E_WARNING, "open_basedir restriction in effect. File is in wrong directory");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "open_basedir restriction in effect. File is in wrong directory");
                efree(pathbuf);
                errno = EPERM; /* we deny permission to open it */
                return -1;
@@ -317,7 +317,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
                fp = NULL;
        }
        if (!fp) {
-               php_error(E_ERROR, "Unable to open %s", filename);
+               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to open %s", filename);
                STR_FREE(SG(request_info).path_translated);     /* for same reason as above */
                return FAILURE;
        }

diff --git a/main/network.c b/main/network.c
index 769fe2a8c448fffda743777c0f745e042605b4db..24c9c16e3d31e661c77aa4c8c3b86bbcb7ccdff5 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -164,10 +164,10 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal)
                hints.ai_family = AF_INET;
 #  endif
                if ((n = getaddrinfo(host, NULL, &hints, &res))) {
-                       php_error(E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
                        return 0;
                } else if (res == NULL) {
-                       php_error(E_WARNING, "php_network_getaddresses: getaddrinfo failed (null result pointer)");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: getaddrinfo failed (null result pointer)");
                        return 0;
                }
 
@@ -203,7 +203,7 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal)
                        /* XXX NOT THREAD SAFE */
                        host_info = gethostbyname(host);
                        if (host_info == NULL) {
-                               php_error(E_WARNING, "php_network_getaddresses: gethostbyname failed");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: gethostbyname failed");
                                return 0;
                        }
                        in = *((struct in_addr *) host_info->h_addr);
@@ -447,7 +447,7 @@ int php_hostconnect(const char *host, unsigned short port, int socktype, struct
                sal++;
        }
        php_network_freeaddresses(psal);
-       php_error(E_WARNING, "php_hostconnect: connect failed");
+       php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_hostconnect: connect failed");
 
 #ifdef PHP_WIN32
        /* Restore the last error */
@@ -649,7 +649,7 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
       /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
          flags = !block;
          if (ioctlsocket(socketd, FIONBIO, &flags)==SOCKET_ERROR){
-                 php_error(E_WARNING, "%s", WSAGetLastError());
+                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError());
                  ret = FALSE;
       }
 #else
@@ -979,7 +979,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC)
                        if (ret)        {
                                /* DANGER!: data buffered in stream->readbuf will be forgotten! */
                                if (TOREAD(sock) > 0)
-                                       zend_error(E_WARNING, "%s(): %d bytes of buffered data lost during conversion to FILE*!", get_active_function_name(TSRMLS_C), TOREAD(sock));
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d bytes of buffered data lost during conversion to FILE*!", TOREAD(sock));
                                *ret = fdopen(sock->socket, stream->mode);
                                if (*ret)
                                        return SUCCESS;

diff --git a/main/php_variables.c b/main/php_variables.c
index 1550de02aab761384fcf04a22b6c47e371b2d0a4..6da7575410e19ca46f958dd248753225473c2687 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -155,7 +155,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra
                        } else {
                                ip = strchr(ip, ']');
                                if (!ip) {
-                                       php_error(E_WARNING, "Missing ] in %s variable", var);
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing ] in %s variable", var);
                                        return;
                                }
                                *ip = 0;

diff --git a/main/safe_mode.c b/main/safe_mode.c
index b56976ab4450e62fbb37235ed4b2e5127804f665..7693da5d69f0bc4f1b41216fbc31a0d45d4c25dc 100644 (file)
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -86,10 +86,10 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
                ret = VCWD_STAT(path, &sb);
                if (ret < 0) {
                        if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {
-                               php_error(E_WARNING, "Unable to access %s", filename);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
                                return 0;
                        } else if (mode == CHECKUID_ALLOW_FILE_NOT_EXISTS) {
-                               php_error(E_WARNING, "Unable to access %s", filename);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
                                return 1;
                        }
                        nofile = 1;
@@ -130,7 +130,7 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
                /* check directory */
                ret = VCWD_STAT(path, &sb);
                if (ret < 0) {
-                       php_error(E_WARNING, "Unable to access %s", filename);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access %s", filename);
                        return 0;
                }
                duid = sb.st_uid;
@@ -165,9 +165,9 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
        }
        
        if (PG(safe_mode_gid)) {
-               php_error(E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid/gid is %ld/%ld is not allowed to access %s owned by uid/gid %ld/%ld", php_getuid(), php_getgid(), filename, uid, gid);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid/gid is %ld/%ld is not allowed to access %s owned by uid/gid %ld/%ld", php_getuid(), php_getgid(), filename, uid, gid);
        } else {
-               php_error(E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid is %ld is not allowed to access %s owned by uid %ld", php_getuid(), filename, uid);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The script whose uid is %ld is not allowed to access %s owned by uid %ld", php_getuid(), filename, uid);
        }                       
        return 0;
 }

diff --git a/main/user_streams.c b/main/user_streams.c
index d5b852c8f0f90350a064ff543ee1f00f52053ef6..ff22f48159095d989c2e315482721640f94c5b52 100644 (file)
--- a/main/user_streams.c
+++ b/main/user_streams.c
@@ -209,7 +209,7 @@ PHP_FUNCTION(file_register_wrapper)
        }
 
        if (!PG(allow_url_fopen)) {
-               zend_error(E_WARNING, "%s(): fopen wrappers have been disabled", get_active_function_name(TSRMLS_C));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "fopen wrappers have been disabled");
                RETURN_FALSE;
        }
        
@@ -230,7 +230,7 @@ PHP_FUNCTION(file_register_wrapper)
                        RETURN_TRUE;
                }
        } else {
-               zend_error(E_WARNING, "%s(): class '%s' is undefined", get_active_function_name(TSRMLS_C),
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "class '%s' is undefined",
                                classname);
        }
 
@@ -272,7 +272,7 @@ static size_t php_userstreamop_write(php_stream *stream, const char *buf, size_t
 
        /* don't allow strange buffer overruns due to bogus return */
        if (didwrite > count) {
-               zend_error(E_WARNING, "%s::" USERSTREAM_WRITE " - wrote %d bytes more data than requested (%d written, %d max)",
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_WRITE " - wrote %d bytes more data than requested (%d written, %d max)",
                                us->wrapper->classname,
                                didwrite - count, didwrite, count);
                didwrite = count;
@@ -328,7 +328,7 @@ static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count
                if (retval && Z_TYPE_P(retval) == IS_STRING) {
                        didread = Z_STRLEN_P(retval);
                        if (didread > count) {
-                               zend_error(E_WARNING, "%s::" USERSTREAM_READ " - read %d bytes more data than requested (%d read, %d max) - excess data will be lost",
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_READ " - read %d bytes more data than requested (%d read, %d max) - excess data will be lost",
                                                us->wrapper->classname, didread - count, didread, count);
                                didread = count;
                        }
@@ -484,7 +484,7 @@ static char *php_userstreamop_gets(php_stream *stream, char *buf, size_t size TS
        if (retval && Z_TYPE_P(retval) == IS_STRING) {
                didread = Z_STRLEN_P(retval);
                if (didread > size) {
-                       zend_error(E_WARNING, "%s::" USERSTREAM_GETS " - read more data than requested; some data will be lost",
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_GETS " - read more data than requested; some data will be lost",
                                        us->wrapper->classname);
                        didread = size;
                }