mattwil Sat Jun 6 02:40:49 2009 UTC Modified files: (Branch: PHP_5_3) /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: MFH: 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.26.2.1.2.1.2.12&r2=1.26.2.1.2.1.2.13&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.12 php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.13 --- php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.12 Wed Dec 31 11:15:36 2008 +++ php-src/ext/dom/xpath.c Sat Jun 6 02:40:48 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.26.2.1.2.1.2.12 2008/12/31 11:15:36 sebastian Exp $ */ +/* $Id: xpath.c,v 1.26.2.1.2.1.2.13 2009/06/06 02:40:48 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_ex(&retval); http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.48&r2=1.208.2.7.2.26.2.49&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.48 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.49 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.48 Tue May 5 01:44:22 2009 +++ php-src/ext/imap/php_imap.c Sat Jun 6 02:40:48 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <z...@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.48 2009/05/05 01:44:22 jani Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.49 2009/06/06 02:40:48 mattwil Exp $ */ #define IMAP41 @@ -3717,7 +3717,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.91.2.3.2.11.2.17&r2=1.91.2.3.2.11.2.18&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.17 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.18 --- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.17 Tue May 19 17:47:06 2009 +++ php-src/ext/mcrypt/mcrypt.c Sat Jun 6 02:40:48 2009 @@ -16,7 +16,7 @@ | Derick Rethans <der...@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.17 2009/05/19 17:47:06 kalle Exp $ */ +/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.18 2009/06/06 02:40:48 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1373,7 +1373,7 @@ } 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_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.2.2.8&r2=1.13.2.2.2.2.2.9&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.8 php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.9 --- php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.8 Wed Dec 31 11:15:39 2008 +++ php-src/ext/odbc/birdstep.c Sat Jun 6 02:40:48 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.13.2.2.2.2.2.8 2008/12/31 11:15:39 sebastian Exp $ */ +/* $Id: birdstep.c,v 1.13.2.2.2.2.2.9 2009/06/06 02:40:48 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.70.2.3.2.16.2.14&r2=1.70.2.3.2.16.2.15&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16.2.14 php-src/ext/posix/posix.c:1.70.2.3.2.16.2.15 --- php-src/ext/posix/posix.c:1.70.2.3.2.16.2.14 Wed Dec 31 11:15:42 2008 +++ php-src/ext/posix/posix.c Sat Jun 6 02:40:48 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.70.2.3.2.16.2.14 2008/12/31 11:15:42 sebastian Exp $ */ +/* $Id: posix.c,v 1.70.2.3.2.16.2.15 2009/06/06 02:40:48 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.70.2.3.2.16.2.14 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.15 $"); php_info_print_table_end(); } /* }}} */ @@ -892,7 +892,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.31.2.2.2.5.2.8&r2=1.31.2.2.2.5.2.9&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.8 php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.9 --- php-src/ext/shmop/shmop.c:1.31.2.2.2.5.2.8 Wed Dec 31 11:15:42 2008 +++ php-src/ext/shmop/shmop.c Sat Jun 6 02:40:48 2009 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <i...@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2.2.5.2.8 2008/12/31 11:15:42 sebastian Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.5.2.9 2009/06/06 02:40:48 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -203,7 +203,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.725.2.31.2.64.2.89&r2=1.725.2.31.2.64.2.90&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.89 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.90 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.89 Tue Apr 28 22:26:59 2009 +++ php-src/ext/standard/basic_functions.c Sat Jun 6 02:40:48 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.89 2009/04/28 22:26:59 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.90 2009/06/06 02:40:48 mattwil Exp $ */ #include "php.h" #include "php_streams.h" @@ -5917,7 +5917,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.85.2.2.2.3.2.11&r2=1.85.2.2.2.3.2.12&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.11 php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.12 --- php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.11 Wed Dec 31 11:15:44 2008 +++ php-src/ext/standard/browscap.c Sat Jun 6 02:40:48 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.85.2.2.2.3.2.11 2008/12/31 11:15:44 sebastian Exp $ */ +/* $Id: browscap.c,v 1.85.2.2.2.3.2.12 2009/06/06 02:40:48 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.84.2.1.2.7.2.7&r2=1.84.2.1.2.7.2.8&diff_format=u Index: php-src/ext/standard/head.c diff -u php-src/ext/standard/head.c:1.84.2.1.2.7.2.7 php-src/ext/standard/head.c:1.84.2.1.2.7.2.8 --- php-src/ext/standard/head.c:1.84.2.1.2.7.2.7 Wed Dec 31 11:15:45 2008 +++ php-src/ext/standard/head.c Sat Jun 6 02:40:48 2009 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf <ras...@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.84.2.1.2.7.2.7 2008/12/31 11:15:45 sebastian Exp $ */ +/* $Id: head.c,v 1.84.2.1.2.7.2.8 2009/06/06 02:40:48 mattwil Exp $ */ #include <stdio.h> #include "php.h" @@ -83,12 +83,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.1.4.2&r2=1.1.4.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.1.4.2 php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.1.4.3 --- php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt:1.1.4.2 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/parse_ini_file_variation4.phpt Sat Jun 6 02:40:48 2009 @@ -161,11 +161,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-- @@ -173,7 +173,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-- @@ -181,15 +181,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-- @@ -201,11 +201,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.70.2.2.2.5.2.12&r2=1.70.2.2.2.5.2.13&diff_format=u Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.12 php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.13 --- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.12 Thu Mar 19 23:11:32 2009 +++ php-src/ext/sysvshm/sysvshm.c Sat Jun 6 02:40:49 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.12 2009/03/19 23:11:32 iliaa Exp $ */ +/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.13 2009/06/06 02:40:49 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.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u Index: php-src/ext/sysvshm/tests/002.phpt diff -u php-src/ext/sysvshm/tests/002.phpt:1.1.2.3.2.2 php-src/ext/sysvshm/tests/002.phpt:1.1.2.3.2.3 --- php-src/ext/sysvshm/tests/002.phpt:1.1.2.3.2.2 Wed Dec 24 00:23:18 2008 +++ php-src/ext/sysvshm/tests/002.phpt Sat Jun 6 02:40:49 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.39.2.2.2.9.2.18&r2=1.39.2.2.2.9.2.19&diff_format=u Index: php-src/ext/xsl/xsltprocessor.c diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.18 php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.19 --- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.18 Sat May 23 14:26:47 2009 +++ php-src/ext/xsl/xsltprocessor.c Sat Jun 6 02:40:49 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.18 2009/05/23 14:26:47 felipe Exp $ */ +/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.19 2009/06/06 02:40:49 mattwil Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -343,7 +343,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_ex(&retval); http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt011.phpt?r1=1.9.8.1&r2=1.9.8.2&diff_format=u Index: php-src/ext/xsl/tests/xslt011.phpt diff -u php-src/ext/xsl/tests/xslt011.phpt:1.9.8.1 php-src/ext/xsl/tests/xslt011.phpt:1.9.8.2 --- php-src/ext/xsl/tests/xslt011.phpt:1.9.8.1 Thu Jun 4 01:15:12 2009 +++ php-src/ext/xsl/tests/xslt011.phpt Sat Jun 6 02:40:49 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 -
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php