statification of local functions and variables.

also remove a few uneeded global variables
interesting new warnings:
/cvs/php5/ext/xmlwriter/php_xmlwriter.c:391: warning: 'xmlwriter_objects_clone' defined but not used
/cvs/php5/ext/xmlwriter/php_xmlwriter.c:1281: warning: 'zif_xmlwriter_start_dtd_entity' defined but not used
/cvs/php5/ext/xmlwriter/php_xmlwriter.c:1325: warning: 'zif_xmlwriter_end_dtd_entity' defined but not used
/cvs/php5/ext/xmlwriter/php_xmlwriter.c:1333: warning: 'zif_xmlwriter_write_dtd_entity' defined but not used

ext/xmlwriter/php_xmlwriter.c

@@ -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 @@ static void xmlwriter_object_free_storage(void *object TSRMLS_DC)
 
 
 /* {{{ 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;
@@ -229,9 +278,9 @@ static zend_function_entry xmlwriter_class_functions[] = {
 #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;
 /* }}} */
@@ -239,7 +288,7 @@ static int le_xmlwriter;
 /* _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;
@@ -301,7 +350,7 @@ static void *php_xmlwriter_streams_IO_open_write_wrapper(const char *filename TS
 /* }}} */
 
 /* {{{ 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);
@@ -309,7 +358,7 @@ int php_xmlwriter_streams_IO_write(void *context, const char *buffer, int len)
 /* }}} */
 
 /* {{{ 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);
@@ -338,7 +387,7 @@ ZEND_GET_MODULE(xmlwriter)
 #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 */
 }
