gst/parse/grammar.y: use GST_ERROR instead of g_warning, and always throw a GST_ERROR

Original commit message from CVS:
* gst/parse/grammar.y:
use GST_ERROR instead of g_warning, and always throw a GST_ERROR
This commit is contained in:
Benjamin Otte 2004-05-04 20:07:38 +00:00
parent 83c7c626f0
commit 2f043c0996
2 changed files with 14 additions and 18 deletions

View file

@ -1,3 +1,8 @@
2004-05-04 Benjamin Otte <otte@gnome.org>
* gst/parse/grammar.y:
use GST_ERROR instead of g_warning, and always throw a GST_ERROR
2004-05-04 Benjamin Otte <otte@gnome.org>
* testsuite/caps/renegotiate.c: (main):

View file

@ -95,12 +95,9 @@ typedef struct {
#ifdef G_HAVE_ISO_VARARGS
#define SET_ERROR(error, type, ...) G_STMT_START{ \
if (error) { \
if (*(error)) { \
g_warning (__VA_ARGS__); \
} else { \
g_set_error ((error), GST_PARSE_ERROR, (type), __VA_ARGS__); \
}\
GST_CAT_ERROR (GST_CAT_PIPELINE, __VA_ARGS__); \
if ((error) && !*(error)) { \
g_set_error ((error), GST_PARSE_ERROR, (type), __VA_ARGS__); \
} \
}G_STMT_END
#define ERROR(type, ...) SET_ERROR (((graph_t *) graph)->error, (type), __VA_ARGS__ )
@ -120,12 +117,9 @@ typedef struct {
#elif defined(G_HAVE_GNUC_VARARGS)
#define SET_ERROR(error, type, args...) G_STMT_START{ \
if (error) { \
if (*(error)) { \
g_warning ( args ); \
} else { \
g_set_error ((error), GST_PARSE_ERROR, (type), args ); \
}\
GST_CAT_ERROR (GST_CAT_PIPELINE, args ); \
if ((error) && !*(error)) { \
g_set_error ((error), GST_PARSE_ERROR, (type), args ); \
} \
}G_STMT_END
#define ERROR(type, args...) SET_ERROR (((graph_t *) graph)->error, (type) , args )
@ -145,12 +139,9 @@ typedef struct {
#else
#define SET_ERROR(error, type, ...) G_STMT_START{ \
if (error) { \
if (*(error)) { \
g_warning ("error while parsing"); \
} else { \
g_set_error ((error), GST_PARSE_ERROR, (type), "error while parsing"); \
}\
GST_CAT_ERROR (GST_CAT_PIPELINE, "error while parsing" ); \
if ((error) && !*(error)) { \
g_set_error ((error), GST_PARSE_ERROR, (type), "error while parsing"); \
} \
}G_STMT_END
#define ERROR(type, ...) SET_ERROR (((graph_t *) graph)->error, (type), "error while parsing")