Skip to content

Commit 2fd74c7

Browse files
committed
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix typo: unitialized -> uninitialized
2 parents 8de838d + 59c2a55 commit 2fd74c7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/exif/tests/bug68799.phpt

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ the alternative names that are used. */
688688
#define foc number
689689
#define save_mark data
690690

691-
/* These statements are here to stop the compiler complaining about unitialized
691+
/* These statements are here to stop the compiler complaining about uninitialized
692692
variables. */
693693

694694
#ifdef SUPPORT_UCP

ext/xmlwriter/php_xmlwriter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC)
113113
ze_xmlwriter_object *obj = (ze_xmlwriter_object*) zend_object_store_get_object(object TSRMLS_CC); \
114114
intern = obj->xmlwriter_ptr; \
115115
if (!intern) { \
116-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized XMLWriter object"); \
116+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
117117
RETURN_FALSE; \
118118
} \
119119
}

0 commit comments

Comments
 (0)