cvs: php4 /ext/swf swf.c

andrey Fri Jan 17 11:33:01 2003 EDT Modified files: /php4/ext/swf swf.c Log: Removed pointless checks around array_init(). Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.47 php4/ext/swf/swf.c:1.48 --- php4/ext/swf/swf.c:1.47 Tue Dec 31 11:07:57 2002 +++ php4/ext/swf/swf.c Fri Jan 17 11:33:01 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.47 2002/12/31 16:07:57 sebastian Exp $ */ +/* $Id: swf.c,v 1.48 2003/01/17 16:33:01 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -908,10 +908,8 @@ { float A_height, x_height; swf_getfontinfo(&A_height, &x_height); - if (array_init(return_value) == FAILURE) { - php_error(E_WARNING, "Cannot initialize return value from swf_getfontinfo"); - RETURN_FALSE; - } + + array_init(return_value); add_assoc_double(return_value, "Aheight", A_height); add_assoc_double(return_value, "xheight", x_height); } @@ -978,10 +976,8 @@ convert_to_long_ex(bitmapid); size = swf_getbitmapinfo(Z_LVAL_PP(bitmapid), &width, &height); - if (array_init(return_value) == FAILURE) { - php_error(E_WARNING, "Cannot initialize return value from swf_getbitmapinfo"); - RETURN_FALSE; - } + + array_init(return_value); add_assoc_long(return_value, "size", size); add_assoc_long(return_value, "width", width);