cvs: php-gtk /main phpg_closure.c phpg_gboxed.c phpg_gobject.c

andrei          Sat Mar  5 17:22:16 2005 EDT

  Modified files:              
    /php-gtk/main       phpg_closure.c phpg_gboxed.c phpg_gobject.c 
  Log:
  Use our own phpg_return_* macros.
  
  
http://cvs.php.net/diff.php/php-gtk/main/phpg_closure.c?r1=1.6&r2=1.7&ty=u
Index: php-gtk/main/phpg_closure.c
diff -u php-gtk/main/phpg_closure.c:1.6 php-gtk/main/phpg_closure.c:1.7
--- php-gtk/main/phpg_closure.c:1.6     Sat Feb 26 23:57:41 2005
+++ php-gtk/main/phpg_closure.c Sat Mar  5 17:22:16 2005
@@ -131,7 +131,7 @@
     GClosure *closure;
     phpg_closure_t *phpg_closure;
 
-    g_return_val_if_fail(callback != NULL, NULL);
+    phpg_return_val_if_fail(callback != NULL, NULL);
     closure = g_closure_new_simple(sizeof(phpg_closure_t), NULL);
     g_closure_add_invalidate_notifier(closure, NULL, phpg_closure_invalidate);
     g_closure_set_marshal(closure, phpg_closure_marshal);
http://cvs.php.net/diff.php/php-gtk/main/phpg_gboxed.c?r1=1.5&r2=1.6&ty=u
Index: php-gtk/main/phpg_gboxed.c
diff -u php-gtk/main/phpg_gboxed.c:1.5 php-gtk/main/phpg_gboxed.c:1.6
--- php-gtk/main/phpg_gboxed.c:1.5      Fri Mar  4 13:29:59 2005
+++ php-gtk/main/phpg_gboxed.c  Sat Mar  5 17:22:16 2005
@@ -94,11 +94,15 @@
 /* }}} */
 
 /* {{{ phpg_gboxed_check() */
-PHP_GTK_API zend_bool phpg_gboxed_check(zval *zobj, GType gtype TSRMLS_DC)
+PHP_GTK_API zend_bool phpg_gboxed_check(zval *zobj, GType gtype, zend_bool 
full_check TSRMLS_DC)
 {
     phpg_gboxed_t *pobj;
 
-    g_return_val_if_fail(zobj != NULL, FALSE);
+    phpg_return_val_if_fail(zobj != NULL, FALSE);
+    if (full_check) {
+        phpg_return_val_if_fail_quiet(Z_TYPE_P(zobj) == IS_OBJECT
+                                      && instanceof_function(Z_OBJCE_P(zobj), 
gboxed_ce TSRMLS_CC), FALSE);
+    }
 
     pobj = phpg_gboxed_get(zobj TSRMLS_CC);
 
@@ -118,8 +122,8 @@
     }
     ZVAL_NULL(*zobj);
 
-    g_return_if_fail(gtype != 0);
-    g_return_if_fail(!copy || (copy && own_ref));
+    phpg_return_if_fail(gtype != 0);
+    phpg_return_if_fail(!copy || (copy && own_ref));
 
     ce = g_type_get_qdata(gtype, phpg_class_key);
     if (!ce) {
http://cvs.php.net/diff.php/php-gtk/main/phpg_gobject.c?r1=1.28&r2=1.29&ty=u
Index: php-gtk/main/phpg_gobject.c
diff -u php-gtk/main/phpg_gobject.c:1.28 php-gtk/main/phpg_gobject.c:1.29
--- php-gtk/main/phpg_gobject.c:1.28    Fri Mar  4 13:29:59 2005
+++ php-gtk/main/phpg_gobject.c Sat Mar  5 17:22:16 2005
@@ -351,8 +351,8 @@
     int i, j;
     int prefix_len = 0;
 
-    g_return_if_fail(ce != NULL);
-    g_return_if_fail(g_type_is_a(gtype, G_TYPE_ENUM));
+    phpg_return_if_fail(ce != NULL);
+    phpg_return_if_fail(g_type_is_a(gtype, G_TYPE_ENUM));
 
     if (strip_prefix) {
         prefix_len = strlen(strip_prefix);
@@ -388,8 +388,8 @@
     int i, j;
     int prefix_len = 0;
 
-    g_return_if_fail(ce != NULL);
-    g_return_if_fail(g_type_is_a(gtype, G_TYPE_FLAGS));
+    phpg_return_if_fail(ce != NULL);
+    phpg_return_if_fail(g_type_is_a(gtype, G_TYPE_FLAGS));
 
     if (strip_prefix) {
         prefix_len = strlen(strip_prefix);
@@ -493,12 +493,12 @@
 {
     phpg_gobject_t *pobj = NULL;
 
-    g_return_if_fail(zobj != NULL);
-    g_return_if_fail(Z_TYPE_P(zobj) == IS_OBJECT && 
instanceof_function(Z_OBJCE_P(zobj), gobject_ce TSRMLS_CC));
-    g_return_if_fail(closure != NULL);
+    phpg_return_if_fail(zobj != NULL);
+    phpg_return_if_fail(closure != NULL);
+    phpg_return_if_fail_quiet(Z_TYPE_P(zobj) == IS_OBJECT && 
instanceof_function(Z_OBJCE_P(zobj), gobject_ce TSRMLS_CC));
 
     pobj = zend_object_store_get_object(zobj TSRMLS_CC);
-    g_return_if_fail(g_slist_find(pobj->closures, closure) == NULL);
+    phpg_return_if_fail_quiet(g_slist_find(pobj->closures, closure) == NULL);
 
     pobj->closures = g_slist_prepend(pobj->closures, closure);
 }

-- 
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php