diff options
| author | Stig Venaas <venaas@php.net> | 2000-10-17 15:51:04 +0000 |
|---|---|---|
| committer | Stig Venaas <venaas@php.net> | 2000-10-17 15:51:04 +0000 |
| commit | 0b59e4b821ece80b583f088613d8b52282e3c7a4 (patch) | |
| tree | 760c1e1ed4e56a7ea3bd7431bf89c35071931c15 /ext/ldap | |
| parent | 142a32b437ec2ef85f24205e264590e9fa295d7d (diff) | |
| download | php-git-0b59e4b821ece80b583f088613d8b52282e3c7a4.tar.gz | |
Removed some redundant convert_to_*_ex() calls. Edited some whitespace.
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/ldap.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index cb8a545581..133a4ee9b3 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -61,36 +61,36 @@ static int le_link; function_entry ldap_functions[] = { PHP_FE(ldap_connect, NULL) - PHP_FALIAS(ldap_close, ldap_unbind, NULL) - PHP_FE(ldap_bind, NULL) - PHP_FE(ldap_unbind, NULL) - PHP_FE(ldap_read, NULL) - PHP_FE(ldap_list, NULL) - PHP_FE(ldap_search, NULL) + PHP_FALIAS(ldap_close, ldap_unbind, NULL) + PHP_FE(ldap_bind, NULL) + PHP_FE(ldap_unbind, NULL) + PHP_FE(ldap_read, NULL) + PHP_FE(ldap_list, NULL) + PHP_FE(ldap_search, NULL) PHP_FE(ldap_free_result, NULL) PHP_FE(ldap_count_entries, NULL) PHP_FE(ldap_first_entry, NULL) PHP_FE(ldap_next_entry, NULL) PHP_FE(ldap_get_entries, NULL) PHP_FE(ldap_first_attribute, third_argument_force_ref) - PHP_FE(ldap_next_attribute, third_argument_force_ref) + PHP_FE(ldap_next_attribute, third_argument_force_ref) PHP_FE(ldap_get_attributes, NULL) PHP_FE(ldap_get_values, NULL) PHP_FE(ldap_get_values_len, NULL) - PHP_FE(ldap_get_dn, NULL) + PHP_FE(ldap_get_dn, NULL) PHP_FE(ldap_explode_dn, NULL) - PHP_FE(ldap_dn2ufn, NULL) - PHP_FE(ldap_add, NULL) - PHP_FE(ldap_delete, NULL) - PHP_FE(ldap_modify, NULL) + PHP_FE(ldap_dn2ufn, NULL) + PHP_FE(ldap_add, NULL) + PHP_FE(ldap_delete, NULL) + PHP_FE(ldap_modify, NULL) /* additional functions for attribute based modifications, Gerrit Thomson */ PHP_FE(ldap_mod_add, NULL) PHP_FE(ldap_mod_replace, NULL) PHP_FE(ldap_mod_del, NULL) /* end gjt mod */ - PHP_FE(ldap_errno, NULL) + PHP_FE(ldap_errno, NULL) PHP_FE(ldap_err2str, NULL) - PHP_FE(ldap_error, NULL) + PHP_FE(ldap_error, NULL) PHP_FE(ldap_compare, NULL) #ifdef STR_TRANSLATION @@ -519,8 +519,6 @@ PHP_FUNCTION(ldap_unbind) WRONG_PARAM_COUNT; } - convert_to_long_ex(link); - ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; @@ -1381,7 +1379,6 @@ PHP_FUNCTION(ldap_errno) { if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ht, &ldap_link) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(ldap_link); ldap = _get_ldap_link(ldap_link); if (ldap == NULL) { @@ -1442,7 +1439,6 @@ PHP_FUNCTION(ldap_compare) { WRONG_PARAM_COUNT; } - convert_to_string_ex(link); ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_LONG(-1); @@ -1471,7 +1467,7 @@ PHP_FUNCTION(ldap_compare) { } /* }}} */ - + #ifdef STR_TRANSLATION static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) { |