Fix miscellaneous typos in code comments/var names

Closes GH-5501

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 300adf400e1d9d6bc0ae197688507ed9a7e34c82..a8cc127683a8a7ae9cb99f00668062a6a6e55c4f 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1495,7 +1495,7 @@ ZEND_FUNCTION(get_resource_type)
 }
 /* }}} */
 
-/* {{{ proto array get_resources([string resouce_type])
+/* {{{ proto array get_resources([string resource_type])
    Get an array with all active resources */
 ZEND_FUNCTION(get_resources)
 {

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index ce681557df9eaed1f31e0df85b3aace65ed06a56..4ce4e4bbfa346afa9fe00849fff94a3f57b58217 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -1136,7 +1136,7 @@ void zend_register_generator_ce(void) /* {{{ */
        zend_ce_generator->serialize = zend_class_serialize_deny;
        zend_ce_generator->unserialize = zend_class_unserialize_deny;
 
-       /* get_iterator has to be assigned *after* implementing the inferface */
+       /* get_iterator has to be assigned *after* implementing the interface */
        zend_class_implements(zend_ce_generator, 1, zend_ce_iterator);
        zend_ce_generator->get_iterator = zend_generator_get_iterator;
 

diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index bb001198f42666e3a028f506f8b141536dc5583e..0cb1729e00a40aed8ffba6b59a266835e80447a6 100644 (file)
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -24,7 +24,7 @@
 /* {{{ data structure */
 
 enum strm_status {
-    PHP_BZ2_UNITIALIZED,
+    PHP_BZ2_UNINITIALIZED,
     PHP_BZ2_RUNNING,
     PHP_BZ2_FINISHED
 };
@@ -89,7 +89,7 @@ static php_stream_filter_status_t php_bz2_decompress_filter(
 
                bucket = php_stream_bucket_make_writeable(buckets_in->head);
                while (bin < bucket->buflen) {
-                       if (data->status == PHP_BZ2_UNITIALIZED) {
+                       if (data->status == PHP_BZ2_UNINITIALIZED) {
                                status = BZ2_bzDecompressInit(streamp, 0, data->small_footprint);
 
                                if (BZ_OK != status) {
@@ -117,7 +117,7 @@ static php_stream_filter_status_t php_bz2_decompress_filter(
                        if (status == BZ_STREAM_END) {
                                BZ2_bzDecompressEnd(&(data->strm));
                                if (data->expect_concatenated) {
-                                       data->status = PHP_BZ2_UNITIALIZED;
+                                       data->status = PHP_BZ2_UNINITIALIZED;
                                } else {
                                        data->status = PHP_BZ2_FINISHED;
                                }
@@ -347,7 +347,7 @@ static php_stream_filter *php_bz2_filter_create(const char *filtername, zval *fi
                        }
                }
 
-               data->status = PHP_BZ2_UNITIALIZED;
+               data->status = PHP_BZ2_UNINITIALIZED;
                fops = &php_bz2_decompress_ops;
        } else if (strcasecmp(filtername, "bzip2.compress") == 0) {
                int blockSize100k = PHP_BZ2_FILTER_DEFAULT_BLOCKSIZE;

diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index baf01bbb3627a65affd7786d36a1b5120902d231..59429082f7cc395183e095d80b3a3126b42b8afd 100644 (file)
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1872,7 +1872,7 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
                        if (!(b->flags & ZEND_BB_REACHABLE)) {
                                continue;
                        }
-                       /* we track data dependencies only insight a single basic block */
+                       /* we track data dependencies only inside a single basic block */
                        if (!(b->flags & ZEND_BB_FOLLOW) ||
                            (b->flags & ZEND_BB_TARGET)) {
                                /* Skip continuation of "extended" BB */

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 8b4c2560e6e1848c1ecbde380496fd89bc090d07..8ede8a31296e82c72d10455072b31d10c5752e4d 100644 (file)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -216,7 +216,7 @@ static inline void spl_filesystem_object_get_file_name(spl_filesystem_object *in
                                if (intern->file_name) {
                                        efree(intern->file_name);
                                }
-                               /* if there is parent path, ammnd it, otherwise just use the given path as is */
+                               /* if there is parent path, amend it, otherwise just use the given path as is */
                                if (path_len == 0) {
                                        intern->file_name_len = spprintf(
                                                &intern->file_name, 0, "%s", intern->u.dir.entry.d_name);