[PHP-DEV] [PATCH] ext/phar/util.c

[xuefeng]

d:\devel\php\php5\ext\phar\util.c(1832) : error C2036: 'void *' : unknown
size

d:\devel\php\php5\ext\phar\util.c(1864) : error C2036: 'void *' : unknown
size

NMAKE : fatal error U1077: '"C:\Program Files\Microsoft Visual Studio
9.0\VC\BIN\cl.exe"' : return code '0x2'

Stop.

 

 

Index: ext/phar/util.c

===================================================================

RCS file: /repository/php-src/ext/phar/util.c,v

retrieving revision 1.55.2.10

diff -u -r1.55.2.10 util.c

--- ext/phar/util.c            15 Jun 2008 22:51:46 -0000
1.55.2.10

+++ ext/phar/util.c         17 Jun 2008 11:12:50 -0000

@@ -1827,12 +1827,12 @@

  */

 static int phar_add_empty(HashTable *ht, char *arKey, uint nKeyLength)  /*
{{{ */

 {

-              void *dummy = (void *) 1;

+             char *dummy = (char *) 1;

                if (SUCCESS == zend_hash_find(ht, arKey, nKeyLength, (void
**)&dummy)) {

                                dummy++;

                }

 

-              return zend_hash_update(ht, arKey, nKeyLength, &dummy,
sizeof(void *), NULL);

+             return zend_hash_update(ht, arKey, nKeyLength, (void*)&dummy,
sizeof(void *), NULL);

 }

 /* }}} */

 

@@ -1856,7 +1856,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;

                                                }

@@ -1864,7 +1864,7 @@

                                                if (!--dummy) {

 
zend_hash_del(&phar->virtual_dirs, filename, s - filename);

                                                } else {

-
zend_hash_update(&phar->virtual_dirs, filename, s - filename, &dummy,
sizeof(void *), NULL);

+
zend_hash_update(&phar->virtual_dirs, filename, s - filename, (void*)&dummy,
sizeof(void *), NULL);

                                                }

                                }

                }

=====================

Done.

 

 

 


Index: ext/phar/util.c
===================================================================
RCS file: /repository/php-src/ext/phar/util.c,v
retrieving revision 1.55.2.10
diff -u -r1.55.2.10 util.c
--- ext/phar/util.c     15 Jun 2008 22:51:46 -0000      1.55.2.10
+++ ext/phar/util.c     17 Jun 2008 11:12:50 -0000
@@ -1827,12 +1827,12 @@
  */
 static int phar_add_empty(HashTable *ht, char *arKey, uint nKeyLength)  /* {{{ 
*/
 {
-       void *dummy = (void *) 1;
+       char *dummy = (char *) 1;
        if (SUCCESS == zend_hash_find(ht, arKey, nKeyLength, (void **)&dummy)) {
                dummy++;
        }
 
-       return zend_hash_update(ht, arKey, nKeyLength, &dummy, sizeof(void *), 
NULL);
+       return zend_hash_update(ht, arKey, nKeyLength, (void*)&dummy, 
sizeof(void *), NULL);
 }
 /* }}} */
 
@@ -1856,7 +1856,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;
                        }
@@ -1864,7 +1864,7 @@
                        if (!--dummy) {
                                zend_hash_del(&phar->virtual_dirs, filename, s 
- filename);
                        } else {
-                               zend_hash_update(&phar->virtual_dirs, filename, 
s - filename, &dummy, sizeof(void *), NULL);
+                               zend_hash_update(&phar->virtual_dirs, filename, 
s - filename, (void*)&dummy, sizeof(void *), NULL);
                        }
                }
        }
=====================
Done.


-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php