Skip to content

Commit 3b8b143

Browse files
committed
Merge branch 'PHP-5.6'
* PHP-5.6: Fix typo: unitialized -> uninitialized Fix typo: unitialized -> uninitialized Conflicts: ext/xmlwriter/php_xmlwriter.c
2 parents 780a812 + 3409d87 commit 3b8b143

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/exif/tests/bug68799.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #68799 (Free called on unitialized pointer)
2+
Bug #68799 (Free called on uninitialized pointer)
33
--SKIPIF--
44
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
55
--FILE--

ext/pcre/pcrelib/pcre_exec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ the alternative names that are used. */
686686
#define foc number
687687
#define save_mark data
688688

689-
/* These statements are here to stop the compiler complaining about unitialized
689+
/* These statements are here to stop the compiler complaining about uninitialized
690690
variables. */
691691

692692
#ifdef SUPPORT_UCP

ext/xmlwriter/php_xmlwriter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern)
112112
ze_xmlwriter_object *obj = Z_XMLWRITER_P(object); \
113113
intern = obj->xmlwriter_ptr; \
114114
if (!intern) { \
115-
php_error_docref(NULL, E_WARNING, "Invalid or unitialized XMLWriter object"); \
115+
php_error_docref(NULL, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
116116
RETURN_FALSE; \
117117
} \
118118
}

0 commit comments

Comments
 (0)