diff options
| author | Stig Venaas <venaas@php.net> | 2000-10-18 07:47:51 +0000 |
|---|---|---|
| committer | Stig Venaas <venaas@php.net> | 2000-10-18 07:47:51 +0000 |
| commit | 2da9a94d38164a1f1029a3d657d5c703c8518468 (patch) | |
| tree | ffa8ba0ae8b8cdcc26e9a94ad16e236abd9d9c5f /ext/ldap/ldap.c | |
| parent | d47e48329b80e8e4721a9ee62b184378185ba7db (diff) | |
| download | php-git-2da9a94d38164a1f1029a3d657d5c703c8518468.tar.gz | |
Added destruction of return value parameter, and using ZVAL_LONG and
ZVAL_STRING to set return value in ldap_get_option.
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index b07525d321..6bf16de8ca 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1525,8 +1525,8 @@ PHP_FUNCTION(ldap_get_option) { if (ldap_get_option(ldap, opt, &val)) { RETURN_FALSE; } - (*retval)->type = IS_LONG; - (*retval)->value.lval = val; + zval_dtor(*retval); + ZVAL_LONG(*retval, val); } break; /* options with string value */ case LDAP_OPT_HOST_NAME: @@ -1538,10 +1538,8 @@ PHP_FUNCTION(ldap_get_option) { if (ldap_get_option(ldap, opt, &val)) { RETURN_FALSE; } - (*retval)->type = IS_STRING; - len = strlen(val); - (*retval)->value.str.len = len; - (*retval)->value.str.val = estrndup(val, len); + zval_dtor(*retval); + ZVAL_STRING(*retval, val, 1); ldap_memfree(val); } break; /* options not implemented |