diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-15 19:03:04 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-15 19:03:04 +0000 |
| commit | 94f59504383ab6ca9becda74c3a4334daa872976 (patch) | |
| tree | d7e85705ab225748af0427f93d1c25c6eee16841 | |
| parent | c4f2e0197b458c427d84db12a0676158b9321045 (diff) | |
| download | php-git-94f59504383ab6ca9becda74c3a4334daa872976.tar.gz | |
Get rid of var_uninit()
| -rw-r--r-- | ext/com/conversion.c | 2 | ||||
| -rw-r--r-- | ext/java/java.c | 2 | ||||
| -rw-r--r-- | ext/rpc/com/conversion.c | 2 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 2 | ||||
| -rw-r--r-- | ext/standard/file.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/com/conversion.c b/ext/com/conversion.c index 3722c31bfd..34da74435a 100644 --- 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 4a6f746147..e596c16fc3 100644 --- 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 3722c31bfd..34da74435a 100644 --- 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 4a6f746147..e596c16fc3 100644 --- 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 9f85df9ad3..dd5c675615 100644 --- 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) { |