mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed error message grammar:

Browse Source 
- "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
This commit is contained in:
Matt Wilmas 2009-06-06 02:40:49 +00:00
parent cb7a21a42b
commit 1fa3b21c15
14 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/dom/xpath.c
View File

@ -232,7 +232,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
} 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);

2
ext/imap/php_imap.c
View File

@ -3717,7 +3717,7 @@ PHP_FUNCTION(imap_mail_compose)
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;
}

2
ext/mcrypt/mcrypt.c
View File

@ -1373,7 +1373,7 @@ PHP_FUNCTION(mcrypt_create_iv)
}
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;
}

2
ext/odbc/birdstep.c
View File

@ -369,7 +369,7 @@ PHP_FUNCTION(birdstep_exec)
}
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;

2
ext/posix/posix.c
View File

@ -892,7 +892,7 @@ PHP_FUNCTION(posix_mknod)
#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
}
}

2
ext/shmop/shmop.c
View File

@ -203,7 +203,7 @@ PHP_FUNCTION(shmop_open)
}
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;
}

2
ext/standard/basic_functions.c
View File

@ -5917,7 +5917,7 @@ PHP_FUNCTION(parse_ini_file)
}
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;
}

2
ext/standard/browscap.c
View File

@ -122,7 +122,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
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;
}

4
ext/standard/head.c
View File

@ -83,12 +83,12 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
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;
}

16
ext/standard/tests/file/parse_ini_file_variation4.phpt
View File

@ -161,11 +161,11 @@ Error: 2 - parse_ini_file() expects parameter 1 to be string, array given, %s(%d
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 @@ Error: 2 - parse_ini_file(1): failed to open stream: No such file or directory,
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 @@ Error: 2 - parse_ini_file(1): failed to open stream: No such file or directory,
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 @@ Error: 2 - parse_ini_file() expects parameter 1 to be string, object given, %s(%
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===

2
ext/sysvshm/sysvshm.c
View File

@ -157,7 +157,7 @@ PHP_FUNCTION(shm_attach)
}
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;
}

10
ext/sysvshm/tests/002.phpt
View File

@ -39,21 +39,21 @@ NULL
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

2
ext/xsl/tests/xslt011.phpt
View File

@ -49,7 +49,7 @@ $dom = new domDocument();
--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 -

2
ext/xsl/xsltprocessor.c
View File

@ -343,7 +343,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
} 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);