diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-07-25 05:38:50 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-07-25 11:57:11 +0200 |
commit | a5e80b22e11c2db7fd5ff07b5b7a28f80745e89b (patch) | |
tree | 31d5964b5ceeb8ca1f81511f08bc4b89d872e8a7 | |
parent | a29a800cb0749c19a99a7019219c44b5415b6a78 (diff) | |
download | php-git-a5e80b22e11c2db7fd5ff07b5b7a28f80745e89b.tar.gz |
Fix typos in code comments
-rw-r--r-- | Zend/zend_virtual_cwd.h | 2 | ||||
-rw-r--r-- | Zend/zend_vm_gen.php | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | ext/calendar/jewish.c | 2 | ||||
-rw-r--r-- | ext/dom/node.c | 2 | ||||
-rw-r--r-- | ext/filter/logical_filters.c | 2 | ||||
-rw-r--r-- | ext/gmp/gmp.c | 2 | ||||
-rw-r--r-- | ext/mbstring/php_mbregex.c | 2 | ||||
-rw-r--r-- | ext/mysqli/mysqli.c | 2 | ||||
-rw-r--r-- | ext/mysqli/mysqli_api.c | 2 | ||||
-rw-r--r-- | ext/mysqli/mysqli_result_iterator.c | 2 | ||||
-rw-r--r-- | ext/opcache/Optimizer/zend_func_info.h | 2 | ||||
-rw-r--r-- | ext/opcache/Optimizer/zend_ssa.h | 2 | ||||
-rw-r--r-- | ext/pcre/upgrade-pcre.php | 2 | ||||
-rw-r--r-- | ext/pgsql/pgsql.c | 2 | ||||
-rw-r--r-- | ext/session/session.c | 2 | ||||
-rw-r--r-- | ext/shmop/README | 2 | ||||
-rw-r--r-- | ext/simplexml/simplexml.c | 2 | ||||
-rw-r--r-- | ext/soap/interop/client_round2_run.php | 2 | ||||
-rw-r--r-- | ext/soap/php_http.c | 2 | ||||
-rw-r--r-- | ext/spl/spl_directory.c | 2 | ||||
-rw-r--r-- | ext/standard/base64.c | 2 | ||||
-rw-r--r-- | ext/standard/file.c | 4 | ||||
-rw-r--r-- | main/rfc1867.c | 2 | ||||
-rw-r--r-- | main/streams/mmap.c | 2 | ||||
-rw-r--r-- | win32/codepage.h | 2 |
26 files changed, 27 insertions, 27 deletions
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 579f4cd20a..43d3965adb 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -170,7 +170,7 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li /* One of the following constants must be used as the last argument in virtual_file_ex() call. */ -#define CWD_EXPAND 0 /* expand "." and ".." but dont resolve symlinks */ +#define CWD_EXPAND 0 /* expand "." and ".." but don't resolve symlinks */ #define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */ #define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */ diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 45e298c9b0..6cbb2c5087 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -705,7 +705,7 @@ function opcode_name($name, $spec, $op1, $op2) { } else if (isset($opcode["op2"]["ANY"])) { $op2 = "ANY"; } else if ($spec) { - /* dispatch to unkonwn handler in unreachable code */ + /* dispatch to unknown handler in unreachable code */ return "ZEND_NULL"; } } diff --git a/configure.ac b/configure.ac index d528fd3acf..c3642fc1c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1144,7 +1144,7 @@ PHP_ARG_WITH(pear, [whether to install PEAR], if test "$PHP_PEAR" != "no"; then dnl - dnl PEAR dependancies + dnl PEAR dependencies dnl if test "$PHP_XML" = "no"; then pear_error_msg="$pear_error_msg diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c index 07284ed8c2..399fcf9100 100644 --- a/ext/calendar/jewish.c +++ b/ext/calendar/jewish.c @@ -272,7 +272,7 @@ #define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7)) #define JEWISH_SDN_OFFSET 347997 -#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises interger overflow */ +#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises integer overflow */ #define NEW_MOON_OF_CREATION 31524 #define SUNDAY 0 diff --git a/ext/dom/node.c b/ext/dom/node.c index 0183174148..0e7f64a9bd 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -1372,7 +1372,7 @@ PHP_FUNCTION(dom_node_clone_node) } /* When deep is false Element nodes still require the attributes - Following taken from libxml as xmlDocCopyNode doesnt do this */ + Following taken from libxml as xmlDocCopyNode doesn't do this */ if (n->type == XML_ELEMENT_NODE && recursive == 0) { if (n->nsDef != NULL) { node->nsDef = xmlCopyNamespaceList(n->nsDef); diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 1b685eb550..076d247946 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -758,7 +758,7 @@ static int _php_filter_validate_ipv6(char *str, size_t str_len) /* {{{ */ return (blocks <= 8); } } else if ((str - 1) == s) { - /* dont allow leading : without another : following */ + /* don't allow leading : without another : following */ return 0; } } diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 84e7b4454c..3c92735cf6 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -604,7 +604,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch gmp_create(object, &gmpnum); /* The "object" variable may be modified during the execution of this unserialize handler - * (it may turn into a reference). Keep the original object around for futher operations. */ + * (it may turn into a reference). Keep the original object around for further operations. */ ZVAL_COPY_VALUE(&object_copy, object); p = buf; diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index dd1bef031a..68922b6966 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -665,7 +665,7 @@ mb_regex_groups_iter(const OnigUChar* name, const OnigUChar* name_end, int ngrou int gn, beg, end; /* - * In case of duplicate groups, keep only the last suceeding one + * In case of duplicate groups, keep only the last succeeding one * to be consistent with preg_match with the PCRE_DUPNAMES option. */ gn = onig_name_to_backref_number(reg, name, name_end, args->region); diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index ae5ed4ba44..a25bc096ce 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -978,7 +978,7 @@ PHP_MINFO_FUNCTION(mysqli) /* }}} */ -/* Dependancies */ +/* Dependencies */ static const zend_module_dep mysqli_deps[] = { ZEND_MOD_REQUIRED("spl") #if defined(MYSQLI_USE_MYSQLND) diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 2110f35ae1..40c7d2982d 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -542,7 +542,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc) MYSQLI_REPORT_STMT_ERROR(stmt->stmt); if (rc) { - /* dont close the statement or subsequent usage (for example ->execute()) will lead to crash */ + /* don't close the statement or subsequent usage (for example ->execute()) will lead to crash */ for (i=0; i < var_cnt ; i++) { if (stmt->result.buf[i].val) { efree(stmt->result.buf[i].val); diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c index ec9a9e5b2d..9b42094345 100644 --- a/ext/mysqli/mysqli_result_iterator.c +++ b/ext/mysqli/mysqli_result_iterator.c @@ -66,7 +66,7 @@ static void php_mysqli_result_iterator_dtor(zend_object_iterator *iter) { php_mysqli_result_iterator *iterator = (php_mysqli_result_iterator*)iter; - /* cleanup handled in sxe_object_dtor as we dont always have an iterator wrapper */ + /* cleanup handled in sxe_object_dtor as we don't always have an iterator wrapper */ zval_ptr_dtor(&iterator->intern.data); zval_ptr_dtor(&iterator->current_row); } diff --git a/ext/opcache/Optimizer/zend_func_info.h b/ext/opcache/Optimizer/zend_func_info.h index 81a52bd078..37a88d8bf0 100644 --- a/ext/opcache/Optimizer/zend_func_info.h +++ b/ext/opcache/Optimizer/zend_func_info.h @@ -22,7 +22,7 @@ #include "zend_ssa.h" /* func flags */ -#define ZEND_FUNC_INDIRECT_VAR_ACCESS (1<<0) /* accesses varables by name */ +#define ZEND_FUNC_INDIRECT_VAR_ACCESS (1<<0) /* accesses variables by name */ #define ZEND_FUNC_HAS_CALLS (1<<1) #define ZEND_FUNC_VARARG (1<<2) /* uses func_get_args() */ #define ZEND_FUNC_NO_LOOPS (1<<3) diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h index 61c4166c64..cfb6f1dec2 100644 --- a/ext/opcache/Optimizer/zend_ssa.h +++ b/ext/opcache/Optimizer/zend_ssa.h @@ -113,7 +113,7 @@ typedef struct _zend_ssa_var { zend_ssa_phi *definition_phi; /* phi that defines this value */ int use_chain; /* uses of this value, linked through opN_use_chain */ zend_ssa_phi *phi_use_chain; /* uses of this value in Phi, linked through use_chain */ - zend_ssa_phi *sym_use_chain; /* uses of this value in Pi constaints */ + zend_ssa_phi *sym_use_chain; /* uses of this value in Pi constraints */ unsigned int no_val : 1; /* value doesn't mater (used as op1 in ZEND_ASSIGN) */ unsigned int scc_entry : 1; unsigned int alias : 2; /* value may be changed indirectly */ diff --git a/ext/pcre/upgrade-pcre.php b/ext/pcre/upgrade-pcre.php index 6da627d750..b0da6cdb44 100644 --- a/ext/pcre/upgrade-pcre.php +++ b/ext/pcre/upgrade-pcre.php @@ -61,7 +61,7 @@ function recurse($path) die("$newfile is not available any more\n"); } - // maintain file mtimes so that cvs doesnt get crazy + // maintain file mtimes so that cvs doesn't get crazy if (file_get_contents($newfile) !== file_get_contents($file)) { copy($newfile, $file); } diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 36cdeac4e0..5b613a4328 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1093,7 +1093,7 @@ static PHP_GINIT_FUNCTION(pgsql) ZEND_TSRMLS_CACHE_UPDATE(); #endif memset(pgsql_globals, 0, sizeof(zend_pgsql_globals)); - /* Initilize notice message hash at MINIT only */ + /* Initialize notice message hash at MINIT only */ zend_hash_init_ex(&pgsql_globals->notices, 0, NULL, ZVAL_PTR_DTOR, 1, 0); } /* }}} */ diff --git a/ext/session/session.c b/ext/session/session.c index 7c6b880cc8..3de3870234 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1544,7 +1544,7 @@ PHPAPI int php_session_start(void) /* {{{ */ PS(define_sid) = 0; } } - /* Initilize session ID from non cookie values */ + /* Initialize session ID from non cookie values */ if (!PS(use_only_cookies)) { if (!PS(id) && (data = zend_hash_str_find(&EG(symbol_table), "_GET", sizeof("_GET") - 1))) { ZVAL_DEREF(data); diff --git a/ext/shmop/README b/ext/shmop/README index c4970376b0..2553f3fe18 100644 --- a/ext/shmop/README +++ b/ext/shmop/README @@ -26,7 +26,7 @@ int shmop_open(int key, string flags, int mode, int size) mode - acsess mode same as for a file (0644) for example size - size of the block in bytes - returns an indentifier + returns an identifier char shmop_read(int shmid, int start, int count) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 1abf68fcc5..92e6de107a 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -2410,7 +2410,7 @@ static void php_sxe_iterator_dtor(zend_object_iterator *iter) /* {{{ */ { php_sxe_iterator *iterator = (php_sxe_iterator *)iter; - /* cleanup handled in sxe_object_dtor as we dont always have an iterator wrapper */ + /* cleanup handled in sxe_object_dtor as we don't always have an iterator wrapper */ if (!Z_ISUNDEF(iterator->intern.data)) { zval_ptr_dtor(&iterator->intern.data); } diff --git a/ext/soap/interop/client_round2_run.php b/ext/soap/interop/client_round2_run.php index d9a2af0aeb..f850448ce9 100644 --- a/ext/soap/interop/client_round2_run.php +++ b/ext/soap/interop/client_round2_run.php @@ -21,7 +21,7 @@ require_once 'client_round2_interop.php'; $iop = new Interop_Client(); $iop->html = 0; -// force a fetch of endpoints, this happens irregardless if no endpoints in database +// force a fetch of endpoints, this happens regardless if no endpoints in database $iop->fetchEndpoints(); // set some options diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 7a2410de82..fc068bf4d1 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -946,7 +946,7 @@ try_again: /* Grab and send back every cookie */ /* Not going to worry about Path: because - we shouldn't be changing urls so path dont + we shouldn't be changing urls so path doesn't matter too much */ cookie_itt = strstr(ZSTR_VAL(http_headers), "Set-Cookie: "); diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 471239dd31..0554226ad8 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -2914,7 +2914,7 @@ SPL_METHOD(SplFileObject, fread) ZVAL_NEW_STR(return_value, zend_string_alloc(length, 0)); Z_STRLEN_P(return_value) = php_stream_read(intern->u.file.stream, Z_STRVAL_P(return_value), length); - /* needed because recv/read/gzread doesnt put a null at the end*/ + /* needed because recv/read/gzread doesn't put a null at the end*/ Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0; } diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 4a3a76ac0a..fb6d491acf 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -396,7 +396,7 @@ static __m128i php_base64_encode_ssse3_translate(__m128i in) /* mask is 0xFF (-1) for range #[1..4] and 0x00 for range #0: */ mask = _mm_cmpgt_epi8(in, _mm_set1_epi8(25)); - /* substract -1, so add 1 to indices for range #[1..4], All indices are now correct: */ + /* subtract -1, so add 1 to indices for range #[1..4], All indices are now correct: */ indices = _mm_sub_epi8(indices, mask); /* Add offsets to input values: */ diff --git a/ext/standard/file.c b/ext/standard/file.c index fd44133639..7596f0e18f 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1121,7 +1121,7 @@ PHPAPI PHP_FUNCTION(fgetss) len = (size_t) bytes; buf = safe_emalloc(sizeof(char), (len + 1), 0); - /*needed because recv doesnt set null char at end*/ + /*needed because recv doesn't set null char at end*/ memset(buf, 0, len + 1); } @@ -1816,7 +1816,7 @@ PHPAPI PHP_FUNCTION(fread) ZVAL_NEW_STR(return_value, zend_string_alloc(len, 0)); Z_STRLEN_P(return_value) = php_stream_read(stream, Z_STRVAL_P(return_value), len); - /* needed because recv/read/gzread doesnt put a null at the end*/ + /* needed because recv/read/gzread doesn't put a null at the end*/ Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0; if (Z_STRLEN_P(return_value) < len / 2) { diff --git a/main/rfc1867.c b/main/rfc1867.c index 38c420ce6f..8a8e335ef4 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -392,7 +392,7 @@ static int find_boundary(multipart_buffer *self, char *boundary) { char *line; - /* loop thru lines */ + /* loop through lines */ while( (line = get_line(self)) ) { /* finished if we found the boundary */ diff --git a/main/streams/mmap.c b/main/streams/mmap.c index 2b7c3e356c..94c80a9dc5 100644 --- a/main/streams/mmap.c +++ b/main/streams/mmap.c @@ -30,7 +30,7 @@ PHPAPI char *_php_stream_mmap_range(php_stream *stream, size_t offset, size_t le range.mapped = NULL; /* For now, we impose an arbitrary limit to avoid - * runaway swapping when large files are passed thru. */ + * runaway swapping when large files are passed through. */ if (length > 4 * 1024 * 1024) { return NULL; } diff --git a/win32/codepage.h b/win32/codepage.h index cf3d72e39b..7929ea7509 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -76,7 +76,7 @@ PW32CP char *php_win32_cp_conv_w_to_cur(const wchar_t* in, size_t in_len, size_t PW32CP wchar_t *php_win32_cp_env_any_to_w(const char* env); /* This function tries to make the best guess to convert any - given string to a wide char, also prefering the fastest code + given string to a wide char, also preferring the fastest code path to unicode. It returns NULL on fail. */ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t in_len, size_t *out_len) {/*{{{*/ |