bjori Sat Dec 15 12:57:05 2007 UTC
Modified files:
/php-src/ext/zip php_zip.c
Log:
MFB: Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.50 php-src/ext/zip/php_zip.c:1.51
--- php-src/ext/zip/php_zip.c:1.50 Sun Oct 7 05:15:07 2007
+++ php-src/ext/zip/php_zip.c Sat Dec 15 12:57:05 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.50 2007/10/07 05:15:07 davidw Exp $ */
+/* $Id: php_zip.c,v 1.51 2007/12/15 12:57:05 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -944,7 +944,7 @@
}
/* }}} */
-/* {{{ proto mixed open(string source [, int flags]) U
+/* {{{ proto mixed ZipArchive::open(string source [, int flags]) U
Create new zip using source uri for output, return TRUE on success or the
error code */
static ZIPARCHIVE_METHOD(open)
{
@@ -1008,7 +1008,7 @@
}
/* }}} */
-/* {{{ proto bool close() U
+/* {{{ proto bool ZipArchive::close() U
close the zip archive */
static ZIPARCHIVE_METHOD(close)
{
@@ -1037,7 +1037,7 @@
}
/* }}} */
-/* {{{ proto bool createEmptyDir(string dirname) U
+/* {{{ proto bool ZipArchive::createEmptyDir(string dirname) U
Returns the index of the entry named filename in the archive */
static ZIPARCHIVE_METHOD(addEmptyDir)
{
@@ -1096,7 +1096,7 @@
}
/* }}} */
-/* {{{ proto bool addFile(string filepath[, string entryname[, int start [,
int length]]]) U
+/* {{{ proto bool ZipArchive::addFile(string filepath[, string entryname[, int
start [, int length]]]) U
Add a file in a Zip archive using its path and the name to use. */
static ZIPARCHIVE_METHOD(addFile)
{
@@ -1201,7 +1201,7 @@
}
/* }}} */
-/* {{{ proto bool addFromString(string name, string content) U
+/* {{{ proto bool ZipArchive::addFromString(string name, string content) U
Add a file using content and the entry name */
static ZIPARCHIVE_METHOD(addFromString)
{
@@ -1267,7 +1267,7 @@
}
/* }}} */
-/* {{{ proto array statName(string filename[, int flags]) U
+/* {{{ proto array ZipArchive::statName(string filename[, int flags]) U
Returns the information about a the zip entry filename */
static ZIPARCHIVE_METHOD(statName)
{
@@ -1301,7 +1301,7 @@
}
/* }}} */
-/* {{{ proto resource statIndex(int index[, int flags]) U
+/* {{{ proto resource ZipArchive::statIndex(int index[, int flags]) U
Returns the zip entry informations using its index */
static ZIPARCHIVE_METHOD(statIndex)
{
@@ -1329,7 +1329,7 @@
}
/* }}} */
-/* {{{ proto int locateName(string filename[, int flags]) U
+/* {{{ proto int ZipArchive::locateName(string filename[, int flags]) U
Returns the index of the entry named filename in the archive */
static ZIPARCHIVE_METHOD(locateName)
{
@@ -1369,7 +1369,7 @@
}
/* }}} */
-/* {{{ proto string getNameIndex(int index [, int flags]) U
+/* {{{ proto string ZipArchive::getNameIndex(int index [, int flags]) U
Returns the name of the file at position index */
static ZIPARCHIVE_METHOD(getNameIndex)
{
@@ -1399,7 +1399,7 @@
}
/* }}} */
-/* {{{ proto bool setArchiveComment(string name, string comment) U
+/* {{{ proto bool ZipArchive::setArchiveComment(string name, string comment) U
Set or remove (NULL/'') the comment of the archive */
static ZIPARCHIVE_METHOD(setArchiveComment)
{
@@ -1425,7 +1425,7 @@
}
/* }}} */
-/* {{{ proto string getArchiveComment() U
+/* {{{ proto string ZipArchive::getArchiveComment() U
Returns the comment of an entry using its index */
static ZIPARCHIVE_METHOD(getArchiveComment)
{
@@ -1450,7 +1450,7 @@
}
/* }}} */
-/* {{{ proto bool setCommentName(string name, string comment) U
+/* {{{ proto bool ZipArchive::setCommentName(string name, string comment) U
Set or remove (NULL/'') the comment of an entry using its Name */
static ZIPARCHIVE_METHOD(setCommentName)
{
@@ -1484,7 +1484,7 @@
}
/* }}} */
-/* {{{ proto bool setCommentIndex(int index, string comment) U
+/* {{{ proto bool ZipArchive::setCommentIndex(int index, string comment) U
Set or remove (NULL/'') the comment of an entry using its index */
static ZIPARCHIVE_METHOD(setCommentIndex)
{
@@ -1511,7 +1511,7 @@
}
/* }}} */
-/* {{{ proto string getCommentName(string name) U
+/* {{{ proto string ZipArchive::getCommentName(string name) U
Returns the comment of an entry using its name */
static ZIPARCHIVE_METHOD(getCommentName)
{
@@ -1549,7 +1549,7 @@
}
/* }}} */
-/* {{{ proto string getCommentIndex(int index) U
+/* {{{ proto string ZipArchive::getCommentIndex(int index) U
Returns the comment of an entry using its index */
static ZIPARCHIVE_METHOD(getCommentIndex)
{
@@ -1577,7 +1577,7 @@
}
/* }}} */
-/* {{{ proto bool deleteIndex(int index) U
+/* {{{ proto bool ZipArchive::deleteIndex(int index) U
Delete a file using its index */
static ZIPARCHIVE_METHOD(deleteIndex)
{
@@ -1607,7 +1607,7 @@
}
/* }}} */
-/* {{{ proto bool deleteName(string name) U
+/* {{{ proto bool ZipArchive::deleteName(string name) U
Delete a file using its index */
static ZIPARCHIVE_METHOD(deleteName)
{
@@ -1638,7 +1638,7 @@
}
/* }}} */
-/* {{{ proto bool renameIndex(int index, string new_name) U
+/* {{{ proto bool ZipArchive::renameIndex(int index, string new_name) U
Rename an entry selected by its index to new_name */
static ZIPARCHIVE_METHOD(renameIndex)
{
@@ -1675,7 +1675,7 @@
}
/* }}} */
-/* {{{ proto bool renameName(string name, string new_name) U
+/* {{{ proto bool ZipArchive::renameName(string name, string new_name) U
Rename an entry selected by its name to new_name */
static ZIPARCHIVE_METHOD(renameName)
{
@@ -1711,7 +1711,7 @@
}
/* }}} */
-/* {{{ proto bool unchangeIndex(int index) U
+/* {{{ proto bool ZipArchive::unchangeIndex(int index) U
Changes to the file at position index are reverted */
static ZIPARCHIVE_METHOD(unchangeIndex)
{
@@ -1741,7 +1741,7 @@
}
/* }}} */
-/* {{{ proto bool unchangeName(string name) U
+/* {{{ proto bool ZipArchive::unchangeName(string name) U
Changes to the file named 'name' are reverted */
static ZIPARCHIVE_METHOD(unchangeName)
{
@@ -1776,7 +1776,7 @@
}
/* }}} */
-/* {{{ proto bool unchangeAll() U
+/* {{{ proto bool ZipArchive::unchangeAll() U
All changes to files and global information in archive are reverted */
static ZIPARCHIVE_METHOD(unchangeAll)
{
@@ -1797,7 +1797,7 @@
}
/* }}} */
-/* {{{ proto bool unchangeAll() U
+/* {{{ proto bool ZipArchive::unchangeAll() U
Revert all global changes to the archive archive. For now, this only reverts
archive comment changes. */
static ZIPARCHIVE_METHOD(unchangeArchive)
{
@@ -1818,7 +1818,7 @@
}
/* }}} */
-/* {{{ array bool extractTo(string pathto[, mixed files]) U
+/* {{{ proto bool ZipArchive::extractTo(string pathto[, mixed files]) U
Extract one or more file from a zip archive */
/* TODO:
* - allow index or array of indeces
@@ -2012,7 +2012,7 @@
}
/* }}} */
-/* {{{ proto string getFromName(string entryname[, int len [, int flags]]) U
+/* {{{ proto string ZipArchive::getFromName(string entryname[, int len [, int
flags]]) U
get the contents of an entry using its name */
static ZIPARCHIVE_METHOD(getFromName)
{
@@ -2020,7 +2020,7 @@
}
/* }}} */
-/* {{{ proto string getFromIndex(string entryname[, int len [, int flags]]) U
+/* {{{ proto string ZipArchive::getFromIndex(string entryname[, int len [, int
flags]]) U
get the contents of an entry using its index */
static ZIPARCHIVE_METHOD(getFromIndex)
{
@@ -2028,7 +2028,7 @@
}
/* }}} */
-/* {{{ proto resource getStream(string entryname) U
+/* {{{ proto resource ZipArchive::getStream(string entryname) U
get a stream for an entry using its name */
static ZIPARCHIVE_METHOD(getStream)
{
@@ -2195,7 +2195,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.50
2007/10/07 05:15:07 davidw Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.51
2007/12/15 12:57:05 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
