iliaa Sat Jan 18 15:27:05 2003 EDT
Modified files:
/php4/sapi/aolserver aolserver.c
/php4/sapi/apache php_apache.c
/php4/sapi/apache2filter php_functions.c
/php4/sapi/apache_hooks php_apache.c
Log:
Removed pointless memory allocation checks.
Index: php4/sapi/aolserver/aolserver.c
diff -u php4/sapi/aolserver/aolserver.c:1.74 php4/sapi/aolserver/aolserver.c:1.75
--- php4/sapi/aolserver/aolserver.c:1.74 Tue Dec 31 10:59:00 2002
+++ php4/sapi/aolserver/aolserver.c Sat Jan 18 15:27:02 2003
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.74 2002/12/31 15:59:00 sebastian Exp $ */
+/* $Id: aolserver.c,v 1.75 2003/01/18 20:27:02 iliaa Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.74
2002/12/31 15:59:00 sebastian Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.75
+2003/01/18 20:27:02 iliaa Exp $");
php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -262,9 +262,7 @@
{
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);
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.75 php4/sapi/apache/php_apache.c:1.76
--- php4/sapi/apache/php_apache.c:1.75 Fri Jan 3 16:33:31 2003
+++ php4/sapi/apache/php_apache.c Sat Jan 18 15:27:04 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.75 2003/01/03 21:33:31 derick Exp $ */
+/* $Id: php_apache.c,v 1.76 2003/01/18 20:27:04 iliaa Exp $ */
#include "php_apache_http.h"
@@ -345,9 +345,7 @@
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 @@
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) {
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.35
php4/sapi/apache2filter/php_functions.c:1.36
--- php4/sapi/apache2filter/php_functions.c:1.35 Sat Jan 11 17:36:38 2003
+++ php4/sapi/apache2filter/php_functions.c Sat Jan 18 15:27:04 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.35 2003/01/11 22:36:38 moriyoshi Exp $ */
+/* $Id: php_functions.c,v 1.36 2003/01/18 20:27:04 iliaa Exp $ */
#include "php.h"
#include "ext/standard/php_smart_str.h"
@@ -158,9 +158,7 @@
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 @@
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);
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.8 php4/sapi/apache_hooks/php_apache.c:1.9
--- php4/sapi/apache_hooks/php_apache.c:1.8 Tue Dec 31 10:59:05 2002
+++ php4/sapi/apache_hooks/php_apache.c Sat Jan 18 15:27:05 2003
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.8 2002/12/31 15:59:05 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.9 2003/01/18 20:27:05 iliaa Exp $ */
#include "php_apache_http.h"
@@ -1754,9 +1754,7 @@
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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
