[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_internal.h util.c

[Pierre-Alain Joye]

pajoye          Wed Jun 18 10:20:47 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar_internal.h util.c 
  Log:
  - really fix the windows builds, don't cast many times when only the hash 
function requires void **
  - copy/paste evilness with TSRM_CC/DC
  (tests still pass but would be nice to speed them up...)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.109.2.15&r2=1.109.2.16&diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.109.2.15 
php-src/ext/phar/phar_internal.h:1.109.2.16
--- php-src/ext/phar/phar_internal.h:1.109.2.15 Wed Jun 18 06:38:47 2008
+++ php-src/ext/phar/phar_internal.h    Wed Jun 18 10:20:47 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_internal.h,v 1.109.2.15 2008/06/18 06:38:47 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.109.2.16 2008/06/18 10:20:47 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -374,7 +374,7 @@
        PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].ufp = fp;
 }
 
-static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_DC)
 {
        if (!phar->is_persistent) {
                return phar->fp;
@@ -382,7 +382,7 @@
        return PHAR_GLOBALS->cached_fp[phar->phar_pos].fp;
 }
 
-static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_DC)
 {
        if (!phar->is_persistent) {
                return phar->ufp;
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.11&r2=1.55.2.12&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.11 php-src/ext/phar/util.c:1.55.2.12
--- php-src/ext/phar/util.c:1.55.2.11   Wed Jun 18 06:38:47 2008
+++ php-src/ext/phar/util.c     Wed Jun 18 10:20:47 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.55.2.11 2008/06/18 06:38:47 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.12 2008/06/18 10:20:47 pajoye Exp $ */
 
 #include "phar_internal.h"
 #ifdef PHAR_HAVE_OPENSSL
@@ -1883,7 +1883,7 @@
  */
 static int phar_add_empty(HashTable *ht, char *arKey, uint nKeyLength)  /* {{{ 
*/
 {
-       void *dummy = (char *) 1;
+       char *dummy = (char*)1;
        if (SUCCESS == zend_hash_find(ht, arKey, nKeyLength, (void **)&dummy)) {
                dummy++;
        }
@@ -1912,7 +1912,7 @@
        /* we use filename_len - 1 to avoid adding a virtual dir for empty 
directory entries */
        for (; s - filename < filename_len - 1; s++) {
                if (*s == '/') {
-                       void *dummy;
+                       char *dummy;
                        if (FAILURE == zend_hash_find(&phar->virtual_dirs, 
filename, s - filename, (void **)&dummy)) {
                                continue;
                        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php