patrickallaert Sun Jun 7 20:00:32 2009 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
Fixed ldap_(first|next)_attribute() function producing 2 warning messages in
case wrong parameters given
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.199&r2=1.200&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.199 php-src/ext/ldap/ldap.c:1.200
--- php-src/ext/ldap/ldap.c:1.199 Sun Jun 7 13:06:03 2009
+++ php-src/ext/ldap/ldap.c Sun Jun 7 20:00:32 2009
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.199 2009/06/07 13:06:03 patrickallaert Exp $ */
+/* $Id: ldap.c,v 1.200 2009/06/07 20:00:32 patrickallaert Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -236,7 +236,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.199
2009/06/07 13:06:03 patrickallaert Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.200
2009/06/07 20:00:32 patrickallaert Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -1051,8 +1051,8 @@
ldap_resultentry *resultentry;
char *attribute;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &link,
&result_entry) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &link,
&result_entry) != SUCCESS) {
+ return;
}
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link",
le_link);
@@ -1078,8 +1078,8 @@
ldap_resultentry *resultentry;
char *attribute;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &link,
&result_entry) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &link,
&result_entry) != SUCCESS) {
+ return;
}
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link",
le_link);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
