archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't use C++ style comments

Browse source 
Cf. <f45b61b898/CODING_STANDARDS.md (syntax-and-indentation)>

cc @mcmic
This commit is contained in:
Christoph M. Becker 2019-08-20 13:58:22 +02:00
parent 3771d66142
commit 963b40c9a8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/ldap/ldap.c
View file

@ -146,7 +146,7 @@ static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array,
add_assoc_bool(array, "iscritical", (ctrl->ldctl_iscritical != 0)); add_assoc_bool(array, "iscritical", (ctrl->ldctl_iscritical != 0));
} }
// If it is a known oid, parse to values /* If it is a known oid, parse to values */
if (strcmp(ctrl->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) == 0) { if (strcmp(ctrl->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) == 0) {
int expire = 0, grace = 0, rc; int expire = 0, grace = 0, rc;
LDAPPasswordPolicyError pperr; LDAPPasswordPolicyError pperr;
@ -361,8 +361,8 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
rc = -1; rc = -1;
php_error_docref(NULL, E_WARNING, "Failed to allocate control value"); php_error_docref(NULL, E_WARNING, "Failed to allocate control value");
} else { } else {
// ldap_create_assertion_control_value does not reset ld_errno, we need to do it ourselves /* ldap_create_assertion_control_value does not reset ld_errno, we need to do it ourselves
// See http://www.openldap.org/its/index.cgi/Incoming?id=8674 See http://www.openldap.org/its/index.cgi/Incoming?id=8674 */
int success = LDAP_SUCCESS; int success = LDAP_SUCCESS;
ldap_set_option(ld, LDAP_OPT_RESULT_CODE, &success); ldap_set_option(ld, LDAP_OPT_RESULT_CODE, &success);
rc = ldap_create_assertion_control_value(ld, ZSTR_VAL(assert), control_value); rc = ldap_create_assertion_control_value(ld, ZSTR_VAL(assert), control_value);
@ -612,7 +612,7 @@ failure:
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
// Failed /* Failed */
*ctrl = NULL; *ctrl = NULL;
return -1; return -1;
} }
@ -1589,7 +1589,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
} }
if (argcount > 8) { if (argcount > 8) {
// We have to parse controls again for each link as they use it /* We have to parse controls again for each link as they use it */
_php_ldap_controls_free(&lserverctrls); _php_ldap_controls_free(&lserverctrls);
lserverctrls = _php_ldap_controls_from_array(ld->link, serverctrls); lserverctrls = _php_ldap_controls_from_array(ld->link, serverctrls);
if (lserverctrls == NULL) { if (lserverctrls == NULL) {