felipe          Thu Jul  3 12:53:12 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/zip    php_zip.c php_zip.h 
  Log:
  - Fixed compile warnings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.10&r2=1.1.2.38.2.11&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.10 
php-src/ext/zip/php_zip.c:1.1.2.38.2.11
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.10     Thu Jul  3 01:55:48 2008
+++ php-src/ext/zip/php_zip.c   Thu Jul  3 12:53:12 2008
@@ -12,11 +12,11 @@
   | obtain it through the world-wide-web, please send a note to          |
   | [EMAIL PROTECTED] so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Piere-Alain Joye <[EMAIL PROTECTED]                             |
+  | Author: Piere-Alain Joye <[EMAIL PROTECTED]>                            |
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.11 2008/07/03 12:53:12 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1080,7 +1080,7 @@
 
 /* {{{ proto resource zip_open(string filename)
 Create new zip using source uri for output */
-static PHP_NAMED_FUNCTION(zif_zip_open)
+PHP_NAMED_FUNCTION(zif_zip_open)
 {
        char     *filename;
        int       filename_len;
@@ -1112,7 +1112,7 @@
 
 /* {{{ proto void zip_close(resource zip)
    Close a Zip archive */
-static PHP_NAMED_FUNCTION(zif_zip_close)
+PHP_NAMED_FUNCTION(zif_zip_close)
 {
        zval * zip;
        zip_rsrc *z_rsrc = NULL;
@@ -1129,7 +1129,7 @@
 
 /* {{{ proto resource zip_read(resource zip)
    Returns the next file in the archive */
-static PHP_NAMED_FUNCTION(zif_zip_read)
+PHP_NAMED_FUNCTION(zif_zip_read)
 {
        zval *zip_dp;
        zip_read_rsrc *zr_rsrc;
@@ -1172,7 +1172,7 @@
 /* {{{ proto bool zip_entry_open(resource zip_dp, resource zip_entry [, string 
mode])
    Open a Zip File, pointed by the resource entry */
 /* Dummy function to follow the old API */
-static PHP_NAMED_FUNCTION(zif_zip_entry_open)
+PHP_NAMED_FUNCTION(zif_zip_entry_open)
 {
        zval * zip;
        zval * zip_entry;
@@ -1199,7 +1199,7 @@
 /* {{{ proto void zip_entry_close(resource zip_ent)
    Close a zip entry */
 /* another dummy function to fit in the old api*/
-static PHP_NAMED_FUNCTION(zif_zip_entry_close)
+PHP_NAMED_FUNCTION(zif_zip_entry_close)
 {
        zval * zip_entry;
        zip_read_rsrc * zr_rsrc;
@@ -1216,7 +1216,7 @@
 
 /* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
    Read from an open directory entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_read)
+PHP_NAMED_FUNCTION(zif_zip_entry_read)
 {
        zval * zip_entry;
        long len = 0;
@@ -1315,7 +1315,7 @@
 
 /* {{{ proto string zip_entry_name(resource zip_entry)
    Return the name given a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_name)
+PHP_NAMED_FUNCTION(zif_zip_entry_name)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -1323,7 +1323,7 @@
 
 /* {{{ proto int zip_entry_compressedsize(resource zip_entry)
    Return the compressed size of a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
+PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -1331,7 +1331,7 @@
 
 /* {{{ proto int zip_entry_filesize(resource zip_entry)
    Return the actual filesize of a ZZip entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
+PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
 }
@@ -1339,7 +1339,7 @@
 
 /* {{{ proto string zip_entry_compressionmethod(resource zip_entry)
    Return a string containing the compression method used on a particular 
entry */
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
+PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
 {
        php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
 }
@@ -2606,7 +2606,7 @@
        php_info_print_table_start();
 
        php_info_print_table_row(2, "Zip", "enabled");
-       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.38.2.10 2008/07/03 01:55:48 felipe Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.38.2.11 2008/07/03 12:53:12 felipe Exp $");
        php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@");
        php_info_print_table_row(2, "Libzip version", "0.7.1");
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.10.2.3.2.3&r2=1.10.2.3.2.4&diff_format=u
Index: php-src/ext/zip/php_zip.h
diff -u php-src/ext/zip/php_zip.h:1.10.2.3.2.3 
php-src/ext/zip/php_zip.h:1.10.2.3.2.4
--- php-src/ext/zip/php_zip.h:1.10.2.3.2.3      Wed May 21 09:27:41 2008
+++ php-src/ext/zip/php_zip.h   Thu Jul  3 12:53:12 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.h,v 1.10.2.3.2.3 2008/05/21 09:27:41 pajoye Exp $ */
+/* $Id: php_zip.h,v 1.10.2.3.2.4 2008/07/03 12:53:12 felipe Exp $ */
 
 #ifndef PHP_ZIP_H
 #define PHP_ZIP_H
@@ -94,16 +94,16 @@
 #endif
 
 /* zip_open is a macro for renaming libzip zipopen, so we need to use 
PHP_NAMED_FUNCTION */
-static PHP_NAMED_FUNCTION(zif_zip_open);
-static PHP_NAMED_FUNCTION(zif_zip_read);
-static PHP_NAMED_FUNCTION(zif_zip_close);
-static PHP_NAMED_FUNCTION(zif_zip_entry_read);
-static PHP_NAMED_FUNCTION(zif_zip_entry_filesize);
-static PHP_NAMED_FUNCTION(zif_zip_entry_name);
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize);
-static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod);
-static PHP_NAMED_FUNCTION(zif_zip_entry_open);
-static PHP_NAMED_FUNCTION(zif_zip_entry_close);
+PHP_NAMED_FUNCTION(zif_zip_open);
+PHP_NAMED_FUNCTION(zif_zip_read);
+PHP_NAMED_FUNCTION(zif_zip_close);
+PHP_NAMED_FUNCTION(zif_zip_entry_read);
+PHP_NAMED_FUNCTION(zif_zip_entry_filesize);
+PHP_NAMED_FUNCTION(zif_zip_entry_name);
+PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize);
+PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod);
+PHP_NAMED_FUNCTION(zif_zip_entry_open);
+PHP_NAMED_FUNCTION(zif_zip_entry_close);
 
 #endif /* PHP_ZIP_H */
 



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

Reply via email to