Removed pointless memory allocation checks.

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 159d452d5da353cf702799899a2c97027d785036..3f414b5ec79829d771df9563306ecb06f5b02b5d 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -262,9 +262,7 @@ PHP_FUNCTION(getallheaders)
 {
        int i;
 
-       if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        
        for (i = 0; i < Ns_SetSize(NSG(conn->headers)); i++) {
                char *key = Ns_SetKey(NSG(conn->headers), i);

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 5e5c95d216614fc987dba74312cbd9bc3f40ada5..59241a5fe8f749ab6a8b2135deda6c6a3403c186 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -345,9 +345,7 @@ PHP_FUNCTION(apache_request_headers)
     table_entry *tenv;
     int i;
        
-    if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-    }
+    array_init(return_value);
     env_arr = table_elts(((request_rec *) SG(server_context))->headers_in);
     tenv = (table_entry *)env_arr->elts;
     for (i = 0; i < env_arr->nelts; ++i) {
@@ -371,9 +369,7 @@ PHP_FUNCTION(apache_response_headers)
     table_entry *tenv;
     int i;
 
-    if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-    }
+    array_init(return_value);
     env_arr = table_elts(((request_rec *) SG(server_context))->headers_out);
     tenv = (table_entry *)env_arr->elts;
     for (i = 0; i < env_arr->nelts; ++i) {

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index a26d6ad5272093634812aaa9a93ca9e2228af837..ae29e6e030f96b1c1b3156a3b57f5948ccf726b5 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -158,9 +158,7 @@ PHP_FUNCTION(apache_request_headers)
        const apr_array_header_t *arr;
        char *key, *val;
 
-       if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        
        ctx = SG(server_context);
        arr = apr_table_elts(ctx->f->r->headers_in);
@@ -180,9 +178,7 @@ PHP_FUNCTION(apache_response_headers)
        const apr_array_header_t *arr;
        char *key, *val;
 
-       if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        
        ctx = SG(server_context);
        arr = apr_table_elts(ctx->f->r->headers_out);

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 86b2abe90083c1fa86e3d37c658aff76083a1e49..aabb29835a32578e09cf15bff99b286d2b9ea031 100644 (file)
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -1754,9 +1754,7 @@ static void apache_table_to_zval(table *t, int safe_mode, zval *return_value)
     table_entry *tenv;
     int i;
        
-    if (array_init(return_value) == FAILURE) {
-               RETURN_FALSE;
-    }
+    array_init(return_value);
     env_arr = table_elts(t);
     tenv = (table_entry *)env_arr->elts;
     for (i = 0; i < env_arr->nelts; ++i) {