From: <tp...@ke...> - 2008-12-27 16:23:32
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Sat Dec 27 2008 16:23:26 UTC Log message: * gst/gstregistrybinary.c: (unpack_element), (unpack_const_string), (unpack_string):: Wrap multi-line macros in G_STMT_{START|END}. Modified files: . : ChangeLog gst : gstregistrybinary.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4205&r2=1.4206 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstregistrybinary.c.diff?r1=1.42&r2=1.43 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.4205 retrieving revision 1.4206 diff -u -d -r1.4205 -r1.4206 --- ChangeLog 20 Dec 2008 17:33:41 -0000 1.4205 +++ ChangeLog 27 Dec 2008 16:23:09 -0000 1.4206 @@ -1,3 +1,9 @@ +2008-12-27 Tim-Philipp Müller <tim.muller at collabora co uk> + + * 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 <seb...@co...> * docs/gst/gstreamer-sections.txt: Index: gstregistrybinary.c RCS file: /cvs/gstreamer/gstreamer/gst/gstregistrybinary.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- gstregistrybinary.c 20 Nov 2008 20:44:56 -0000 1.42 +++ gstregistrybinary.c 27 Dec 2008 16:23:12 -0000 1.43 @@ -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; \ -#define unpack_string(_inptr, _outptr) \ +#define unpack_string(_inptr, _outptr) G_STMT_START{\ _outptr = g_strdup ((gchar *)_inptr); \ #define ALIGNMENT (sizeof (void *)) #define alignment(_address) (gsize)_address%ALIGNMENT |