dmitry          Thu Jul 17 13:22:33 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar.c zip.c 
  Log:
  Fixed wrong arguments order
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.32&r2=1.370.2.33&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.32 php-src/ext/phar/phar.c:1.370.2.33
--- php-src/ext/phar/phar.c:1.370.2.32  Thu Jul 10 11:36:50 2008
+++ php-src/ext/phar/phar.c     Thu Jul 17 13:22:32 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.370.2.32 2008/07/10 11:36:50 dmitry Exp $ */
+/* $Id: phar.c,v 1.370.2.33 2008/07/17 13:22:32 dmitry Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -963,7 +963,7 @@
                MAPPHAR_FAIL("internal corruption of phar \"%s\" (too many 
manifest entries for size of manifest)")
        }
 
-       mydata = pecalloc(sizeof(phar_archive_data), 1, PHAR_G(persist));
+       mydata = pecalloc(1, sizeof(phar_archive_data), PHAR_G(persist));
        mydata->is_persistent = PHAR_G(persist);
 
        /* check whether we have meta data, zero check works regardless of byte 
order */
@@ -1281,7 +1281,7 @@
        }
 
        /* set up our manifest */
-       mydata = ecalloc(sizeof(phar_archive_data), 1);
+       mydata = ecalloc(1, sizeof(phar_archive_data));
 
        mydata->fname = expand_filepath(fname, NULL TSRMLS_CC);
        fname_len = strlen(mydata->fname);
@@ -3412,7 +3412,7 @@
        php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
        php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
        php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
-       php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.32 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.33 $");
        php_info_print_table_row(2, "Phar-based phar archives", "enabled");
        php_info_print_table_row(2, "Tar-based phar archives", "enabled");
        php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.13&r2=1.47.2.14&diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.47.2.13 php-src/ext/phar/zip.c:1.47.2.14
--- php-src/ext/phar/zip.c:1.47.2.13    Sat Jun 21 20:14:43 2008
+++ php-src/ext/phar/zip.c      Thu Jul 17 13:22:32 2008
@@ -193,7 +193,7 @@
                                php_stream_close(fp);
                                return FAILURE;
                        }
-                       mydata = pecalloc(sizeof(phar_archive_data), 1, 
PHAR_G(persist));
+                       mydata = pecalloc(1, sizeof(phar_archive_data), 
PHAR_G(persist));
                        mydata->is_persistent = PHAR_G(persist);
 
                        /* read in archive comment, if any */



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

Reply via email to