From: Greg Beaver <cellog@php.net>
Date: Mon, 11 Feb 2008 06:49:22 +0000 (+0000)
Subject: minor refactoring to remove 1 call to zend_get_executed_filename()
X-Git-Tag: RELEASE_2_0_0a1~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de5238a3bc678d1c9481d0710a23a0016bbb6c1a;p=php

minor refactoring to remove 1 call to zend_get_executed_filename()
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 4a768390fd..bd06a67383 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -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);