cvs: php4 /ext/ldap ldap.c

derick Sun Jun 30 07:14:28 2002 EDT Modified files: /php4/ext/ldap ldap.c Log: - More error messages cleanup Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.123 php4/ext/ldap/ldap.c:1.124 --- php4/ext/ldap/ldap.c:1.123 Thu Jun 27 02:24:26 2002 +++ php4/ext/ldap/ldap.c Sun Jun 30 07:14:27 2002 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.123 2002/06/27 06:24:26 derick Exp $ */ +/* $Id: ldap.c,v 1.124 2002/06/30 11:14:27 derick Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -276,7 +276,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.123 2002/06/27 06:24:26 derick Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.124 2002/06/30 11:14:27 derick Exp $" ); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -1352,7 +1352,7 @@ if (zend_hash_get_current_key(Z_ARRVAL_PP(entry), &attribute, &index, 0) == HASH_KEY_IS_STRING) { ldap_mods[i]->mod_type = estrdup(attribute); } else { - php_error(E_ERROR, "%s(): Unknown Attribute in the data", get_active_function_name(TSRMLS_C)); + php_error(E_ERROR, "%s(): Unknown attribute in the data", get_active_function_name(TSRMLS_C)); /* Free allocated memory */ while (i >= 0) { efree(ldap_mods[i--]); @@ -1605,7 +1605,7 @@ } if (ldap_sort_entries(ld->link, (LDAPMessage **) &le->ptr, sflen ? sortfilter : NULL, strcmp) != LDAP_SUCCESS) { - php_error(E_WARNING, "%s(): The ldap_sort call failed: %s", get_active_function_name(TSRMLS_C), ldap_err2string(errno)); + php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), ldap_err2string(errno)); RETURN_FALSE; } @@ -2076,7 +2076,7 @@ retval = Z_LVAL_P(cb_retval); zval_ptr_dtor(&cb_retval); } else { - php_error(E_WARNING, "%s(): rebind_proc php callback failed", get_active_function_name(TSRMLS_C)); + php_error(E_WARNING, "%s(): rebind_proc PHP callback failed", get_active_function_name(TSRMLS_C)); retval = LDAP_OTHER; } zval_dtor(cb_url); @@ -2111,7 +2111,7 @@ /* callable? */ if (!zend_is_callable(callback, 0, &callback_name)) { - php_error(E_WARNING, "%s() expects argument 2, '%s', to be a valid callback", get_active_function_name(TSRMLS_C), callback_name); + php_error(E_WARNING, "%s(): Two arguments expected for '%s' to be a valid callback", get_active_function_name(TSRMLS_C), callback_name); efree(callback_name); RETURN_FALSE; }