mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
Get rid of var_uninit()
This commit is contained in:
parent
c4f2e0197b
commit
94f5950438
@ -552,7 +552,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
|
||||
else switch(var_arg->vt & ~VT_BYREF)
|
||||
{
|
||||
case VT_EMPTY:
|
||||
var_uninit(pval_arg);
|
||||
pval_arg->type = IS_NULL;
|
||||
break;
|
||||
|
||||
case VT_UI1:
|
||||
|
@ -552,7 +552,7 @@ static pval _java_getset_property
|
||||
0, (void **) &pobject);
|
||||
obj = zend_list_find((*pobject)->value.lval,&type);
|
||||
result = (jlong)(long) &presult;
|
||||
var_uninit(&presult);
|
||||
presult.type = IS_NULL;
|
||||
|
||||
if (!obj || (type!=le_jobject)) {
|
||||
php_error(E_ERROR,
|
||||
|
@ -552,7 +552,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
|
||||
else switch(var_arg->vt & ~VT_BYREF)
|
||||
{
|
||||
case VT_EMPTY:
|
||||
var_uninit(pval_arg);
|
||||
pval_arg->type = IS_NULL;
|
||||
break;
|
||||
|
||||
case VT_UI1:
|
||||
|
@ -552,7 +552,7 @@ static pval _java_getset_property
|
||||
0, (void **) &pobject);
|
||||
obj = zend_list_find((*pobject)->value.lval,&type);
|
||||
result = (jlong)(long) &presult;
|
||||
var_uninit(&presult);
|
||||
presult.type = IS_NULL;
|
||||
|
||||
if (!obj || (type!=le_jobject)) {
|
||||
php_error(E_ERROR,
|
||||
|
@ -2257,7 +2257,7 @@ PHP_FUNCTION(fd_set)
|
||||
|
||||
if(ARG_COUNT(ht) <= 0) {
|
||||
php_error(E_WARNING, "fd_set: Must be passed at least one value" );
|
||||
var_uninit(return_value);
|
||||
return_value->type = IS_NULL;
|
||||
return;
|
||||
}
|
||||
else if(ARG_COUNT(ht) == 1) {
|
||||
|
Loading…
Reference in New Issue
Block a user