]> granicus.if.org Git - php/commitdiff
minor refactoring to remove 1 call to zend_get_executed_filename()
authorGreg Beaver <cellog@php.net>
Mon, 11 Feb 2008 06:49:22 +0000 (06:49 +0000)
committerGreg Beaver <cellog@php.net>
Mon, 11 Feb 2008 06:49:22 +0000 (06:49 +0000)
ext/phar/phar_object.c

index 4a768390fd7b4c0fc16b3c646fa6465936a7932a..bd06a67383a398de3f2b8cad9b4dd320b1e1907a 100755 (executable)
@@ -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);