diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 18:20:26 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 18:20:26 +0300 |
| commit | 2fd74c7f03638c35297220d90c9a5dadf2a6dd9b (patch) | |
| tree | aa5b7688961ab0f0c5bda47b947330acedcd43f8 | |
| parent | 8de838dc2636eafd7957cd391605fe84d62762d9 (diff) | |
| parent | 59c2a55ec7cbc70cc0227a127d3859fdc95566e7 (diff) | |
| download | php-git-2fd74c7f03638c35297220d90c9a5dadf2a6dd9b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix typo: unitialized -> uninitialized
| -rw-r--r-- | ext/exif/tests/bug68799.phpt | 2 | ||||
| -rw-r--r-- | ext/pcre/pcrelib/pcre_exec.c | 2 | ||||
| -rw-r--r-- | ext/xmlwriter/php_xmlwriter.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/exif/tests/bug68799.phpt b/ext/exif/tests/bug68799.phpt index b09f21ca7b..f50a41b402 100644 --- a/ext/exif/tests/bug68799.phpt +++ b/ext/exif/tests/bug68799.phpt @@ -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-- diff --git a/ext/pcre/pcrelib/pcre_exec.c b/ext/pcre/pcrelib/pcre_exec.c index 2d0230f4f3..47e99e7664 100644 --- a/ext/pcre/pcrelib/pcre_exec.c +++ b/ext/pcre/pcrelib/pcre_exec.c @@ -688,7 +688,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 diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 206d82ab47..6b5c3557a4 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -113,7 +113,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC) ze_xmlwriter_object *obj = (ze_xmlwriter_object*) zend_object_store_get_object(object TSRMLS_CC); \ intern = obj->xmlwriter_ptr; \ if (!intern) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized XMLWriter object"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized XMLWriter object"); \ RETURN_FALSE; \ } \ } |