minor refactoring to remove 1 call to zend_get_executed_filename()

This commit is contained in:
Greg Beaver 2008-02-11 06:49:22 +00:00
parent 1a6fb65c83
commit de5238a3bc

View File

@ -437,9 +437,9 @@ PHP_METHOD(Phar, webPhar)
}
phar_request_initialize(TSRMLS_C);
fname = zend_get_executed_filename(TSRMLS_C);
fname_len = strlen(fname);
if (zend_hash_num_elements(&(PHAR_GLOBALS->phar_plain_map))) {
fname = zend_get_executed_filename(TSRMLS_C);
fname_len = strlen(fname);
if((alias &&
zend_hash_find(&(PHAR_GLOBALS->phar_plain_map), alias, alias_len+1, (void **)&plain_map) == SUCCESS)
|| (zend_hash_find(&(PHAR_GLOBALS->phar_plain_map), fname, fname_len+1, (void **)&plain_map) == SUCCESS)
@ -461,9 +461,6 @@ PHP_METHOD(Phar, webPhar)
return;
}
fname = zend_get_executed_filename(TSRMLS_C);
fname_len = strlen(fname);
#ifdef PHP_WIN32
fname = estrndup(fname, fname_len);
phar_unixify_path_separators(fname, fname_len);