com php-src: Fix typos in code comments [skip ci]: ext/dba/dba.c ext/dba/dba_cdb.c ext/dom/node.c ext/exif/exif.c ext/reflection/php_reflection.c
ext/standard/basic_func tions.c ext/standard/ftp_fopen_wrapper.c ext/standa rd/image.c ext/standard/string.c

From: Date: Mon, 18 Feb 2019 16:48:12 +0000
Subject: com php-src: Fix typos in code comments [skip ci]: ext/dba/dba.c ext/dba/dba_cdb.c ext/dom/node.c ext/exif/exif.c ext/reflection/php_reflection.c
ext/standard/basic_func tions.c ext/standard/ftp_fopen_wrapper.c ext/standa rd/image.c ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104699@lists.php.net to get a copy of this message
Commit: 9249d82019c162c42d2ce8e911e19fd3cc5a726a Author: Tyson Andre <tysonandre775@hotmail.com> Mon, 18 Feb 2019 11:14:22 -0500 Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Feb 2019 17:48:12 +0100 Parents: cb4c74dfe315205662fee8ad269706ae8eacce4b Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9249d82019c162c42d2ce8e911e19fd3cc5a726a Log: Fix typos in code comments [skip ci] Changed paths: M ext/dba/dba.c M ext/dba/dba_cdb.c M ext/dom/node.c M ext/exif/exif.c M ext/reflection/php_reflection.c M ext/standard/basic_functions.c M ext/standard/ftp_fopen_wrapper.c M ext/standard/image.c M ext/standard/string.c Diff: diff --git a/ext/dba/dba.c b/ext/dba/dba.c index e2f9652..5e16306 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -889,7 +889,7 @@ restart: spprintf(&lock_name, 0, "%s.lck", info->path); if (!strcmp(file_mode, "r")) { /* when in read only mode try to use existing .lck file first */ - /* do not log errors for .lck file while in read ony mode on .lck file */ + /* do not log errors for .lck file while in read only mode on .lck file */ lock_file_mode = "rb"; info->lock.fp = php_stream_open_wrapper(lock_name, lock_file_mode, STREAM_MUST_SEEK|IGNORE_PATH|persistent_flag, &opened_path); } diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c index 6e91cee..d269990 100644 --- a/ext/dba/dba_cdb.c +++ b/ext/dba/dba_cdb.c @@ -183,7 +183,7 @@ DBA_UPDATE_FUNC(cdb) if (!cdb->make) return FAILURE; /* database was opened readonly */ if (!mode) - return FAILURE; /* cdb_make dosn't know replace */ + return FAILURE; /* cdb_make doesn't know replace */ if (cdb_make_add(&cdb->m, key, keylen, val, vallen) != -1) return SUCCESS; #endif diff --git a/ext/dom/node.c b/ext/dom/node.c index c88d402..03e61ef 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -291,7 +291,7 @@ int dom_node_node_value_read(dom_object *obj, zval *retval) return FAILURE; } - /* Access to Element node is implemented as a convience method */ + /* Access to Element node is implemented as a convenience method */ switch (nodep->type) { case XML_ATTRIBUTE_NODE: case XML_TEXT_NODE: @@ -329,7 +329,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval) return FAILURE; } - /* Access to Element node is implemented as a convience method */ + /* Access to Element node is implemented as a convenience method */ switch (nodep->type) { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: diff --git a/ext/exif/exif.c b/ext/exif/exif.c index fe256d8..982c463 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2969,7 +2969,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count * In contrast to exif_process_string this function does always return a string buffer */ static int exif_process_string(char **result, char *value, size_t byte_count) { /* we cannot use strlcpy - here the problem is that we cannot use strlen to - * determin length of string and we cannot use strlcpy with len=byte_count+1 + * determine length of string and we cannot use strlcpy with len=byte_count+1 * because then we might get into an EXCEPTION if we exceed an allocated * memory page...so we use php_strnlen in conjunction with memcpy and add the NUL * char. @@ -3651,7 +3651,7 @@ static void exif_process_TIFF_in_JPEG(image_info_type *ImageInfo, char *CharBuf, exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Process TIFF in JPEG done"); #endif - /* Compute the CCD width, in milimeters. */ + /* Compute the CCD width, in millimeters. */ if (ImageInfo->FocalplaneXRes != 0) { ImageInfo->CCDWidth = (float)(ImageInfo->ExifImageWidth * ImageInfo->FocalplaneUnits / ImageInfo->FocalplaneXRes); } @@ -3716,7 +3716,7 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo) /* get marker byte, swallowing possible padding */ /* some software does not count the length bytes of COM section */ - /* one company doing so is very much envolved in JPEG... so we accept too */ + /* one company doing so is very much involved in JPEG... so we accept too */ if (last_marker==M_COM && comment_correction) { comment_correction = 2; } diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 1773745..bfbe88f 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -3113,7 +3113,7 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic) } ZEND_HASH_FOREACH_END(); } - /* In case this is a static method, we should'nt pass an object_ptr + /* In case this is a static method, we shouldn't pass an object_ptr * (which is used as calling context aka $this). We can thus ignore the * first parameter. * diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4189b01..64c40b5 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4905,7 +4905,7 @@ PHP_FUNCTION(error_clear_last) } /* }}} */ -/* {{{ proto mixed call_user_func(mixed function_name [, mixed parmeter] [, mixed ...]) +/* {{{ proto mixed call_user_func(mixed function_name [, mixed parameter] [, mixed ...]) Call a user function which is the first parameter Warning: This function is special-cased by zend_compile.c and so is usually bypassed */ PHP_FUNCTION(call_user_func) @@ -4958,7 +4958,7 @@ PHP_FUNCTION(call_user_func_array) } /* }}} */ -/* {{{ proto mixed forward_static_call(mixed function_name [, mixed parmeter] [, mixed ...]) U +/* {{{ proto mixed forward_static_call(mixed function_name [, mixed parameter] [, mixed ...]) U Call a user function which is the first parameter */ PHP_FUNCTION(forward_static_call) { diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index dc97fa8..26e55cb 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -1061,7 +1061,7 @@ static int php_stream_ftp_mkdir(php_stream_wrapper *wrapper, const char *url, in php_stream_printf(stream, "MKD %s\r\n", ZSTR_VAL(resource->path)); result = GET_FTP_RESULT(stream); } else { - /* we look for directory separator from the end of string, thus hopefuly reducing our work load */ + /* we look for directory separator from the end of string, thus hopefully reducing our work load */ char *p, *e, *buf; buf = estrndup(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path)); diff --git a/ext/standard/image.c b/ext/standard/image.c index 9df5290..53c42a0 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -613,7 +613,7 @@ static struct gfxinfo *php_handle_jpc(php_stream * stream) "bit depth" answer somewhat problematic. For this implementation we'll use the highest depth encountered. */ - /* Get the single byte that remains after the file type indentification */ + /* Get the single byte that remains after the file type identification */ first_marker_id = php_stream_getc(stream); /* Ensure that this marker is SIZ (as is mandated by the standard) */ diff --git a/ext/standard/string.c b/ext/standard/string.c index 6f3571e..91cb14d 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1766,7 +1766,7 @@ PHP_FUNCTION(pathinfo) /* }}} */ /* {{{ php_stristr - case insensitve strstr */ + case insensitive strstr */ PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len) { php_strtolower(s, s_len);

« previous php.cvs (#104699) next »