Add missing curled braces so that it doesn't always return. Also indent

2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>

* gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing curled braces so that it doesn't always return.  Also indent both CHECK_IN_BUFFER* macros properly, and make use of G_STMT_START/G_STMT_END.

diff --git a/ChangeLog b/ChangeLog
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fdf2ff2e26d1cf774c22b3784e3ea4da7ea3dc19..50f17b60a7f0fec70ac4d05bfadee779de3a4fec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-02-09  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing
+       curled braces so that it doesn't always return.  Also indent
+       both CHECK_IN_BUFFER* macros properly, and make use of
+       G_STMT_START/G_STMT_END.
+
 Sat Feb  9 13:27:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbindings.h: Add prototype for

diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index 7b00005b9072262582123b145eba8a25f6246b94..716132bd759d11f152c784bec3ce3a2cb96c5248 100644 (file)
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -52,8 +52,22 @@
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
 
-#define CHECK_IN_BUFFER(anchor) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); } while (0)
-#define CHECK_IN_BUFFER_RETURN(anchor, val) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); return (val); } while (0)
+#define CHECK_IN_BUFFER(anchor)                                                            \
+  G_STMT_START {                                                                           \
+    if ((anchor)->segment == NULL)                                                         \
+      {                                                                                    \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
+      }                                                                                    \
+  } G_STMT_END
+
+#define CHECK_IN_BUFFER_RETURN(anchor, val)                                                \
+  G_STMT_START {                                                                           \
+    if ((anchor)->segment == NULL)                                                         \
+      {                                                                                    \
+        g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \
+        return (val);                                                                      \
+      }                                                                                    \
+  } G_STMT_END
 
 static GtkTextLineSegment *
 pixbuf_segment_cleanup_func (GtkTextLineSegment *seg,