[Xfce4-commits] <midori:master> Simplify definitions of katze assignment macros

[Christian Dywan]

Updating branch refs/heads/master
         to d0e2433f867938145e0f7694a9e3a36c869ce9ca (commit)
       from 304d99903aad95aa8d5d5ad542ebc1e0d04f59c1 (commit)

commit d0e2433f867938145e0f7694a9e3a36c869ce9ca
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Sep 18 01:45:17 2010 +0200

    Simplify definitions of katze assignment macros

 katze/katze-utils.h |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/katze/katze-utils.h b/katze/katze-utils.h
index 6b811f5..03a462d 100644
--- a/katze/katze-utils.h
+++ b/katze/katze-utils.h
@@ -34,13 +34,7 @@ G_BEGIN_DECLS
  *
  * Frees @lvalue if needed and assigns it the value of @rvalue.
  **/
-#define katze_assign(lvalue, rvalue) \
-    do \
-    { \
-        g_free (lvalue); \
-        lvalue = rvalue; \
-    } \
-    while (0)
+#define katze_assign(lvalue, rvalue) lvalue = (g_free (lvalue), rvalue)
 
 /**
  * katze_object_assign:
@@ -50,13 +44,7 @@ G_BEGIN_DECLS
  * Unrefs @lvalue if needed and assigns it the value of @rvalue.
  **/
 #define katze_object_assign(lvalue, rvalue) \
-    do \
-    { \
-        if (lvalue) \
-            g_object_unref (lvalue); \
-        lvalue = rvalue; \
-    } \
-    while (0)
+    lvalue = ((lvalue ? g_object_unref (lvalue) : lvalue), rvalue)
 
 /**
  * katze_strv_assign:
@@ -67,13 +55,7 @@ G_BEGIN_DECLS
  *
  * Since: 0.1.7
  **/
-#define katze_strv_assign(lvalue, rvalue) \
-    do \
-    { \
-        g_strfreev (lvalue); \
-        lvalue = rvalue; \
-    } \
-    while (0)
+#define katze_strv_assign(lvalue, rvalue) lvalue = (g_strfreev (lvalue), rvalue)
 
 GtkWidget*
 katze_property_proxy                (gpointer     object,