com php-src: Fix miscellaneous typos in docs and error messages: UPGRADING Zend/zend_alloc.c Zend/zend_compile.h Zend/zend_t ypes.h
ext/standard/config.w32 ext/standard/math. c ext/standard/var_unserializer.re
| From: | Nikita Popov | Date: | Mon, 28 Oct 2019 10:44:08 +0000 |
| Subject: | com php-src: Fix miscellaneous typos in docs and error messages: UPGRADING Zend/zend_alloc.c Zend/zend_compile.h Zend/zend_t ypes.h ext/standard/config.w32 ext/standard/math. c ext/standard/var_unserializer.re |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109083@lists.php.net to get a copy of this message | ||
Commit: 9d48bf5152295fb63ab5da8570c9b2fd73aa2cf7
Author: Tyson Andre <tysonandre775@hotmail.com> Sat, 26 Oct 2019 23:44:36 -0400
Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 28 Oct 2019 11:44:08 +0100
Parents: 742aaaa150952221cffece991a346f2c3166fcd2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d48bf5152295fb63ab5da8570c9b2fd73aa2cf7
Log:
Fix miscellaneous typos in docs and error messages
Closes GH-4863.
Changed paths:
M UPGRADING
M Zend/zend_alloc.c
M Zend/zend_compile.h
M Zend/zend_types.h
M ext/standard/config.w32
M ext/standard/math.c
M ext/standard/var_unserializer.re
Diff:
diff --git a/UPGRADING b/UPGRADING
index f083d6d245e..8ef0d141179 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -209,7 +209,7 @@ PHP 8.0 UPGRADE NOTES
mb_decode_numericentity().
- PCRE:
- . When passing invalid escape sequences they are no longer intepreted as
+ . When passing invalid escape sequences they are no longer interpreted as
literals. This behaviour previously required the X modifier - which is
now ignored.
@@ -333,7 +333,7 @@ PHP 8.0 UPGRADE NOTES
========================================
- Standard:
- . Added fdiv() method, which performs a floating-point devision under
+ . Added fdiv() method, which performs a floating-point division under
IEEE 754 semantics. Division by zero is considered well-defined and
will return one of Inf, -Inf or NaN.
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 21ccf850496..982bb038746 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc..c
@@ -260,7 +260,7 @@ struct _zend_mm_heap {
int peak_chunks_count; /* peak number of allocated chunks for current request */
int cached_chunks_count; /* number of cached chunks */
double avg_chunks_count; /* average number of chunks allocated per request */
- int last_chunks_delete_boundary; /* numer of chunks after last deletion */
+ int last_chunks_delete_boundary; /* number of chunks after last deletion */
int last_chunks_delete_count; /* number of deletion over the last boundary */
#if ZEND_MM_CUSTOM
union {
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 8eac0dcae7e..e4096a05a56 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -51,7 +51,7 @@ typedef struct _zend_op zend_op;
/* On 64-bit systems less optimal, but more compact VM code leads to better
* performance. So on 32-bit systems we use absolute addresses for jump
- * targets and constants, but on 64-bit systems realtive 32-bit offsets */
+ * targets and constants, but on 64-bit systems relative 32-bit offsets */
#if SIZEOF_SIZE_T == 4
# define ZEND_USE_ABS_JMP_ADDR 1
# define ZEND_USE_ABS_CONST_ADDR 1
diff --git a/Zend/zend_types.h b/Zend/zend_types..h
index 4582f3188c6..5fa3e7918c0 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -1277,7 +1277,7 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
} \
} while (0)
-/* Properties store a flag distinguishing unset and unintialized properties
+/* Properties store a flag distinguishing unset and uninitialized properties
* (both use IS_UNDEF type) in the Z_EXTRA space. As such we also need to copy
* the Z_EXTRA space when copying property default values etc. We define separate
* macros for this purpose, so this workaround is easier to remove in the future. */
diff --git a/ext/standard/config.w32 b/ext/standard/config.w32
index 0f472421455...16238f800ef 100644
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@ -6,11 +6,11 @@ if (PHP_PASSWORD_ARGON2 != "no") {
if (CHECK_LIB("argon2_a.lib;argon2.lib", null, PHP_PASSWORD_ARGON2)
&& CHECK_HEADER_ADD_INCLUDE("argon2.h", "CFLAGS")) {
if (!CHECK_FUNC_IN_HEADER("argon2.h", "argon2id_hash_raw", PHP_PHP_BUILD +
"\\include", "CFLAGS")) {
- ERROR("Please verify that Argon2 header and libaries >= 20161029 are installed");
+ ERROR("Please verify that Argon2 header and libraries >= 20161029 are installed");
}
AC_DEFINE('HAVE_ARGON2LIB', 1);
} else {
- WARNING("Argon2 not enabled; libaries and headers not found");
+ WARNING("Argon2 not enabled; libraries and headers not found");
}
}
diff --git a/ext/standard/math.c b/ext/standard/math.c
index be3516400a1..c810c432f3a 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -649,7 +649,7 @@ PHP_FUNCTION(exp)
/* {{{ proto float expm1(float number)
Returns exp(number) - 1, computed in a way that accurate even when the value of number is close
to zero */
/*
- WARNING: this function is expermental: it could change its name or
+ WARNING: this function is experimental: it could change its name or
disappear in the next version of PHP!
*/
PHP_FUNCTION(expm1)
@@ -667,7 +667,7 @@ PHP_FUNCTION(expm1)
/* {{{ proto float log1p(float number)
Returns log(1 + number), computed in a way that accurate even when the value of number is close
to zero */
/*
- WARNING: this function is expermental: it could change its name or
+ WARNING: this function is experimental: it could change its name or
disappear in the next version of PHP!
*/
PHP_FUNCTION(log1p)
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 172f4147971..feaccb2a50f 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -999,7 +999,7 @@ use_double:
if (elements) {
array_init_size(rval, elements);
/* we can't convert from packed to hash during unserialization, because
- reference to some zvals might be keept in var_hash (to support references) */
+ reference to some zvals might be kept in var_hash (to support references) */
zend_hash_real_init_mixed(Z_ARRVAL_P(rval));
} else {
ZVAL_EMPTY_ARRAY(rval);