archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.4' into PHP-5.5

Browse source 
* PHP-5.4:
  Correct typo in comments: 'initialized'
This commit is contained in:
Lior Kaplan 2014-08-17 21:33:41 +03:00
commit fac08a960b
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/dom/php_dom.c
View file

@ -518,7 +518,7 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC
value = null_value; value = null_value;
} else if (Z_TYPE_P(value) == IS_OBJECT) { } else if (Z_TYPE_P(value) == IS_OBJECT) {
/* these are zvalues create on demand, with refcount and is_ref /* these are zvalues create on demand, with refcount and is_ref
* status left in an uninitalized stated */ * status left in an uninitialized stated */
zval_dtor(value); zval_dtor(value);
efree(value); efree(value);

2
ext/mbstring/mb_gpc.c
View file

@ -260,7 +260,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i
goto out; goto out;
} }
num = n; /* make sure to process initilized vars only */ num = n; /* make sure to process initialized vars only */
/* initialize converter */ /* initialize converter */
if (info->num_from_encodings <= 0) { if (info->num_from_encodings <= 0) {

2
ext/spl/php_spl.c
View file

@ -326,7 +326,7 @@ PHP_FUNCTION(spl_autoload)
RETURN_FALSE; RETURN_FALSE;
} }
if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */ if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */
copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1); copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1);
} else { } else {
copy = pos1 = estrndup(file_exts, file_exts_len); copy = pos1 = estrndup(file_exts, file_exts_len);