Fixed the common misspelling of the word occurred (occured -> occurred)

This commit is contained in:
Marc Easen 2012-06-11 21:47:40 +01:00 committed by Stanislav Malyshev
parent b8d453d8d4
commit 896ac689c9
34 changed files with 73 additions and 73 deletions

View file

@ -62,17 +62,17 @@ print "\nDone\n";
?> ?>
--EXPECTF-- --EXPECTF--
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 0 in %s on line %d Notice: Uninitialized string offset: 0 in %s on line %d
Notice: Uninitialized string offset: 0 in %s on line %d Notice: Uninitialized string offset: 0 in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: %i in %s on line %d Notice: Uninitialized string offset: %i in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: %i in %s on line %d Notice: Uninitialized string offset: %i in %s on line %d
@ -88,16 +88,16 @@ Notice: Uninitialized string offset: 4 in %s on line %d
Notice: Uninitialized string offset: 4 in %s on line %d Notice: Uninitialized string offset: 4 in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 12 in %s on line %d Notice: Uninitialized string offset: 12 in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: Uninitialized string offset: 12 in %s on line %d Notice: Uninitialized string offset: 12 in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
b b
Done Done

View file

@ -30,10 +30,10 @@ echo "Done\n";
--EXPECTF-- --EXPECTF--
string(1) "i" string(1) "i"
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
string(1) "S" string(1) "S"
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
string(1) "S" string(1) "S"
Warning: Illegal string offset 'run away' in %s on line %d Warning: Illegal string offset 'run away' in %s on line %d
@ -46,10 +46,10 @@ string(1) "o"
Notice: A non well formed numeric value encountered in %s on line %d Notice: A non well formed numeric value encountered in %s on line %d
string(1) "r" string(1) "r"
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
string(1) "i" string(1) "i"
Notice: String offset cast occured in %s on line %d Notice: String offset cast occurred in %s on line %d
string(1) "S" string(1) "S"
Warning: Illegal offset type in %s on line %d Warning: Illegal offset type in %s on line %d

View file

@ -3712,7 +3712,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
} else { } else {
/* Add it to result function table */ /* Add it to result function table */
if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) { if (zend_hash_quick_add(resulting_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, fn, sizeof(zend_function), NULL)==FAILURE) {
zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating resulting trait method table", fn->common.function_name); zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating resulting trait method table", fn->common.function_name);
} }
} }
@ -3829,7 +3829,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
function_add_ref(&fn_copy); function_add_ref(&fn_copy);
if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) { if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) {
zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating class method table", hash_key->arKey); zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occurred during updating class method table", hash_key->arKey);
} }
zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC); zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);

View file

@ -1161,7 +1161,7 @@ convert_to_array:
case IS_DOUBLE: case IS_DOUBLE:
case IS_NULL: case IS_NULL:
case IS_BOOL: case IS_BOOL:
zend_error(E_NOTICE, "String offset cast occured"); zend_error(E_NOTICE, "String offset cast occurred");
break; break;
default: default:
zend_error(E_WARNING, "Illegal offset type"); zend_error(E_WARNING, "Illegal offset type");
@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont
case IS_NULL: case IS_NULL:
case IS_BOOL: case IS_BOOL:
if (type != BP_VAR_IS) { if (type != BP_VAR_IS) {
zend_error(E_NOTICE, "String offset cast occured"); zend_error(E_NOTICE, "String offset cast occurred");
} }
break; break;
default: default:

View file

