cvs: php4 /ext/ldap ldap.c

venaas Wed Oct 18 00:47:51 2000 EDT Modified files: /php4/ext/ldap ldap.c Log: Added destruction of return value parameter, and using ZVAL_LONG and ZVAL_STRING to set return value in ldap_get_option. Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.64 php4/ext/ldap/ldap.c:1.65 --- php4/ext/ldap/ldap.c:1.64 Tue Oct 17 09:06:04 2000 +++ php4/ext/ldap/ldap.c Wed Oct 18 00:47:51 2000 @@ -23,7 +23,7 @@ */ -/* $Id: ldap.c,v 1.64 2000/10/17 16:06:04 venaas Exp $ */ +/* $Id: ldap.c,v 1.65 2000/10/18 07:47:51 venaas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -222,7 +222,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.64 2000/10/17 16:06:04 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.65 2000/10/18 07:47:51 venaas Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); @@ -1525,8 +1525,8 @@ 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 @@ 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