cvs: php4 /ext/ldap ldap.c
| From: | Ilia Alshanetsky | Date: | Sat, 18 Jan 2003 20:10:24 +0000 |
| Subject: | cvs: php4 /ext/ldap ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18018@lists.php.net to get a copy of this message | ||
iliaa Sat Jan 18 15:10:24 2003 EDT
Modified files:
/php4/ext/ldap ldap.c
Log:
Removed pointless memory allocation checks.
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.131 php4/ext/ldap/ldap.c:1.132
--- php4/ext/ldap/ldap.c:1.131 Tue Dec 31 11:06:51 2002
+++ php4/ext/ldap/ldap.c Sat Jan 18 15:10:23 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.131 2002/12/31 16:06:51 sebastian Exp $ */
+/* $Id: ldap.c,v 1.132 2003/01/18 20:10:23 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.131 2002/12/31 16:06:51
sebastian Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.132 2003/01/18 20:10:23
iliaa Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -685,11 +685,7 @@
efree(ldap_attrs);
}
- if (array_init(return_value) == FAILURE) {
- efree(lds);
- efree(rcs);
- RETURN_FALSE;
- }
+ array_init(return_value);
/* Collect results from the searches */
for (i=0; i<nlinks; i++) {
@@ -1107,9 +1103,7 @@
num_values = ldap_count_values(ldap_value);
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
for(i=0; i<num_values; i++) {
add_next_index_string(return_value, ldap_value[i], 1);
@@ -1148,10 +1142,7 @@
}
num_values = ldap_count_values_len(ldap_value_len);
- if (array_init(return_value) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value",
get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
+ array_init(return_value);
for (i=0; i<num_values; i++) {
add_next_index_stringl(return_value, ldap_value_len[i]->bv_val, ldap_value_len[i]->bv_len,
1);
@@ -1214,9 +1205,7 @@
while(ldap_value[i] != NULL) i++;
count = i;
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
add_assoc_long(return_value, "count", count);
for(i=0; i<count; i++) {
@@ -1807,13 +1796,7 @@
switch(myargcount) {
case 6 :
zval_dtor(*referrals);
- if (array_init(*referrals) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value",
get_active_function_name(TSRMLS_C));
- ldap_value_free(lreferrals);
- ldap_memfree(lerrmsg);
- ldap_memfree(lmatcheddn);
- RETURN_FALSE;
- }
+ array_init(*referrals);
if (lreferrals != NULL) {
refp = lreferrals;
while (*refp) {
@@ -1921,11 +1904,7 @@
}
zval_dtor(*referrals);
- if (array_init(*referrals) == FAILURE) {
- php_error(E_ERROR, "%s(): Cannot initialize return value",
get_active_function_name(TSRMLS_C));
- ldap_value_free(lreferrals);
- RETURN_FALSE;
- }
+ array_init(*referrals);
if (lreferrals != NULL) {
refp = lreferrals;
while (*refp) {