bjori Sat Dec 15 12:52:55 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/zip php_zip.c Log: MFB5.2: Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.2&r2=1.1.2.38.2.3&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.2 php-src/ext/zip/php_zip.c:1.1.2.38.2.3 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.2 Sun Oct 7 05:22:07 2007 +++ php-src/ext/zip/php_zip.c Sat Dec 15 12:52:55 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.2 2007/10/07 05:22:07 davidw Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.3 2007/12/15 12:52:55 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -939,7 +939,7 @@ } /* }}} */ -/* {{{ proto mixed open(string source [, int flags]) +/* {{{ proto mixed ZipArchive::open(string source [, int flags]) Create new zip using source uri for output, return TRUE on success or the error code */ static ZIPARCHIVE_METHOD(open) { @@ -997,7 +997,7 @@ } /* }}} */ -/* {{{ proto bool close() +/* {{{ proto bool ZipArchive::close() close the zip archive */ static ZIPARCHIVE_METHOD(close) { @@ -1026,7 +1026,7 @@ } /* }}} */ -/* {{{ proto bool createEmptyDir(string dirname) U +/* {{{ proto bool ZipArchive::createEmptyDir(string dirname) Returns the index of the entry named filename in the archive */ static ZIPARCHIVE_METHOD(addEmptyDir) { @@ -1085,7 +1085,7 @@ } /* }}} */ -/* {{{ proto bool addFile(string filepath[, string entryname[, int start [, int length]]]) +/* {{{ proto bool ZipArchive::addFile(string filepath[, string entryname[, int start [, int length]]]) Add a file in a Zip archive using its path and the name to use. */ static ZIPARCHIVE_METHOD(addFile) { @@ -1157,7 +1157,7 @@ } /* }}} */ -/* {{{ proto bool addFromString(string name, string content) +/* {{{ proto bool ZipArchive::addFromString(string name, string content) Add a file using content and the entry name */ static ZIPARCHIVE_METHOD(addFromString) { @@ -1222,7 +1222,7 @@ } /* }}} */ -/* {{{ proto array statName(string filename[, int flags]) +/* {{{ proto array ZipArchive::statName(string filename[, int flags]) Returns the information about a the zip entry filename */ static ZIPARCHIVE_METHOD(statName) { @@ -1250,7 +1250,7 @@ } /* }}} */ -/* {{{ proto resource statIndex(int index[, int flags]) +/* {{{ proto resource ZipArchive::statIndex(int index[, int flags]) Returns the zip entry informations using its index */ static ZIPARCHIVE_METHOD(statIndex) { @@ -1278,7 +1278,7 @@ } /* }}} */ -/* {{{ proto int locateName(string filename[, int flags]) +/* {{{ proto int ZipArchive::locateName(string filename[, int flags]) Returns the index of the entry named filename in the archive */ static ZIPARCHIVE_METHOD(locateName) { @@ -1318,7 +1318,7 @@ } /* }}} */ -/* {{{ proto string getNameIndex(int index [, int flags]) +/* {{{ proto string ZipArchive::getNameIndex(int index [, int flags]) Returns the name of the file at position index */ static ZIPARCHIVE_METHOD(getNameIndex) { @@ -1348,7 +1348,7 @@ } /* }}} */ -/* {{{ proto bool setArchiveComment(string name, string comment) +/* {{{ proto bool ZipArchive::setArchiveComment(string name, string comment) Set or remove (NULL/'') the comment of the archive */ static ZIPARCHIVE_METHOD(setArchiveComment) { @@ -1374,7 +1374,7 @@ } /* }}} */ -/* {{{ proto string getArchiveComment() +/* {{{ proto string ZipArchive::getArchiveComment() Returns the comment of an entry using its index */ static ZIPARCHIVE_METHOD(getArchiveComment) { @@ -1399,7 +1399,7 @@ } /* }}} */ -/* {{{ proto bool setCommentName(string name, string comment) +/* {{{ proto bool ZipArchive::setCommentName(string name, string comment) Set or remove (NULL/'') the comment of an entry using its Name */ static ZIPARCHIVE_METHOD(setCommentName) { @@ -1432,7 +1432,7 @@ } /* }}} */ -/* {{{ proto bool setCommentIndex(int index, string comment) +/* {{{ proto bool ZipArchive::setCommentIndex(int index, string comment) Set or remove (NULL/'') the comment of an entry using its index */ static ZIPARCHIVE_METHOD(setCommentIndex) { @@ -1459,7 +1459,7 @@ } /* }}} */ -/* {{{ proto string getCommentName(string name) +/* {{{ proto string ZipArchive::getCommentName(string name) Returns the comment of an entry using its name */ static ZIPARCHIVE_METHOD(getCommentName) { @@ -1496,7 +1496,7 @@ } /* }}} */ -/* {{{ proto string getCommentIndex(int index) +/* {{{ proto string ZipArchive::getCommentIndex(int index) Returns the comment of an entry using its index */ static ZIPARCHIVE_METHOD(getCommentIndex) { @@ -1524,7 +1524,7 @@ } /* }}} */ -/* {{{ proto bool deleteIndex(int index) +/* {{{ proto bool ZipArchive::deleteIndex(int index) Delete a file using its index */ static ZIPARCHIVE_METHOD(deleteIndex) { @@ -1554,7 +1554,7 @@ } /* }}} */ -/* {{{ proto bool deleteName(string name) +/* {{{ proto bool ZipArchive::deleteName(string name) Delete a file using its index */ static ZIPARCHIVE_METHOD(deleteName) { @@ -1585,7 +1585,7 @@ } /* }}} */ -/* {{{ proto bool renameIndex(int index, string new_name) +/* {{{ proto bool ZipArchive::renameIndex(int index, string new_name) Rename an entry selected by its index to new_name */ static ZIPARCHIVE_METHOD(renameIndex) { @@ -1621,7 +1621,7 @@ } /* }}} */ -/* {{{ proto bool renameName(string name, string new_name) +/* {{{ proto bool ZipArchive::renameName(string name, string new_name) Rename an entry selected by its name to new_name */ static ZIPARCHIVE_METHOD(renameName) { @@ -1655,7 +1655,7 @@ } /* }}} */ -/* {{{ proto bool unchangeIndex(int index) +/* {{{ proto bool ZipArchive::unchangeIndex(int index) Changes to the file at position index are reverted */ static ZIPARCHIVE_METHOD(unchangeIndex) { @@ -1685,7 +1685,7 @@ } /* }}} */ -/* {{{ proto bool unchangeName(string name) +/* {{{ proto bool ZipArchive::unchangeName(string name) Changes to the file named 'name' are reverted */ static ZIPARCHIVE_METHOD(unchangeName) { @@ -1719,7 +1719,7 @@ } /* }}} */ -/* {{{ proto bool unchangeAll() +/* {{{ proto bool ZipArchive::unchangeAll() All changes to files and global information in archive are reverted */ static ZIPARCHIVE_METHOD(unchangeAll) { @@ -1740,7 +1740,7 @@ } /* }}} */ -/* {{{ proto bool unchangeAll() +/* {{{ proto bool ZipArchive::unchangeAll() Revert all global changes to the archive archive. For now, this only reverts archive comment changes. */ static ZIPARCHIVE_METHOD(unchangeArchive) { @@ -1761,7 +1761,7 @@ } /* }}} */ -/* {{{ array bool extractTo(string pathto[, mixed files]) +/* {{{ proto bool ZipArchive::extractTo(string pathto[, mixed files]) Extract one or more file from a zip archive */ /* TODO: * - allow index or array of indeces @@ -1918,7 +1918,7 @@ } /* }}} */ -/* {{{ proto string getFromName(string entryname[, int len [, int flags]]) +/* {{{ proto string ZipArchive::getFromName(string entryname[, int len [, int flags]]) get the contents of an entry using its name */ static ZIPARCHIVE_METHOD(getFromName) { @@ -1926,7 +1926,7 @@ } /* }}} */ -/* {{{ proto string getFromIndex(string entryname[, int len [, int flags]]) +/* {{{ proto string ZipArchive::getFromIndex(string entryname[, int len [, int flags]]) get the contents of an entry using its index */ static ZIPARCHIVE_METHOD(getFromIndex) { @@ -1934,7 +1934,7 @@ } /* }}} */ -/* {{{ proto resource getStream(string entryname) +/* {{{ proto resource ZipArchive::getStream(string entryname) get a stream for an entry using its name */ static ZIPARCHIVE_METHOD(getStream) { @@ -2101,7 +2101,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.2 2007/10/07 05:22:07 davidw Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.3 2007/12/15 12:52:55 bjori Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php