cvs: php4 /ext/com conversion.c /ext/java java.c /ext/standard file.c

zeev Sun Jul 15 15:03:04 2001 EDT Modified files: /php4/ext/com conversion.c /php4/ext/java java.c /php4/ext/standard file.c Log: Get rid of var_uninit() Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.22 php4/ext/com/conversion.c:1.23 --- php4/ext/com/conversion.c:1.22 Wed Jul 11 08:42:21 2001 +++ php4/ext/com/conversion.c Sun Jul 15 15:03:03 2001 @@ -552,7 +552,7 @@ else switch(var_arg->vt & ~VT_BYREF) { case VT_EMPTY: - var_uninit(pval_arg); + pval_arg->type = IS_NULL; break; case VT_UI1: Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.46 php4/ext/java/java.c:1.47 --- php4/ext/java/java.c:1.46 Wed Jul 11 08:42:21 2001 +++ php4/ext/java/java.c Sun Jul 15 15:03:03 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.46 2001/07/11 12:42:21 thies Exp $ */ +/* $Id: java.c,v 1.47 2001/07/15 19:03:03 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -552,7 +552,7 @@ 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, Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.166 php4/ext/standard/file.c:1.167 --- php4/ext/standard/file.c:1.166 Thu Jul 5 19:29:11 2001 +++ php4/ext/standard/file.c Sun Jul 15 15:03:03 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.166 2001/07/05 23:29:11 elixer Exp $ */ +/* $Id: file.c,v 1.167 2001/07/15 19:03:03 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2257,7 +2257,7 @@ 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) {