clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c
This commit is contained in:
Lior Kaplan 2015-04-01 18:30:55 +03:00
commit 3b8b1435ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/exif/tests/bug68799.phpt
View File

@ -1,5 +1,5 @@
--TEST--
Bug #68799 (Free called on unitialized pointer)
Bug #68799 (Free called on uninitialized pointer)
--SKIPIF--
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--

2
ext/pcre/pcrelib/pcre_exec.c
View File

@ -686,7 +686,7 @@ the alternative names that are used. */
#define foc number
#define save_mark data
/* These statements are here to stop the compiler complaining about unitialized
/* These statements are here to stop the compiler complaining about uninitialized
variables. */
#ifdef SUPPORT_UCP

2
ext/xmlwriter/php_xmlwriter.c
View File

@ -112,7 +112,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern)
ze_xmlwriter_object *obj = Z_XMLWRITER_P(object); \
intern = obj->xmlwriter_ptr; \
if (!intern) { \
php_error_docref(NULL, E_WARNING, "Invalid or unitialized XMLWriter object"); \
php_error_docref(NULL, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
RETURN_FALSE; \
} \
}