mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
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> 2004-05-04 Benjamin Otte <otte@gnome.org>
* testsuite/caps/renegotiate.c: (main): * testsuite/caps/renegotiate.c: (main):

21
gst/parse/grammar.y
View file

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