Get rid of var_uninit()

diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index 3722c31bfd716da14e56e6de0bb171afc53e0522..34da74435a149e45bf8f94f237c326e6b4432ebd 100644 (file)
--- a/ext/com/conversion.c
+++ b/ext/com/conversion.c
@@ -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:

diff --git a/ext/java/java.c b/ext/java/java.c
index 4a6f7461476bda0622c4e789a6e0115344d3e2de..e596c16fc3a127ff1ce9bfe058147cf02dd952db 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -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,

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 3722c31bfd716da14e56e6de0bb171afc53e0522..34da74435a149e45bf8f94f237c326e6b4432ebd 100644 (file)
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -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:

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 4a6f7461476bda0622c4e789a6e0115344d3e2de..e596c16fc3a127ff1ce9bfe058147cf02dd952db 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -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,

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 9f85df9ad33c6c159348cafbcd3abdb8d5df0e28..dd5c675615dd3f98203d5a101156bc40a93e121a 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -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) {