com php-src: typofixes: acinclude.m4 ext/ereg/tests/eregi_bas ic.phpt ext/json/json.c ext/mysqlnd/mysqlnd_result. c ext/pcre/pcrelib/ChangeLog
ext/soap/interop/client_roun d2_interop.php ext/spl/php_spl.c ext/standard/tes ts/strings/dirname_basic.phpt ext/standard/url.c scri
pts/dev/find_tested.php server-tests-config.php win 32/build/confutils.js win32/sendmail.h

Commit: 3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 Author: Veres Lajos <vlajos@gmail.com> Tue, 12 Aug 2014 22:00:23 +0100 Committer: Lior Kaplan <kaplanlior@gmail.com> Sun, 17 Aug 2014 15:44:02 +0300 Parents: 0407bdf252004cce08e383bc0f4aa0bbc69c9a25 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 Log: typofixes Changed paths: M acinclude.m4 M ext/ereg/tests/eregi_basic.phpt M ext/json/json.c M ext/mysqlnd/mysqlnd_result.c M ext/pcre/pcrelib/ChangeLog M ext/soap/interop/client_round2_interop.php M ext/spl/php_spl.c M ext/standard/tests/strings/dirname_basic..phpt M ext/standard/url.c M scripts/dev/find_tested.php M server-tests-config.php M win32/build/confutils.js M win32/sendmail.h Diff: diff --git a/acinclude.m4 b/acinclude.m4 index 25f3655..4fd452e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2800,7 +2800,7 @@ AC_DEFUN([PHP_DETECT_ICC], dnl PHP_DETECT_SUNCC dnl Detect if the systems default compiler is suncc. -dnl We also set some usefull CFLAGS if the user didn't set any +dnl We also set some useful CFLAGS if the user didn't set any AC_DEFUN([PHP_DETECT_SUNCC],[ SUNCC="no" AC_MSG_CHECKING([for suncc]) diff --git a/ext/ereg/tests/eregi_basic.phpt b/ext/ereg/tests/eregi_basic.phpt index 14b4b7d..cbcfdb6 100644 --- a/ext/ereg/tests/eregi_basic.phpt +++ b/ext/ereg/tests/eregi_basic..phpt @@ -9,7 +9,7 @@ Test eregi() function : basic functionality - confirm case insensitivity */ /* - * Test basic funtionality of eregi() + * Test basic functionality of eregi() */ echo "*** Testing eregi() : basic functionality ***\n"; diff --git a/ext/json/json.c b/ext/json/json.c index b3240e1..87de49c 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -368,7 +368,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{ } } } else { - /* Only check if utf8 string is valid, and compute utf16 lenght */ + /* Only check if utf8 string is valid, and compute utf16 length */ for (j=0 ; pos < len ; j++) { us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status); if (status != SUCCESS) { diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 0814926..bb4dc09 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1182,7 +1182,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c No need to FREE_ALLOCA as we can reuse the 'lengths' and 'fields' arrays. For lengths its absolutely safe.. 'fields' is reused because the ownership of the strings has been - transfered above. + transferred above. */ } /* Overflow ? */ diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog index ed164fe..e5c6bc8 100644 --- a/ext/pcre/pcrelib/ChangeLog +++ b/ext/pcre/pcrelib/ChangeLog @@ -4935,7 +4935,7 @@ by an auxiliary program - but can then be edited by hand if required. There are now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or toupper() in the code. -7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and +7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and make them global. Abolish the function for setting them, as the caller can now set them directly. diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php index b8ee893..fd5767c 100644 --- a/ext/soap/interop/client_round2_interop.php +++ b/ext/soap/interop/client_round2_interop.php @@ -373,7 +373,7 @@ class Interop_Client } $soap =& $endpoint_info['client']; - # XXX how do we determine a failure on retreiving/parsing wsdl? + # XXX how do we determine a failure on retrieving/parsing wsdl? if ($soap->wsdl->fault) { $fault = $soap->wsdl->fault; $soap_test->setResult(0,'WSDL', diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index a37a453..473ab00 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -326,7 +326,7 @@ PHP_FUNCTION(spl_autoload) RETURN_FALSE; } - if (file_exts == NULL) { /* autoload_extensions is not intialzed, set to defaults */ + if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */ copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1); } else { copy = pos1 = estrndup(file_exts, file_exts_len); diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt index 2b5e4d43..33fee61 100644 --- a/ext/standard/tests/strings/dirname_basic.phpt +++ b/ext/standard/tests/strings/dirname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic funtionality +Test dirname() function : basic functionality --FILE-- <?php /* Prototype: string dirname ( string $path ); diff --git a/ext/standard/url.c b/ext/standard/url.c index d8271a1..fe1b2fe 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -266,7 +266,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) p = s; } else { /* memrchr is a GNU specific extension - Emulate for wide compatability */ + Emulate for wide compatibility */ for(p = e; p >= s && *p != ':'; p--); } diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php index f95c462..e841e2e 100644 --- a/scripts/dev/find_tested.php +++ b/scripts/dev/find_tested.php @@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) { foreach($tested_functions as $tested_function) { - // go through method info array marking this funtion as tested + // go through method info array marking this function as tested foreach($method_info as &$current_method_record) { if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) { // matched the method name diff --git a/server-tests-config.php b/server-tests-config.php index 0ddff28..a4fa88a 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -52,7 +52,7 @@ $conf = array( /* file extension of pages requested via http this allows for php to be configured to parse - extensions other than php, usefull for multiple + extensions other than php, useful for multiple configurations under a single webserver */ 'TEST_WEB_EXT' => 'php', diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8da7604..2151361 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1499,7 +1499,7 @@ function output_as_table(header, ar_out) { var l = header.length; var cols = 80; - var fixedlenght = ""; + var fixedlength = ""; var t = 0; var i,j,k,m; var out = "| "; diff --git a/win32/sendmail.h b/win32/sendmail.h index 0a7698e..6fed77e 100644 --- a/win32/sendmail.h +++ b/win32/sendmail.h @@ -5,7 +5,7 @@ #endif #define HOST_NAME_LEN 256 -#define MAX_APPNAME_LENGHT 100 +#define MAX_APPNAME_LENGTH 100 #define MAIL_BUFFER_SIZE (1024*4) /* 4k buffer */ /* Return values */ #define MIN_ERROR_INDEX 0 /* Always 0 like SUCCESS */