cvs: php-gtk /ext/gtk+ php_gtk+_types.c /main php_gtk_util.c phpg_atom.c phpg_gboxed.c phpg_gobject.c phpg_gpointer.c phpg_gtype.c

andrei Fri Mar 31 18:10:23 2006 UTC Modified files: /php-gtk/main php_gtk_util.c phpg_atom.c phpg_gboxed.c phpg_gobject.c phpg_gpointer.c phpg_gtype.c /php-gtk/ext/gtk+ php_gtk+_types.c Log: Destroy guards. http://cvs.php.net/viewcvs.cgi/php-gtk/main/php_gtk_util.c?r1=1.52&r2=1.53&diff_format=u Index: php-gtk/main/php_gtk_util.c diff -u php-gtk/main/php_gtk_util.c:1.52 php-gtk/main/php_gtk_util.c:1.53 --- php-gtk/main/php_gtk_util.c:1.52 Fri Oct 21 13:27:48 2005 +++ php-gtk/main/php_gtk_util.c Fri Mar 31 18:10:22 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_util.c,v 1.52 2005/10/21 13:27:48 sfox Exp $ */ +/* $Id: php_gtk_util.c,v 1.53 2006/03/31 18:10:22 andrei Exp $ */ #include "php_gtk.h" @@ -150,8 +150,6 @@ case IS_DOUBLE: case IS_BOOL: convert_to_string_ex(arg); - if ((int)strlen(Z_STRVAL_PP(arg)) != Z_STRLEN_PP(arg)) - return "string without null bytes"; if (as_zval) goto ret_zval; *va_arg(*va, char **) = Z_STRVAL_PP(arg);; if (*spec_walk == '#') { http://cvs.php.net/viewcvs.cgi/php-gtk/main/phpg_atom.c?r1=1.3&r2=1.4&diff_format=u Index: php-gtk/main/phpg_atom.c diff -u php-gtk/main/phpg_atom.c:1.3 php-gtk/main/phpg_atom.c:1.4 --- php-gtk/main/phpg_atom.c:1.3 Sat Dec 10 20:59:20 2005 +++ php-gtk/main/phpg_atom.c Fri Mar 31 18:10:22 2006 @@ -39,6 +39,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } if (object->name) efree(object->name); efree(object); } http://cvs.php.net/viewcvs.cgi/php-gtk/main/phpg_gboxed.c?r1=1.11&r2=1.12&diff_format=u Index: php-gtk/main/phpg_gboxed.c diff -u php-gtk/main/phpg_gboxed.c:1.11 php-gtk/main/phpg_gboxed.c:1.12 --- php-gtk/main/phpg_gboxed.c:1.11 Thu Mar 16 05:29:53 2006 +++ php-gtk/main/phpg_gboxed.c Fri Mar 31 18:10:22 2006 @@ -56,6 +56,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } if (object->boxed && object->free_on_destroy) { g_boxed_free(object->gtype, object->boxed); object->boxed = NULL; http://cvs.php.net/viewcvs.cgi/php-gtk/main/phpg_gobject.c?r1=1.51&r2=1.52&diff_format=u Index: php-gtk/main/phpg_gobject.c diff -u php-gtk/main/phpg_gobject.c:1.51 php-gtk/main/phpg_gobject.c:1.52 --- php-gtk/main/phpg_gobject.c:1.51 Tue Mar 28 00:55:41 2006 +++ php-gtk/main/phpg_gobject.c Fri Mar 31 18:10:22 2006 @@ -41,6 +41,10 @@ zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } /* * Remove cached handle information, since the object wrapper is going away. http://cvs.php.net/viewcvs.cgi/php-gtk/main/phpg_gpointer.c?r1=1.2&r2=1.3&diff_format=u Index: php-gtk/main/phpg_gpointer.c diff -u php-gtk/main/phpg_gpointer.c:1.2 php-gtk/main/phpg_gpointer.c:1.3 --- php-gtk/main/phpg_gpointer.c:1.2 Sun Oct 2 16:03:59 2005 +++ php-gtk/main/phpg_gpointer.c Fri Mar 31 18:10:22 2006 @@ -37,6 +37,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } efree(object); } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-gtk/main/phpg_gtype.c?r1=1.17&r2=1.18&diff_format=u Index: php-gtk/main/phpg_gtype.c diff -u php-gtk/main/phpg_gtype.c:1.17 php-gtk/main/phpg_gtype.c:1.18 --- php-gtk/main/phpg_gtype.c:1.17 Fri Sep 2 09:16:55 2005 +++ php-gtk/main/phpg_gtype.c Fri Mar 31 18:10:22 2006 @@ -53,6 +53,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } efree(object); } http://cvs.php.net/viewcvs.cgi/php-gtk/ext/gtk+/php_gtk+_types.c?r1=1.47&r2=1.48&diff_format=u Index: php-gtk/ext/gtk+/php_gtk+_types.c diff -u php-gtk/ext/gtk+/php_gtk+_types.c:1.47 php-gtk/ext/gtk+/php_gtk+_types.c:1.48 --- php-gtk/ext/gtk+/php_gtk+_types.c:1.47 Thu Mar 9 07:57:36 2006 +++ php-gtk/ext/gtk+/php_gtk+_types.c Fri Mar 31 18:10:22 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk+_types.c,v 1.47 2006/03/09 07:57:36 andrei Exp $ */ +/* $Id: php_gtk+_types.c,v 1.48 2006/03/31 18:10:22 andrei Exp $ */ #include "php_gtk.h" @@ -599,6 +599,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } g_object_unref(object->model); efree(object); } @@ -657,6 +661,10 @@ { zend_hash_destroy(object->zobj.properties); FREE_HASHTABLE(object->zobj.properties); + if (object->zobj.guards) { + zend_hash_destroy(object->zobj.guards); + FREE_HASHTABLE(object->zobj.guards); + } if (object->current) { zval_ptr_dtor(&object->current); }