From 13089a438ac429e04cd8e42ff6de71ca86cc0eb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 27 Dec 2008 16:23:12 +0000 Subject: [PATCH] gst/gstregistrybinary.c: Wrap multi-line macros in G_STMT_{START|END}. Original commit message from CVS: * gst/gstregistrybinary.c: (unpack_element), (unpack_const_string), (unpack_string):: Wrap multi-line macros in G_STMT_{START|END}. --- ChangeLog | 6 ++++++ gst/gstregistrybinary.c | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e1ccf0..154d77a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-27 Tim-Philipp Müller + + * gst/gstregistrybinary.c: (unpack_element), (unpack_const_string), + (unpack_string):: + Wrap multi-line macros in G_STMT_{START|END}. + 2008-12-20 Sebastian Dröge * docs/gst/gstreamer-sections.txt: diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c index 75dbc3a..a1a21ef 100644 --- a/gst/gstregistrybinary.c +++ b/gst/gstregistrybinary.c @@ -74,17 +74,20 @@ /* macros */ -#define unpack_element(_inptr, _outptr, _element) \ +#define unpack_element(_inptr, _outptr, _element) G_STMT_START{ \ _outptr = (_element *) _inptr; \ - _inptr += sizeof (_element) + _inptr += sizeof (_element); \ +}G_STMT_END -#define unpack_const_string(_inptr, _outptr) \ +#define unpack_const_string(_inptr, _outptr) G_STMT_START{\ _outptr = g_intern_string ((const gchar *)_inptr); \ - _inptr += strlen(_outptr) + 1 + _inptr += strlen(_outptr) + 1; \ +}G_STMT_END -#define unpack_string(_inptr, _outptr) \ +#define unpack_string(_inptr, _outptr) G_STMT_START{\ _outptr = g_strdup ((gchar *)_inptr); \ - _inptr += strlen(_outptr) + 1 + _inptr += strlen(_outptr) + 1; \ +}G_STMT_END #define ALIGNMENT (sizeof (void *)) #define alignment(_address) (gsize)_address%ALIGNMENT -- 2.7.4