cvs: php-src /ext/bz2 bz2.c bz2_filter.c /ext/bz2/tests 001.phpt /ext/calendar calendar.c /ext/calendar/tests cal_info.phpt /ext/curl interface.c
/ext/date php_date.c /ext/date/tests 005.phpt /ext/dbase dbf_rec.c /ext/dom document.c node.c /ext/fbsql php_fbsql.c /ext/ftp ftp.c php_ftp.c
/ext/iconv iconv.c /ext/imap php_imap.c /ext/ldap ldap.c /ext/mbstring mbstring.c /ext/mcrypt mcrypt.c /ext/mcrypt/tests bug35496.phpt
/ext/mime_magic mime_magic.c /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c /ext/oci8 oci8_lob.c /ext/openssl openssl.c /ext/pcre php_pcre.c
/ext/pcre/tests preg_replace2.phpt /ext/pdo pdo_dbh.c /ext/pspell pspell.c /ext/pspell/tests 003.phpt 005.phpt /ext/recode recode.c /ext/session
session.c /ext/session/tests 014.phpt /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt /ext/sockets sockets.c /ext/sqlite sqlite.c
/ext/standard array.c basic_functions.c browscap.c dl.c exec.c file.c filters.c http.c http_fopen_wrap! per.c image.c streamsfuncs.c string.c uniqid.c
url.c uuencode.c var.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/sysvmsg sysvmsg.c /ext/tidy tidy.c /ext/wddx wddx.c
/ext/xml xml.c /ext/xmlreader php_xmlreader.c /ext/xsl xsltprocessor.c /ext/zlib zlib_filter.c /main/streams filter.c streams.c unicode_filter.c
userspace.c

