mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

unmangle the nesting a little

Browse source 
Original commit message from CVS:
unmangle the nesting a little
This commit is contained in:
Thomas Vander Stichele 2005-10-10 22:59:22 +00:00
parent 1b27dd60dd
commit 5fb2b32a1f
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
gst/parse/grammar.y
View file

@ -97,7 +97,10 @@ typedef struct {
* but there is no such signal */ * but there is no such signal */
} DelayedLink; } DelayedLink;
/*** define SET_ERROR and ERROR macros/functions */
#ifdef G_HAVE_ISO_VARARGS #ifdef G_HAVE_ISO_VARARGS
# define SET_ERROR(error, type, ...) \ # define SET_ERROR(error, type, ...) \
G_STMT_START { \ G_STMT_START { \
GST_CAT_ERROR (GST_CAT_PIPELINE, __VA_ARGS__); \ GST_CAT_ERROR (GST_CAT_PIPELINE, __VA_ARGS__); \
@ -109,20 +112,6 @@ G_STMT_START { \
# define ERROR(type, ...) \ # define ERROR(type, ...) \
SET_ERROR (((graph_t *) graph)->error, (type), __VA_ARGS__ ) SET_ERROR (((graph_t *) graph)->error, (type), __VA_ARGS__ )
# ifndef GST_DISABLE_GST_DEBUG
# define YYDEBUG 1
/* bison 1.35 calls this macro with side effects, we need to make sure the
side effects work - crappy bison
# define YYFPRINTF(a, ...) GST_CAT_DEBUG (GST_CAT_PIPELINE, __VA_ARGS__)
*/
# define YYFPRINTF(a, ...) \
G_STMT_START { \
gchar *temp = g_strdup_printf (__VA_ARGS__); \
GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
} G_STMT_END
# endif /* GST_DISABLE_GST_DEBUG */
#elif defined(G_HAVE_GNUC_VARARGS) #elif defined(G_HAVE_GNUC_VARARGS)
# define SET_ERROR(error, type, args...) \ # define SET_ERROR(error, type, args...) \
@ -136,20 +125,6 @@ G_STMT_START { \
# define ERROR(type, args...) \ # define ERROR(type, args...) \
SET_ERROR (((graph_t *) graph)->error,(type) , args ) SET_ERROR (((graph_t *) graph)->error,(type) , args )
# ifndef GST_DISABLE_GST_DEBUG
# define YYDEBUG 1
/* bison 1.35 calls this macro with side effects, we need to make sure the
side effects work - crappy bison
# define YYFPRINTF(a, args...) GST_CAT_DEBUG (GST_CAT_PIPELINE, args )
*/
# define YYFPRINTF(a, args...) \
G_STMT_START { \
gchar *temp = g_strdup_printf ( args ); \
GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
} G_STMT_END
# endif /* GST_DISABLE_GST_DEBUG */
#else #else
static inline void static inline void
@ -173,8 +148,37 @@ SET_ERROR (GError **error, gint type, const char *format, ...)
} }
} }
# ifndef GST_DISABLE_GST_DEBUG #endif /* G_HAVE_ISO_VARARGS */
# define YYDEBUG 1
/*** define YYPRINTF macro/function if we're debugging */
/* bison 1.35 calls this macro with side effects, we need to make sure the
side effects work - crappy bison */
#ifndef GST_DISABLE_GST_DEBUG
# define YYDEBUG 1
# ifdef G_HAVE_ISO_VARARGS
/* # define YYFPRINTF(a, ...) GST_CAT_DEBUG (GST_CAT_PIPELINE, __VA_ARGS__) */
# define YYFPRINTF(a, ...) \
G_STMT_START { \
gchar *temp = g_strdup_printf (__VA_ARGS__); \
GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
} G_STMT_END
# elif defined(G_HAVE_GNUC_VARARGS)
# define YYFPRINTF(a, args...) \
G_STMT_START { \
gchar *temp = g_strdup_printf ( args ); \
GST_CAT_LOG (GST_CAT_PIPELINE, temp); \
g_free (temp); \
} G_STMT_END
# else
static inline void static inline void
YYPRINTF(const char *format, ...) YYPRINTF(const char *format, ...)
{ {
@ -187,9 +191,10 @@ YYPRINTF(const char *format, ...)
g_free (temp); g_free (temp);
va_end (varargs); va_end (varargs);
} }
# endif /* GST_DISABLE_GST_DEBUG */
#endif /* G_HAVE_ISO_VARARGS */ # endif /* G_HAVE_ISO_VARARGS */
#endif /* GST_DISABLE_GST_DEBUG */
#define GST_BIN_MAKE(res, type, chainval, assign) \ #define GST_BIN_MAKE(res, type, chainval, assign) \
G_STMT_START { \ G_STMT_START { \