cvs: php-src /ext/dom xpath.c /ext/imap php_imap.c /ext/mcrypt mcrypt.c /ext/odbc birdstep.c /ext/posix posix.c /ext/shmop shmop.c /ext/standard
basic_functions.c browscap.c head.c /ext/standard/tests/file parse_ini_file_variation4.phpt /ext/sysvshm sysvshm.c /ext/sysvshm/tests 002.phpt
/ext/xsl xsltprocessor.c /ext/xsl/tests xslt011.phpt
| From: | Matt Wilmas | Date: | Sat, 06 Jun 2009 02:40:14 +0000 |
| Subject: | cvs: php-src /ext/dom xpath.c /ext/imap php_imap.c /ext/mcrypt mcrypt.c /ext/odbc birdstep.c /ext/posix posix.c /ext/shmop shmop.c /ext/standard basic_functions.c browscap.c head.c /ext/standard/tests/file parse_ini_file_variation4.phpt /ext/sysvshm sysvshm.c /ext/sysvshm/tests 002.phpt /ext/xsl xsltprocessor.c /ext/xsl/tests xslt011.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58524@lists.php.net to get a copy of this message | ||
mattwil Sat Jun 6 02:40:14 2009 UTC
Modified files:
/php-src/ext/dom xpath.c
/php-src/ext/imap php_imap.c
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/odbc birdstep.c
/php-src/ext/posix posix.c
/php-src/ext/shmop shmop.c
/php-src/ext/standard basic_functions.c browscap.c head.c
/php-src/ext/standard/tests/file parse_ini_file_variation4.phpt
/php-src/ext/sysvshm sysvshm.c
/php-src/ext/sysvshm/tests 002.phpt
/php-src/ext/xsl xsltprocessor.c
/php-src/ext/xsl/tests xslt011.phpt
Log:
Fixed error message grammar:
- "cannot" instead of "can not" (meaning "also can")
- "than" instead of "then" (Hint: "then" should hardly be needed;
you're not telling the order in which to do something)
... plus removed a couple ending. dots
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.47&r2=1.48&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.47 php-src/ext/dom/xpath.c:1.48 --- php-src/ext/dom/xpath.c:1.47 Tue Mar 10 23:39:13 2009 +++ php-src/ext/dom/xpath.c Sat Jun 6 02:40:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.47 2009/03/10 23:39:13 helly Exp $ */ +/* $Id: xpath.c,v 1.48 2009/06/06 02:40:13 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -232,7 +232,7 @@ } else if (retval->type == IS_BOOL) { valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval)); } else if (retval->type == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { convert_to_string_with_converter(retval, UG(utf8_conv)); http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.290&r2=1.291&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.290 php-src/ext/imap/php_imap.c:1.291 --- php-src/ext/imap/php_imap.c:1.290 Wed May 20 08:22:38 2009 +++ php-src/ext/imap/php_imap.c Sat Jun 6 02:40:13 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.290 2009/05/20 08:22:38 kalle Exp $ */ +/* $Id: php_imap.c,v 1.291 2009/06/06 02:40:13 mattwil Exp $ */ #define IMAP41 @@ -3726,7 +3726,7 @@ if (!cookie) { cookie = "-"; } else if (strlen(cookie) > (SENDBUFLEN - 2 - 2 - 2)) { /* validate cookie length -- + CRLF * 2 */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boudary should be no longer then 4kb"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boundary should be no longer than 4kb"); RETVAL_FALSE; goto done; } http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.122&r2=1.123&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.122 php-src/ext/mcrypt/mcrypt.c:1.123 --- php-src/ext/mcrypt/mcrypt.c:1.122 Tue May 19 17:46:56 2009 +++ php-src/ext/mcrypt/mcrypt.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.122 2009/05/19 17:46:56 kalle Exp $ */ +/* $Id: mcrypt.c,v 1.123 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1169,7 +1169,7 @@ int php_mcrypt_iv(php_mcrypt_iv_source source, int size, char **iv_str, int *iv_len TSRMLS_DC) { if (size <= 0 || size >= INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create an IV with a size of less then 1 or greater then %d", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create an IV with a size of less than 1 or greater than %d", INT_MAX); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.26&r2=1.27&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.26 php-src/ext/odbc/birdstep.c:1.27 --- php-src/ext/odbc/birdstep.c:1.26 Tue Mar 10 23:39:27 2009 +++ php-src/ext/odbc/birdstep.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.26 2009/03/10 23:39:27 helly Exp $ */ +/* $Id: birdstep.c,v 1.27 2009/06/06 02:40:14 mattwil Exp $ */ /* * TODO: @@ -369,7 +369,7 @@ } stat = SQLExecDirect(res->hstmt,query,SQL_NTS); if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Can not execute \"%s\" query",query); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Cannot execute \"%s\" query",query); SQLFreeStmt(res->hstmt,SQL_DROP); efree(res); RETURN_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.108&r2=1.109&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.108 php-src/ext/posix/posix.c:1.109 --- php-src/ext/posix/posix.c:1.108 Tue Mar 10 23:39:32 2009 +++ php-src/ext/posix/posix.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.108 2009/03/10 23:39:32 helly Exp $ */ +/* $Id: posix.c,v 1.109 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -310,7 +310,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.108 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.109 $"); php_info_print_table_end(); } /* }}} */ @@ -886,7 +886,7 @@ #if defined(HAVE_MAKEDEV) || defined(makedev) php_dev = makedev(major, minor); #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create a block or character device, creating a normal file instead"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create a block or character device, creating a normal file instead"); #endif } } http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.48&r2=1.49&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.48 php-src/ext/shmop/shmop.c:1.49 --- php-src/ext/shmop/shmop.c:1.48 Wed Dec 31 11:12:35 2008 +++ php-src/ext/shmop/shmop.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.48 2008/12/31 11:12:35 sebastian Exp $ */ +/* $Id: shmop.c,v 1.49 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -215,7 +215,7 @@ } if (shmop->shmflg & IPC_CREAT && shmop->size < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater then zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater than zero"); goto err; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.957&r2=1.958&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.957 php-src/ext/standard/basic_functions.c:1.958 --- php-src/ext/standard/basic_functions.c:1.957 Mon May 25 14:32:15 2009 +++ php-src/ext/standard/basic_functions.c Sat Jun 6 02:40:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.957 2009/05/25 14:32:15 felipe Exp $ */ +/* $Id: basic_functions.c,v 1.958 2009/06/06 02:40:14 mattwil Exp $ */ #include "php.h" #include "php_streams.h" @@ -6036,7 +6036,7 @@ } if (filename_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename can not be empty!"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot be empty!"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.105&r2=1.106&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.105 php-src/ext/standard/browscap.c:1.106 --- php-src/ext/standard/browscap.c:1.105 Tue Mar 10 23:39:39 2009 +++ php-src/ext/standard/browscap.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.105 2009/03/10 23:39:39 helly Exp $ */ +/* $Id: browscap.c,v 1.106 2009/06/06 02:40:14 mattwil Exp $ */ #include "php.h" #include "php_browscap.h" @@ -122,7 +122,7 @@ current_section_name != NULL && !strcasecmp(current_section_name, Z_STRVAL_P(arg2)) ) { - zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value can not be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap")); + zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value cannot be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap")); return; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.106&r2=1.107&diff_format=u Index: php-src/ext/standard/head.c diff -u php-src/ext/standard/head.c:1.106 php-src/ext/standard/head.c:1.107 --- php-src/ext/standard/head.c:1.106 Thu Mar 26 20:02:28 2009 +++ php-src/ext/standard/head.c Sat Jun 6 02:40:14 2009 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.106 2009/03/26 20:02:28 felipe Exp $ */ +/* $Id: head.c,v 1.107 2009/06/06 02:40:14 mattwil Exp $ */ #include <stdio.h> #include "php.h" @@ -84,12 +84,12 @@ int result; if (name && strpbrk(name, "=,; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie names can not contain any of the following '=,; \\t\\r\\n\\013\\014'" ); + zend_error( E_WARNING, "Cookie names cannot contain any of the following '=,; \\t\\r\\n\\013\\014'" ); return FAILURE; } if (!url_encode && value && strpbrk(value, ",; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie values can not contain any of the following ',; \\t\\r\\n\\013\\014'" ); + zend_error( E_WARNING, "Cookie values cannot contain any of the following ',; \\t\\r\\n\\013\\014'" ); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt diff -u php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.2 php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.3 --- php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt Sat Jun 6 02:40:14 2009 @@ -165,11 +165,11 @@ bool(false) --uppercase NULL-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --lowercase null-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --lowercase true-- @@ -177,7 +177,7 @@ bool(false) --lowercase false-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --uppercase TRUE-- @@ -185,15 +185,15 @@ bool(false) --uppercase FALSE-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --empty string DQ-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --empty string SQ-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --instance of classWithToString-- @@ -207,11 +207,11 @@ bool(false) --undefined var-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --unset var-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.88&r2=1.89&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.88 php-src/ext/sysvshm/sysvshm.c:1.89 --- php-src/ext/sysvshm/sysvshm.c:1.88 Thu Mar 19 23:11:54 2009 +++ php-src/ext/sysvshm/sysvshm.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.88 2009/03/19 23:11:54 iliaa Exp $ */ +/* $Id: sysvshm.c,v 1.89 2009/06/06 02:40:14 mattwil Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -157,7 +157,7 @@ } if (shm_size < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater then zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater than zero"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/sysvshm/tests/002.phpt diff -u php-src/ext/sysvshm/tests/002.phpt:1.4 php-src/ext/sysvshm/tests/002.phpt:1.5 --- php-src/ext/sysvshm/tests/002.phpt:1.4 Wed Dec 24 00:04:40 2008 +++ php-src/ext/sysvshm/tests/002.phpt Sat Jun 6 02:40:14 2009 @@ -39,21 +39,21 @@ Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d NULL -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.75&r2=1.76&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.75 php-src/ext/xsl/xsltprocessor.c:1.76 --- php-src/ext/xsl/xsltprocessor.c:1.75 Sun May 10 20:00:58 2009 +++ php-src/ext/xsl/xsltprocessor.c Sat Jun 6 02:40:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.75 2009/05/10 20:00:58 davidc Exp $ */ +/* $Id: xsltprocessor.c,v 1.76 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -344,7 +344,7 @@ } else if (retval->type == IS_BOOL) { valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval)); } else if (retval->type == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); valuePush(ctxt, xmlXPathNewString("")); } else { convert_to_string_with_converter(retval, UG(utf8_conv)); http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt011.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/xsl/tests/xslt011.phpt diff -u php-src/ext/xsl/tests/xslt011.phpt:1.11 php-src/ext/xsl/tests/xslt011.phpt:1.12 --- php-src/ext/xsl/tests/xslt011.phpt:1.11 Thu Jun 4 01:14:48 2009 +++ php-src/ext/xsl/tests/xslt011.phpt Sat Jun 6 02:40:14 2009 @@ -49,7 +49,7 @@ --EXPECTF-- Test 11: php:function Support -Warning: XSLTProcessor::transformToXml(): A PHP Object can not be converted to a XPath-string in %s on line 16 +Warning: XSLTProcessor::transformToXml(): A PHP Object cannot be converted to a XPath-string in %s on line 16 <?xml version="1.0"?> foobar - secondArg foobar -
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.47&r2=1.48&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.47 php-src/ext/dom/xpath.c:1.48 --- php-src/ext/dom/xpath.c:1.47 Tue Mar 10 23:39:13 2009 +++ php-src/ext/dom/xpath.c Sat Jun 6 02:40:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.47 2009/03/10 23:39:13 helly Exp $ */ +/* $Id: xpath.c,v 1.48 2009/06/06 02:40:13 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -232,7 +232,7 @@ } else if (retval->type == IS_BOOL) { valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval)); } else if (retval->type == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { convert_to_string_with_converter(retval, UG(utf8_conv)); http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.290&r2=1.291&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.290 php-src/ext/imap/php_imap.c:1.291 --- php-src/ext/imap/php_imap.c:1.290 Wed May 20 08:22:38 2009 +++ php-src/ext/imap/php_imap.c Sat Jun 6 02:40:13 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.290 2009/05/20 08:22:38 kalle Exp $ */ +/* $Id: php_imap.c,v 1.291 2009/06/06 02:40:13 mattwil Exp $ */ #define IMAP41 @@ -3726,7 +3726,7 @@ if (!cookie) { cookie = "-"; } else if (strlen(cookie) > (SENDBUFLEN - 2 - 2 - 2)) { /* validate cookie length -- + CRLF * 2 */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boudary should be no longer then 4kb"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boundary should be no longer than 4kb"); RETVAL_FALSE; goto done; } http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.122&r2=1.123&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.122 php-src/ext/mcrypt/mcrypt.c:1.123 --- php-src/ext/mcrypt/mcrypt.c:1.122 Tue May 19 17:46:56 2009 +++ php-src/ext/mcrypt/mcrypt.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.122 2009/05/19 17:46:56 kalle Exp $ */ +/* $Id: mcrypt.c,v 1.123 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1169,7 +1169,7 @@ int php_mcrypt_iv(php_mcrypt_iv_source source, int size, char **iv_str, int *iv_len TSRMLS_DC) { if (size <= 0 || size >= INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create an IV with a size of less then 1 or greater then %d", INT_MAX); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create an IV with a size of less than 1 or greater than %d", INT_MAX); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.26&r2=1.27&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.26 php-src/ext/odbc/birdstep.c:1.27 --- php-src/ext/odbc/birdstep.c:1.26 Tue Mar 10 23:39:27 2009 +++ php-src/ext/odbc/birdstep.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.26 2009/03/10 23:39:27 helly Exp $ */ +/* $Id: birdstep.c,v 1.27 2009/06/06 02:40:14 mattwil Exp $ */ /* * TODO: @@ -369,7 +369,7 @@ } stat = SQLExecDirect(res->hstmt,query,SQL_NTS); if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Can not execute \"%s\" query",query); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Cannot execute \"%s\" query",query); SQLFreeStmt(res->hstmt,SQL_DROP); efree(res); RETURN_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.108&r2=1.109&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.108 php-src/ext/posix/posix.c:1.109 --- php-src/ext/posix/posix.c:1.108 Tue Mar 10 23:39:32 2009 +++ php-src/ext/posix/posix.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.108 2009/03/10 23:39:32 helly Exp $ */ +/* $Id: posix.c,v 1.109 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -310,7 +310,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.108 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.109 $"); php_info_print_table_end(); } /* }}} */ @@ -886,7 +886,7 @@ #if defined(HAVE_MAKEDEV) || defined(makedev) php_dev = makedev(major, minor); #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not create a block or character device, creating a normal file instead"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create a block or character device, creating a normal file instead"); #endif } } http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.48&r2=1.49&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.48 php-src/ext/shmop/shmop.c:1.49 --- php-src/ext/shmop/shmop.c:1.48 Wed Dec 31 11:12:35 2008 +++ php-src/ext/shmop/shmop.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.48 2008/12/31 11:12:35 sebastian Exp $ */ +/* $Id: shmop.c,v 1.49 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -215,7 +215,7 @@ } if (shmop->shmflg & IPC_CREAT && shmop->size < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater then zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shared memory segment size must be greater than zero"); goto err; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.957&r2=1.958&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.957 php-src/ext/standard/basic_functions.c:1.958 --- php-src/ext/standard/basic_functions.c:1.957 Mon May 25 14:32:15 2009 +++ php-src/ext/standard/basic_functions.c Sat Jun 6 02:40:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.957 2009/05/25 14:32:15 felipe Exp $ */ +/* $Id: basic_functions.c,v 1.958 2009/06/06 02:40:14 mattwil Exp $ */ #include "php.h" #include "php_streams.h" @@ -6036,7 +6036,7 @@ } if (filename_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename can not be empty!"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filename cannot be empty!"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.105&r2=1.106&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.105 php-src/ext/standard/browscap.c:1.106 --- php-src/ext/standard/browscap.c:1.105 Tue Mar 10 23:39:39 2009 +++ php-src/ext/standard/browscap.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.105 2009/03/10 23:39:39 helly Exp $ */ +/* $Id: browscap.c,v 1.106 2009/06/06 02:40:14 mattwil Exp $ */ #include "php.h" #include "php_browscap.h" @@ -122,7 +122,7 @@ current_section_name != NULL && !strcasecmp(current_section_name, Z_STRVAL_P(arg2)) ) { - zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value can not be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap")); + zend_error(E_CORE_ERROR, "Invalid browscap ini file: 'Parent' value cannot be same as the section name: %s (in file %s)", current_section_name, INI_STR("browscap")); return; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.106&r2=1.107&diff_format=u Index: php-src/ext/standard/head.c diff -u php-src/ext/standard/head.c:1.106 php-src/ext/standard/head.c:1.107 --- php-src/ext/standard/head.c:1.106 Thu Mar 26 20:02:28 2009 +++ php-src/ext/standard/head.c Sat Jun 6 02:40:14 2009 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.106 2009/03/26 20:02:28 felipe Exp $ */ +/* $Id: head.c,v 1.107 2009/06/06 02:40:14 mattwil Exp $ */ #include <stdio.h> #include "php.h" @@ -84,12 +84,12 @@ int result; if (name && strpbrk(name, "=,; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie names can not contain any of the following '=,; \\t\\r\\n\\013\\014'" ); + zend_error( E_WARNING, "Cookie names cannot contain any of the following '=,; \\t\\r\\n\\013\\014'" ); return FAILURE; } if (!url_encode && value && strpbrk(value, ",; \t\r\n\013\014") != NULL) { /* man isspace for \013 and \014 */ - zend_error( E_WARNING, "Cookie values can not contain any of the following ',; \\t\\r\\n\\013\\014'" ); + zend_error( E_WARNING, "Cookie values cannot contain any of the following ',; \\t\\r\\n\\013\\014'" ); return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt diff -u php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.2 php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.3 --- php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt Sat Jun 6 02:40:14 2009 @@ -165,11 +165,11 @@ bool(false) --uppercase NULL-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --lowercase null-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --lowercase true-- @@ -177,7 +177,7 @@ bool(false) --lowercase false-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --uppercase TRUE-- @@ -185,15 +185,15 @@ bool(false) --uppercase FALSE-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --empty string DQ-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --empty string SQ-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --instance of classWithToString-- @@ -207,11 +207,11 @@ bool(false) --undefined var-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) --unset var-- -Error: 2 - parse_ini_file(): Filename can not be empty!, %s(%d) +Error: 2 - parse_ini_file(): Filename cannot be empty!, %s(%d) bool(false) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.88&r2=1.89&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.88 php-src/ext/sysvshm/sysvshm.c:1.89 --- php-src/ext/sysvshm/sysvshm.c:1.88 Thu Mar 19 23:11:54 2009 +++ php-src/ext/sysvshm/sysvshm.c Sat Jun 6 02:40:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.88 2009/03/19 23:11:54 iliaa Exp $ */ +/* $Id: sysvshm.c,v 1.89 2009/06/06 02:40:14 mattwil Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -157,7 +157,7 @@ } if (shm_size < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater then zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Segment size must be greater than zero"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/tests/002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/sysvshm/tests/002.phpt diff -u php-src/ext/sysvshm/tests/002.phpt:1.4 php-src/ext/sysvshm/tests/002.phpt:1.5 --- php-src/ext/sysvshm/tests/002.phpt:1.4 Wed Dec 24 00:04:40 2008 +++ php-src/ext/sysvshm/tests/002.phpt Sat Jun 6 02:40:14 2009 @@ -39,21 +39,21 @@ Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d NULL -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d -Warning: shm_attach(): Segment size must be greater then zero. in %s on line %d +Warning: shm_attach(): Segment size must be greater than zero in %s on line %d bool(false) Warning: shm_remove() expects parameter 1 to be resource, boolean given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.75&r2=1.76&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.75 php-src/ext/xsl/xsltprocessor.c:1.76 --- php-src/ext/xsl/xsltprocessor.c:1.75 Sun May 10 20:00:58 2009 +++ php-src/ext/xsl/xsltprocessor.c Sat Jun 6 02:40:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.75 2009/05/10 20:00:58 davidc Exp $ */ +/* $Id: xsltprocessor.c,v 1.76 2009/06/06 02:40:14 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -344,7 +344,7 @@ } else if (retval->type == IS_BOOL) { valuePush(ctxt, xmlXPathNewBoolean(retval->value.lval)); } else if (retval->type == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object can not be converted to a XPath-string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "A PHP Object cannot be converted to a XPath-string"); valuePush(ctxt, xmlXPathNewString("")); } else { convert_to_string_with_converter(retval, UG(utf8_conv)); http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt011.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/xsl/tests/xslt011.phpt diff -u php-src/ext/xsl/tests/xslt011.phpt:1.11 php-src/ext/xsl/tests/xslt011.phpt:1.12 --- php-src/ext/xsl/tests/xslt011.phpt:1.11 Thu Jun 4 01:14:48 2009 +++ php-src/ext/xsl/tests/xslt011.phpt Sat Jun 6 02:40:14 2009 @@ -49,7 +49,7 @@ --EXPECTF-- Test 11: php:function Support -Warning: XSLTProcessor::transformToXml(): A PHP Object can not be converted to a XPath-string in %s on line 16 +Warning: XSLTProcessor::transformToXml(): A PHP Object cannot be converted to a XPath-string in %s on line 16 <?xml version="1.0"?> foobar - secondArg foobar -