cvs: php4 /ext/ldap ldap.c

venaas Tue Oct 17 08:51:04 2000 EDT Modified files: /php4/ext/ldap ldap.c Log: Removed some redundant convert_to_*_ex() calls. Edited some whitespace. Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.62 php4/ext/ldap/ldap.c:1.63 --- php4/ext/ldap/ldap.c:1.62 Thu Aug 31 09:14:35 2000 +++ php4/ext/ldap/ldap.c Tue Oct 17 08:51:04 2000 @@ -23,7 +23,7 @@ */ -/* $Id: ldap.c,v 1.62 2000/08/31 16:14:35 venaas Exp $ */ +/* $Id: ldap.c,v 1.63 2000/10/17 15:51:04 venaas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -61,36 +61,36 @@ 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 @@ -201,7 +201,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.62 2000/08/31 16:14:35 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.63 2000/10/17 15:51:04 venaas Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); @@ -519,8 +519,6 @@ WRONG_PARAM_COUNT; } - convert_to_long_ex(link); - ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; @@ -1381,7 +1379,6 @@ 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 @@ WRONG_PARAM_COUNT; } - convert_to_string_ex(link); ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_LONG(-1); @@ -1471,7 +1467,7 @@ } /* }}} */ - + #ifdef STR_TRANSLATION static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) {