@ -216,7 +216,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
if (Z_TYPE(handler) == IS_STRING) { if (Z_TYPE(handler) == IS_STRING) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
} }
/* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */ /* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */
} else if (retval == NULL) { } else if (retval == NULL) {
} else { } else {
if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) { if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {

View file

@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
--FILE-- --FILE--
<?php <?php
/* Prototype : array imap_errors ( void ) /* Prototype : array imap_errors ( void )
* Description: Returns all of the IMAP errors that have occured. * Description: Returns all of the IMAP errors that have occurred.
* Source code: ext/imap/php_imap.c * Source code: ext/imap/php_imap.c
*/ */

View file

@ -24,7 +24,7 @@
#include "common_error.h" #include "common_error.h"
/* {{{ proto int intl_get_error_code() /* {{{ proto int intl_get_error_code()
* Get code of the last occured error. * Get code of the last occurred error.
*/ */
PHP_FUNCTION( intl_get_error_code ) PHP_FUNCTION( intl_get_error_code )
{ {
@ -33,7 +33,7 @@ PHP_FUNCTION( intl_get_error_code )
/* }}} */ /* }}} */
/* {{{ proto string intl_get_error_message() /* {{{ proto string intl_get_error_message()
* Get text description of the last occured error. * Get text description of the last occurred error.
*/ */
PHP_FUNCTION( intl_get_error_message ) PHP_FUNCTION( intl_get_error_message )
{ {

View file

@ -116,7 +116,7 @@ class Collator {
/** /**
* Return error text for the last ICU operation. * Return error text for the last ICU operation.
* *
* @return string Description of an error occured in the last * @return string Description of an error occurred in the last
* Collator method call. * Collator method call.
*/ */
public function getErrorMessage() {} public function getErrorMessage() {}
@ -236,7 +236,7 @@ class Collator {
* *
* @return string Real locale name from which the * @return string Real locale name from which the
* collation data comes. If the collator * collation data comes. If the collator
* was instantiated from rules or an error occured, * was instantiated from rules or an error occurred,
* returns false. * returns false.
*/ */
public function getLocale( $type ) {} public function getLocale( $type ) {}
@ -331,7 +331,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {}
* *
* @return string Real locale name from which the * @return string Real locale name from which the
* collation data comes. If the collator * collation data comes. If the collator
* was instantiated from rules or an error occured, * was instantiated from rules or an error occurred,
* returns false. * returns false.
*/ */
function collator_get_locale( $coll, $type ) {} function collator_get_locale( $coll, $type ) {}
@ -391,7 +391,7 @@ function collator_get_error_code( $coll ) {}
* *
* @param Collator $coll Collator object. * @param Collator $coll Collator object.
* *
* @return string Description of an error occured in the last * @return string Description of an error occurred in the last
* Collator API function call. * Collator API function call.
*/ */
function collator_get_error_message( $coll ) {} function collator_get_error_message( $coll ) {}

View file

@ -1,7 +1,7 @@
<?php <?php
/** /**
* Handling of errors occured in static methods * Handling of errors occurred in static methods
* when there's no object to get error code/message from. * when there's no object to get error code/message from.
* *
* Example #1: * Example #1:
@ -29,7 +29,7 @@ function intl_get_error_code() {}
/** /**
* Get description of the last error. * Get description of the last error.
* *
* @return string Description of an error occured in the last * @return string Description of an error occurred in the last
* API function call. * API function call.
*/ */
function intl_get_error_message() {} function intl_get_error_message() {}

View file

@ -215,7 +215,7 @@ class DateFormatter {
/** /**
* Sets the pattern to use * Sets the pattern to use
* @param string $pattern new pattern string to use * @param string $pattern new pattern string to use
* @return boolean 'true' if successful, 'false' if an error occured. Bad format * @return boolean 'true' if successful, 'false' if an error occurred. Bad format
* strings are usually the cause of the latter. * strings are usually the cause of the latter.
*/ */
public function setPattern($pattern) {} public function setPattern($pattern) {}
@ -410,7 +410,7 @@ class DateFormatter {
* Sets the pattern to use * Sets the pattern to use
* @param DateFormatter $fmt The date formatter resource * @param DateFormatter $fmt The date formatter resource
* @param string $pattern new pattern string to use * @param string $pattern new pattern string to use
* @return boolean 'true' if successful, 'false' if an error occured. Bad format * @return boolean 'true' if successful, 'false' if an error occurred. Bad format
* strings are usually the cause of the latter. * strings are usually the cause of the latter.
*/ */
function datefmt_set_pattern($fmt , $pattern) {} function datefmt_set_pattern($fmt , $pattern) {}

View file

@ -317,7 +317,7 @@ class NumberFormatter {
/** /**
* Get the error text from the last operation. * Get the error text from the last operation.
* *
* @return string Description of the last occured error. * @return string Description of the last occurred error.
*/ */
public public function getErrorMessage() {} public public function getErrorMessage() {}
@ -495,6 +495,6 @@ function numfmt_get_error_code($formatter) {}
* Get the error text from the last operation. * Get the error text from the last operation.
* *
* @param NumberFormatter $formatter The formatter resource * @param NumberFormatter $formatter The formatter resource
* @return string Description of the last occured error. * @return string Description of the last occurred error.
*/ */
function numfmt_get_error_message($formatter) {} function numfmt_get_error_message($formatter) {}

View file

@ -54,7 +54,7 @@ class MessageFormatter {
* @param string $locale the locale to use when formatting numbers and dates and suchlike * @param string $locale the locale to use when formatting numbers and dates and suchlike
* @param string $pattern the pattern string to insert things into * @param string $pattern the pattern string to insert things into
* @param array $args the array of values to insert into $pattern * @param array $args the array of values to insert into $pattern
* @return string the formatted pattern string or false if an error occured * @return string the formatted pattern string or false if an error occurred
*/ */
public static function formatMessage($locale, $pattern, $args) {} public static function formatMessage($locale, $pattern, $args) {}
@ -148,7 +148,7 @@ class MessageFormatter {
* @param string $locale the locale to use when formatting numbers and dates and suchlike * @param string $locale the locale to use when formatting numbers and dates and suchlike
* @param string $pattern the pattern string to insert things into * @param string $pattern the pattern string to insert things into
* @param array $args the array of values to insert into $pattern * @param array $args the array of values to insert into $pattern
* @return string the formatted pattern string or false if an error occured * @return string the formatted pattern string or false if an error occurred
*/ */
function msgfmt_format_message($locale, $pattern, $args) {} function msgfmt_format_message($locale, $pattern, $args) {}

View file

@ -67,7 +67,7 @@ void intl_convert_utf8_to_utf16(
return; return;
} }
/* Bail out if an unexpected error occured. /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough). * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty). * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/ */
@ -119,7 +119,7 @@ void intl_convert_utf16_to_utf8(
*status = U_ZERO_ERROR; *status = U_ZERO_ERROR;
u_strToUTF8( NULL, 0, &dst_len, src, src_len, status ); u_strToUTF8( NULL, 0, &dst_len, src, src_len, status );
/* Bail out if an unexpected error occured. /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough). * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty). * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/ */

View file

@ -110,7 +110,7 @@ PHP_FUNCTION( normalizer_normalize )
/* normalize */ /* normalize */
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status); size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
/* Bail out if an unexpected error occured. /* Bail out if an unexpected error occurred.
* (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough). * (U_BUFFER_OVERFLOW_ERROR means that *target buffer is not large enough).
* (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty). * (U_STRING_NOT_TERMINATED_WARNING usually means that the input string is empty).
*/ */
@ -133,7 +133,7 @@ PHP_FUNCTION( normalizer_normalize )
/* try normalize again */ /* try normalize again */
size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status); size_needed = unorm_normalize( uinput, uinput_len, form, (int32_t) 0 /* options */, uret_buf, uret_len, &status);
/* Bail out if an unexpected error occured. */ /* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) { if( U_FAILURE(status) ) {
/* Set error messages. */ /* Set error messages. */
intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC ); intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
@ -234,7 +234,7 @@ PHP_FUNCTION( normalizer_is_normalized )
efree( uinput ); efree( uinput );
/* Bail out if an unexpected error occured. */ /* Bail out if an unexpected error occurred. */
if( U_FAILURE(status) ) { if( U_FAILURE(status) ) {
/* Set error messages. */ /* Set error messages. */
intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC ); intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );

View file

@ -19,7 +19,7 @@ function ut_main()
if( $num === false ) if( $num === false )
return $fmt->getErrorMessage() . " (" . $fmt->getErrorCode() . ")\n"; return $fmt->getErrorMessage() . " (" . $fmt->getErrorCode() . ")\n";
else else
return "Ooops, an error should have occured."; return "Ooops, an error should have occurred.";
} }
include_once( 'ut_common.inc' ); include_once( 'ut_common.inc' );

View file

@ -162,7 +162,7 @@ void php_clear_stmt_bind(MY_STMT *stmt TSRMLS_DC)
{ {
if (stmt->stmt) { if (stmt->stmt) {
if (mysqli_stmt_close(stmt->stmt, TRUE)) { if (mysqli_stmt_close(stmt->stmt, TRUE)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occured while closing statement"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error occurred while closing statement");
return; return;
} }
} }

View file

@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc');
// NOTE: the error message varies with the MySQL Server version, dump only the error code! // NOTE: the error message varies with the MySQL Server version, dump only the error code!
printf("[009] [%d] (error message varies with the MySQL Server version, check the error code)\n", mysqli_stmt_errno($stmt)); printf("[009] [%d] (error message varies with the MySQL Server version, check the error code)\n", mysqli_stmt_errno($stmt));
/* an error occured: affected rows should return -1 */ /* an error occurred: affected rows should return -1 */
if (-1 !== ($tmp = mysqli_stmt_affected_rows($stmt))) if (-1 !== ($tmp = mysqli_stmt_affected_rows($stmt)))
printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp); printf("[010] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);

View file

@ -188,7 +188,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
char tmp_buf[sizeof(conn->error_info->error)]; char tmp_buf[sizeof(conn->error_info->error)];
int tmp_error_no; int tmp_error_no;
*is_warning = TRUE; *is_warning = TRUE;
/* error occured */ /* error occurred */
tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC); tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC);
SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf); SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf);
/* write empty packet to server */ /* write empty packet to server */
@ -211,7 +211,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen
goto infile_error; goto infile_error;
} }
/* error during read occured */ /* error during read occurred */
if (bufsize < 0) { if (bufsize < 0) {
char tmp_buf[sizeof(conn->error_info->error)]; char tmp_buf[sizeof(conn->error_info->error)];
int tmp_error_no; int tmp_error_no;

View file

@ -816,7 +816,7 @@ PHP_FUNCTION(pcntl_exec)
if (execve(path, argv, envp) == -1) { if (execve(path, argv, envp) == -1) {
PCNTL_G(last_error) = errno; PCNTL_G(last_error) = errno;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
} }
/* Cleanup */ /* Cleanup */
@ -826,7 +826,7 @@ PHP_FUNCTION(pcntl_exec)
if (execv(path, argv) == -1) { if (execv(path, argv) == -1) {
PCNTL_G(last_error) = errno; PCNTL_G(last_error) = errno;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno));
} }
} }
@ -1127,7 +1127,7 @@ PHP_FUNCTION(pcntl_getpriority)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno);
break; break;
default: default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
break; break;
} }
RETURN_FALSE; RETURN_FALSE;
@ -1167,7 +1167,7 @@ PHP_FUNCTION(pcntl_setpriority)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno);
break; break;
default: default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno);
break; break;
} }
RETURN_FALSE; RETURN_FALSE;

