Remove zend_dynamic_array and it's build targets as it is not longer needed

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 3283effca365a76719fc4873869f584fb780a1b2..5c4cb5aeec2e85e311e2c545e25b2e90c2214af5 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES=libZend.la
 libZend_la_SOURCES=\
        zend_language_parser.y zend_language_scanner.l \
        zend_ini_parser.y zend_ini_scanner.l \
-       zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+       zend_alloc.c zend_compile.c zend_constants.c \
        zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
        zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
        zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 6d3f404a716ab49f98240580226b3927ef2ba479..042d584edbb53ac7d80fbc06529bb536b3fb42fa 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -139,10 +139,6 @@ SOURCE=.\zend_default_classes.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_dynamic_array.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_execute.c\r
 # End Source File\r
 # Begin Source File\r
@@ -295,10 +291,6 @@ SOURCE=.\zend_default_classes.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_dynamic_array.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_errors.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index 92d2be093540db980581ef3db7d214d901e40104..df709fff7231684e878940e29614f657d4207d61 100644 (file)
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -164,10 +164,6 @@ SOURCE=.\zend_default_classes.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_dynamic_array.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_exceptions.c\r
 # End Source File\r
 # Begin Source File\r
@@ -328,10 +324,6 @@ SOURCE=.\zend_default_classes.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\zend_dynamic_array.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\zend_errors.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/zend_dynamic_array.c b/Zend/zend_dynamic_array.c
deleted file mode 100644 (file)
index 8fc6cab..0000000
--- a/Zend/zend_dynamic_array.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include "zend.h"
-
-typedef struct _dynamic_array {
-        char *array;
-        unsigned int element_size;
-        unsigned int current;
-        unsigned int allocated;
-} dynamic_array;
-
-ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size) /* {{{ */
-{
-       da->element_size = element_size;
-       da->allocated = size;
-       da->current = 0;
-       da->array = (char *) emalloc(size*element_size);
-       if (da->array == NULL) {
-               return 1;
-       }
-       return 0;
-}
-/* }}} */
-
-ZEND_API void *zend_dynamic_array_push(dynamic_array *da) /* {{{ */
-{
-       if (da->current == da->allocated) {
-               da->allocated *= 2;
-               da->array = (char *) erealloc(da->array, da->allocated*da->element_size);
-       }
-       return (void *)(da->array+(da->current++)*da->element_size);
-}
-/* }}} */
-
-ZEND_API void *zend_dynamic_array_pop(dynamic_array *da) /* {{{ */
-{
-       return (void *)(da->array+(--(da->current))*da->element_size);
-
-}
-/* }}} */
-
-ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index) /* {{{ */
-{
-       if (index >= da->current) {
-               return NULL;
-       }
-       return (void *)(da->array+index*da->element_size);
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */

diff --git a/Zend/zend_dynamic_array.h b/Zend/zend_dynamic_array.h
deleted file mode 100644 (file)
index e50d8a8..0000000
--- a/Zend/zend_dynamic_array.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef ZEND_DYNAMIC_ARRAY_H
-#define ZEND_DYNAMIC_ARRAY_H
-
-typedef struct _dynamic_array {
-       char *array;
-       unsigned int element_size;
-       unsigned int last_used;
-       unsigned int allocated;
-} dynamic_array;
-
-BEGIN_EXTERN_C()
-ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size);
-ZEND_API void *zend_dynamic_array_push(dynamic_array *da);
-ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
-ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);
-END_EXTERN_C()
-
-#endif /* ZEND_DYNAMIC_ARRAY_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- */

diff --git a/configure.in b/configure.in
index e0a1414d508a2328eb518ab9e81ae4e2bbcbfa2c..949f253ee406c32c493cc7750e54329b9ba38e87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1359,7 +1359,7 @@ esac
 PHP_ADD_SOURCES(Zend, \
     zend_language_parser.c zend_language_scanner.c \
     zend_ini_parser.c zend_ini_scanner.c \
-    zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+    zend_alloc.c zend_compile.c zend_constants.c \
     zend_execute_API.c zend_unicode.c zend_highlight.c zend_llist.c \
     zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 7ecfd9d7e65c11608a76d5bd7d0cf48ead7ab288..30775c8a58749addedb60713fd3ccf138388b89f 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -335,7 +335,7 @@ STDOUT.WriteLine("PHP Core:  " + get_define('PHPDLL') + " and " + get_define('PH
 
 ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
        zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
-       zend_constants.c zend_dynamic_array.c zend_exceptions.c \
+       zend_constants.c zend_exceptions.c \
        zend_execute_API.c zend_highlight.c \
        zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
        zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \