com gtk/php-gtk: Destroy guards.: ext/gtk+/php_gtk+_types .c main/php_gtk_util.c main/phpg_atom.c main/ phpg_gboxed.c main/phpg_gobject.c main/phpg_gpoin ter.c main/phpg_gtype.c

Commit:    2b92bb1c46b4a394f77bc540829be2e29386daee
Author:    Andrei Zmievski <[email protected]>         Fri, 31 Mar 2006 18:10:22 +0000
Parents:   725b65d114b6f783a7df66bbd2e173431c72f796
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=2b92bb1c46b4a394f77bc540829be2e29386daee

Log:
Destroy guards.

Changed paths:
  M  ext/gtk+/php_gtk+_types.c
  M  main/php_gtk_util.c
  M  main/phpg_atom.c
  M  main/phpg_gboxed.c
  M  main/phpg_gobject.c
  M  main/phpg_gpointer.c
  M  main/phpg_gtype.c


Diff:
2b92bb1c46b4a394f77bc540829be2e29386daee
diff --git a/ext/gtk+/php_gtk+_types.c b/ext/gtk+/php_gtk+_types.c
index d5cb7af..dae26c7 100644
--- a/ext/gtk+/php_gtk+_types.c
+++ b/ext/gtk+/php_gtk+_types.c
@@ -599,6 +599,10 @@ static void phpg_modelrow_free_object_storage(phpg_modelrow_t *object TSRMLS_DC)
 {
 	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 @@ static void phpg_modelrowiter_free_object_storage(phpg_modelrowiter_t *object TS
 {
 	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);
     }
diff --git a/main/php_gtk_util.c b/main/php_gtk_util.c
index 3c6c83d..14bdaac 100644
--- a/main/php_gtk_util.c
+++ b/main/php_gtk_util.c
@@ -150,8 +150,6 @@ static char *parse_arg_impl(zval **arg, va_list *va, char **spec, char *buf, int
 					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 == '#') {
diff --git a/main/phpg_atom.c b/main/phpg_atom.c
index 93e593f..b9b5750 100644
--- a/main/phpg_atom.c
+++ b/main/phpg_atom.c
@@ -39,6 +39,10 @@ static void phpg_free_gdkatom_storage(phpg_gdkatom_t *object TSRMLS_DC)
 {
 	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);
 }
diff --git a/main/phpg_gboxed.c b/main/phpg_gboxed.c
index e10a1e3..ae7c62b 100644
--- a/main/phpg_gboxed.c
+++ b/main/phpg_gboxed.c
@@ -56,6 +56,10 @@ static void phpg_free_gboxed_storage(phpg_gboxed_t *object TSRMLS_DC)
 {
 	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;
diff --git a/main/phpg_gobject.c b/main/phpg_gobject.c
index 67bb3e4..6af3700 100644
--- a/main/phpg_gobject.c
+++ b/main/phpg_gobject.c
@@ -41,6 +41,10 @@ static inline void phpg_free_gobject_storage(phpg_gobject_t *object, zend_object
 
     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.
diff --git a/main/phpg_gpointer.c b/main/phpg_gpointer.c
index ae0dfbb..fa9e899 100644
--- a/main/phpg_gpointer.c
+++ b/main/phpg_gpointer.c
@@ -37,6 +37,10 @@ static void phpg_free_gpointer_storage(phpg_gpointer_t *object TSRMLS_DC)
 {
 	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);
 }
 /* }}} */
diff --git a/main/phpg_gtype.c b/main/phpg_gtype.c
index c7453d9..fb71419 100644
--- a/main/phpg_gtype.c
+++ b/main/phpg_gtype.c
@@ -53,6 +53,10 @@ static void gtype_free_object_storage(phpg_gtype_t *object TSRMLS_DC)
 {
 	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);
 }