nlopess Thu Nov 9 16:18:28 2006 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c php_xmlwriter.h
/php-src/ext/zip php_zip.c php_zip.h
Log:
MFB: static'fication
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.39&r2=1.40&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.39
php-src/ext/xmlwriter/php_xmlwriter.c:1.40
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.39 Sat Oct 7 22:55:18 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Thu Nov 9 16:18:27 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.39 2006/10/07 22:55:18 bjori Exp $ */
+/* $Id: php_xmlwriter.c,v 1.40 2006/11/09 16:18:27 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -29,7 +29,56 @@
#include "ext/standard/info.h"
#include "php_xmlwriter.h"
-zend_class_entry *xmlwriter_class_entry;
+
+#if LIBXML_VERSION >= 20605
+static PHP_FUNCTION(xmlwriter_set_indent);
+static PHP_FUNCTION(xmlwriter_set_indent_string);
+#endif
+static PHP_FUNCTION(xmlwriter_start_attribute);
+static PHP_FUNCTION(xmlwriter_end_attribute);
+static PHP_FUNCTION(xmlwriter_write_attribute);
+#if LIBXML_VERSION > 20617
+static PHP_FUNCTION(xmlwriter_start_attribute_ns);
+static PHP_FUNCTION(xmlwriter_write_attribute_ns);
+#endif
+static PHP_FUNCTION(xmlwriter_start_element);
+static PHP_FUNCTION(xmlwriter_end_element);
+static PHP_FUNCTION(xmlwriter_full_end_element);
+static PHP_FUNCTION(xmlwriter_start_element_ns);
+static PHP_FUNCTION(xmlwriter_write_element);
+static PHP_FUNCTION(xmlwriter_write_element_ns);
+static PHP_FUNCTION(xmlwriter_start_pi);
+static PHP_FUNCTION(xmlwriter_end_pi);
+static PHP_FUNCTION(xmlwriter_write_pi);
+static PHP_FUNCTION(xmlwriter_start_cdata);
+static PHP_FUNCTION(xmlwriter_end_cdata);
+static PHP_FUNCTION(xmlwriter_write_cdata);
+static PHP_FUNCTION(xmlwriter_text);
+static PHP_FUNCTION(xmlwriter_write_raw);
+static PHP_FUNCTION(xmlwriter_start_document);
+static PHP_FUNCTION(xmlwriter_end_document);
+#if LIBXML_VERSION >= 20607
+static PHP_FUNCTION(xmlwriter_start_comment);
+static PHP_FUNCTION(xmlwriter_end_comment);
+#endif
+static PHP_FUNCTION(xmlwriter_write_comment);
+static PHP_FUNCTION(xmlwriter_start_dtd);
+static PHP_FUNCTION(xmlwriter_end_dtd);
+static PHP_FUNCTION(xmlwriter_write_dtd);
+static PHP_FUNCTION(xmlwriter_start_dtd_element);
+static PHP_FUNCTION(xmlwriter_end_dtd_element);
+static PHP_FUNCTION(xmlwriter_write_dtd_element);
+#if LIBXML_VERSION > 20608
+static PHP_FUNCTION(xmlwriter_start_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_end_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_write_dtd_attlist);
+#endif
+static PHP_FUNCTION(xmlwriter_open_uri);
+static PHP_FUNCTION(xmlwriter_open_memory);
+static PHP_FUNCTION(xmlwriter_output_memory);
+static PHP_FUNCTION(xmlwriter_flush);
+
+static zend_class_entry *xmlwriter_class_entry_ce;
static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
@@ -88,7 +137,7 @@
/* {{{ xmlwriter_object_new */
-PHP_XMLWRITER_API zend_object_value xmlwriter_object_new(zend_class_entry
*class_type TSRMLS_DC)
+static zend_object_value xmlwriter_object_new(zend_class_entry *class_type
TSRMLS_DC)
{
ze_xmlwriter_object *intern;
zval *tmp;
@@ -233,9 +282,9 @@
#endif
/* {{{ function prototypes */
-PHP_MINIT_FUNCTION(xmlwriter);
-PHP_MSHUTDOWN_FUNCTION(xmlwriter);
-PHP_MINFO_FUNCTION(xmlwriter);
+static PHP_MINIT_FUNCTION(xmlwriter);
+static PHP_MSHUTDOWN_FUNCTION(xmlwriter);
+static PHP_MINFO_FUNCTION(xmlwriter);
static int le_xmlwriter;
/* }}} */
@@ -243,7 +292,7 @@
/* _xmlwriter_get_valid_file_path should be made a
common function in libxml extension as code is common to a few xml
extensions */
/* {{{ _xmlwriter_get_valid_file_path */
-char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, int
resolved_path_len TSRMLS_DC) {
+static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path,
int resolved_path_len TSRMLS_DC) {
xmlURI *uri;
xmlChar *escsource;
char *file_dest;
@@ -305,7 +354,7 @@
/* }}} */
/* {{{ php_xmlwriter_streams_IO_write */
-int php_xmlwriter_streams_IO_write(void *context, const char *buffer, int len)
+static int php_xmlwriter_streams_IO_write(void *context, const char *buffer,
int len)
{
TSRMLS_FETCH();
return php_stream_write((php_stream*)context, buffer, len);
@@ -313,7 +362,7 @@
/* }}} */
/* {{{ xmlwriter_objects_clone */
-int php_xmlwriter_streams_IO_close(void *context)
+static int php_xmlwriter_streams_IO_close(void *context)
{
TSRMLS_FETCH();
return php_stream_close((php_stream*)context);
@@ -342,7 +391,7 @@
#endif
/* {{{ xmlwriter_objects_clone */
-void xmlwriter_objects_clone(void *object, void **object_clone TSRMLS_DC)
+static void xmlwriter_objects_clone(void *object, void **object_clone
TSRMLS_DC)
{
/* TODO */
}
@@ -434,7 +483,7 @@
#if LIBXML_VERSION >= 20605
/* {{{ proto bool xmlwriter_set_indent(resource xmlwriter, bool indent) U
Toggle indentation on/off - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_set_indent)
+static PHP_FUNCTION(xmlwriter_set_indent)
{
zval *pind;
xmlwriter_object *intern;
@@ -474,7 +523,7 @@
/* {{{ proto bool xmlwriter_set_indent_string(resource xmlwriter, string
indentString) U
Set string used for indenting - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_set_indent_string)
+static PHP_FUNCTION(xmlwriter_set_indent_string)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterSetIndentString, NULL);
}
@@ -484,7 +533,7 @@
/* {{{ proto bool xmlwriter_start_attribute(resource xmlwriter, string name) U
Create start attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_attribute)
+static PHP_FUNCTION(xmlwriter_start_attribute)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterStartAttribute, "Invalid Attribute Name");
}
@@ -492,7 +541,7 @@
/* {{{ proto bool xmlwriter_end_attribute(resource xmlwriter) U
End attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_attribute)
+static PHP_FUNCTION(xmlwriter_end_attribute)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndAttribute);
}
@@ -501,7 +550,7 @@
#if LIBXML_VERSION > 20617
/* {{{ proto bool xmlwriter_start_attribute_ns(resource xmlwriter, string
prefix, string name, string uri) U
Create start namespaced attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_attribute_ns)
+static PHP_FUNCTION(xmlwriter_start_attribute_ns)
{
zval *pind;
xmlwriter_object *intern;
@@ -545,7 +594,7 @@
/* {{{ proto bool xmlwriter_write_attribute(resource xmlwriter, string name,
string content) U
Write full attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_attribute)
+static PHP_FUNCTION(xmlwriter_write_attribute)
{
zval *pind;
xmlwriter_object *intern;
@@ -590,7 +639,7 @@
#if LIBXML_VERSION > 20617
/* {{{ proto bool xmlwriter_write_attribute_ns(resource xmlwriter, string
prefix, string name, string uri, string content) U
Write full namespaced attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_attribute_ns)
+static PHP_FUNCTION(xmlwriter_write_attribute_ns)
{
zval *pind;
xmlwriter_object *intern;
@@ -637,7 +686,7 @@
/* {{{ proto bool xmlwriter_start_element(resource xmlwriter, string name) U
Create start element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_element)
+static PHP_FUNCTION(xmlwriter_start_element)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterStartElement, "Invalid Element Name");
}
@@ -646,7 +695,7 @@
/* {{{ proto bool xmlwriter_start_element_ns(resource xmlwriter, string
prefix, string name, string uri) U
Create start namespaced element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_element_ns)
+static PHP_FUNCTION(xmlwriter_start_element_ns)
{
zval *pind;
xmlwriter_object *intern;
@@ -690,7 +739,7 @@
/* {{{ proto bool xmlwriter_end_element(resource xmlwriter) U
End current element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_element)
+static PHP_FUNCTION(xmlwriter_end_element)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndElement);
}
@@ -698,7 +747,7 @@
/* {{{ proto bool xmlwriter_full_end_element(resource xmlwriter) U
End current element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_full_end_element)
+static PHP_FUNCTION(xmlwriter_full_end_element)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterFullEndElement);
}
@@ -706,7 +755,7 @@
/* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name,
string content) U
Write full element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_element)
+static PHP_FUNCTION(xmlwriter_write_element)
{
zval *pind;
xmlwriter_object *intern;
@@ -749,7 +798,7 @@
/* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string
prefix, string name, string uri, string content) U
Write full namesapced element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_element_ns)
+static PHP_FUNCTION(xmlwriter_write_element_ns)
{
zval *pind;
xmlwriter_object *intern;
@@ -793,7 +842,7 @@
/* {{{ proto bool xmlwriter_start_pi(resource xmlwriter, string target) U
Create start PI tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_pi)
+static PHP_FUNCTION(xmlwriter_start_pi)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterStartPI, "Invalid PI Target");
}
@@ -801,7 +850,7 @@
/* {{{ proto bool xmlwriter_end_pi(resource xmlwriter) U
End current PI - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_pi)
+static PHP_FUNCTION(xmlwriter_end_pi)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndPI);
}
@@ -809,7 +858,7 @@
/* {{{ proto bool xmlwriter_write_pi(resource xmlwriter, string target, string
content) U
Write full PI tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_pi)
+static PHP_FUNCTION(xmlwriter_write_pi)
{
zval *pind;
xmlwriter_object *intern;
@@ -853,7 +902,7 @@
/* {{{ proto bool xmlwriter_start_cdata(resource xmlwriter) U
Create start CDATA tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_cdata)
+static PHP_FUNCTION(xmlwriter_start_cdata)
{
zval *pind;
xmlwriter_object *intern;
@@ -888,7 +937,7 @@
/* {{{ proto bool xmlwriter_end_cdata(resource xmlwriter) U
End current CDATA - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_cdata)
+static PHP_FUNCTION(xmlwriter_end_cdata)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndCDATA);
}
@@ -896,7 +945,7 @@
/* {{{ proto bool xmlwriter_write_cdata(resource xmlwriter, string content) U
Write full CDATA tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_cdata)
+static PHP_FUNCTION(xmlwriter_write_cdata)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterWriteCDATA, NULL);
}
@@ -904,7 +953,7 @@
/* {{{ proto bool xmlwriter_write_raw(resource xmlwriter, string content) U
Write text - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_raw)
+static PHP_FUNCTION(xmlwriter_write_raw)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterWriteRaw, NULL);
}
@@ -912,7 +961,7 @@
/* {{{ proto bool xmlwriter_text(resource xmlwriter, string content) U
Write text - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_text)
+static PHP_FUNCTION(xmlwriter_text)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterWriteString, NULL);
}
@@ -921,7 +970,7 @@
#if LIBXML_VERSION >= 20607
/* {{{ proto bool xmlwriter_start_comment(resource xmlwriter) U
Create start comment - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_comment)
+static PHP_FUNCTION(xmlwriter_start_comment)
{
zval *pind;
xmlwriter_object *intern;
@@ -956,7 +1005,7 @@
/* {{{ proto bool xmlwriter_end_comment(resource xmlwriter) U
Create end comment - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_comment)
+static PHP_FUNCTION(xmlwriter_end_comment)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndComment);
}
@@ -966,7 +1015,7 @@
/* {{{ proto bool xmlwriter_write_comment(resource xmlwriter, string content) U
Write full comment tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_comment)
+static PHP_FUNCTION(xmlwriter_write_comment)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterWriteComment, NULL);
}
@@ -974,7 +1023,7 @@
/* {{{ proto bool xmlwriter_start_document(resource xmlwriter, string version,
string encoding, string standalone) U
Create document tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_document)
+static PHP_FUNCTION(xmlwriter_start_document)
{
zval *pind;
xmlwriter_object *intern;
@@ -1018,7 +1067,7 @@
/* {{{ proto bool xmlwriter_end_document(resource xmlwriter) U
End current document - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_document)
+static PHP_FUNCTION(xmlwriter_end_document)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndDocument);
}
@@ -1026,7 +1075,7 @@
/* {{{ proto bool xmlwriter_start_dtd(resource xmlwriter, string name, string
pubid, string sysid) U
Create start DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd)
+static PHP_FUNCTION(xmlwriter_start_dtd)
{
zval *pind;
xmlwriter_object *intern;
@@ -1071,7 +1120,7 @@
/* {{{ proto bool xmlwriter_end_dtd(resource xmlwriter) U
End current DTD - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd)
+static PHP_FUNCTION(xmlwriter_end_dtd)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndDTD);
}
@@ -1079,7 +1128,7 @@
/* {{{ proto bool xmlwriter_write_dtd(resource xmlwriter, string name, string
pubid, string sysid, string subset) U
Write full DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd)
+static PHP_FUNCTION(xmlwriter_write_dtd)
{
zval *pind;
xmlwriter_object *intern;
@@ -1125,7 +1174,7 @@
/* {{{ proto bool xmlwriter_start_dtd_element(resource xmlwriter, string name)
U
Create start DTD element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_element)
+static PHP_FUNCTION(xmlwriter_start_dtd_element)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterStartDTDElement, "Invalid Element Name");
}
@@ -1133,7 +1182,7 @@
/* {{{ proto bool xmlwriter_end_dtd_element(resource xmlwriter) U
End current DTD element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_element)
+static PHP_FUNCTION(xmlwriter_end_dtd_element)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndDTDElement);
}
@@ -1141,7 +1190,7 @@
/* {{{ proto bool xmlwriter_write_dtd_element(resource xmlwriter, string name,
string content) U
Write full DTD element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_element)
+static PHP_FUNCTION(xmlwriter_write_dtd_element)
{
zval *pind;
xmlwriter_object *intern;
@@ -1186,7 +1235,7 @@
#if LIBXML_VERSION > 20608
/* {{{ proto bool xmlwriter_start_dtd_attlist(resource xmlwriter, string name)
U
Create start DTD AttList - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_start_dtd_attlist)
{
php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterStartDTDAttlist, "Invalid Element Name");
}
@@ -1194,7 +1243,7 @@
/* {{{ proto bool xmlwriter_end_dtd_attlist(resource xmlwriter) U
End current DTD AttList - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_end_dtd_attlist)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndDTDAttlist);
}
@@ -1202,7 +1251,7 @@
/* {{{ proto bool xmlwriter_write_dtd_attlist(resource xmlwriter, string name,
string content) U
Write full DTD AttList tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_write_dtd_attlist)
{
zval *pind;
xmlwriter_object *intern;
@@ -1247,7 +1296,7 @@
/* {{{ proto bool xmlwriter_start_dtd_entity(resource xmlwriter, string name,
bool isparam) U
Create start DTD Entity - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_entity)
+static PHP_FUNCTION(xmlwriter_start_dtd_entity)
{
zval *pind;
xmlwriter_object *intern;
@@ -1291,7 +1340,7 @@
/* {{{ proto bool xmlwriter_end_dtd_entity(resource xmlwriter) U
End current DTD Entity - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_entity)
+static PHP_FUNCTION(xmlwriter_end_dtd_entity)
{
php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,
xmlTextWriterEndDTDEntity);
}
@@ -1299,7 +1348,7 @@
/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name,
string content) U
Write full DTD Entity tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_entity)
+static PHP_FUNCTION(xmlwriter_write_dtd_entity)
{
zval *pind;
xmlwriter_object *intern;
@@ -1344,7 +1393,7 @@
/* {{{ proto resource xmlwriter_open_uri(string source) U
Create new xmlwriter using source uri for output */
-PHP_FUNCTION(xmlwriter_open_uri)
+static PHP_FUNCTION(xmlwriter_open_uri)
{
char *valid_file = NULL;
xmlwriter_object *intern;
@@ -1446,7 +1495,7 @@
/* {{{ proto resource xmlwriter_open_memory() U
Create new xmlwriter using memory for string output */
-PHP_FUNCTION(xmlwriter_open_memory)
+static PHP_FUNCTION(xmlwriter_open_memory)
{
xmlwriter_object *intern;
xmlTextWriterPtr ptr;
@@ -1547,7 +1596,7 @@
/* {{{ proto string xmlwriter_output_memory(resource xmlwriter [,bool flush]) U
Output current buffer as string */
-PHP_FUNCTION(xmlwriter_output_memory)
+static PHP_FUNCTION(xmlwriter_output_memory)
{
php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -1555,7 +1604,7 @@
/* {{{ proto mixed xmlwriter_flush(resource xmlwriter [,bool empty]) U
Output current buffer */
-PHP_FUNCTION(xmlwriter_flush)
+static PHP_FUNCTION(xmlwriter_flush)
{
php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -1563,7 +1612,7 @@
/* {{{ PHP_MINIT_FUNCTION
*/
-PHP_MINIT_FUNCTION(xmlwriter)
+static PHP_MINIT_FUNCTION(xmlwriter)
{
#ifdef ZEND_ENGINE_2
zend_class_entry ce;
@@ -1584,7 +1633,7 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
-PHP_MSHUTDOWN_FUNCTION(xmlwriter)
+static PHP_MSHUTDOWN_FUNCTION(xmlwriter)
{
return SUCCESS;
}
@@ -1592,7 +1641,7 @@
/* {{{ PHP_MINFO_FUNCTION
*/
-PHP_MINFO_FUNCTION(xmlwriter)
+static PHP_MINFO_FUNCTION(xmlwriter)
{
php_info_print_table_start();
{
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.h?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.h
diff -u php-src/ext/xmlwriter/php_xmlwriter.h:1.14
php-src/ext/xmlwriter/php_xmlwriter.h:1.15
--- php-src/ext/xmlwriter/php_xmlwriter.h:1.14 Sun Jan 1 13:09:56 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.h Thu Nov 9 16:18:27 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.h,v 1.14 2006/01/01 13:09:56 sniper Exp $ */
+/* $Id: php_xmlwriter.h,v 1.15 2006/11/09 16:18:27 nlopess Exp $ */
#ifndef PHP_XMLWRITER_H
#define PHP_XMLWRITER_H
@@ -25,12 +25,6 @@
extern zend_module_entry xmlwriter_module_entry;
#define phpext_xmlwriter_ptr &xmlwriter_module_entry
-#ifdef PHP_WIN32
-#define PHP_XMLWRITER_API __declspec(dllexport)
-#else
-#define PHP_XMLWRITER_API
-#endif
-
#ifdef ZTS
#include "TSRM.h"
#endif
@@ -55,56 +49,6 @@
xmlwriter_object *xmlwriter_ptr;
} ze_xmlwriter_object;
-zend_class_entry *xmlwriter_class_entry_ce;
-
-#if LIBXML_VERSION >= 20605
-PHP_FUNCTION(xmlwriter_set_indent);
-PHP_FUNCTION(xmlwriter_set_indent_string);
-#endif
-PHP_FUNCTION(xmlwriter_start_attribute);
-PHP_FUNCTION(xmlwriter_end_attribute);
-PHP_FUNCTION(xmlwriter_write_attribute);
-#if LIBXML_VERSION > 20617
-PHP_FUNCTION(xmlwriter_start_attribute_ns);
-PHP_FUNCTION(xmlwriter_write_attribute_ns);
-#endif
-PHP_FUNCTION(xmlwriter_start_element);
-PHP_FUNCTION(xmlwriter_end_element);
-PHP_FUNCTION(xmlwriter_full_end_element);
-PHP_FUNCTION(xmlwriter_start_element_ns);
-PHP_FUNCTION(xmlwriter_write_element);
-PHP_FUNCTION(xmlwriter_write_element_ns);
-PHP_FUNCTION(xmlwriter_start_pi);
-PHP_FUNCTION(xmlwriter_end_pi);
-PHP_FUNCTION(xmlwriter_write_pi);
-PHP_FUNCTION(xmlwriter_start_cdata);
-PHP_FUNCTION(xmlwriter_end_cdata);
-PHP_FUNCTION(xmlwriter_write_cdata);
-PHP_FUNCTION(xmlwriter_text);
-PHP_FUNCTION(xmlwriter_write_raw);
-PHP_FUNCTION(xmlwriter_start_document);
-PHP_FUNCTION(xmlwriter_end_document);
-#if LIBXML_VERSION >= 20607
-PHP_FUNCTION(xmlwriter_start_comment);
-PHP_FUNCTION(xmlwriter_end_comment);
-#endif
-PHP_FUNCTION(xmlwriter_write_comment);
-PHP_FUNCTION(xmlwriter_start_dtd);
-PHP_FUNCTION(xmlwriter_end_dtd);
-PHP_FUNCTION(xmlwriter_write_dtd);
-PHP_FUNCTION(xmlwriter_start_dtd_element);
-PHP_FUNCTION(xmlwriter_end_dtd_element);
-PHP_FUNCTION(xmlwriter_write_dtd_element);
-#if LIBXML_VERSION > 20608
-PHP_FUNCTION(xmlwriter_start_dtd_attlist);
-PHP_FUNCTION(xmlwriter_end_dtd_attlist);
-PHP_FUNCTION(xmlwriter_write_dtd_attlist);
-#endif
-PHP_FUNCTION(xmlwriter_open_uri);
-PHP_FUNCTION(xmlwriter_open_memory);
-PHP_FUNCTION(xmlwriter_output_memory);
-PHP_FUNCTION(xmlwriter_flush);
-
#endif /* PHP_XMLWRITER_H */
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.28 php-src/ext/zip/php_zip.c:1.29
--- php-src/ext/zip/php_zip.c:1.28 Fri Nov 3 16:23:12 2006
+++ php-src/ext/zip/php_zip.c Thu Nov 9 16:18:28 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.28 2006/11/03 16:23:12 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.29 2006/11/09 16:18:28 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,6 +31,17 @@
#include "lib/zip.h"
#include "lib/zipint.h"
+static PHP_FUNCTION(zip_open);
+static PHP_FUNCTION(zip_read);
+static PHP_FUNCTION(zip_close);
+static PHP_FUNCTION(zip_entry_read);
+static PHP_FUNCTION(zip_entry_filesize);
+static PHP_FUNCTION(zip_entry_name);
+static PHP_FUNCTION(zip_entry_compressedsize);
+static PHP_FUNCTION(zip_entry_compressionmethod);
+static PHP_FUNCTION(zip_entry_open);
+static PHP_FUNCTION(zip_entry_close);
+
/* {{{ Resource le */
static int le_zip_dir;
#define le_zip_dir_name "Zip Directory"
@@ -70,7 +81,6 @@
/* }}} */
-#ifdef ZEND_ENGINE_2_1
/* {{{ php_zip_extract_file */
/* TODO: Simplify it */
static int php_zip_extract_file(struct zip * za, char *dest, char *file
TSRMLS_DC)
@@ -78,7 +88,7 @@
php_stream_statbuf ssb;
struct zip_file *zf;
struct zip_stat sb;
- char b[8192];
+ char b[8192];
int n, len, ret, file_len;
@@ -238,7 +248,6 @@
return NULL;
}
/* }}} */
-#endif
/* {{{ zend_function_entry */
static zend_function_entry zip_functions[] = {
@@ -258,8 +267,7 @@
/* }}} */
/* {{{ ZE2 OO definitions */
-#ifdef ZEND_ENGINE_2_1
-zend_class_entry *zip_class_entry;
+static zend_class_entry *zip_class_entry;
static zend_object_handlers zip_object_handlers;
static HashTable zip_prop_handlers;
@@ -275,10 +283,8 @@
int type;
} zip_prop_handler;
-#endif
/* }}} */
-#ifdef ZEND_ENGINE_2_1
static void php_zip_register_prop_handler(HashTable *prop_handler, char *name,
zip_read_int_t read_int_func, zip_read_const_char_t read_char_func,
zip_read_const_char_from_ze_t read_char_from_obj_func, int rettype TSRMLS_DC)
/* {{{ */
{
zip_prop_handler hnd;
@@ -341,7 +347,7 @@
}
/* }}} */
-zval **php_zip_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) /*
{{{ */
+static zval **php_zip_get_property_ptr_ptr(zval *object, zval *member
TSRMLS_DC) /* {{{ */
{
ze_zip_object *obj;
zval tmp_member;
@@ -378,7 +384,7 @@
}
/* }}} */
-zval* php_zip_read_property(zval *object, zval *member, int type TSRMLS_DC) /*
{{{ */
+static zval* php_zip_read_property(zval *object, zval *member, int type
TSRMLS_DC) /* {{{ */
{
ze_zip_object *obj;
zval tmp_member;
@@ -476,20 +482,7 @@
}
intern->za = NULL;
-
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 1 && PHP_RELEASE_VERSION >
2) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1) || (PHP_MAJOR_VERSION >
5)
zend_object_std_dtor(&intern->zo TSRMLS_CC);
-#else
- if (intern->zo.guards) {
- zend_hash_destroy(intern->zo.guards);
- FREE_HASHTABLE(intern->zo.guards);
- }
-
- if (intern->zo.properties) {
- zend_hash_destroy(intern->zo.properties);
- FREE_HASHTABLE(intern->zo.properties);
- }
-#endif
if (intern->filename) {
efree(intern->filename);
@@ -498,7 +491,7 @@
}
/* }}} */
-PHP_ZIP_API zend_object_value php_zip_object_new(zend_class_entry *class_type
TSRMLS_DC) /* {{{ */
+static zend_object_value php_zip_object_new(zend_class_entry *class_type
TSRMLS_DC) /* {{{ */
{
ze_zip_object *intern;
zval *tmp;
@@ -527,7 +520,6 @@
return retval;
}
/* }}} */
-#endif
/* {{{ Resource dtors */
@@ -561,9 +553,9 @@
/* }}}*/
/* {{{ function prototypes */
-PHP_MINIT_FUNCTION(zip);
-PHP_MSHUTDOWN_FUNCTION(zip);
-PHP_MINFO_FUNCTION(zip);
+static PHP_MINIT_FUNCTION(zip);
+static PHP_MSHUTDOWN_FUNCTION(zip);
+static PHP_MINFO_FUNCTION(zip);
/* }}} */
/* {{{ zip_module_entry
@@ -588,7 +580,7 @@
/* {{{ proto resource zip_open(string filename)
Create new zip using source uri for output */
-PHP_FUNCTION(zip_open)
+static PHP_FUNCTION(zip_open)
{
char *filename;
int filename_len;
@@ -616,7 +608,7 @@
/* {{{ proto void zip_close(resource zip)
Close a Zip archive */
-PHP_FUNCTION(zip_close)
+static PHP_FUNCTION(zip_close)
{
zval * zip;
zip_rsrc *z_rsrc = NULL;
@@ -633,7 +625,7 @@
/* {{{ proto resource zip_read(resource zip)
Returns the next file in the archive */
-PHP_FUNCTION(zip_read)
+static PHP_FUNCTION(zip_read)
{
zval *zip_dp;
zip_read_rsrc *zr_rsrc;
@@ -676,7 +668,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 */
-PHP_FUNCTION(zip_entry_open)
+static PHP_FUNCTION(zip_entry_open)
{
zval * zip;
zval * zip_entry;
@@ -703,7 +695,7 @@
/* {{{ proto void zip_entry_close(resource zip_ent)
Close a zip entry */
/* another dummy function to fit in the old api*/
-PHP_FUNCTION(zip_entry_close)
+static PHP_FUNCTION(zip_entry_close)
{
zval * zip_entry;
zip_read_rsrc * zr_rsrc;
@@ -720,7 +712,7 @@
/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
Read from an open directory entry */
-PHP_FUNCTION(zip_entry_read)
+static PHP_FUNCTION(zip_entry_read)
{
zval * zip_entry;
long len = 0;
@@ -819,7 +811,7 @@
/* {{{ proto string zip_entry_name(resource zip_entry)
Return the name given a ZZip entry */
-PHP_FUNCTION(zip_entry_name)
+static PHP_FUNCTION(zip_entry_name)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -827,7 +819,7 @@
/* {{{ proto int zip_entry_compressedsize(resource zip_entry)
Return the compressed size of a ZZip entry */
-PHP_FUNCTION(zip_entry_compressedsize)
+static PHP_FUNCTION(zip_entry_compressedsize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -835,7 +827,7 @@
/* {{{ proto int zip_entry_filesize(resource zip_entry)
Return the actual filesize of a ZZip entry */
-PHP_FUNCTION(zip_entry_filesize)
+static PHP_FUNCTION(zip_entry_filesize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
}
@@ -849,10 +841,9 @@
}
/* }}} */
-#ifdef ZEND_ENGINE_2_1
/* {{{ proto mixed open(string source [, int flags]) U
Create new zip using source uri for output, return TRUE on success or the
error code */
-ZIPARCHIVE_METHOD(open)
+static ZIPARCHIVE_METHOD(open)
{
struct zip *intern;
zval **filename_zval;
@@ -908,7 +899,7 @@
/* {{{ proto bool close() U
close the zip archive */
-ZIPARCHIVE_METHOD(close)
+static ZIPARCHIVE_METHOD(close)
{
struct zip *intern;
zval *this = getThis();
@@ -937,7 +928,7 @@
/* {{{ proto bool createEmptyDir(string dirname) U
Returns the index of the entry named filename in the archive */
-ZIPARCHIVE_METHOD(addEmptyDir)
+static ZIPARCHIVE_METHOD(addEmptyDir)
{
struct zip *intern;
zval *this = getThis();
@@ -966,7 +957,7 @@
/* {{{ proto bool 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. */
-ZIPARCHIVE_METHOD(addFile)
+static ZIPARCHIVE_METHOD(addFile)
{
struct zip *intern;
zval *this = getThis();
@@ -1067,7 +1058,7 @@
/* {{{ proto bool addFromString(string name, string content) U
Add a file using content and the entry name */
-ZIPARCHIVE_METHOD(addFromString)
+static ZIPARCHIVE_METHOD(addFromString)
{
struct zip *intern;
zval *this = getThis();
@@ -1138,7 +1129,7 @@
/* {{{ proto array statName(string filename[, int flags]) U
Returns the information about a the zip entry filename */
-ZIPARCHIVE_METHOD(statName)
+static ZIPARCHIVE_METHOD(statName)
{
struct zip *intern;
zval *this = getThis();
@@ -1166,7 +1157,7 @@
/* {{{ proto resource statIndex(int index[, int flags]) U
Returns the zip entry informations using its index */
-ZIPARCHIVE_METHOD(statIndex)
+static ZIPARCHIVE_METHOD(statIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1194,7 +1185,7 @@
/* {{{ proto int locateName(string filename[, int flags]) U
Returns the index of the entry named filename in the archive */
-ZIPARCHIVE_METHOD(locateName)
+static ZIPARCHIVE_METHOD(locateName)
{
struct zip *intern;
zval *this = getThis();
@@ -1234,7 +1225,7 @@
/* {{{ proto string getNameIndex(int index [, int flags]) U
Returns the name of the file at position index */
-ZIPARCHIVE_METHOD(getNameIndex)
+static ZIPARCHIVE_METHOD(getNameIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1264,7 +1255,7 @@
/* {{{ proto bool setArchiveComment(string name, string comment) U
Set or remove (NULL/'') the comment of the archive */
-ZIPARCHIVE_METHOD(setArchiveComment)
+static ZIPARCHIVE_METHOD(setArchiveComment)
{
struct zip *intern;
zval *this = getThis();
@@ -1290,7 +1281,7 @@
/* {{{ proto string getArchiveComment() U
Returns the comment of an entry using its index */
-ZIPARCHIVE_METHOD(getArchiveComment)
+static ZIPARCHIVE_METHOD(getArchiveComment)
{
struct zip *intern;
zval *this = getThis();
@@ -1315,7 +1306,7 @@
/* {{{ proto bool setCommentName(string name, string comment) U
Set or remove (NULL/'') the comment of an entry using its Name */
-ZIPARCHIVE_METHOD(setCommentName)
+static ZIPARCHIVE_METHOD(setCommentName)
{
struct zip *intern;
zval *this = getThis();
@@ -1349,7 +1340,7 @@
/* {{{ proto bool setCommentIndex(int index, string comment) U
Set or remove (NULL/'') the comment of an entry using its index */
-ZIPARCHIVE_METHOD(setCommentIndex)
+static ZIPARCHIVE_METHOD(setCommentIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1376,7 +1367,7 @@
/* {{{ proto string getCommentName(string name) U
Returns the comment of an entry using its name */
-ZIPARCHIVE_METHOD(getCommentName)
+static ZIPARCHIVE_METHOD(getCommentName)
{
struct zip *intern;
zval *this = getThis();
@@ -1414,7 +1405,7 @@
/* {{{ proto string getCommentIndex(int index) U
Returns the comment of an entry using its index */
-ZIPARCHIVE_METHOD(getCommentIndex)
+static ZIPARCHIVE_METHOD(getCommentIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1442,7 +1433,7 @@
/* {{{ proto bool deleteIndex(int index) U
Delete a file using its index */
-ZIPARCHIVE_METHOD(deleteIndex)
+static ZIPARCHIVE_METHOD(deleteIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1472,7 +1463,7 @@
/* {{{ proto bool deleteName(string name) U
Delete a file using its index */
-ZIPARCHIVE_METHOD(deleteName)
+static ZIPARCHIVE_METHOD(deleteName)
{
struct zip *intern;
zval *this = getThis();
@@ -1503,7 +1494,7 @@
/* {{{ proto bool renameIndex(int index, string new_name) U
Rename an entry selected by its index to new_name */
-ZIPARCHIVE_METHOD(renameIndex)
+static ZIPARCHIVE_METHOD(renameIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1540,7 +1531,7 @@
/* {{{ proto bool renameName(string name, string new_name) U
Rename an entry selected by its name to new_name */
-ZIPARCHIVE_METHOD(renameName)
+static ZIPARCHIVE_METHOD(renameName)
{
struct zip *intern;
zval *this = getThis();
@@ -1576,7 +1567,7 @@
/* {{{ proto bool unchangeIndex(int index) U
Changes to the file at position index are reverted */
-ZIPARCHIVE_METHOD(unchangeIndex)
+static ZIPARCHIVE_METHOD(unchangeIndex)
{
struct zip *intern;
zval *this = getThis();
@@ -1606,7 +1597,7 @@
/* {{{ proto bool unchangeName(string name) U
Changes to the file named 'name' are reverted */
-ZIPARCHIVE_METHOD(unchangeName)
+static ZIPARCHIVE_METHOD(unchangeName)
{
struct zip *intern;
zval *this = getThis();
@@ -1641,7 +1632,7 @@
/* {{{ proto bool unchangeAll() U
All changes to files and global information in archive are reverted */
-ZIPARCHIVE_METHOD(unchangeAll)
+static ZIPARCHIVE_METHOD(unchangeAll)
{
struct zip *intern;
zval *this = getThis();
@@ -1662,7 +1653,7 @@
/* {{{ proto bool unchangeAll() U
Revert all global changes to the archive archive. For now, this only reverts
archive comment changes. */
-ZIPARCHIVE_METHOD(unchangeArchive)
+static ZIPARCHIVE_METHOD(unchangeArchive)
{
struct zip *intern;
zval *this = getThis();
@@ -1688,7 +1679,7 @@
* - replace path
* - patterns
*/
-ZIPARCHIVE_METHOD(extractTo)
+static ZIPARCHIVE_METHOD(extractTo)
{
struct zip *intern;
@@ -1879,7 +1870,7 @@
/* {{{ proto string getFromName(string entryname[, int len [, int flags]]) U
get the contents of an entry using its name */
-ZIPARCHIVE_METHOD(getFromName)
+static ZIPARCHIVE_METHOD(getFromName)
{
php_zip_get_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -1887,7 +1878,7 @@
/* {{{ proto string getFromIndex(string entryname[, int len [, int flags]]) U
get the contents of an entry using its index */
-ZIPARCHIVE_METHOD(getFromIndex)
+static ZIPARCHIVE_METHOD(getFromIndex)
{
php_zip_get_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -1895,7 +1886,7 @@
/* {{{ proto resource getStream(string entryname) U
get a stream for an entry using its name */
-ZIPARCHIVE_METHOD(getStream)
+static ZIPARCHIVE_METHOD(getStream)
{
struct zip *intern;
zval *this = getThis();
@@ -1961,17 +1952,15 @@
{NULL, NULL, NULL}
};
/* }}} */
-#endif
/* {{{ PHP_MINIT_FUNCTION */
-PHP_MINIT_FUNCTION(zip)
+static PHP_MINIT_FUNCTION(zip)
{
-#ifdef ZEND_ENGINE_2_1
zend_class_entry ce;
memcpy(&zip_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
zip_object_handlers.clone_obj = NULL;
- zip_object_handlers.get_property_ptr_ptr = php_zip_get_property_ptr_ptr;
+ zip_object_handlers.get_property_ptr_ptr = php_zip_get_property_ptr_ptr;
zip_object_handlers.get_properties = php_zip_get_properties;
zip_object_handlers.read_property = php_zip_read_property;
@@ -2035,7 +2024,6 @@
REGISTER_ZIP_CLASS_CONST_LONG("ER_DELETED", ZIP_ER_DELETED);
/* N Entry has been deleted */
php_register_url_stream_wrapper("zip", &php_stream_zip_wrapper
TSRMLS_CC);
-#endif
le_zip_dir = zend_register_list_destructors_ex(php_zip_free_dir,
NULL, le_zip_dir_name, module_number);
le_zip_entry = zend_register_list_destructors_ex(php_zip_free_entry,
NULL, le_zip_entry_name, module_number);
@@ -2046,24 +2034,23 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
-PHP_MSHUTDOWN_FUNCTION(zip)
+static PHP_MSHUTDOWN_FUNCTION(zip)
{
-#ifdef ZEND_ENGINE_2_1
zend_hash_destroy(&zip_prop_handlers);
php_unregister_url_stream_wrapper("zip" TSRMLS_CC);
-#endif
+
return SUCCESS;
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION
*/
-PHP_MINFO_FUNCTION(zip)
+static PHP_MINFO_FUNCTION(zip)
{
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.28
2006/11/03 16:23:12 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.29
2006/11/09 16:18:28 nlopess Exp $");
php_info_print_table_row(2, "Zip version", "2.0.0");
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.12&r2=1.13&diff_format=u
Index: php-src/ext/zip/php_zip.h
diff -u php-src/ext/zip/php_zip.h:1.12 php-src/ext/zip/php_zip.h:1.13
--- php-src/ext/zip/php_zip.h:1.12 Tue Oct 31 14:27:09 2006
+++ php-src/ext/zip/php_zip.h Thu Nov 9 16:18:28 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.h,v 1.12 2006/10/31 14:27:09 pajoye Exp $ */
+/* $Id: php_zip.h,v 1.13 2006/11/09 16:18:28 nlopess Exp $ */
#ifndef PHP_ZIP_H
#define PHP_ZIP_H
@@ -24,31 +24,12 @@
extern zend_module_entry zip_module_entry;
#define phpext_zip_ptr &zip_module_entry
-#ifdef PHP_WIN32
-#define PHP_ZIP_API __declspec(dllexport)
-#else
-#define PHP_ZIP_API
-#endif
-
#ifdef ZTS
#include "TSRM.h"
#endif
#include "lib/zip.h"
-#ifndef ZEND_ENGINE_2_1
-# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) || PHP_MAJOR_VERSION ==
6
-# define ZEND_ENGINE_2_1
-# endif
-#endif
-
-#if PHP_MAJOR_VERSION < 6
-#define zend_ascii_hash_find(hash, name, sizeof_name, val)
zend_hash_find(hash, name, sizeof_name, val)
-#define add_ascii_assoc_long(array, name, val) add_assoc_long(array, name, val)
-#define add_ascii_assoc_string(array, name, val, dup) add_assoc_long(array,
name, val, dup)
-
-#endif
-
typedef struct _ze_zip_rsrc {
struct zip *za;
int index_current;
@@ -62,7 +43,6 @@
struct zip_stat sb;
} zip_read_rsrc;
-#ifdef ZEND_ENGINE_2_1
#define ZIPARCHIVE_ME(name, arg_info, flags) ZEND_FENTRY(name, c_ziparchive_
##name, arg_info, flags)
#define ZIPARCHIVE_METHOD(name) ZEND_NAMED_FUNCTION(c_ziparchive_##name)
@@ -77,24 +57,10 @@
int filename_len;
} ze_zip_object;
-zend_class_entry *zip_class_entry_ce;
-
php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper, char *path,
char *mode, int options, char **opened_path, php_stream_context *context
STREAMS_DC TSRMLS_DC);
php_stream *php_stream_zip_open(char *filename, char *path, char *mode
STREAMS_DC TSRMLS_DC);
extern php_stream_wrapper php_stream_zip_wrapper;
-#endif
-
-PHP_FUNCTION(zip_open);
-PHP_FUNCTION(zip_read);
-PHP_FUNCTION(zip_close);
-PHP_FUNCTION(zip_entry_read);
-PHP_FUNCTION(zip_entry_filesize);
-PHP_FUNCTION(zip_entry_name);
-PHP_FUNCTION(zip_entry_compressedsize);
-PHP_FUNCTION(zip_entry_compressionmethod);
-PHP_FUNCTION(zip_entry_open);
-PHP_FUNCTION(zip_entry_close);
#endif /* PHP_ZIP_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