View file

@ -13,5 +13,5 @@ unlink($file);
Warning: pcntl_exec() expects at least 1 parameter, 0 given %s Warning: pcntl_exec() expects at least 1 parameter, 0 given %s
NULL NULL
Warning: pcntl_exec(): Error has occured: (errno %d) %s Warning: pcntl_exec(): Error has occurred: (errno %d) %s
bool(false) bool(false)

View file

@ -134,7 +134,7 @@ static int pdo_mysql_fill_stmt_from_result(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
row_count = mysql_affected_rows(H->server); row_count = mysql_affected_rows(H->server);
if (row_count == (my_ulonglong)-1) { if (row_count == (my_ulonglong)-1) {
/* we either have a query that returned a result set or an error occured /* we either have a query that returned a result set or an error occurred
lets see if we have access to a result set */ lets see if we have access to a result set */
if (!H->buffered) { if (!H->buffered) {
S->result = mysql_use_result(H->server); S->result = mysql_use_result(H->server);

View file

@ -10,7 +10,7 @@ $sxe = simplexml_load_string('<root><node1>1</node1></root>');
$nodes = $sxe->xpath("/root/node2/@test"); $nodes = $sxe->xpath("/root/node2/@test");
if (! is_array($nodes)) { if (! is_array($nodes)) {
echo "An error occured\n"; echo "An error occurred\n";
} else { } else {
echo "Result Count: " . count($nodes) . "\n"; echo "Result Count: " . count($nodes) . "\n";
} }

View file

@ -25,7 +25,7 @@ if (!extension_loaded('sockets')) {
$len = strlen($msg); $len = strlen($msg);
$bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223); $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
if ($bytes_sent == -1) { if ($bytes_sent == -1) {
die('An error occured while sending to the socket'); die('An error occurred while sending to the socket');
} else if ($bytes_sent != $len) { } else if ($bytes_sent != $len) {
die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected'); die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
} }
@ -36,7 +36,7 @@ if (!extension_loaded('sockets')) {
socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
$bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port); $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
if ($bytes_received == -1) { if ($bytes_received == -1) {
die('An error occured while receiving from the socket'); die('An error occurred while receiving from the socket');
} else if ($bytes_received != $len) { } else if ($bytes_received != $len) {
die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected'); die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
} }

View file

@ -26,7 +26,7 @@ require 'ipv6_skipif.inc';
$len = strlen($msg); $len = strlen($msg);
$bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223); $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
if ($bytes_sent == -1) { if ($bytes_sent == -1) {
die('An error occured while sending to the socket'); die('An error occurred while sending to the socket');
} else if ($bytes_sent != $len) { } else if ($bytes_sent != $len) {
die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected'); die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
} }
@ -37,7 +37,7 @@ require 'ipv6_skipif.inc';
socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
$bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port); $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
if ($bytes_received == -1) { if ($bytes_received == -1) {
die('An error occured while receiving from the socket'); die('An error occurred while receiving from the socket');
} else if ($bytes_received != $len) { } else if ($bytes_received != $len) {
die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected'); die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
} }

View file

@ -30,7 +30,7 @@ if (!extension_loaded('sockets')) {
$bytes_sent = socket_sendto($socket, $msg, $len, 0, $address); $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address);
if ($bytes_sent == -1) { if ($bytes_sent == -1) {
@unlink($address); @unlink($address);
die('An error occured while sending to the socket'); die('An error occurred while sending to the socket');
} else if ($bytes_sent != $len) { } else if ($bytes_sent != $len) {
@unlink($address); @unlink($address);
die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected'); die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
@ -41,7 +41,7 @@ if (!extension_loaded('sockets')) {
$bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from); $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from);
if ($bytes_received == -1) { if ($bytes_received == -1) {
@unlink($address); @unlink($address);
die('An error occured while receiving from the socket'); die('An error occurred while receiving from the socket');
} else if ($bytes_received != $len) { } else if ($bytes_received != $len) {
@unlink($address); @unlink($address);
die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected'); die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');

View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Bug #52238 - Crash when an Exception occured in iterator_to_array Bug #52238 - Crash when an Exception occurred in iterator_to_array
--FILE-- --FILE--
<?php <?php
class Foo implements IteratorAggregate class Foo implements IteratorAggregate

View file

@ -23307,7 +23307,7 @@ static int os2OpenSharedMemory( os2File *fd, int szRegion ) {
sqlite3_mutex_leave(pNode->mutex); sqlite3_mutex_leave(pNode->mutex);
} else { } else {
/* Error occured. Free our link object. */ /* Error occurred. Free our link object. */
sqlite3_free(pLink); sqlite3_free(pLink);
} }
@ -28994,7 +28994,7 @@ static int fillInUnixFile(
unixEnterMutex(); unixEnterMutex();
rc = findInodeInfo(pNew, &pNew->pInode); rc = findInodeInfo(pNew, &pNew->pInode);
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
/* If an error occured in findInodeInfo(), close the file descriptor /* If an error occurred in findInodeInfo(), close the file descriptor
** immediately, before releasing the mutex. findInodeInfo() may fail ** immediately, before releasing the mutex. findInodeInfo() may fail
** in two scenarios: ** in two scenarios:
** **
@ -32173,7 +32173,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
** containing the lower 32-bits of the new file-offset. Or, if it fails, ** containing the lower 32-bits of the new file-offset. Or, if it fails,
** it returns INVALID_SET_FILE_POINTER. However according to MSDN, ** it returns INVALID_SET_FILE_POINTER. However according to MSDN,
** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine ** INVALID_SET_FILE_POINTER may also be a valid new offset. So to determine
** whether an error has actually occured, it is also necessary to call ** whether an error has actually occurred, it is also necessary to call
** GetLastError(). ** GetLastError().
*/ */
dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN); dwRet = SetFilePointer(pFile->h, lowerBits, &upperBits, FILE_BEGIN);
@ -32273,7 +32273,7 @@ static int winWrite(
int amt, /* Number of bytes to write */ int amt, /* Number of bytes to write */
sqlite3_int64 offset /* Offset into the file to begin writing at */ sqlite3_int64 offset /* Offset into the file to begin writing at */
){ ){
int rc; /* True if error has occured, else false */ int rc; /* True if error has occurred, else false */
winFile *pFile = (winFile*)id; /* File handle */ winFile *pFile = (winFile*)id; /* File handle */
assert( amt>0 ); assert( amt>0 );
@ -37068,7 +37068,7 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
** * A write transaction is active. ** * A write transaction is active.
** * An EXCLUSIVE or greater lock is held on the database file. ** * An EXCLUSIVE or greater lock is held on the database file.
** * All writing and syncing of journal and database data has finished. ** * All writing and syncing of journal and database data has finished.
** If no error occured, all that remains is to finalize the journal to ** If no error occurred, all that remains is to finalize the journal to
** commit the transaction. If an error did occur, the caller will need ** commit the transaction. If an error did occur, the caller will need
** to rollback the transaction. ** to rollback the transaction.
** **
@ -54279,7 +54279,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
insertCell(pPage, idx, newCell, szNew, 0, 0, &rc); insertCell(pPage, idx, newCell, szNew, 0, 0, &rc);
assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 ); assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 );
/* If no error has occured and pPage has an overflow cell, call balance() /* If no error has occurred and pPage has an overflow cell, call balance()
** to redistribute the cells within the tree. Since balance() may move ** to redistribute the cells within the tree. Since balance() may move
** the cursor, zero the BtCursor.info.nSize and BtCursor.validNKey ** the cursor, zero the BtCursor.info.nSize and BtCursor.validNKey
** variables. ** variables.
@ -57935,7 +57935,7 @@ SQLITE_PRIVATE int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){
} }
sqlite3DbFree(v->db, sIter.apSub); sqlite3DbFree(v->db, sIter.apSub);
/* Return true if hasAbort==mayAbort. Or if a malloc failure occured. /* Return true if hasAbort==mayAbort. Or if a malloc failure occurred.
** If malloc failed, then the while() loop above may not have iterated ** If malloc failed, then the while() loop above may not have iterated
** through all opcodes and hasAbort may be set incorrectly. Return ** through all opcodes and hasAbort may be set incorrectly. Return
** true for this case to prevent the assert() in the callers frame ** true for this case to prevent the assert() in the callers frame
@ -59562,7 +59562,7 @@ SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
/* If p->iStatement is greater than zero, then this Vdbe opened a /* If p->iStatement is greater than zero, then this Vdbe opened a
** statement transaction that should be closed here. The only exception ** statement transaction that should be closed here. The only exception
** is that an IO error may have occured, causing an emergency rollback. ** is that an IO error may have occurred, causing an emergency rollback.
** In this case (db->nStatement==0), and there is nothing to do. ** In this case (db->nStatement==0), and there is nothing to do.
*/ */
if( db->nStatement && p->iStatement ){ if( db->nStatement && p->iStatement ){
@ -59697,7 +59697,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
** **
** Even if the statement is read-only, it is important to perform ** Even if the statement is read-only, it is important to perform
** a statement or transaction rollback operation. If the error ** a statement or transaction rollback operation. If the error
** occured while writing to the journal, sub-journal or database ** occurred while writing to the journal, sub-journal or database
** file as part of an effort to free up cache space (see function ** file as part of an effort to free up cache space (see function
** pagerStress() in pager.c), the rollback is required to restore ** pagerStress() in pager.c), the rollback is required to restore
** the pager to a consistent state. ** the pager to a consistent state.
@ -61245,7 +61245,7 @@ end_of_step:
assert( p->rc!=SQLITE_ROW && p->rc!=SQLITE_DONE ); assert( p->rc!=SQLITE_ROW && p->rc!=SQLITE_DONE );
if( p->isPrepareV2 && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){ if( p->isPrepareV2 && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
/* If this statement was prepared using sqlite3_prepare_v2(), and an /* If this statement was prepared using sqlite3_prepare_v2(), and an
** error has occured, then return the error code in p->rc to the ** error has occurred, then return the error code in p->rc to the
** caller. Set the error code in the database handle to the same value. ** caller. Set the error code in the database handle to the same value.
*/ */
rc = db->errCode = p->rc; rc = db->errCode = p->rc;
@ -113286,7 +113286,7 @@ static int fts3CursorSeek(sqlite3_context *pContext, Fts3Cursor *pCsr){
}else{ }else{
int rc = sqlite3_reset(pCsr->pStmt); int rc = sqlite3_reset(pCsr->pStmt);
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
/* If no row was found and no error has occured, then the %_content /* If no row was found and no error has occurred, then the %_content
** table is missing a row that is present in the full-text index. ** table is missing a row that is present in the full-text index.
** The data structures are corrupt. ** The data structures are corrupt.
*/ */

View file

@ -1097,7 +1097,7 @@ static int php_sqlite3_stream_close(php_stream *stream, int close_handle TSRMLS_
php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *) stream->abstract; php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *) stream->abstract;
if (sqlite3_blob_close(sqlite3_stream->blob) != SQLITE_OK) { if (sqlite3_blob_close(sqlite3_stream->blob) != SQLITE_OK) {
/* Error occured, but it still closed */ /* Error occurred, but it still closed */
} }
efree(sqlite3_stream); efree(sqlite3_stream);

View file

@ -3833,7 +3833,7 @@ PHP_NAMED_FUNCTION(php_inet_ntop)
} }
if (!inet_ntop(af, address, buffer, sizeof(buffer))) { if (!inet_ntop(af, address, buffer, sizeof(buffer))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occured"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occurred");
RETURN_FALSE; RETURN_FALSE;
} }

View file

@ -20,7 +20,7 @@ for($mask = 0000; $mask <= 0777; $mask++) {
var_dump( umask() ); var_dump( umask() );
echo "\n"; echo "\n";
if ($mask != umask()) { if ($mask != umask()) {
die('An error occured while changing back the umask'); die('An error occurred while changing back the umask');
} }
} }

View file

@ -26,7 +26,7 @@
if(tidy_warning_count() || if(tidy_warning_count() ||
tidy_error_count()) { tidy_error_count()) {
echo "\n\nThe following errors or warnings occured:\n"; echo "\n\nThe following errors or warnings occurred:\n";
echo tidy_get_error_buffer(); echo tidy_get_error_buffer();
echo "\n"; echo "\n";
} }

View file

@ -25,7 +25,7 @@
if(!empty($tidy->errorBuffer)) { if(!empty($tidy->errorBuffer)) {
echo "\n\nThe following errors or warnings occured:\n"; echo "\n\nThe following errors or warnings occurred:\n";
echo "{$tidy->errorBuffer}\n"; echo "{$tidy->errorBuffer}\n";
} }

View file

@ -1238,7 +1238,7 @@ static PHP_FUNCTION(tidy_parse_string)
/* }}} */ /* }}} */
/* {{{ proto string tidy_get_error_buffer() /* {{{ proto string tidy_get_error_buffer()
Return warnings and errors which occured parsing the specified document*/ Return warnings and errors which occurred parsing the specified document*/
static PHP_FUNCTION(tidy_get_error_buffer) static PHP_FUNCTION(tidy_get_error_buffer)
{ {
TIDY_FETCH_OBJECT; TIDY_FETCH_OBJECT;

View file

@ -336,7 +336,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler));
valuePush(ctxt, xmlXPathNewString("")); valuePush(ctxt, xmlXPathNewString(""));
} }
/* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */ /* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */
} else if (retval == NULL) { } else if (retval == NULL) {
} else { } else {
if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) { if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) {