diff options
| -rw-r--r-- | ext/ldap/ldap.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 2237a760e1..b8794fadfd 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -654,8 +654,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) for (i=0; i<nlinks; i++) { zend_hash_get_current_data(Z_ARRVAL_PP(link), (void **)&entry); - ZEND_FETCH_RESOURCE(ldap, LDAP *, entry, -1, "ldap link", le_link); - + ldap = (LDAP *) zend_fetch_resource(entry TSRMLS_CC, -1, "ldap link", NULL, 1, le_link); if (ldap == NULL) { efree(links); efree(rcs); @@ -716,7 +715,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) ldap_base_dn = NULL; } - ZEND_FETCH_RESOURCE(ldap, LDAP *, link, -1, "ldap link", le_link); + ldap = (LDAP *) zend_fetch_resource(link TSRMLS_CC, -1, "ldap link", NULL, 1, le_link); if (ldap == NULL) { if (ldap_attrs != NULL) { efree(ldap_attrs); @@ -796,13 +795,8 @@ PHP_FUNCTION(ldap_free_result) ZEND_FETCH_RESOURCE(ldap_result, LDAPMessage *, result, -1, "ldap result", le_result); - if (ldap_result == NULL) { - RETVAL_FALSE; - } else { - zend_list_delete(Z_LVAL_PP(result)); /* Delete list entry and call registered destructor function */ - RETVAL_TRUE; - } - return; + zend_list_delete(Z_LVAL_PP(result)); /* Delete list entry and call registered destructor function */ + RETVAL_TRUE; } /* }}} */ @@ -1458,10 +1452,6 @@ PHP_FUNCTION(ldap_errno) ZEND_FETCH_RESOURCE(ldap, LDAP *, link, -1, "ldap link", le_link); - if (ldap == NULL) { - RETURN_LONG(0); - } - RETURN_LONG( _get_lderrno(ldap) ); } /* }}} */ @@ -1516,8 +1506,6 @@ PHP_FUNCTION(ldap_compare) ZEND_FETCH_RESOURCE(ldap, LDAP *, link, -1, "ldap link", le_link); - if (ldap == NULL) RETURN_LONG(-1); - convert_to_string_ex(dn); convert_to_string_ex(attr); convert_to_string_ex(value); |