@@ -430,7 +479,7 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
 #if LIBXML_VERSION >= 20605
 /* {{{ proto bool xmlwriter_set_indent(resource xmlwriter, bool indent)
 Toggle indentation on/off - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_set_indent)
+static PHP_FUNCTION(xmlwriter_set_indent)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -470,7 +519,7 @@ PHP_FUNCTION(xmlwriter_set_indent)
 
 /* {{{ proto bool xmlwriter_set_indent_string(resource xmlwriter, string indentString)
 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);
 }
@@ -480,7 +529,7 @@ PHP_FUNCTION(xmlwriter_set_indent_string)
 
 /* {{{ proto bool xmlwriter_start_attribute(resource xmlwriter, string name)
 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");
 }
@@ -488,7 +537,7 @@ PHP_FUNCTION(xmlwriter_start_attribute)
 
 /* {{{ proto bool xmlwriter_end_attribute(resource xmlwriter)
 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);
 }
@@ -497,7 +546,7 @@ PHP_FUNCTION(xmlwriter_end_attribute)
 #if LIBXML_VERSION > 20617
 /* {{{ proto bool xmlwriter_start_attribute_ns(resource xmlwriter, string prefix, string name, string uri)
 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;
@@ -541,7 +590,7 @@ PHP_FUNCTION(xmlwriter_start_attribute_ns)
 
 /* {{{ proto bool xmlwriter_write_attribute(resource xmlwriter, string name, string content)
 Write full attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_attribute)
+static PHP_FUNCTION(xmlwriter_write_attribute)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -586,7 +635,7 @@ PHP_FUNCTION(xmlwriter_write_attribute)
 #if LIBXML_VERSION > 20617
 /* {{{ proto bool xmlwriter_write_attribute_ns(resource xmlwriter, string prefix, string name, string uri, string content)
 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;
@@ -631,7 +680,7 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns)
 
 /* {{{ proto bool xmlwriter_start_element(resource xmlwriter, string name)
 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");
 }
@@ -640,7 +689,7 @@ PHP_FUNCTION(xmlwriter_start_element)
 
 /* {{{ proto bool xmlwriter_start_element_ns(resource xmlwriter, string prefix, string name, string uri)
 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;
@@ -684,7 +733,7 @@ PHP_FUNCTION(xmlwriter_start_element_ns)
 
 /* {{{ proto bool xmlwriter_end_element(resource xmlwriter)
 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);
 }
@@ -692,7 +741,7 @@ PHP_FUNCTION(xmlwriter_end_element)
 
 /* {{{ proto bool xmlwriter_full_end_element(resource xmlwriter)
 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);
 }
@@ -700,7 +749,7 @@ PHP_FUNCTION(xmlwriter_full_end_element)
 
 /* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name, string content)
 Write full element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_element)
+static PHP_FUNCTION(xmlwriter_write_element)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -743,7 +792,7 @@ PHP_FUNCTION(xmlwriter_write_element)
 
 /* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string prefix, string name, string uri, string content)
 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;
@@ -787,7 +836,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns)
 
 /* {{{ proto bool xmlwriter_start_pi(resource xmlwriter, string target)
 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");
 }
@@ -795,7 +844,7 @@ PHP_FUNCTION(xmlwriter_start_pi)
 
 /* {{{ proto bool xmlwriter_end_pi(resource xmlwriter)
 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);
 }
@@ -803,7 +852,7 @@ PHP_FUNCTION(xmlwriter_end_pi)
 
 /* {{{ proto bool xmlwriter_write_pi(resource xmlwriter, string target, string content)
 Write full PI tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_pi)
+static PHP_FUNCTION(xmlwriter_write_pi)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -847,7 +896,7 @@ PHP_FUNCTION(xmlwriter_write_pi)
 
 /* {{{ proto bool xmlwriter_start_cdata(resource xmlwriter)
 Create start CDATA tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_cdata)
+static PHP_FUNCTION(xmlwriter_start_cdata)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -882,7 +931,7 @@ PHP_FUNCTION(xmlwriter_start_cdata)
 
 /* {{{ proto bool xmlwriter_end_cdata(resource xmlwriter)
 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);
 }
@@ -890,7 +939,7 @@ PHP_FUNCTION(xmlwriter_end_cdata)
 
 /* {{{ proto bool xmlwriter_write_cdata(resource xmlwriter, string content)
 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);
 }
@@ -898,7 +947,7 @@ PHP_FUNCTION(xmlwriter_write_cdata)
 
 /* {{{ proto bool xmlwriter_write_raw(resource xmlwriter, string content)
 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);
 }
@@ -906,7 +955,7 @@ PHP_FUNCTION(xmlwriter_write_raw)
 
 /* {{{ proto bool xmlwriter_text(resource xmlwriter, string content)
 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);
 }
@@ -915,7 +964,7 @@ PHP_FUNCTION(xmlwriter_text)
 #if LIBXML_VERSION >= 20607
 /* {{{ proto bool xmlwriter_start_comment(resource xmlwriter)
 Create start comment - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_comment)
+static PHP_FUNCTION(xmlwriter_start_comment)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -950,7 +999,7 @@ PHP_FUNCTION(xmlwriter_start_comment)
 
 /* {{{ proto bool xmlwriter_end_comment(resource xmlwriter)
 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);
 }
@@ -960,7 +1009,7 @@ PHP_FUNCTION(xmlwriter_end_comment)
 
 /* {{{ proto bool xmlwriter_write_comment(resource xmlwriter, string content)
 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);
 }
@@ -968,7 +1017,7 @@ PHP_FUNCTION(xmlwriter_write_comment)
 
 /* {{{ proto bool xmlwriter_start_document(resource xmlwriter, string version, string encoding, string standalone)
 Create document tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_document)
+static PHP_FUNCTION(xmlwriter_start_document)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1008,7 +1057,7 @@ PHP_FUNCTION(xmlwriter_start_document)
 
 /* {{{ proto bool xmlwriter_end_document(resource xmlwriter)
 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);
 }
@@ -1016,7 +1065,7 @@ PHP_FUNCTION(xmlwriter_end_document)
 
 /* {{{ proto bool xmlwriter_start_dtd(resource xmlwriter, string name, string pubid, string sysid)
 Create start DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd)
+static PHP_FUNCTION(xmlwriter_start_dtd)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1057,7 +1106,7 @@ PHP_FUNCTION(xmlwriter_start_dtd)
 
 /* {{{ proto bool xmlwriter_end_dtd(resource xmlwriter)
 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);
 }
@@ -1065,7 +1114,7 @@ PHP_FUNCTION(xmlwriter_end_dtd)
 
 /* {{{ proto bool xmlwriter_write_dtd(resource xmlwriter, string name, string pubid, string sysid, string subset)
 Write full DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd)
+static PHP_FUNCTION(xmlwriter_write_dtd)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1107,7 +1156,7 @@ PHP_FUNCTION(xmlwriter_write_dtd)
 
 /* {{{ proto bool xmlwriter_start_dtd_element(resource xmlwriter, string name)
 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");
 }
@@ -1115,7 +1164,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_element)
 
 /* {{{ proto bool xmlwriter_end_dtd_element(resource xmlwriter)
 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);
 }
@@ -1123,7 +1172,7 @@ PHP_FUNCTION(xmlwriter_end_dtd_element)
 
 /* {{{ proto bool xmlwriter_write_dtd_element(resource xmlwriter, string name, string content)
 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;
@@ -1167,7 +1216,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_element)
 #if LIBXML_VERSION > 20608
 /* {{{ proto bool xmlwriter_start_dtd_attlist(resource xmlwriter, string name)
 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");
 }
@@ -1175,7 +1224,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_end_dtd_attlist(resource xmlwriter)
 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);
 }
@@ -1183,7 +1232,7 @@ PHP_FUNCTION(xmlwriter_end_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_write_dtd_attlist(resource xmlwriter, string name, string content)
 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;
@@ -1228,7 +1277,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_start_dtd_entity(resource xmlwriter, string name, bool isparam)
 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;
@@ -1272,7 +1321,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_entity)
 
 /* {{{ proto bool xmlwriter_end_dtd_entity(resource xmlwriter)
 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);
 }
@@ -1280,7 +1329,7 @@ PHP_FUNCTION(xmlwriter_end_dtd_entity)
 
 /* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content)
 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;
@@ -1325,7 +1374,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_entity)
 
 /* {{{ proto resource xmlwriter_open_uri(resource xmlwriter, string source)
 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;
@@ -1406,7 +1455,7 @@ PHP_FUNCTION(xmlwriter_open_uri)
 
 /* {{{ proto resource xmlwriter_open_memory()
 Create new xmlwriter using memory for string output */
