--- embedaddon/php/ext/phar/util.c	2012/02/21 23:47:59	1.1.1.1
+++ embedaddon/php/ext/phar/util.c	2012/05/29 12:34:41	1.1.1.2
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.1.1.1 2012/02/21 23:47:59 misho Exp $ */
+/* $Id: util.c,v 1.1.1.2 2012/05/29 12:34:41 misho Exp $ */
 
 #include "phar_internal.h"
 #ifdef PHAR_HASH_OK
@@ -156,7 +156,6 @@ int phar_seek_efp(phar_entry_info *entry, off_t offset
 			break;
 		default:
 			temp = 0;
-			break;
 	}
 
 	if (temp > eoffset + (off_t) entry->uncompressed_filesize) {
@@ -274,7 +273,7 @@ char *phar_find_in_include_path(char *filename, int fi
 		return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
 	}
 
-	fname = zend_get_executed_filename(TSRMLS_C);
+	fname = (char*)zend_get_executed_filename(TSRMLS_C);
 	fname_len = strlen(fname);
 
 	if (PHAR_G(last_phar) && !memcmp(fname, "phar://", 7) && fname_len - 7 >= PHAR_G(last_phar_name_len) && !memcmp(fname + 7, PHAR_G(last_phar_name), PHAR_G(last_phar_name_len))) {
@@ -366,7 +365,7 @@ splitted:
 		goto doit;
 	}
 
-	fname = zend_get_executed_filename(TSRMLS_C);
+	fname = (char*)zend_get_executed_filename(TSRMLS_C);
 
 	if (SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) {
 		goto doit;
@@ -524,7 +523,7 @@ not_stream:
 
 	/* check in calling scripts' current working directory as a fall back case */
 	if (zend_is_executing(TSRMLS_C)) {
-		char *exec_fname = zend_get_executed_filename(TSRMLS_C);
+		char *exec_fname = (char*)zend_get_executed_filename(TSRMLS_C);
 		int exec_fname_length = strlen(exec_fname);
 		const char *p;
 		int n = 0;
@@ -2218,7 +2217,7 @@ int phar_create_signature(phar_archive_data *phar, php
 
 void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC) /* {{{ */
 {
-	char *s;
+	const char *s;
 
 	while ((s = zend_memrchr(filename, '/', filename_len))) {
 		filename_len = s - filename;