bjori Sun Oct 8 13:34:25 2006 UTC Modified files: /php-src/ext/bz2 bz2.c bz2_filter.c /php-src/ext/bz2/tests 001.phpt /php-src/ext/calendar calendar.c /php-src/ext/calendar/tests cal_info.phpt /php-src/ext/curl interface.c /php-src/ext/date php_date.c /php-src/ext/date/tests 005.phpt /php-src/ext/dbase dbf_rec.c /php-src/ext/dom document.c node.c /php-src/ext/fbsql php_fbsql.c /php-src/ext/ftp ftp.c php_ftp.c /php-src/ext/iconv iconv.c /php-src/ext/imap php_imap.c /php-src/ext/ldap ldap.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcrypt mcrypt.c /php-src/ext/mcrypt/tests bug35496.phpt /php-src/ext/mime_magic mime_magic.c /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli_api.c /php-src/ext/oci8 oci8_lob.c /php-src/ext/openssl openssl.c /php-src/ext/pcre php_pcre.c /php-src/ext/pcre/tests preg_replace2.phpt /php-src/ext/pdo pdo_dbh.c /php-src/ext/pspell pspell.c /php-src/ext/pspell/tests 003.phpt 005.phpt /php-src/ext/recode recode.c /php-src/ext/session session.c /php-src/ext/session/tests 014.phpt /php-src/ext/soap soap.c /php-src/ext/soap/tests/bugs bug31755.phpt /php-src/ext/sockets sockets.c /php-src/ext/sqlite sqlite.c /php-src/ext/standard array.c basic_functions.c browscap.c dl.c exec.c file.c filters.c http.c http_fopen_wrapper.c image.c streamsfuncs.c string.c uniqid.c url.c uuencode.c var.c /php-src/ext/sybase php_sybase_db.c /php-src/ext/sybase_ct php_sybase_ct.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/tidy tidy.c /php-src/ext/wddx wddx.c /php-src/ext/xml xml.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xsl xsltprocessor.c /php-src/ext/zlib zlib_filter.c /php-src/main/streams filter.c streams.c unicode_filter.c userspace.c Log: Error message clean up (patch by Matt W (php_lists -AT- realpain.com))

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.28&r2=1.29&diff_format=u Index: php-src/ext/bz2/bz2.c diff -u php-src/ext/bz2/bz2.c:1.28 php-src/ext/bz2/bz2.c:1.29 --- php-src/ext/bz2/bz2.c:1.28 Sun Oct 8 00:05:17 2006 +++ php-src/ext/bz2/bz2.c Sun Oct 8 13:34:20 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.28 2006/10/08 00:05:17 bjori Exp $ */ +/* $Id: bz2.c,v 1.29 2006/10/08 13:34:20 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -374,7 +374,7 @@ } if (mode_len != 1 || (mode[0] != 'r' && mode[0] != 'w')) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.", mode); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid mode for bzopen(). Only 'w' and 'r' are supported", mode); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/bz2/bz2_filter.c diff -u php-src/ext/bz2/bz2_filter.c:1.9 php-src/ext/bz2/bz2_filter.c:1.10 --- php-src/ext/bz2/bz2_filter.c:1.9 Fri Jun 23 07:30:40 2006 +++ php-src/ext/bz2/bz2_filter.c Sun Oct 8 13:34:20 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2_filter.c,v 1.9 2006/06/23 07:30:40 mike Exp $ */ +/* $Id: bz2_filter.c,v 1.10 2006/10/08 13:34:20 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -290,7 +290,7 @@ /* Create this filter */ data = pecalloc(1, sizeof(php_bz2_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", sizeof(php_bz2_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes", sizeof(php_bz2_filter_data)); return NULL; } @@ -303,14 +303,14 @@ data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048; data->strm.next_in = data->inbuf = (char *) pemalloc(data->inbuf_len, persistent); if (!data->inbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes", data->inbuf_len); pefree(data, persistent); return NULL; } data->strm.avail_in = 0; data->strm.next_out = data->outbuf = (char *) pemalloc(data->outbuf_len, persistent); if (!data->outbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes.", data->outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zu bytes", data->outbuf_len); pefree(data->inbuf, persistent); pefree(data, persistent); return NULL; http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/bz2/tests/001.phpt diff -u php-src/ext/bz2/tests/001.phpt:1.3 php-src/ext/bz2/tests/001.phpt:1.4 --- php-src/ext/bz2/tests/001.phpt:1.3 Thu Oct 5 21:28:19 2006 +++ php-src/ext/bz2/tests/001.phpt Sun Oct 8 13:34:20 2006 @@ -22,7 +22,7 @@ Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d NULL -Warning: bzopen(): '' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d +Warning: bzopen(): '' is not a valid mode for bzopen(). Only 'w' and 'r' are supported in %s on line %d bool(false) Warning: bzopen(): filename cannot be empty in %s on line %d @@ -31,10 +31,10 @@ Warning: bzopen(): filename cannot be empty in %s on line %d bool(false) -Warning: bzopen(): 'x' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d +Warning: bzopen(): 'x' is not a valid mode for bzopen(). Only 'w' and 'r' are supported in %s on line %d bool(false) -Warning: bzopen(): 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d +Warning: bzopen(): 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported in %s on line %d bool(false) Warning: bzopen(no_such_file): failed to open stream: No such file or directory in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/calendar.c?r1=1.49&r2=1.50&diff_format=u Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.49 php-src/ext/calendar/calendar.c:1.50 --- php-src/ext/calendar/calendar.c:1.49 Sat Jun 10 22:59:39 2006 +++ php-src/ext/calendar/calendar.c Sun Oct 8 13:34:21 2006 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.49 2006/06/10 22:59:39 bjori Exp $ */ +/* $Id: calendar.c,v 1.50 2006/10/08 13:34:21 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -328,7 +328,7 @@ if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld", cal); RETURN_FALSE; } @@ -350,7 +350,7 @@ } if (cal < 0 || cal >= CAL_NUM_CALS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld", cal); RETURN_FALSE; } @@ -359,7 +359,7 @@ sdn_start = calendar->to_jd(year, month, 1); if (sdn_start == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid date"); RETURN_FALSE; } @@ -385,7 +385,7 @@ } if (cal < 0 || cal >= CAL_NUM_CALS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld", cal); RETURN_FALSE; } @@ -615,7 +615,7 @@ RETURN_STRING(date, 1); } else { if (year <= 0 || year > 9999) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Year out of range (0-9999)."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Year out of range (0-9999)"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/cal_info.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/calendar/tests/cal_info.phpt diff -u php-src/ext/calendar/tests/cal_info.phpt:1.2 php-src/ext/calendar/tests/cal_info.phpt:1.3 --- php-src/ext/calendar/tests/cal_info.phpt:1.2 Tue Jul 11 14:15:38 2006 +++ php-src/ext/calendar/tests/cal_info.phpt Sun Oct 8 13:34:21 2006 @@ -213,4 +213,4 @@ [calsymbol] => CAL_JULIAN ) -Warning: cal_info(): invalid calendar ID 99999. in %s on line %d +Warning: cal_info(): invalid calendar ID 99999 in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.90&r2=1.91&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.90 php-src/ext/curl/interface.c:1.91 --- php-src/ext/curl/interface.c:1.90 Mon Sep 18 16:13:00 2006 +++ php-src/ext/curl/interface.c Sun Oct 8 13:34:21 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.90 2006/09/18 16:13:00 iliaa Exp $ */ +/* $Id: interface.c,v 1.91 2006/10/08 13:34:21 bjori Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -168,7 +168,7 @@ } \ \ if (php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters.", str); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters", str); \ RETURN_FALSE; \ } \ \ @@ -953,7 +953,7 @@ strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string.", Z_STRVAL_P(func)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s' did not return a string", Z_STRVAL_P(func)); } zval_ptr_dtor(&argv[0]); @@ -1602,7 +1602,7 @@ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos); while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry, &pos) == SUCCESS) { if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key, &str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent interger values."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys must be CURLOPT constants or equivalent integer values"); RETURN_FALSE; } if (_php_curl_setopt(ch, option, entry, return_value TSRMLS_CC)) { http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.122&r2=1.123&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.122 php-src/ext/date/php_date.c:1.123 --- php-src/ext/date/php_date.c:1.122 Sat Oct 7 22:31:52 2006 +++ php-src/ext/date/php_date.c Sun Oct 8 13:34:21 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.122 2006/10/07 22:31:52 bjori Exp $ */ +/* $Id: php_date.c,v 1.123 2006/10/08 13:34:21 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -1139,7 +1139,7 @@ ret = php_idate(format[0], ts, 0); if (ret == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token"); RETURN_FALSE; } RETURN_LONG(ret); http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/005.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/005.phpt diff -u php-src/ext/date/tests/005.phpt:1.1 php-src/ext/date/tests/005.phpt:1.2 --- php-src/ext/date/tests/005.phpt:1.1 Tue Jun 27 15:54:36 2006 +++ php-src/ext/date/tests/005.phpt Sun Oct 8 13:34:21 2006 @@ -27,19 +27,19 @@ Warning: idate() expects at most 2 parameters, 3 given in %s on line %d bool(false) -Warning: idate(): Unrecognized date format token. in %s on line %d +Warning: idate(): Unrecognized date format token in %s on line %d bool(false) Warning: idate(): idate format is one char in %s on line %d bool(false) -Warning: idate(): Unrecognized date format token. in %s on line %d +Warning: idate(): Unrecognized date format token in %s on line %d bool(false) int(41) -Warning: idate(): Unrecognized date format token. in %s on line %d +Warning: idate(): Unrecognized date format token in %s on line %d bool(false) -Warning: idate(): Unrecognized date format token. in %s on line %d +Warning: idate(): Unrecognized date format token in %s on line %d bool(false) Done http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbf_rec.c?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/dbase/dbf_rec.c diff -u php-src/ext/dbase/dbf_rec.c:1.10 php-src/ext/dbase/dbf_rec.c:1.11 --- php-src/ext/dbase/dbf_rec.c:1.10 Thu Nov 27 10:15:20 2003 +++ php-src/ext/dbase/dbf_rec.c Sun Oct 8 13:34:21 2006 @@ -137,7 +137,7 @@ /* Try to truncate the file to the right size. */ if (ftruncate(dbh->db_fd, out_off) != 0) { TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbase_pack() couldn't truncate the file to the right size. Some deleted records may still be left in there."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "dbase_pack() couldn't truncate the file to the right size. Some deleted records may still be left in there"); } if (rec_cnt == 0) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.82&r2=1.83&diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.82 php-src/ext/dom/document.c:1.83 --- php-src/ext/dom/document.c:1.82 Sat Oct 7 19:41:10 2006 +++ php-src/ext/dom/document.c Sun Oct 8 13:34:21 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.82 2006/10/07 19:41:10 iliaa Exp $ */ +/* $Id: document.c,v 1.83 2006/10/08 13:34:21 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2302,7 +2302,7 @@ } if (basece == NULL || ! instanceof_function(basece, dom_node_class_entry TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s is not derived from DOMNode.", baseclass); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s is not derived from DOMNode", baseclass); return; } @@ -2319,11 +2319,11 @@ DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (dom_set_doc_classmap(intern->document, basece, ce TSRMLS_CC) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be registered.", extendedclass); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be registered", extendedclass); } RETURN_TRUE; } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s is not derived from %s.", extendedclass, baseclass); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s is not derived from %s", extendedclass, baseclass); } RETURN_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.51 php-src/ext/dom/node.c:1.52 --- php-src/ext/dom/node.c:1.51 Tue Sep 19 10:38:30 2006 +++ php-src/ext/dom/node.c Sun Oct 8 13:34:21 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.51 2006/09/19 10:38:30 dmitry Exp $ */ +/* $Id: node.c,v 1.52 2006/10/08 13:34:21 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1736,7 +1736,7 @@ if (file_type == IS_UNICODE) { efree(file); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset"); RETURN_FALSE; } } @@ -1835,7 +1835,7 @@ xmlXPathFreeObject(xpathobjp); } xmlXPathFreeContext(ctxp); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "XPath query did not return a nodeset"); RETURN_FALSE; } } http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.120&r2=1.121&diff_format=u Index: php-src/ext/fbsql/php_fbsql.c diff -u php-src/ext/fbsql/php_fbsql.c:1.120 php-src/ext/fbsql/php_fbsql.c:1.121 --- php-src/ext/fbsql/php_fbsql.c:1.120 Mon Aug 14 18:39:30 2006 +++ php-src/ext/fbsql/php_fbsql.c Sun Oct 8 13:34:22 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.120 2006/08/14 18:39:30 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.121 2006/10/08 13:34:22 bjori Exp $ */ /* TODO: * @@ -907,7 +907,7 @@ md = fbcdcRollback(phpLink->connection); if ( !mdOk(phpLink, md, "Rollback;") ) { if (FB_SQL_G(generateWarnings)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "FrontBase link is not connected, ty to reconnect."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "FrontBase link is not connected, ty to reconnect"); } // Make sure select_db will reconnect. fbcmdRelease(md); @@ -1226,11 +1226,11 @@ } if (Z_LVAL_PP(Locking) < 0 || Z_LVAL_PP(Locking) > 2) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locking type."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locking type"); RETURN_FALSE; } if (Z_LVAL_PP(Isolation) < 0 || Z_LVAL_PP(Isolation) > 4) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid isolation type."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid isolation type"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/ftp.c?r1=1.116&r2=1.117&diff_format=u Index: php-src/ext/ftp/ftp.c diff -u php-src/ext/ftp/ftp.c:1.116 php-src/ext/ftp/ftp.c:1.117 --- php-src/ext/ftp/ftp.c:1.116 Mon Apr 3 09:14:50 2006 +++ php-src/ext/ftp/ftp.c Sun Oct 8 13:34:22 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.c,v 1.116 2006/04/03 09:14:50 tony2001 Exp $ */ +/* $Id: ftp.c,v 1.117 2006/10/08 13:34:22 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -810,7 +810,7 @@ if (resumepos > 0) { if (resumepos > 2147483647) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483647 bytes."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483647 bytes"); goto bail; } sprintf(arg, "%u", resumepos); @@ -907,7 +907,7 @@ if (startpos > 0) { if (startpos > 2147483647) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes"); goto bail; } sprintf(arg, "%u", startpos); @@ -1598,7 +1598,7 @@ if ((tmpstream = php_stream_fopen_tmpfile()) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create temporary file. Check permissions in temporary files directory."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create temporary file. Check permissions in temporary files directory"); return NULL; } @@ -1706,7 +1706,7 @@ * since php is 32 bit by design, we bail out with warning */ if (resumepos > 2147483647) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483648 bytes."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483648 bytes"); goto bail; } sprintf(arg, "%u", resumepos); @@ -1824,7 +1824,7 @@ } if (startpos > 0) { if (startpos > 2147483647) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes"); goto bail; } sprintf(arg, "%u", startpos); http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/php_ftp.c?r1=1.107&r2=1.108&diff_format=u Index: php-src/ext/ftp/php_ftp.c diff -u php-src/ext/ftp/php_ftp.c:1.107 php-src/ext/ftp/php_ftp.c:1.108 --- php-src/ext/ftp/php_ftp.c:1.107 Sun Jun 11 19:59:53 2006 +++ php-src/ext/ftp/php_ftp.c Sun Oct 8 13:34:22 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.107 2006/06/11 19:59:53 bjori Exp $ */ +/* $Id: php_ftp.c,v 1.108 2006/10/08 13:34:22 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1024,7 +1024,7 @@ ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!ftp->nb) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no nbronous transfer to continue."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "no nbronous transfer to continue"); RETURN_LONG(PHP_FTP_FAILED); } http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.145&r2=1.146&diff_format=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.145 php-src/ext/iconv/iconv.c:1.146 --- php-src/ext/iconv/iconv.c:1.145 Tue Sep 12 17:26:24 2006 +++ php-src/ext/iconv/iconv.c Sun Oct 8 13:34:22 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.145 2006/09/12 17:26:24 tony2001 Exp $ */ +/* $Id: iconv.c,v 1.146 2006/10/08 13:34:22 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2007,7 +2007,7 @@ } if (offset < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.225&r2=1.226&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.225 php-src/ext/imap/php_imap.c:1.226 --- php-src/ext/imap/php_imap.c:1.225 Thu Oct 5 14:28:33 2006 +++ php-src/ext/imap/php_imap.c Sun Oct 8 13:34:22 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.225 2006/10/05 14:28:33 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.226 2006/10/08 13:34:22 bjori Exp $ */ #define IMAP41 @@ -3221,7 +3221,7 @@ } if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot generate multipart e-mail without components."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot generate multipart e-mail without components"); RETVAL_FALSE; goto done; } http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.166&r2=1.167&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.166 php-src/ext/ldap/ldap.c:1.167 --- php-src/ext/ldap/ldap.c:1.166 Tue Jun 13 13:12:18 2006 +++ php-src/ext/ldap/ldap.c Sun Oct 8 13:34:22 2006 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.166 2006/06/13 13:12:18 dmitry Exp $ */ +/* $Id: ldap.c,v 1.167 2006/10/08 13:34:22 bjori Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -317,7 +317,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.166 2006/06/13 13:12:18 dmitry Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.167 2006/10/08 13:34:22 bjori Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -893,11 +893,11 @@ RETVAL_FALSE; } else { if (errno == LDAP_SIZELIMIT_EXCEEDED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Sizelimit exceeded."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Sizelimit exceeded"); } #ifdef LDAP_ADMINLIMIT_EXCEEDED else if (errno == LDAP_ADMINLIMIT_EXCEEDED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Adminlimit exceeded."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Partial search results returned: Adminlimit exceeded"); } #endif http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.261&r2=1.262&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.261 php-src/ext/mbstring/mbstring.c:1.262 --- php-src/ext/mbstring/mbstring.c:1.261 Tue Sep 5 12:32:13 2006 +++ php-src/ext/mbstring/mbstring.c Sun Oct 8 13:34:22 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.261 2006/09/05 12:32:13 nlopess Exp $ */ +/* $Id: mbstring.c,v 1.262 2006/10/08 13:34:22 bjori Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -967,14 +967,14 @@ zend_hash_find(EG(function_table), p->ovld_func, strlen(p->ovld_func)+1 , (void **)&func); if (zend_hash_find(EG(function_table), p->orig_func, strlen(p->orig_func)+1, (void **)&orig) != SUCCESS) { - php_error_docref("ref.mbstring" TSRMLS_CC, E_WARNING, "mbstring couldn't find function %s.", p->orig_func); + php_error_docref("ref.mbstring" TSRMLS_CC, E_WARNING, "mbstring couldn't find function %s", p->orig_func); return FAILURE; } else { zend_hash_add(EG(function_table), p->save_func, strlen(p->save_func)+1, orig, sizeof(zend_function), NULL); if (zend_hash_update(EG(function_table), p->orig_func, strlen(p->orig_func)+1, func, sizeof(zend_function), NULL) == FAILURE) { - php_error_docref("ref.mbstring" TSRMLS_CC, E_WARNING, "mbstring couldn't replace function %s.", p->orig_func); + php_error_docref("ref.mbstring" TSRMLS_CC, E_WARNING, "mbstring couldn't replace function %s", p->orig_func); return FAILURE; } } @@ -1341,7 +1341,7 @@ MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR; MBSTRG(current_filter_illegal_substchar) = Z_LVAL_PP(arg1); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character"); RETVAL_FALSE; } } @@ -1352,7 +1352,7 @@ MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR; MBSTRG(current_filter_illegal_substchar) = Z_LVAL_PP(arg1); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character"); RETVAL_FALSE; } break; @@ -1615,16 +1615,16 @@ case 1: break; case 2: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Needle has not positive length."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Needle has non-positive length"); break; case 4: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding or conversion error."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding or conversion error"); break; case 8: - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument is empty."); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument is empty"); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in mb_strpos."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in mb_strpos"); break; } RETVAL_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.99&r2=1.100&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.99 php-src/ext/mcrypt/mcrypt.c:1.100 --- php-src/ext/mcrypt/mcrypt.c:1.99 Mon Jun 26 11:31:19 2006 +++ php-src/ext/mcrypt/mcrypt.c Sun Oct 8 13:34:22 2006 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.99 2006/06/26 11:31:19 bjori Exp $ */ +/* $Id: mcrypt.c,v 1.100 2006/10/08 13:34:22 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -226,7 +226,7 @@ #define PHP_MCRYPT_INIT_CHECK \ if (!pm->init) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Operation disallowed prior to mcrypt_generic_init()."); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Operation disallowed prior to mcrypt_generic_init()"); \ RETURN_FALSE; \ } \ http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/bug35496.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mcrypt/tests/bug35496.phpt diff -u php-src/ext/mcrypt/tests/bug35496.phpt:1.2 php-src/ext/mcrypt/tests/bug35496.phpt:1.3 --- php-src/ext/mcrypt/tests/bug35496.phpt:1.2 Wed Nov 30 23:53:47 2005 +++ php-src/ext/mcrypt/tests/bug35496.phpt Sun Oct 8 13:34:22 2006 @@ -9,6 +9,6 @@ mdecrypt_generic($td, "baz"); ?> --EXPECTF-- -Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %s/bug35496.php on line 3 +Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init() in %s/bug35496.php on line 3 -Warning: mdecrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %s/bug35496.php on line 4 +Warning: mdecrypt_generic(): Operation disallowed prior to mcrypt_generic_init() in %s/bug35496.php on line 4 http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.49&r2=1.50&diff_format=u Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.49 php-src/ext/mime_magic/mime_magic.c:1.50 --- php-src/ext/mime_magic/mime_magic.c:1.49 Tue Jun 13 13:12:18 2006 +++ php-src/ext/mime_magic/mime_magic.c Sun Oct 8 13:34:22 2006 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.49 2006/06/13 13:12:18 dmitry Exp $ + $Id: mime_magic.c,v 1.50 2006/10/08 13:34:22 bjori Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -1228,7 +1228,7 @@ break; default: if(MIME_MAGIC_G(debug)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid mode 0%o.", (unsigned int)stat_ssb.sb.st_mode); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid mode 0%o", (unsigned int)stat_ssb.sb.st_mode); return MIME_MAGIC_ERROR; } @@ -1631,7 +1631,7 @@ default: /* bogosity, pretend that it just wasn't a match */ if(MIME_MAGIC_G(debug)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid type %d in mcheck().", m->type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid type %d in mcheck()", m->type); return 0; } @@ -1680,7 +1680,7 @@ /* bogosity, pretend it didn't match */ matched = 0; if(MIME_MAGIC_G(debug)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "mcheck: can't happen: invalid relation %d.", m->reln); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "mcheck: can't happen: invalid relation %d", m->reln); break; } @@ -1765,7 +1765,7 @@ { TSRMLS_FETCH(); if(MIME_MAGIC_G(debug)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid m->type (%d) in mprint().", m->type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid m->type (%d) in mprint()", m->type); return; } } @@ -1813,7 +1813,7 @@ { TSRMLS_FETCH(); if(MIME_MAGIC_G(debug)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid type %d in mconvert().", m->type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid type %d in mconvert()", m->type); return 0; } } http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.225&r2=1.226&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.225 php-src/ext/mysql/php_mysql.c:1.226 --- php-src/ext/mysql/php_mysql.c:1.225 Wed Aug 2 10:04:02 2006 +++ php-src/ext/mysql/php_mysql.c Sun Oct 8 13:34:22 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.225 2006/08/02 10:04:02 tony2001 Exp $ */ +/* $Id: php_mysql.c,v 1.226 2006/10/08 13:34:22 bjori Exp $ */ /* TODO: * @@ -1240,9 +1240,9 @@ mysql_result = mysql_use_result(&mysql->conn); while ((row = mysql_fetch_row(mysql_result))) { if (!strcmp("ALL", row[1])) { - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full tablescan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); + php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full tablescan (table %s, %s rows affected). Use EXPLAIN to optimize your query", row[0], row[6]); } else if (!strcmp("INDEX", row[1])) { - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full indexscan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); + php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full indexscan (table %s, %s rows affected). Use EXPLAIN to optimize your query", row[0], row[6]); } } mysql_free_result(mysql_result); @@ -1368,7 +1368,7 @@ /* FIXME: Unicode support??? */ if (MySG(trace_mode) || !strcasecmp(get_active_function_name(TSRMLS_C).s, "mysql")) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated; use mysql_query() instead."); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated; use mysql_query() instead"); } php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); @@ -1667,7 +1667,7 @@ Z_TYPE_P(return_value) = IS_STRING; if (MySG(trace_mode)){ - php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_WARNING, "This function is deprecated; use mysql_real_escape_string() instead."); + php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_WARNING, "This function is deprecated; use mysql_real_escape_string() instead"); } } @@ -1930,7 +1930,7 @@ } if ((result_type & MYSQL_BOTH) == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH"); } ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.136&r2=1.137&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.136 php-src/ext/mysqli/mysqli_api.c:1.137 --- php-src/ext/mysqli/mysqli_api.c:1.136 Mon Oct 2 16:08:11 2006 +++ php-src/ext/mysqli/mysqli_api.c Sun Oct 8 13:34:22 2006 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.136 2006/10/02 16:08:11 tony2001 Exp $ + $Id: mysqli_api.c,v 1.137 2006/10/08 13:34:22 bjori Exp $ */ #ifdef HAVE_CONFIG_H @@ -241,7 +241,7 @@ var_cnt = argc - start; if (var_cnt != mysql_stmt_field_count(stmt->stmt)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of bind variables doesn't match number of fields in prepared statement."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of bind variables doesn't match number of fields in prepared statement"); efree(args); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.18 php-src/ext/oci8/oci8_lob.c:1.19 --- php-src/ext/oci8/oci8_lob.c:1.18 Tue Aug 22 11:08:28 2006 +++ php-src/ext/oci8/oci8_lob.c Sun Oct 8 13:34:22 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_lob.c,v 1.18 2006/08/22 11:08:28 tony2001 Exp $ */ +/* $Id: oci8_lob.c,v 1.19 2006/10/08 13:34:22 bjori Exp $ */ @@ -62,7 +62,7 @@ /* these three are allowed */ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown descriptor type %ld.", type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown descriptor type %ld", type); return NULL; break; } http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.124&r2=1.125&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.124 php-src/ext/openssl/openssl.c:1.125 --- php-src/ext/openssl/openssl.c:1.124 Sat Sep 16 12:05:42 2006 +++ php-src/ext/openssl/openssl.c Sun Oct 8 13:34:23 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.124 2006/09/16 12:05:42 nlopess Exp $ */ +/* $Id: openssl.c,v 1.125 2006/10/08 13:34:23 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2988,7 +2988,7 @@ mdtype = php_openssl_get_evp_md_from_algo(signature_algo); if (!mdtype) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm"); RETURN_FALSE; } @@ -3032,7 +3032,7 @@ mdtype = php_openssl_get_evp_md_from_algo(signature_algo); if (!mdtype) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.206&r2=1.207&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.206 php-src/ext/pcre/php_pcre.c:1.207 --- php-src/ext/pcre/php_pcre.c:1.206 Tue Oct 3 21:37:02 2006 +++ php-src/ext/pcre/php_pcre.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.206 2006/10/03 21:37:02 tony2001 Exp $ */ +/* $Id: php_pcre.c,v 1.207 2006/10/08 13:34:23 bjori Exp $ */ /* TODO * php_pcre_replace_impl(): @@ -1373,7 +1373,7 @@ } if (!is_callable_replace && Z_TYPE_P(replace) == IS_ARRAY && Z_TYPE_P(regex) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter mismatch, pattern is a string while replacement in an array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter mismatch, pattern is a string while replacement in an array"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/preg_replace2.phpt diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.3 php-src/ext/pcre/tests/preg_replace2.phpt:1.4 --- php-src/ext/pcre/tests/preg_replace2.phpt:1.3 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/preg_replace2.phpt Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ ?> --EXPECTF-- -Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array. in %spreg_replace2.php on line 3 +Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array in %spreg_replace2.php on line 3 bool(false) string(1) "c" array(3) { @@ -41,7 +41,7 @@ } ==done== --UEXPECTF-- -Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array. in %s on line %d +Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array in %s on line %d bool(false) unicode(1) "c" array(3) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.135&r2=1.136&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.135 php-src/ext/pdo/pdo_dbh.c:1.136 --- php-src/ext/pdo/pdo_dbh.c:1.135 Mon Aug 21 16:54:05 2006 +++ php-src/ext/pdo/pdo_dbh.c Sun Oct 8 13:34:23 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.135 2006/08/21 16:54:05 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.136 2006/10/08 13:34:23 bjori Exp $ */ /* The PDO Database Handle Class */ @@ -1151,7 +1151,7 @@ } if (!(dbh->cls_methods[kind] = pemalloc(sizeof(HashTable), dbh->is_persistent))) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "out of memory while allocating PDO methods."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "out of memory while allocating PDO methods"); } zend_hash_init_ex(dbh->cls_methods[kind], 8, NULL, NULL, dbh->is_persistent, 0); http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.52&r2=1.53&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.52 php-src/ext/pspell/pspell.c:1.53 --- php-src/ext/pspell/pspell.c:1.52 Sun Oct 8 00:05:17 2006 +++ php-src/ext/pspell/pspell.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.52 2006/10/08 00:05:17 bjori Exp $ */ +/* $Id: pspell.c,v 1.53 2006/10/08 13:34:23 bjori Exp $ */ #define IS_EXT_MODULE @@ -246,7 +246,7 @@ delete_pspell_config(config); if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s", pspell_error_message(ret)); RETURN_FALSE; } @@ -358,7 +358,7 @@ delete_pspell_config(config); if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s", pspell_error_message(ret)); RETURN_FALSE; } @@ -391,7 +391,7 @@ ret = new_pspell_manager(config); if(pspell_error_number(ret) != 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s", pspell_error_message(ret)); RETURN_FALSE; } @@ -456,7 +456,7 @@ } delete_pspell_string_emulation(els); }else{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL had a problem. details: %s ", pspell_manager_error_message(manager)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL had a problem. details: %s", pspell_manager_error_message(manager)); RETURN_FALSE; } } http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pspell/tests/003.phpt diff -u php-src/ext/pspell/tests/003.phpt:1.3 php-src/ext/pspell/tests/003.phpt:1.4 --- php-src/ext/pspell/tests/003.phpt:1.3 Thu Jun 29 22:46:49 2006 +++ php-src/ext/pspell/tests/003.phpt Sun Oct 8 13:34:23 2006 @@ -29,7 +29,7 @@ --EXPECTF-- bool(false) -Warning: pspell_new_config(): PSPELL couldn't open the dictionary. reason: The encoding "b0rked" is not known. This could also mean that the file "%s/b0rked.%s" could not be opened for reading or does not exist. in %s003.php on line 9 +Warning: pspell_new_config(): PSPELL couldn't open the dictionary. reason: The encoding "b0rked" is not known. This could also mean that the file "%s/b0rked.%s" could not be opened for reading or does not exist. in %s003.php on line 9 Warning: pspell_check(): 0 is not a PSPELL result index in %s003.php on line 10 bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/tests/005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pspell/tests/005.phpt diff -u php-src/ext/pspell/tests/005.phpt:1.2 php-src/ext/pspell/tests/005.phpt:1.3 --- php-src/ext/pspell/tests/005.phpt:1.2 Wed Jun 28 14:42:32 2006 +++ php-src/ext/pspell/tests/005.phpt Sun Oct 8 13:34:23 2006 @@ -33,7 +33,7 @@ unlink("$wordlist.tmp"); ?> --EXPECTF-- -Warning: pspell_new_personal(): PSPELL couldn't open the dictionary. reason: The file "%s005.php" is not in the proper format. in %s005.php on line 5 +Warning: pspell_new_personal(): PSPELL couldn't open the dictionary. reason: The file "%s005.php" is not in the proper format. in %s005.php on line 5 bool(false) bool(true) -- http://cvs.php.net/viewvc.cgi/php-src/ext/recode/recode.c?r1=1.39&r2=1.40&diff_format=u Index: php-src/ext/recode/recode.c diff -u php-src/ext/recode/recode.c:1.39 php-src/ext/recode/recode.c:1.40 --- php-src/ext/recode/recode.c:1.39 Tue Jun 13 13:12:19 2006 +++ php-src/ext/recode/recode.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.39 2006/06/13 13:12:19 dmitry Exp $ */ +/* $Id: recode.c,v 1.40 2006/10/08 13:34:23 bjori Exp $ */ /* {{{ includes & prototypes */ @@ -122,7 +122,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.39 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.40 $"); php_info_print_table_end(); } @@ -154,7 +154,7 @@ recode_buffer_to_buffer(request, str, str_len, &r, &r_len, &r_alen); if (!r) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed"); error_exit: RETVAL_FALSE; } else { @@ -207,7 +207,7 @@ } if (!recode_file_to_file(request, in_fp, out_fp)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Recoding failed"); goto error_exit; } http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.454&r2=1.455&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.454 php-src/ext/session/session.c:1.455 --- php-src/ext/session/session.c:1.454 Sat Oct 7 22:55:18 2006 +++ php-src/ext/session/session.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.454 2006/10/07 22:55:18 bjori Exp $ */ +/* $Id: session.c,v 1.455 2006/10/08 13:34:23 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,7 +83,7 @@ #define SESSION_CHECK_ACTIVE_STATE \ if (PS(session_status) == php_session_active) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is active. You cannot change the session module's ini settings at this time."); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is active. You cannot change the session module's ini settings at this time"); \ return FAILURE; \ } \ @@ -505,13 +505,13 @@ IF_SESSION_VARS() { if (!PS(serializer)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to encode session object."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to encode session object"); ret = NULL; } else if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE) ret = NULL; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode non-existent session."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode non-existent session"); } return ret; @@ -520,12 +520,12 @@ static void php_session_decode(const char *val, int vallen TSRMLS_DC) { if (!PS(serializer)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.serialize_handler. Failed to decode session object"); return; } if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) { php_session_destroy(TSRMLS_C); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode session object. Session has been destroyed."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode session object. Session has been destroyed"); } } @@ -688,7 +688,7 @@ } if (!PS(mod)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module chosen - failed to initialize session."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module chosen - failed to initialize session"); return; } @@ -751,7 +751,7 @@ case HASH_KEY_IS_LONG: php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The session bug compatibility code will not " "try to locate the global variable $%lu due to its " - "numeric nature.", num_key); + "numeric nature", num_key); break; } http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/014.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/session/tests/014.phpt diff -u php-src/ext/session/tests/014.phpt:1.9 php-src/ext/session/tests/014.phpt:1.10 --- php-src/ext/session/tests/014.phpt:1.9 Mon Apr 10 15:06:51 2006 +++ php-src/ext/session/tests/014.phpt Sun Oct 8 13:34:23 2006 @@ -32,8 +32,8 @@ --EXPECTF-- <a href="/link?PHPSESSID=abtest"> -Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time. in %s on line %d +Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d <a href="/link?PHPSESSID=abtest"> -Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time. in %s on line %d +Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d <a href="/link?PHPSESSID=abtest"> http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.214&r2=1.215&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.214 php-src/ext/soap/soap.c:1.215 --- php-src/ext/soap/soap.c:1.214 Tue Oct 3 19:52:34 2006 +++ php-src/ext/soap/soap.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.214 2006/10/03 19:52:34 iliaa Exp $ */ +/* $Id: soap.c,v 1.215 2006/10/08 13:34:23 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -897,7 +897,7 @@ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters"); } if (name_length == 0) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid parameter name."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid parameter name"); } if (name_type == IS_STRING) { @@ -926,10 +926,10 @@ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters"); } if (ns_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid namespace."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid namespace"); } if (name_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid header name."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid header name"); } if (ns_type == IS_STRING) { @@ -957,7 +957,7 @@ } else if (Z_TYPE_P(actor) == IS_UNICODE && Z_USTRLEN_P(actor) > 0) { add_property_unicodel(this_ptr, "actor", Z_USTRVAL_P(actor), Z_USTRLEN_P(actor), 1); } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid actor."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid actor"); } } @@ -998,13 +998,13 @@ fault_code_ns = soap_encode_string(*t_ns, NULL TSRMLS_CC); fault_code = soap_encode_string(*t_code, NULL TSRMLS_CC); } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code"); } } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code"); } if (fault_code != NULL && !fault_code[0]) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code"); } if (name.v != NULL && name_len == 0) { name.v = NULL; @@ -1352,7 +1352,7 @@ } encoding = xmlFindCharEncodingHandler(str); if (encoding == NULL) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'.", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); } else { service->encoding = encoding; } @@ -1388,7 +1388,7 @@ } if (wsdl == NULL && service->uri == NULL) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. 'uri' option is required in nonWSDL mode."); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. 'uri' option is required in nonWSDL mode"); return; } @@ -2682,7 +2682,7 @@ } encoding = xmlFindCharEncodingHandler(str); if (encoding == NULL) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'.", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%v'", Z_TYPE_PP(tmp), Z_UNIVAL_PP(tmp)); } else { client->encoding = encoding; } http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug31755.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/soap/tests/bugs/bug31755.phpt diff -u php-src/ext/soap/tests/bugs/bug31755.phpt:1.4 php-src/ext/soap/tests/bugs/bug31755.phpt:1.5 --- php-src/ext/soap/tests/bugs/bug31755.phpt:1.4 Thu Jul 13 16:47:25 2006 +++ php-src/ext/soap/tests/bugs/bug31755.phpt Sun Oct 8 13:34:23 2006 @@ -14,4 +14,4 @@ print $client->__getLastRequest(); ?> --EXPECTF-- -Fatal error: SoapHeader::__construct(): Invalid parameters. Invalid namespace. in %s on line %d +Fatal error: SoapHeader::__construct(): Invalid parameters. Invalid namespace in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.183&r2=1.184&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.183 php-src/ext/sockets/sockets.c:1.184 --- php-src/ext/sockets/sockets.c:1.183 Tue Oct 3 19:52:34 2006 +++ php-src/ext/sockets/sockets.c Sun Oct 8 13:34:23 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.183 2006/10/03 19:52:34 iliaa Exp $ */ +/* $Id: sockets.c,v 1.184 2006/10/08 13:34:23 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -397,7 +397,7 @@ #else /* No IPv6 specific hostname resolution is available on this system? */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host lookup failed: getaddrinfo() not available on this system."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host lookup failed: getaddrinfo() not available on this system"); return 0; #endif http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.198&r2=1.199&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.198 php-src/ext/sqlite/sqlite.c:1.199 --- php-src/ext/sqlite/sqlite.c:1.198 Sat Oct 7 17:49:30 2006 +++ php-src/ext/sqlite/sqlite.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.198 2006/10/07 17:49:30 pollita Exp $ + $Id: sqlite.c,v 1.199 2006/10/08 13:34:23 bjori Exp $ */ #ifdef HAVE_CONFIG_H @@ -172,7 +172,7 @@ #define PHP_SQLITE_EMPTY_QUERY \ if (!sql_len) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot execute empty query."); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot execute empty query"); \ RETURN_FALSE; \ } @@ -1220,7 +1220,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.198 2006/10/07 17:49:30 pollita Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.199 2006/10/08 13:34:23 bjori Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.388&r2=1.389&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.388 php-src/ext/standard/array.c:1.389 --- php-src/ext/standard/array.c:1.388 Tue Oct 3 17:45:16 2006 +++ php-src/ext/standard/array.c Sun Oct 8 13:34:23 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.388 2006/10/03 17:45:16 iliaa Exp $ */ +/* $Id: array.c,v 1.389 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_ini.h" @@ -599,7 +599,7 @@ /* check if comparison function is valid */ #define PHP_ARRAY_CMP_FUNC_CHECK(func_name) \ if (!zend_is_callable(*func_name, 0, NULL)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison function."); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison function"); \ BG(user_compare_fci) = old_user_compare_fci; \ BG(user_compare_fci_cache) = old_user_compare_fci_cache; \ RETURN_FALSE; \ @@ -3003,7 +3003,7 @@ fci_key = &fci2; fci_key_cache = &fci2_cache; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_compare_type is %d. key_compare_type is %d. This should never happen. Please report as a bug.", data_compare_type, key_compare_type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_compare_type is %d. key_compare_type is %d. This should never happen. Please report as a bug", data_compare_type, key_compare_type); return; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.809&r2=1.810&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.809 php-src/ext/standard/basic_functions.c:1.810 --- php-src/ext/standard/basic_functions.c:1.809 Sat Oct 7 22:55:18 2006 +++ php-src/ext/standard/basic_functions.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.809 2006/10/07 22:55:18 bjori Exp $ */ +/* $Id: basic_functions.c,v 1.810 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -4427,7 +4427,7 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter syntax."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter syntax"); RETURN_FALSE; } /* }}} */ @@ -4741,7 +4741,7 @@ c_ts = (double)(d_ts - tm.tv_sec - tm.tv_usec / 1000000.00); if (c_ts < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to time is less than current time."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to time is less than current time"); RETURN_FALSE; } @@ -6226,11 +6226,11 @@ if (!prefix_len) { if (!hash_key->nKeyLength) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric key detected - possible security hazard"); return 0; } else if (hash_key->nKeyLength == sizeof("GLOBALS") && ZEND_U_EQUAL(hash_key->type, hash_key->arKey, hash_key->nKeyLength-1, "GLOBALS", sizeof("GLOBALS")-1)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted GLOBALS variable overwrite."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted GLOBALS variable overwrite"); return 0; } } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.87&r2=1.88&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.87 php-src/ext/standard/browscap.c:1.88 --- php-src/ext/standard/browscap.c:1.87 Sun Jan 1 13:09:54 2006 +++ php-src/ext/standard/browscap.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.87 2006/01/01 13:09:54 sniper Exp $ */ +/* $Id: browscap.c,v 1.88 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_regex.h" @@ -290,7 +290,7 @@ char *browscap = INI_STR("browscap"); if (!browscap || !browscap[0]) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.109&r2=1.110&diff_format=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.109 php-src/ext/standard/dl.c:1.110 --- php-src/ext/standard/dl.c:1.109 Thu Mar 16 16:53:09 2006 +++ php-src/ext/standard/dl.c Sun Oct 8 13:34:23 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.109 2006/03/16 16:53:09 dmitry Exp $ */ +/* $Id: dl.c,v 1.110 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "dl.h" @@ -141,7 +141,7 @@ if (!get_module) { DL_UNLOAD(handle); - php_error_docref(NULL TSRMLS_CC, error_type, "Invalid library (maybe not a PHP library) '%s' ", Z_STRVAL_P(file)); + php_error_docref(NULL TSRMLS_CC, error_type, "Invalid library (maybe not a PHP library) '%s'", Z_STRVAL_P(file)); RETURN_FALSE; } module_entry = get_module(); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.121&r2=1.122&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.121 php-src/ext/standard/exec.c:1.122 --- php-src/ext/standard/exec.c:1.121 Sun Sep 24 17:03:58 2006 +++ php-src/ext/standard/exec.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <iliaa@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.121 2006/09/24 17:03:58 pollita Exp $ */ +/* $Id: exec.c,v 1.122 2006/10/08 13:34:23 bjori Exp $ */ #include <stdio.h> #include "php.h" @@ -485,7 +485,7 @@ errno = 0; nice(pri); if (errno) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.461&r2=1.462&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.461 php-src/ext/standard/file.c:1.462 --- php-src/ext/standard/file.c:1.461 Tue Oct 3 23:09:08 2006 +++ php-src/ext/standard/file.c Sun Oct 8 13:34:23 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.461 2006/10/03 23:09:08 tony2001 Exp $ */ +/* $Id: file.c,v 1.462 2006/10/08 13:34:23 bjori Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -556,7 +556,7 @@ } if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", offset); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", offset); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filters.c?r1=1.58&r2=1.59&diff_format=u Index: php-src/ext/standard/filters.c diff -u php-src/ext/standard/filters.c:1.58 php-src/ext/standard/filters.c:1.59 --- php-src/ext/standard/filters.c:1.58 Mon Sep 4 19:16:21 2006 +++ php-src/ext/standard/filters.c Sun Oct 8 13:34:23 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filters.c,v 1.58 2006/09/04 19:16:21 nlopess Exp $ */ +/* $Id: filters.c,v 1.59 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -1961,7 +1961,7 @@ /* Create this filter */ data = pecalloc(1, sizeof(php_consumed_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_consumed_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", sizeof(php_consumed_filter_data)); return NULL; } data->persistent = persistent; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.22&r2=1.23&diff_format=u Index: php-src/ext/standard/http.c diff -u php-src/ext/standard/http.c:1.22 php-src/ext/standard/http.c:1.23 --- php-src/ext/standard/http.c:1.22 Mon Jul 24 17:55:41 2006 +++ php-src/ext/standard/http.c Sun Oct 8 13:34:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: http.c,v 1.22 2006/07/24 17:55:41 helly Exp $ */ +/* $Id: http.c,v 1.23 2006/10/08 13:34:23 bjori Exp $ */ #include "php_http.h" #include "php_ini.h" @@ -80,7 +80,7 @@ } if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array"); return FAILURE; } if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { @@ -207,7 +207,7 @@ } if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.119&r2=1.120&diff_format=u Index: php-src/ext/standard/http_fopen_wrapper.c diff -u php-src/ext/standard/http_fopen_wrapper.c:1.119 php-src/ext/standard/http_fopen_wrapper.c:1.120 --- php-src/ext/standard/http_fopen_wrapper.c:1.119 Tue Sep 19 10:38:31 2006 +++ php-src/ext/standard/http_fopen_wrapper.c Sun Oct 8 13:34:23 2006 @@ -19,7 +19,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.119 2006/09/19 10:38:31 dmitry Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.120 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -150,7 +150,7 @@ tmp_line[0] = '\0'; if (redirect_max < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Redirection limit reached, aborting."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Redirection limit reached, aborting"); return NULL; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.125&r2=1.126&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.125 php-src/ext/standard/image.c:1.126 --- php-src/ext/standard/image.c:1.125 Tue Sep 19 10:38:31 2006 +++ php-src/ext/standard/image.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.125 2006/09/19 10:38:31 dmitry Exp $ */ +/* $Id: image.c,v 1.126 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include <stdio.h> @@ -1349,7 +1349,7 @@ #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) result = php_handle_swc(stream TSRMLS_CC); #else - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled."); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); #endif break; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.93&r2=1.94&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.93 php-src/ext/standard/streamsfuncs.c:1.94 --- php-src/ext/standard/streamsfuncs.c:1.93 Fri Oct 6 17:41:30 2006 +++ php-src/ext/standard/streamsfuncs.c Sun Oct 8 13:34:23 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.93 2006/10/06 17:41:30 pollita Exp $ */ +/* $Id: streamsfuncs.c,v 1.94 2006/10/08 13:34:23 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -365,7 +365,7 @@ } if (to_read <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0"); RETURN_FALSE; } @@ -407,7 +407,7 @@ php_stream_from_zval(stream, &zsrc); if (pos > 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -459,7 +459,7 @@ php_stream_from_zval(dest, &zdest); if (pos > 0 && php_stream_seek(src, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -803,10 +803,10 @@ convert_to_long_ex(sec); if (Z_LVAL_PP(sec) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0"); RETURN_FALSE; } else if (usec < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0"); RETURN_FALSE; } @@ -1059,7 +1059,7 @@ } context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1090,7 +1090,7 @@ /* figure out where the context is coming from exactly */ context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1117,7 +1117,7 @@ context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1313,7 +1313,7 @@ } if (max_length < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero"); RETURN_FALSE; } if (!max_length) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.606&r2=1.607&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.606 php-src/ext/standard/string.c:1.607 --- php-src/ext/standard/string.c:1.606 Thu Oct 5 22:44:31 2006 +++ php-src/ext/standard/string.c Sun Oct 8 13:34:24 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.606 2006/10/05 22:44:31 andrei Exp $ */ +/* $Id: string.c,v 1.607 2006/10/08 13:34:24 bjori Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -546,22 +546,22 @@ /* Error, try to be as helpful as possible: (a range ending/starting with '.' won't be captured here) */ if (end-len >= input) { /* there was no 'left' char */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the left of '..'."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the left of '..'"); result = FAILURE; continue; } if (input+2 >= end) { /* there is no 'right' char */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the right of '..'."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, no character to the right of '..'"); result = FAILURE; continue; } if (input[-1] > input[2]) { /* wrong order */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, '..'-range needs to be incrementing."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range, '..'-range needs to be incrementing"); result = FAILURE; continue; } /* FIXME: better error (a..b..c is the only left possibility?) */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid '..'-range"); result = FAILURE; continue; } else { @@ -847,7 +847,7 @@ } if (linelength == 0 && docut) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't force cut when width is zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't force cut when width is zero"); RETURN_FALSE; } @@ -1110,7 +1110,7 @@ } if ( delim_len == 0 ) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -1264,7 +1264,7 @@ if (argc == 1) { if (Z_TYPE_PP(arg1) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array"); RETURN_FALSE; } else { SEPARATE_ZVAL(arg1); @@ -1292,7 +1292,7 @@ } delim = *arg1; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments"); RETURN_FALSE; } } @@ -1358,7 +1358,7 @@ } if (BG(strtok_zval) && tok_type != Z_TYPE_P(BG(strtok_zval))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Delimiter type must match string type."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Delimiter type must match string type"); RETURN_FALSE; } @@ -2363,7 +2363,7 @@ if (Z_TYPE_PP(needle) == IS_UNICODE || Z_TYPE_PP(needle) == IS_STRING) { if (!Z_UNILEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } if (Z_TYPE_PP(haystack) != Z_TYPE_PP(needle)) { @@ -2446,7 +2446,7 @@ if (Z_TYPE_PP(needle) == IS_STRING || Z_TYPE_PP(needle) == IS_UNICODE) { if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -2554,13 +2554,13 @@ * code units, and leave the rest to zend_u_memnstr(). */ if (offset < 0 || offset > haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } if (Z_TYPE_PP(needle) == IS_STRING || Z_TYPE_PP(needle) == IS_UNICODE) { if (!Z_STRLEN_PP(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); RETURN_FALSE; } @@ -2653,7 +2653,7 @@ * code units, and leave the rest to zend_u_memnstr(). */ if (offset < 0 || offset > Z_UNILEN_PP(haystack)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } @@ -3150,7 +3150,7 @@ } if (chunklen <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length should be greater than zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length should be greater than zero"); RETURN_FALSE; } @@ -3392,7 +3392,7 @@ if (Z_TYPE_PP(str) != IS_ARRAY) { if ( (argc == 3 && Z_TYPE_PP(from) == IS_ARRAY) || (argc == 4 && Z_TYPE_PP(from) != Z_TYPE_PP(len)) ) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "'from' and 'len' should be of same type - numerical or array "); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "'from' and 'len' should be of same type - numerical or array"); RETURN_ZVAL(*str, 1, 0); } if (argc == 4 && Z_TYPE_PP(from) == IS_ARRAY) { @@ -3433,7 +3433,7 @@ RETURN_STRINGL((char *)result, result_len, 0); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Functionality of 'from' and 'len' as arrays is not implemented."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Functionality of 'from' and 'len' as arrays is not implemented"); RETURN_ZVAL(*str, 1, 0); } } else { /* str is array of strings */ @@ -4138,7 +4138,7 @@ } if (ac == 2 && Z_TYPE_PP(from) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument is not an array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second argument is not an array"); RETURN_FALSE; } @@ -5966,7 +5966,7 @@ cat = Z_LVAL_PP(pcategory); } else { /* FIXME: The following behaviour should be removed. */ char *category; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale category name as string is deprecated. Use the LC_* -constants instead."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale category name as string is deprecated. Use the LC_* -constants instead"); convert_to_string_ex(pcategory); category = Z_STRVAL_P(*pcategory); @@ -5987,7 +5987,7 @@ else if (!strcasecmp ("LC_TIME", category)) cat = LC_TIME; else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME.", category); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME", category); efree(args); RETURN_FALSE; } @@ -6764,7 +6764,7 @@ if (ZEND_NUM_ARGS() > 1) { if (mode < 0 || mode > 4) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown mode."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown mode"); RETURN_FALSE; } if (UG(unicode) && mode != 1) { @@ -7001,7 +7001,7 @@ } if (needle_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring"); RETURN_FALSE; } @@ -7015,7 +7015,7 @@ if (ac > 2) { if (offset < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset should be greater than or equal to 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset should be greater than or equal to 0"); RETURN_FALSE; } if (haystack_type == IS_UNICODE) { @@ -7026,12 +7026,12 @@ p = (char *)haystack + offset; } if (p > endp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length.", offset); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length", offset); RETURN_FALSE; } if (ac == 4) { if (length < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length should be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length should be greater than 0"); RETURN_FALSE; } if (haystack_type == IS_UNICODE) { @@ -7043,7 +7043,7 @@ tmp = (char *)p + length; } if (tmp > endp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length.", offset); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset value %ld exceeds string length", offset); RETURN_FALSE; } else { endp = tmp; @@ -7128,12 +7128,12 @@ /* Setup the padding string values if NOT specified. */ if (ZEND_NUM_ARGS() > 2) { if (padstr_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding string cannot be empty."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding string cannot be empty"); return; } if (ZEND_NUM_ARGS() > 3) { if (pad_type < STR_PAD_LEFT || pad_type > STR_PAD_BOTH) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH"); return; } } else { @@ -7537,7 +7537,7 @@ } if (split_length <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each segment must be greater than zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each segment must be greater than zero"); RETURN_FALSE; } @@ -7581,7 +7581,7 @@ } if (!char_list_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list cannot be empty."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list cannot be empty"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.47&r2=1.48&diff_format=u Index: php-src/ext/standard/uniqid.c diff -u php-src/ext/standard/uniqid.c:1.47 php-src/ext/standard/uniqid.c:1.48 --- php-src/ext/standard/uniqid.c:1.47 Sat Oct 7 00:41:14 2006 +++ php-src/ext/standard/uniqid.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.47 2006/10/07 00:41:14 andrei Exp $ */ +/* $Id: uniqid.c,v 1.48 2006/10/08 13:34:24 bjori Exp $ */ #include "php.h" @@ -64,7 +64,7 @@ #if HAVE_USLEEP && !defined(PHP_WIN32) if (!more_entropy) { #if defined(__CYGWIN__) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN"); RETURN_FALSE; #else usleep(1); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.99&r2=1.100&diff_format=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.99 php-src/ext/standard/url.c:1.100 --- php-src/ext/standard/url.c:1.99 Thu Sep 28 14:52:55 2006 +++ php-src/ext/standard/url.c Sun Oct 8 13:34:24 2006 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.99 2006/09/28 14:52:55 iliaa Exp $ */ +/* $Id: url.c,v 1.100 2006/10/08 13:34:24 bjori Exp $ */ #include <stdlib.h> #include <string.h> @@ -375,7 +375,7 @@ if (resource->fragment != NULL) RETVAL_STRING(resource->fragment, 1); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld.", key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld", key); RETVAL_FALSE; } goto done; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uuencode.c?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/standard/uuencode.c diff -u php-src/ext/standard/uuencode.c:1.8 php-src/ext/standard/uuencode.c:1.9 --- php-src/ext/standard/uuencode.c:1.8 Tue Oct 3 19:51:35 2006 +++ php-src/ext/standard/uuencode.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uuencode.c,v 1.8 2006/10/03 19:51:35 pollita Exp $ */ +/* $Id: uuencode.c,v 1.9 2006/10/08 13:34:24 bjori Exp $ */ /* * Portions of this code are based on Berkeley's uuencode/uudecode @@ -238,7 +238,7 @@ } if (dst_len < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.245&r2=1.246&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.245 php-src/ext/standard/var.c:1.246 --- php-src/ext/standard/var.c:1.245 Fri Oct 6 18:03:41 2006 +++ php-src/ext/standard/var.c Sun Oct 8 13:34:24 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.245 2006/10/06 18:03:41 andrei Exp $ */ +/* $Id: var.c,v 1.246 2006/10/08 13:34:24 bjori Exp $ */ @@ -775,7 +775,7 @@ if (Z_TYPE_PP(name) != (UG(unicode)?IS_UNICODE:IS_STRING)) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only " "containing the names of instance-variables to " - "serialize."); + "serialize"); /* we should still add element even if it's not OK, since we already wrote the length of the array before */ smart_str_appendl(buf,"N;", 2); @@ -960,7 +960,7 @@ } else { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only " "containing the names of instance-variables to " - "serialize."); + "serialize"); /* we should still add element even if it's not OK, since we already wrote the length of the array before */ smart_str_appendl(buf,"N;", 2); http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.72&r2=1.73&diff_format=u Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.72 php-src/ext/sybase/php_sybase_db.c:1.73 --- php-src/ext/sybase/php_sybase_db.c:1.72 Wed Mar 8 00:43:28 2006 +++ php-src/ext/sybase/php_sybase_db.c Sun Oct 8 13:34:24 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.72 2006/03/08 00:43:28 pajoye Exp $ */ +/* $Id: php_sybase_db.c,v 1.73 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H @@ -935,7 +935,7 @@ /* Check assumption that dbnextrow returns NO_MORE_ROWS */ retvalue = dbnextrow(sybase_ptr->link); if (retvalue != NO_MORE_ROWS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Expected dbnextrow() to return NO_MORE_ROWS."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected dbnextrow() to return NO_MORE_ROWS"); } } } http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.114&r2=1.115&diff_format=u Index: php-src/ext/sybase_ct/php_sybase_ct.c diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.114 php-src/ext/sybase_ct/php_sybase_ct.c:1.115 --- php-src/ext/sybase_ct/php_sybase_ct.c:1.114 Tue Jul 25 09:12:07 2006 +++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Oct 8 13:34:24 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.114 2006/07/25 09:12:07 thetaphi Exp $ */ +/* $Id: php_sybase_ct.c,v 1.115 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H @@ -512,16 +512,16 @@ if (charset) { if (cs_loc_alloc(SybCtG(context), &tmp_locale)!=CS_SUCCEED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to allocate locale information."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to allocate locale information"); } else { if (cs_locale(SybCtG(context), CS_SET, tmp_locale, CS_LC_ALL, NULL, CS_NULLTERM, NULL)!=CS_SUCCEED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to load default locale data."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to load default locale data"); } else { if (cs_locale(SybCtG(context), CS_SET, tmp_locale, CS_SYB_CHARSET, charset, CS_NULLTERM, NULL)!=CS_SUCCEED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update character set."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update character set"); } else { if (ct_con_props(sybase->connection, CS_SET, CS_LOC_PROP, tmp_locale, CS_UNUSED, NULL)!=CS_SUCCEED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update connection properties."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update connection properties"); } } } @@ -530,7 +530,7 @@ if (cfg_get_long("sybct.packet_size", &packetsize) == SUCCESS) { if (ct_con_props(sybase->connection, CS_SET, CS_PACKETSIZE, (CS_VOID *)&packetsize, CS_UNUSED, NULL) != CS_SUCCEED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update connection packetsize."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Unable to update connection packetsize"); } } http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.25&r2=1.26&diff_format=u Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.25 php-src/ext/sysvmsg/sysvmsg.c:1.26 --- php-src/ext/sysvmsg/sysvmsg.c:1.25 Mon Jun 5 22:52:27 2006 +++ php-src/ext/sysvmsg/sysvmsg.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvmsg.c,v 1.25 2006/06/05 22:52:27 iliaa Exp $ */ +/* $Id: sysvmsg.c,v 1.26 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -144,7 +144,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "sysvmsg support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.25 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.26 $"); php_info_print_table_end(); } /* }}} */ @@ -411,7 +411,7 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Message parameter must be either a string or a number."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Message parameter must be either a string or a number"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.102&r2=1.103&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.102 php-src/ext/tidy/tidy.c:1.103 --- php-src/ext/tidy/tidy.c:1.102 Mon Oct 2 07:54:37 2006 +++ php-src/ext/tidy/tidy.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.102 2006/10/02 07:54:37 bjori Exp $ */ +/* $Id: tidy.c,v 1.103 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -165,7 +165,7 @@ #define TIDY_SET_DEFAULT_CONFIG(_doc) \ if (TG(default_config) && TG(default_config)[0]) { \ if (tidyLoadConfig(_doc, TG(default_config)) < 0) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load Tidy configuration file at '%s'.", TG(default_config)); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to load Tidy configuration file at '%s'", TG(default_config)); \ } \ } /* }}} */ @@ -1012,7 +1012,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.102 2006/10/02 07:54:37 bjori Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.103 2006/10/08 13:34:24 bjori Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1202,7 +1202,7 @@ obj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC); if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); RETURN_FALSE; } @@ -1516,7 +1516,7 @@ if (inputfile) { if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); return; } @@ -1547,7 +1547,7 @@ } if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path, &contents_len TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory%s", inputfile, (use_include_path) ? " (Using include path)" : ""); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.139&r2=1.140&diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.139 php-src/ext/wddx/wddx.c:1.140 --- php-src/ext/wddx/wddx.c:1.139 Wed Aug 2 22:02:12 2006 +++ php-src/ext/wddx/wddx.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.139 2006/08/02 22:02:12 tony2001 Exp $ */ +/* $Id: wddx.c,v 1.140 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -462,7 +462,7 @@ zend_hash_get_current_data(HASH_OF(retval), (void **)&varname) == SUCCESS; zend_hash_move_forward(HASH_OF(retval))) { if (Z_TYPE_PP(varname) != IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize."); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize"); continue; } http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.166&r2=1.167&diff_format=u Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.166 php-src/ext/xml/xml.c:1.167 --- php-src/ext/xml/xml.c:1.166 Tue Aug 15 22:45:18 2006 +++ php-src/ext/xml/xml.c Sun Oct 8 13:34:24 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.166 2006/08/15 22:45:18 rrichards Exp $ */ +/* $Id: xml.c,v 1.167 2006/10/08 13:34:24 bjori Exp $ */ #define IS_EXT_MODULE @@ -1504,7 +1504,7 @@ ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); if (parser->isparsing == 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parser cannot be freed while it is parsing."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parser cannot be freed while it is parsing"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.42&r2=1.43&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.42 php-src/ext/xmlreader/php_xmlreader.c:1.43 --- php-src/ext/xmlreader/php_xmlreader.c:1.42 Wed Oct 4 13:30:41 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.42 2006/10/04 13:30:41 tony2001 Exp $ */ +/* $Id: php_xmlreader.c,v 1.43 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -551,11 +551,11 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors"); RETURN_FALSE; #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml"); RETURN_FALSE; #endif @@ -1022,11 +1022,11 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set schema. This must be set prior to reading or schema contains errors"); RETURN_FALSE; #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "No Schema support built into libxml"); RETURN_FALSE; #endif @@ -1177,7 +1177,7 @@ node = xmlTextReaderExpand(intern->ptr); if (node == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding "); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding"); RETURN_FALSE; } else { nodec = xmlCopyNode(node, 1); http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.51 php-src/ext/xsl/xsltprocessor.c:1.52 --- php-src/ext/xsl/xsltprocessor.c:1.51 Thu Sep 21 10:31:35 2006 +++ php-src/ext/xsl/xsltprocessor.c Sun Oct 8 13:34:24 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.51 2006/09/21 10:31:35 rrichards Exp $ */ +/* $Id: xsltprocessor.c,v 1.52 2006/10/08 13:34:24 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -268,14 +268,14 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %R()", Z_TYPE(callable), Z_UNIVAL(callable)); } else if ( intern->registerPhpFunctions == 2 && zend_u_hash_exists(intern->registered_phpfunctions, Z_TYPE(callable), Z_UNIVAL(callable), Z_UNILEN(callable) + 1) == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to call handler '%R()'.", Z_TYPE(callable), Z_UNIVAL(callable)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to call handler '%R()'", Z_TYPE(callable), Z_UNIVAL(callable)); // Push an empty string, so that we at least have an xslt result... valuePush(ctxt, xmlXPathNewString("")); } else { result = zend_call_function(&fci, NULL TSRMLS_CC); if (result == FAILURE) { if (Z_TYPE(callable) == IS_STRING || Z_TYPE(callable) == IS_UNICODE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler '%R()'.", Z_TYPE(callable), Z_UNIVAL(callable)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler '%R()'", Z_TYPE(callable), Z_UNIVAL(callable)); } /* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */ } else if (retval == NULL) { http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/zlib/zlib_filter.c diff -u php-src/ext/zlib/zlib_filter.c:1.11 php-src/ext/zlib/zlib_filter.c:1.12 --- php-src/ext/zlib/zlib_filter.c:1.11 Mon Jun 12 23:28:44 2006 +++ php-src/ext/zlib/zlib_filter.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib_filter.c,v 1.11 2006/06/12 23:28:44 iliaa Exp $ */ +/* $Id: zlib_filter.c,v 1.12 2006/10/08 13:34:24 bjori Exp $ */ #include "php.h" #include "php_zlib.h" @@ -292,7 +292,7 @@ /* Create this filter */ data = pecalloc(1, sizeof(php_zlib_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes.", sizeof(php_zlib_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes", sizeof(php_zlib_filter_data)); return NULL; } @@ -304,14 +304,14 @@ data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048; data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent); if (!data->inbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes.", data->inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes", data->inbuf_len); pefree(data, persistent); return NULL; } data->strm.avail_in = 0; data->strm.next_out = data->outbuf = (Bytef *) pemalloc(data->outbuf_len, persistent); if (!data->outbuf) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes.", data->outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %ld bytes", data->outbuf_len); pefree(data->inbuf, persistent); pefree(data, persistent); return NULL; @@ -403,7 +403,7 @@ zval_ptr_dtor(tmpzval); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filter parameter, ignored."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filter parameter, ignored"); } } status = deflateInit2(&(data->strm), level, Z_DEFLATED, windowBits, memLevel, 0); http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.36&r2=1.37&diff_format=u Index: php-src/main/streams/filter.c diff -u php-src/main/streams/filter.c:1.36 php-src/main/streams/filter.c:1.37 --- php-src/main/streams/filter.c:1.36 Tue Oct 3 19:52:34 2006 +++ php-src/main/streams/filter.c Sun Oct 8 13:34:24 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.36 2006/10/03 19:52:34 iliaa Exp $ */ +/* $Id: filter.c,v 1.37 2006/10/08 13:34:24 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -436,7 +436,7 @@ } php_stream_bucket_unlink(bucket TSRMLS_CC); php_stream_bucket_delref(bucket TSRMLS_CC); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filter failed to process pre-buffered data. Not adding to filterchain."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filter failed to process pre-buffered data. Not adding to filterchain"); } else { /* This filter addition may change the readbuffer type. Since all the previously held data is in the bucket brigade, http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.139&r2=1.140&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.139 php-src/main/streams/streams.c:1.140 --- php-src/main/streams/streams.c:1.139 Tue Oct 3 23:22:21 2006 +++ php-src/main/streams/streams.c Sun Oct 8 13:34:24 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.139 2006/10/03 23:22:21 tony2001 Exp $ */ +/* $Id: streams.c,v 1.140 2006/10/08 13:34:24 bjori Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -2066,7 +2066,7 @@ /* BC with older php scripts and zlib wrapper */ protocol = "compress.zlib"; n = 13; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use of \"zlib:\" wrapper is deprecated; please use \"compress.zlib://\" instead."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use of \"zlib:\" wrapper is deprecated; please use \"compress.zlib://\" instead"); } if (protocol) { @@ -2335,7 +2335,7 @@ wrapper = php_stream_locate_url_wrapper(path, &path_to_open, options TSRMLS_CC); if (options & STREAM_USE_URL && (!wrapper || !wrapper->is_url)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function may only be used against URLs."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function may only be used against URLs"); return NULL; } http://cvs.php.net/viewvc.cgi/php-src/main/streams/unicode_filter.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/main/streams/unicode_filter.c diff -u php-src/main/streams/unicode_filter.c:1.4 php-src/main/streams/unicode_filter.c:1.5 --- php-src/main/streams/unicode_filter.c:1.4 Tue Sep 19 10:38:31 2006 +++ php-src/main/streams/unicode_filter.c Sun Oct 8 13:34:24 2006 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unicode_filter.c,v 1.4 2006/09/19 10:38:31 dmitry Exp $ */ +/* $Id: unicode_filter.c,v 1.5 2006/10/08 13:34:24 bjori Exp $ */ #include "php.h" @@ -288,7 +288,7 @@ /* Create this filter */ data = (php_unicode_filter_data *)pecalloc(1, sizeof(php_unicode_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failed allocating %d bytes.", sizeof(php_unicode_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failed allocating %d bytes", sizeof(php_unicode_filter_data)); return NULL; } http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.36&r2=1.37&diff_format=u Index: php-src/main/streams/userspace.c diff -u php-src/main/streams/userspace.c:1.36 php-src/main/streams/userspace.c:1.37 --- php-src/main/streams/userspace.c:1.36 Tue Sep 19 10:38:31 2006 +++ php-src/main/streams/userspace.c Sun Oct 8 13:34:24 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.36 2006/09/19 10:38:31 dmitry Exp $ */ +/* $Id: userspace.c,v 1.37 2006/10/08 13:34:24 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -456,7 +456,7 @@ } else { /* We failed. But why? */ if (zend_hash_exists(php_stream_get_url_stream_wrappers_hash(), protocol, protocol_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol %s:// is already defined.", protocol); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Protocol %s:// is already defined", protocol); } else { /* Should never happen */ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to register wrapper class %s to %s://", classname, protocol);