-PHP_FUNCTION(xmlwriter_open_memory)
+static PHP_FUNCTION(xmlwriter_open_memory)
 {
 	xmlwriter_object *intern;
 	xmlTextWriterPtr ptr;
@@ -1507,7 +1556,7 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
 
 /* {{{ proto string xmlwriter_output_memory(resource xmlwriter [,bool flush])
 Output current buffer as string */
-PHP_FUNCTION(xmlwriter_output_memory)
+static PHP_FUNCTION(xmlwriter_output_memory)
 {
 	php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -1515,7 +1564,7 @@ PHP_FUNCTION(xmlwriter_output_memory)
 
 /* {{{ proto mixed xmlwriter_flush(resource xmlwriter [,bool empty])
 Output current buffer */
-PHP_FUNCTION(xmlwriter_flush)
+static PHP_FUNCTION(xmlwriter_flush)
 {
 	php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -1523,7 +1572,7 @@ PHP_FUNCTION(xmlwriter_flush)
 
 /* {{{ PHP_MINIT_FUNCTION
  */
-PHP_MINIT_FUNCTION(xmlwriter)
+static PHP_MINIT_FUNCTION(xmlwriter)
 {
 #ifdef ZEND_ENGINE_2
 	zend_class_entry ce;
@@ -1544,7 +1593,7 @@ PHP_MINIT_FUNCTION(xmlwriter)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
-PHP_MSHUTDOWN_FUNCTION(xmlwriter)
+static PHP_MSHUTDOWN_FUNCTION(xmlwriter)
 {
 	return SUCCESS;
 }
@@ -1552,7 +1601,7 @@ PHP_MSHUTDOWN_FUNCTION(xmlwriter)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(xmlwriter)
+static PHP_MINFO_FUNCTION(xmlwriter)
 {
 	php_info_print_table_start();
 	{

ext/xmlwriter/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 @@ typedef struct _ze_xmlwriter_object {
 	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 */
 
 /*

ext/zip/php_zip.c

@@ -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"
@@ -75,7 +86,6 @@ static int le_zip_entry;
 
 /* }}} */
 
-#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)
@@ -83,7 +93,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file TSRMLS_D
 	php_stream_statbuf ssb;
 	struct zip_file *zf;
 	struct zip_stat sb;
-    char b[8192];
+	char b[8192];
 
 	int n, len, ret, file_len;
 
@@ -258,7 +268,6 @@ static char * php_zipobj_get_zip_comment(struct zip *za, int *len TSRMLS_DC) /*
 	return NULL;
 }
 /* }}} */
-#endif
 
 /* {{{ zend_function_entry */
 static zend_function_entry zip_functions[] = {
@@ -278,8 +287,7 @@ static zend_function_entry zip_functions[] = {
 /* }}} */
 
 /* {{{ 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;
@@ -295,10 +303,8 @@ typedef struct _zip_prop_handler {
 
 	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;
@@ -361,7 +367,7 @@ static int php_zip_property_reader(ze_zip_object *obj, zip_prop_handler *hnd, zv
 }
 /* }}} */
 
-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;
@@ -398,7 +404,7 @@ zval **php_zip_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) /* {{{
 }
 /* }}} */
 
-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;
@@ -496,20 +502,7 @@ static void php_zip_object_free_storage(void *object TSRMLS_DC) /* {{{ */
 	}
 
 	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);
@@ -518,7 +511,7 @@ static void php_zip_object_free_storage(void *object TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-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;
@@ -547,7 +540,6 @@ PHP_ZIP_API zend_object_value php_zip_object_new(zend_class_entry *class_type TS
 	return retval;
 }
 /* }}} */
-#endif
 
 /* {{{ Resource dtors */
 
@@ -581,9 +573,9 @@ static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 /* }}}*/
 
 /* {{{ 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
@@ -608,7 +600,7 @@ ZEND_GET_MODULE(zip)
 
 /* {{{ 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;
@@ -639,7 +631,7 @@ PHP_FUNCTION(zip_open)
 
 /* {{{ 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;
@@ -656,7 +648,7 @@ PHP_FUNCTION(zip_close)
 
 /* {{{ 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;
@@ -699,7 +691,7 @@ PHP_FUNCTION(zip_read)
 /* {{{ 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;
@@ -726,7 +718,7 @@ PHP_FUNCTION(zip_entry_open)
 /* {{{ 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;
@@ -743,7 +735,7 @@ PHP_FUNCTION(zip_entry_close)
 
 /* {{{ 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;
@@ -842,7 +834,7 @@ static void php_zip_entry_get_info(INTERNAL_FUNCTION_PARAMETERS, int opt) /* {{{
 
 /* {{{ 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);
 }
@@ -850,7 +842,7 @@ PHP_FUNCTION(zip_entry_name)
 
 /* {{{ 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);
 }
@@ -858,7 +850,7 @@ PHP_FUNCTION(zip_entry_compressedsize)
 
 /* {{{ 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);
 }
@@ -866,16 +858,15 @@ PHP_FUNCTION(zip_entry_filesize)
 
 /* {{{ proto string zip_entry_compressionmethod(resource zip_entry)
    Return a string containing the compression method used on a particular entry */
-PHP_FUNCTION(zip_entry_compressionmethod)
+static PHP_FUNCTION(zip_entry_compressionmethod)
 {
 	php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
 }
 /* }}} */
 
-#ifdef ZEND_ENGINE_2_1
 /* {{{ proto mixed open(string source [, int flags])
 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;
 	char *filename;
@@ -925,7 +916,7 @@ ZIPARCHIVE_METHOD(open)
 
 /* {{{ proto bool close()
 close the zip archive */
-ZIPARCHIVE_METHOD(close)
+static ZIPARCHIVE_METHOD(close)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -983,7 +974,7 @@ ZIPARCHIVE_METHOD(addEmptyDir)
 
 /* {{{ proto bool addFile(string filepath[, string entryname[, int start [, int length]]])
 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();
@@ -1056,7 +1047,7 @@ ZIPARCHIVE_METHOD(addFile)
 
 /* {{{ proto bool addFromString(string name, string content)
 Add a file using content and the entry name */
-ZIPARCHIVE_METHOD(addFromString)
+static ZIPARCHIVE_METHOD(addFromString)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1121,7 +1112,7 @@ ZIPARCHIVE_METHOD(addFromString)
 
 /* {{{ proto array statName(string filename[, int flags])
 Returns the information about a the zip entry filename */
-ZIPARCHIVE_METHOD(statName)
+static ZIPARCHIVE_METHOD(statName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1149,7 +1140,7 @@ ZIPARCHIVE_METHOD(statName)
 
 /* {{{ proto resource statIndex(int index[, int flags])
 Returns the zip entry informations using its index */
-ZIPARCHIVE_METHOD(statIndex)
+static ZIPARCHIVE_METHOD(statIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1177,7 +1168,7 @@ ZIPARCHIVE_METHOD(statIndex)
 
 /* {{{ proto int locateName(string filename[, int flags])
 Returns the index of the entry named filename in the archive */
-ZIPARCHIVE_METHOD(locateName)
+static ZIPARCHIVE_METHOD(locateName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1217,7 +1208,7 @@ ZIPARCHIVE_METHOD(locateName)
 
 /* {{{ proto string getNameIndex(int index [, int flags])
 Returns the name of the file at position index */
-ZIPARCHIVE_METHOD(getNameIndex)
+static ZIPARCHIVE_METHOD(getNameIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1247,7 +1238,7 @@ ZIPARCHIVE_METHOD(getNameIndex)
 
 /* {{{ proto bool setArchiveComment(string name, string comment)
 Set or remove (NULL/'') the comment of the archive */
-ZIPARCHIVE_METHOD(setArchiveComment)
+static ZIPARCHIVE_METHOD(setArchiveComment)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1273,7 +1264,7 @@ ZIPARCHIVE_METHOD(setArchiveComment)
 
 /* {{{ proto string getArchiveComment()
 Returns the comment of an entry using its index */
-ZIPARCHIVE_METHOD(getArchiveComment)
+static ZIPARCHIVE_METHOD(getArchiveComment)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1298,7 +1289,7 @@ ZIPARCHIVE_METHOD(getArchiveComment)
 
 /* {{{ proto bool setCommentName(string name, string comment)
 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();
@@ -1331,7 +1322,7 @@ ZIPARCHIVE_METHOD(setCommentName)
 
 /* {{{ proto bool setCommentIndex(int index, string comment)
 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();
@@ -1358,7 +1349,7 @@ ZIPARCHIVE_METHOD(setCommentIndex)
 
 /* {{{ proto string getCommentName(string name)
 Returns the comment of an entry using its name */
-ZIPARCHIVE_METHOD(getCommentName)
+static ZIPARCHIVE_METHOD(getCommentName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1395,7 +1386,7 @@ ZIPARCHIVE_METHOD(getCommentName)
 
 /* {{{ proto string getCommentIndex(int index)
 Returns the comment of an entry using its index */
-ZIPARCHIVE_METHOD(getCommentIndex)
+static ZIPARCHIVE_METHOD(getCommentIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1423,7 +1414,7 @@ ZIPARCHIVE_METHOD(getCommentIndex)
 
 /* {{{ proto bool deleteIndex(int index)
 Delete a file using its index */
-ZIPARCHIVE_METHOD(deleteIndex)
+static ZIPARCHIVE_METHOD(deleteIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1453,7 +1444,7 @@ ZIPARCHIVE_METHOD(deleteIndex)
 
 /* {{{ proto bool deleteName(string name)
 Delete a file using its index */
-ZIPARCHIVE_METHOD(deleteName)
+static ZIPARCHIVE_METHOD(deleteName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1484,7 +1475,7 @@ ZIPARCHIVE_METHOD(deleteName)
 
 /* {{{ proto bool renameIndex(int index, string new_name)
 Rename an entry selected by its index to new_name */
-ZIPARCHIVE_METHOD(renameIndex)
+static ZIPARCHIVE_METHOD(renameIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1520,7 +1511,7 @@ ZIPARCHIVE_METHOD(renameIndex)
 
 /* {{{ proto bool renameName(string name, string new_name)
 Rename an entry selected by its name to new_name */
-ZIPARCHIVE_METHOD(renameName)
+static ZIPARCHIVE_METHOD(renameName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1554,7 +1545,7 @@ ZIPARCHIVE_METHOD(renameName)
 
 /* {{{ proto bool unchangeIndex(int index)
 Changes to the file at position index are reverted */
-ZIPARCHIVE_METHOD(unchangeIndex)
+static ZIPARCHIVE_METHOD(unchangeIndex)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1584,7 +1575,7 @@ ZIPARCHIVE_METHOD(unchangeIndex)
 
 /* {{{ proto bool unchangeName(string name)
 Changes to the file named 'name' are reverted */
-ZIPARCHIVE_METHOD(unchangeName)
+static ZIPARCHIVE_METHOD(unchangeName)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1618,7 +1609,7 @@ ZIPARCHIVE_METHOD(unchangeName)
 
 /* {{{ proto bool unchangeAll()
 All changes to files and global information in archive are reverted */
-ZIPARCHIVE_METHOD(unchangeAll)
+static ZIPARCHIVE_METHOD(unchangeAll)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1639,7 +1630,7 @@ ZIPARCHIVE_METHOD(unchangeAll)
 
 /* {{{ proto bool unchangeAll()
 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();
@@ -1665,7 +1656,7 @@ Extract one or more file from a zip archive */
  * - replace path
  * - patterns
  */
-ZIPARCHIVE_METHOD(extractTo)
+static ZIPARCHIVE_METHOD(extractTo)
 {
 	struct zip *intern;
 
@@ -1821,7 +1812,7 @@ static void php_zip_get_from(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 
 /* {{{ proto string getFromName(string entryname[, int len [, int flags]])
 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);
 }
@@ -1829,7 +1820,7 @@ ZIPARCHIVE_METHOD(getFromName)
 
 /* {{{ proto string getFromIndex(string entryname[, int len [, int flags]])
 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);
 }
@@ -1837,7 +1828,7 @@ ZIPARCHIVE_METHOD(getFromIndex)
 
 /* {{{ proto resource getStream(string entryname)
 get a stream for an entry using its name */
-ZIPARCHIVE_METHOD(getStream)
+static ZIPARCHIVE_METHOD(getStream)
 {
 	struct zip *intern;
 	zval *this = getThis();
@@ -1903,17 +1894,15 @@ static zend_function_entry zip_class_functions[] = {
 	{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;
@@ -1977,7 +1966,6 @@ PHP_MINIT_FUNCTION(zip)
 	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);
@@ -1988,19 +1976,18 @@ PHP_MINIT_FUNCTION(zip)
 
 /* {{{ 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();
 

ext/zip/php_zip.h

@@ -24,24 +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)
-#  define ZEND_ENGINE_2_1
-# endif
-#endif
-
 typedef struct _ze_zip_rsrc {
 	struct zip *za;
 	int index_current;
@@ -55,7 +43,6 @@ typedef struct _ze_zip_read_rsrc {
 	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)
 
@@ -70,24 +57,10 @@ typedef struct _ze_zip_object {
 	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 */