mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Fix typos in code comments
This commit is contained in:
parent
a29a800cb0
commit
a5e80b22e1
26 changed files with 27 additions and 27 deletions
|
@ -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
|
/* One of the following constants must be used as the last argument
|
||||||
in virtual_file_ex() call. */
|
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_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
|
||||||
#define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */
|
#define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */
|
||||||
|
|
||||||
|
|
|
@ -705,7 +705,7 @@ function opcode_name($name, $spec, $op1, $op2) {
|
||||||
} else if (isset($opcode["op2"]["ANY"])) {
|
} else if (isset($opcode["op2"]["ANY"])) {
|
||||||
$op2 = "ANY";
|
$op2 = "ANY";
|
||||||
} else if ($spec) {
|
} else if ($spec) {
|
||||||
/* dispatch to unkonwn handler in unreachable code */
|
/* dispatch to unknown handler in unreachable code */
|
||||||
return "ZEND_NULL";
|
return "ZEND_NULL";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1144,7 +1144,7 @@ PHP_ARG_WITH(pear, [whether to install PEAR],
|
||||||
if test "$PHP_PEAR" != "no"; then
|
if test "$PHP_PEAR" != "no"; then
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl PEAR dependancies
|
dnl PEAR dependencies
|
||||||
dnl
|
dnl
|
||||||
if test "$PHP_XML" = "no"; then
|
if test "$PHP_XML" = "no"; then
|
||||||
pear_error_msg="$pear_error_msg
|
pear_error_msg="$pear_error_msg
|
||||||
|
|
|
@ -272,7 +272,7 @@
|
||||||
#define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
|
#define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
|
||||||
|
|
||||||
#define JEWISH_SDN_OFFSET 347997
|
#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 NEW_MOON_OF_CREATION 31524
|
||||||
|
|
||||||
#define SUNDAY 0
|
#define SUNDAY 0
|
||||||
|
|
|
@ -1372,7 +1372,7 @@ PHP_FUNCTION(dom_node_clone_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* When deep is false Element nodes still require the attributes
|
/* 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->type == XML_ELEMENT_NODE && recursive == 0) {
|
||||||
if (n->nsDef != NULL) {
|
if (n->nsDef != NULL) {
|
||||||
node->nsDef = xmlCopyNamespaceList(n->nsDef);
|
node->nsDef = xmlCopyNamespaceList(n->nsDef);
|
||||||
|
|
|
@ -758,7 +758,7 @@ static int _php_filter_validate_ipv6(char *str, size_t str_len) /* {{{ */
|
||||||
return (blocks <= 8);
|
return (blocks <= 8);
|
||||||
}
|
}
|
||||||
} else if ((str - 1) == s) {
|
} else if ((str - 1) == s) {
|
||||||
/* dont allow leading : without another : following */
|
/* don't allow leading : without another : following */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -604,7 +604,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch
|
||||||
gmp_create(object, &gmpnum);
|
gmp_create(object, &gmpnum);
|
||||||
|
|
||||||
/* The "object" variable may be modified during the execution of this unserialize handler
|
/* 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);
|
ZVAL_COPY_VALUE(&object_copy, object);
|
||||||
|
|
||||||
p = buf;
|
p = buf;
|
||||||
|
|
|
@ -665,7 +665,7 @@ mb_regex_groups_iter(const OnigUChar* name, const OnigUChar* name_end, int ngrou
|
||||||
int gn, beg, end;
|
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.
|
* to be consistent with preg_match with the PCRE_DUPNAMES option.
|
||||||
*/
|
*/
|
||||||
gn = onig_name_to_backref_number(reg, name, name_end, args->region);
|
gn = onig_name_to_backref_number(reg, name, name_end, args->region);
|
||||||
|
|
|
@ -978,7 +978,7 @@ PHP_MINFO_FUNCTION(mysqli)
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
|
||||||
/* Dependancies */
|
/* Dependencies */
|
||||||
static const zend_module_dep mysqli_deps[] = {
|
static const zend_module_dep mysqli_deps[] = {
|
||||||
ZEND_MOD_REQUIRED("spl")
|
ZEND_MOD_REQUIRED("spl")
|
||||||
#if defined(MYSQLI_USE_MYSQLND)
|
#if defined(MYSQLI_USE_MYSQLND)
|
||||||
|
|
|
@ -542,7 +542,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc)
|
||||||
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
|
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
|
||||||
|
|
||||||
if (rc) {
|
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++) {
|
for (i=0; i < var_cnt ; i++) {
|
||||||
if (stmt->result.buf[i].val) {
|
if (stmt->result.buf[i].val) {
|
||||||
efree(stmt->result.buf[i].val);
|
efree(stmt->result.buf[i].val);
|
||||||
|
|
|
@ -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;
|
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->intern.data);
|
||||||
zval_ptr_dtor(&iterator->current_row);
|
zval_ptr_dtor(&iterator->current_row);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "zend_ssa.h"
|
#include "zend_ssa.h"
|
||||||
|
|
||||||
/* func flags */
|
/* 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_HAS_CALLS (1<<1)
|
||||||
#define ZEND_FUNC_VARARG (1<<2) /* uses func_get_args() */
|
#define ZEND_FUNC_VARARG (1<<2) /* uses func_get_args() */
|
||||||
#define ZEND_FUNC_NO_LOOPS (1<<3)
|
#define ZEND_FUNC_NO_LOOPS (1<<3)
|
||||||
|
|
|
@ -113,7 +113,7 @@ typedef struct _zend_ssa_var {
|
||||||
zend_ssa_phi *definition_phi; /* phi that defines this value */
|
zend_ssa_phi *definition_phi; /* phi that defines this value */
|
||||||
int use_chain; /* uses of this value, linked through opN_use_chain */
|
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 *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 no_val : 1; /* value doesn't mater (used as op1 in ZEND_ASSIGN) */
|
||||||
unsigned int scc_entry : 1;
|
unsigned int scc_entry : 1;
|
||||||
unsigned int alias : 2; /* value may be changed indirectly */
|
unsigned int alias : 2; /* value may be changed indirectly */
|
||||||
|
|
|
@ -61,7 +61,7 @@ function recurse($path)
|
||||||
die("$newfile is not available any more\n");
|
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)) {
|
if (file_get_contents($newfile) !== file_get_contents($file)) {
|
||||||
copy($newfile, $file);
|
copy($newfile, $file);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1093,7 +1093,7 @@ static PHP_GINIT_FUNCTION(pgsql)
|
||||||
ZEND_TSRMLS_CACHE_UPDATE();
|
ZEND_TSRMLS_CACHE_UPDATE();
|
||||||
#endif
|
#endif
|
||||||
memset(pgsql_globals, 0, sizeof(zend_pgsql_globals));
|
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);
|
zend_hash_init_ex(&pgsql_globals->notices, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
|
@ -1544,7 +1544,7 @@ PHPAPI int php_session_start(void) /* {{{ */
|
||||||
PS(define_sid) = 0;
|
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(use_only_cookies)) {
|
||||||
if (!PS(id) && (data = zend_hash_str_find(&EG(symbol_table), "_GET", sizeof("_GET") - 1))) {
|
if (!PS(id) && (data = zend_hash_str_find(&EG(symbol_table), "_GET", sizeof("_GET") - 1))) {
|
||||||
ZVAL_DEREF(data);
|
ZVAL_DEREF(data);
|
||||||
|
|
|
@ -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
|
mode - acsess mode same as for a file (0644) for example
|
||||||
size - size of the block in bytes
|
size - size of the block in bytes
|
||||||
|
|
||||||
returns an indentifier
|
returns an identifier
|
||||||
|
|
||||||
|
|
||||||
char shmop_read(int shmid, int start, int count)
|
char shmop_read(int shmid, int start, int count)
|
||||||
|
|
|
@ -2410,7 +2410,7 @@ static void php_sxe_iterator_dtor(zend_object_iterator *iter) /* {{{ */
|
||||||
{
|
{
|
||||||
php_sxe_iterator *iterator = (php_sxe_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)) {
|
if (!Z_ISUNDEF(iterator->intern.data)) {
|
||||||
zval_ptr_dtor(&iterator->intern.data);
|
zval_ptr_dtor(&iterator->intern.data);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ require_once 'client_round2_interop.php';
|
||||||
$iop = new Interop_Client();
|
$iop = new Interop_Client();
|
||||||
$iop->html = 0;
|
$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();
|
$iop->fetchEndpoints();
|
||||||
|
|
||||||
// set some options
|
// set some options
|
||||||
|
|
|
@ -946,7 +946,7 @@ try_again:
|
||||||
/* Grab and send back every cookie */
|
/* Grab and send back every cookie */
|
||||||
|
|
||||||
/* Not going to worry about Path: because
|
/* 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
|
matter too much
|
||||||
*/
|
*/
|
||||||
cookie_itt = strstr(ZSTR_VAL(http_headers), "Set-Cookie: ");
|
cookie_itt = strstr(ZSTR_VAL(http_headers), "Set-Cookie: ");
|
||||||
|
|
|
@ -2914,7 +2914,7 @@ SPL_METHOD(SplFileObject, fread)
|
||||||
ZVAL_NEW_STR(return_value, zend_string_alloc(length, 0));
|
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);
|
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;
|
Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 is 0xFF (-1) for range #[1..4] and 0x00 for range #0: */
|
||||||
mask = _mm_cmpgt_epi8(in, _mm_set1_epi8(25));
|
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);
|
indices = _mm_sub_epi8(indices, mask);
|
||||||
|
|
||||||
/* Add offsets to input values: */
|
/* Add offsets to input values: */
|
||||||
|
|
|
@ -1121,7 +1121,7 @@ PHPAPI PHP_FUNCTION(fgetss)
|
||||||
|
|
||||||
len = (size_t) bytes;
|
len = (size_t) bytes;
|
||||||
buf = safe_emalloc(sizeof(char), (len + 1), 0);
|
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);
|
memset(buf, 0, len + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1816,7 +1816,7 @@ PHPAPI PHP_FUNCTION(fread)
|
||||||
ZVAL_NEW_STR(return_value, zend_string_alloc(len, 0));
|
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);
|
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;
|
Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
|
||||||
|
|
||||||
if (Z_STRLEN_P(return_value) < len / 2) {
|
if (Z_STRLEN_P(return_value) < len / 2) {
|
||||||
|
|
|
@ -392,7 +392,7 @@ static int find_boundary(multipart_buffer *self, char *boundary)
|
||||||
{
|
{
|
||||||
char *line;
|
char *line;
|
||||||
|
|
||||||
/* loop thru lines */
|
/* loop through lines */
|
||||||
while( (line = get_line(self)) )
|
while( (line = get_line(self)) )
|
||||||
{
|
{
|
||||||
/* finished if we found the boundary */
|
/* finished if we found the boundary */
|
||||||
|
|
|
@ -30,7 +30,7 @@ PHPAPI char *_php_stream_mmap_range(php_stream *stream, size_t offset, size_t le
|
||||||
range.mapped = NULL;
|
range.mapped = NULL;
|
||||||
|
|
||||||
/* For now, we impose an arbitrary limit to avoid
|
/* 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) {
|
if (length > 4 * 1024 * 1024) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
PW32CP wchar_t *php_win32_cp_env_any_to_w(const char* env);
|
||||||
|
|
||||||
/* This function tries to make the best guess to convert any
|
/* 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. */
|
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)
|
__forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t in_len, size_t *out_len)
|
||||||
{/*{{{*/
|
{/*{{{*/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue