com php-src: Use cheaper functions: ext/standard/file.c ext/standard/filestat.c
| From: | Dmitry Stogov | Date: | Thu, 30 Nov 2017 22:32:51 +0000 |
| Subject: | com php-src: Use cheaper functions: ext/standard/file.c ext/standard/filestat.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100457@lists.php.net to get a copy of this message | ||
Commit: 64c5e38adf165d5bc2b4293d4c3c264e76122886
Author: Dmitry Stogov <dmitry@zend.com> Fri, 1 Dec 2017 01:32:51 +0300
Parents: af7705bec2c57580d0baa219511f1827897d662d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=64c5e38adf165d5bc2b4293d4c3c264e76122886
Log:
Use cheaper functions
Changed paths:
M ext/standard/file.c
M ext/standard/filestat.c
Diff:
diff --git a/ext/standard/file.c b/ext/standard/file.c
index ccd6cc0..e88197d 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1635,19 +1635,19 @@ PHP_NAMED_FUNCTION(php_if_fstat)
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_blocks);
/* Store string indexes referencing the same zval*/
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[0], strlen(stat_sb_names[0]),
&stat_dev);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[1], strlen(stat_sb_names[1]),
&stat_ino);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[2], strlen(stat_sb_names[2]),
&stat_mode);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[3], strlen(stat_sb_names[3]),
&stat_nlink);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[4], strlen(stat_sb_names[4]),
&stat_uid);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[5], strlen(stat_sb_names[5]),
&stat_gid);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[6], strlen(stat_sb_names[6]),
&stat_rdev);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[7], strlen(stat_sb_names[7]),
&stat_size);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[8], strlen(stat_sb_names[8]),
&stat_atime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[9], strlen(stat_sb_names[9]),
&stat_mtime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[10], strlen(stat_sb_names[10]),
&stat_ctime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[11], strlen(stat_sb_names[11]),
&stat_blksize);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[12], strlen(stat_sb_names[12]),
&stat_blocks);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[0], strlen(stat_sb_names[0]),
&stat_dev);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[1], strlen(stat_sb_names[1]),
&stat_ino);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[2], strlen(stat_sb_names[2]),
&stat_mode);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[3], strlen(stat_sb_names[3]),
&stat_nlink);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[4], strlen(stat_sb_names[4]),
&stat_uid);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[5], strlen(stat_sb_names[5]),
&stat_gid);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[6], strlen(stat_sb_names[6]),
&stat_rdev);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[7], strlen(stat_sb_names[7]),
&stat_size);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[8], strlen(stat_sb_names[8]),
&stat_atime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[9], strlen(stat_sb_names[9]),
&stat_mtime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[10], strlen(stat_sb_names[10]),
&stat_ctime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[11], strlen(stat_sb_names[11]),
&stat_blksize);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[12], strlen(stat_sb_names[12]),
&stat_blocks);
}
/* }}} */
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index c762d30..7b417a7 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -972,19 +972,19 @@ PHPAPI void php_stat(const char *filename, size_t filename_length, int type,
zva
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_blocks);
/* Store string indexes referencing the same zval*/
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[0], strlen(stat_sb_names[0]),
&stat_dev);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[1], strlen(stat_sb_names[1]),
&stat_ino);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[2], strlen(stat_sb_names[2]),
&stat_mode);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[3], strlen(stat_sb_names[3]),
&stat_nlink);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[4], strlen(stat_sb_names[4]),
&stat_uid);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[5], strlen(stat_sb_names[5]),
&stat_gid);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[6], strlen(stat_sb_names[6]),
&stat_rdev);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[7], strlen(stat_sb_names[7]),
&stat_size);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[8], strlen(stat_sb_names[8]),
&stat_atime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[9], strlen(stat_sb_names[9]),
&stat_mtime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[10], strlen(stat_sb_names[10]),
&stat_ctime);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[11], strlen(stat_sb_names[11]),
&stat_blksize);
- zend_hash_str_update(Z_ARRVAL_P(return_value), stat_sb_names[12], strlen(stat_sb_names[12]),
&stat_blocks);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[0], strlen(stat_sb_names[0]),
&stat_dev);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[1], strlen(stat_sb_names[1]),
&stat_ino);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[2], strlen(stat_sb_names[2]),
&stat_mode);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[3], strlen(stat_sb_names[3]),
&stat_nlink);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[4], strlen(stat_sb_names[4]),
&stat_uid);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[5], strlen(stat_sb_names[5]),
&stat_gid);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[6], strlen(stat_sb_names[6]),
&stat_rdev);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[7], strlen(stat_sb_names[7]),
&stat_size);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[8], strlen(stat_sb_names[8]),
&stat_atime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[9], strlen(stat_sb_names[9]),
&stat_mtime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[10], strlen(stat_sb_names[10]),
&stat_ctime);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[11], strlen(stat_sb_names[11]),
&stat_blksize);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[12], strlen(stat_sb_names[12]),
&stat_blocks);
return;
}