From: Steph Fox <sfox@php.net>
Date: Mon, 18 Feb 2008 04:51:04 +0000 (+0000)
Subject: Fix ZTS build (again), kill unused var
X-Git-Tag: RELEASE_2_0_0a1~442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=335e57e4439e9bd8041500f8b206d14805139c3c;p=php

Fix ZTS build (again), kill unused var
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index f185f7d445..84c646a98b 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2574,7 +2574,7 @@ int phar_zend_open(const char *filename, zend_file_handle *handle TSRMLS_DC) /*
 					if (!(entry = phar_find_in_include_path(entry, old, *pphar TSRMLS_CC))) {
 						/* this file is not in the phar, use the original path */
 						if (SUCCESS == phar_orig_zend_open(filename, handle TSRMLS_CC)) {
-							if (SUCCESS == phar_mount_entry(*pphar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename))) {
+							if (SUCCESS == phar_mount_entry(*pphar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename) TSRMLS_CC)) {
 								entry = (char *) filename;
 								goto dopharthing;
 							}
diff --git a/ext/phar/util.c b/ext/phar/util.c
index c690e05e00..83ba4f5723 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -78,7 +78,6 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
 	phar_entry_info entry = {0};
 	php_stream_statbuf ssb;
 	const char *err;
-	int is_dir;
 
 	if (phar_path_check(&path, &path_len, &err) > pcr_is_ok) {
 		return FAILURE;