From 8ae735049233e3a45b6900ecb2d6373924dc7853 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 4 Apr 2002 19:28:23 +0000 Subject: [PATCH] fix all compiler warnings Original commit message from CVS: fix all compiler warnings --- gst/autoplug/gstautoplugcache.c | 2 +- gst/autoplug/gstautoplugger.c | 19 ++++++++++--------- gst/autoplug/gstspideridentity.c | 10 +++++----- gst/autoplug/spidertest.c | 2 +- gst/gstclock.c | 1 + gst/gstevent.c | 1 + gst/schedulers/gstfastscheduler.c | 14 ++++---------- libs/gst/bytestream/bstest.c | 2 ++ tests/bufspeed/gstmempool.c | 1 + tests/bufspeed/test1.c | 1 + tests/lat.c | 1 + tests/memchunk/gmemchunktest.c | 1 + tests/memchunk/gstmemchunk.c | 1 + tests/memchunk/gstmemchunktest.c | 1 + tools/gst-launch.c | 4 ++-- 15 files changed, 33 insertions(+), 28 deletions(-) diff --git a/gst/autoplug/gstautoplugcache.c b/gst/autoplug/gstautoplugcache.c index 3daf7db..d2f000c 100644 --- a/gst/autoplug/gstautoplugcache.c +++ b/gst/autoplug/gstautoplugcache.c @@ -236,7 +236,7 @@ gst_autoplugcache_loop (GstElement *element) if (GST_STATE(cache) != oldstate) { gst_object_ref (GST_OBJECT (cache)); GST_DEBUG(GST_CAT_AUTOPLUG, "state changed during signal, aborting"); - gst_element_yield (cache); + gst_element_yield (GST_ELEMENT (cache)); } gst_object_unref (GST_OBJECT (cache)); } diff --git a/gst/autoplug/gstautoplugger.c b/gst/autoplug/gstautoplugger.c index d60714b..7428240 100644 --- a/gst/autoplug/gstautoplugger.c +++ b/gst/autoplug/gstautoplugger.c @@ -94,9 +94,10 @@ static void gst_autoplugger_external_sink_caps_changed (GstPad *pad, GstCaps *ca static void gst_autoplugger_external_src_caps_changed (GstPad *pad, GstCaps *caps, GstAutoplugger *autoplugger); static void gst_autoplugger_external_sink_caps_nego_failed (GstPad *pad, gboolean *result, GstAutoplugger *autoplugger); static void gst_autoplugger_external_src_caps_nego_failed (GstPad *pad, gboolean *result, GstAutoplugger *autoplugger); +/* defined but not used static void gst_autoplugger_external_sink_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger); static void gst_autoplugger_external_src_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger); - +*/ static void gst_autoplugger_cache_first_buffer (GstElement *element,GstBuffer *buf,GstAutoplugger *autoplugger); static void gst_autoplugger_cache_empty (GstElement *element, GstAutoplugger *autoplugger); static void gst_autoplugger_typefind_have_type (GstElement *element, GstCaps *caps, GstAutoplugger *autoplugger); @@ -200,16 +201,16 @@ gst_autoplugger_init (GstAutoplugger *autoplugger) gst_element_add_ghost_pad (GST_ELEMENT(autoplugger), autoplugger->cache_srcpad, "src"); } - +/* defined but not used G_GNUC_UNUSED static void gst_autoplugger_external_sink_connected(GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger) { GstPadTemplate *peertemplate; GstCaps *peercaps, *peertemplatecaps; - GST_INFO(GST_CAT_AUTOPLUG, "have cache:sink connected"); + GST_INFO(GST_CAT_AUTOPLUG, "have cache:sink connected");*/ /* autoplugger->sinkpadpeer = peerpad; */ - +/* if (autoplugger->sinkpadpeer) { peercaps = GST_PAD_CAPS(autoplugger->sinkpadpeer); if (peercaps) @@ -232,9 +233,9 @@ gst_autoplugger_external_src_connected(GstPad *pad, GstPad *peerpad, GstAutoplug GstPadTemplate *peertemplate; GstCaps *peercaps, *peertemplatecaps; - GST_INFO(GST_CAT_AUTOPLUG, "have cache:src connected"); + GST_INFO(GST_CAT_AUTOPLUG, "have cache:src connected");*/ /* autoplugger->srcpadpeer = peerpad; */ - +/* if (autoplugger->srcpadpeer) { peercaps = GST_PAD_CAPS(autoplugger->srcpadpeer); if (peercaps) @@ -246,13 +247,13 @@ gst_autoplugger_external_src_connected(GstPad *pad, GstPad *peerpad, GstAutoplug if (peertemplatecaps) { GST_INFO(GST_CAT_AUTOPLUG, "there are some caps on this pad's peer's padtemplate %s", gst_caps_get_mime(peertemplatecaps)); - autoplugger->sinktemplatecaps = peertemplatecaps; + autoplugger->sinktemplatecaps = peertemplatecaps;*/ /* GST_DEBUG(GST_CAT_AUTOPLUG, "turning on caps nego proxying in cache"); */ /* gtk_object_set(G_OBJECT(autoplugger->cache),"caps_proxy",TRUE,NULL);*/ - } +/* } } } -} +}*/ static void diff --git a/gst/autoplug/gstspideridentity.c b/gst/autoplug/gstspideridentity.c index d5e4f18..2d5c20c 100644 --- a/gst/autoplug/gstspideridentity.c +++ b/gst/autoplug/gstspideridentity.c @@ -126,17 +126,17 @@ gst_spider_identity_class_init (GstSpiderIdentityClass *klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR(gst_spider_identity_change_state); gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR(gst_spider_identity_request_new_pad); } - +/* defined but not used static GstBufferPool* gst_spider_identity_get_bufferpool (GstPad *pad) -{ +{*/ /* fix me */ - GstSpiderIdentity *spider_identity; +/* GstSpiderIdentity *spider_identity; spider_identity = GST_SPIDER_IDENTITY (gst_pad_get_parent (pad)); return gst_pad_get_bufferpool (spider_identity->src); -} +}*/ static void gst_spider_identity_init (GstSpiderIdentity *ident) @@ -188,7 +188,7 @@ gst_spider_identity_chain (GstPad *pad, GstBuffer *buf) if (conn->sink == ident && (GstElement *) conn->src != conn->current) { gst_element_set_eos (GST_ELEMENT (conn->src)); - gst_pad_push (conn->src->src, gst_event_new (GST_EVENT_EOS)); + gst_pad_push (conn->src->src, GST_BUFFER (gst_event_new (GST_EVENT_EOS))); } } } diff --git a/gst/autoplug/spidertest.c b/gst/autoplug/spidertest.c index cd5c2c5..b46d556 100644 --- a/gst/autoplug/spidertest.c +++ b/gst/autoplug/spidertest.c @@ -127,7 +127,7 @@ int main(int argc,char *argv[]) exit (-4); } - gst_bin_use_clock (GST_BIN (bin), gst_system_clock_obtain ()); +/* gst_bin_use_clock (GST_BIN (bin), gst_system_clock_obtain ());*/ /* start playing */ gst_element_set_state(bin, GST_STATE_PLAYING); diff --git a/gst/gstclock.c b/gst/gstclock.c index 9fc75f4..c220ea1 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -423,6 +423,7 @@ gst_clock_notify_async (GstClock *clock, GstClockTime interval, GstClockCallback func, gpointer user_data) { g_warning ("not supported"); + return NULL; } /** diff --git a/gst/gstevent.c b/gst/gstevent.c index 35a878e..3dbec8e 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -23,6 +23,7 @@ #include "gst/gstinfo.h" #include "gst/gstevent.h" +#include /* memcpy */ GType _gst_event_type; diff --git a/gst/schedulers/gstfastscheduler.c b/gst/schedulers/gstfastscheduler.c index 45a1264..200d311 100644 --- a/gst/schedulers/gstfastscheduler.c +++ b/gst/schedulers/gstfastscheduler.c @@ -114,9 +114,9 @@ static void gst_fast_scheduler_pad_disconnect (GstScheduler *sched, GstPad static GstPad* gst_fast_scheduler_pad_select (GstScheduler *sched, GList *padlist); static GstSchedulerState gst_fast_scheduler_iterate (GstScheduler *sched); - +/* defined but not used static void gst_fast_scheduler_show (GstScheduler *sched); - +*/ static GstSchedulerClass *parent_class = NULL; static GType @@ -283,7 +283,6 @@ gst_fast_scheduler_getfunc_proxy (GstPad *pad) static gboolean gst_fast_scheduler_cothreaded_element (GstBin * bin, GstElement *element) { - GList *elements; cothread_func wrapper_function; GList *pads; @@ -636,9 +635,7 @@ static void gst_fast_scheduler_reset (GstScheduler *sched) { cothread_context *ctx; - GstBin *bin = GST_BIN (GST_SCHEDULER_PARENT (sched)); GList *elements = GST_FAST_SCHEDULER_CAST (sched)->elements; - GstFastScheduler *bsched = GST_FAST_SCHEDULER (sched); while (elements) { GST_ELEMENT_THREADSTATE (elements->data) = NULL; @@ -858,7 +855,6 @@ gst_fast_scheduler_pad_connect (GstScheduler * sched, GstPad *srcpad, GstPad *si static void gst_fast_scheduler_pad_disconnect (GstScheduler * sched, GstPad * srcpad, GstPad * sinkpad) { - GstSchedulerChain *chain; GstElement *element1, *element2; GstSchedulerChain *chain1, *chain2; GstFastScheduler *bsched = GST_FAST_SCHEDULER (sched); @@ -905,7 +901,6 @@ static GstPad * gst_fast_scheduler_pad_select (GstScheduler * sched, GList * padlist) { GstPad *pad = NULL; - GList *padlist2 = padlist; GST_INFO (GST_CAT_SCHEDULING, "imlement me!!"); @@ -918,8 +913,6 @@ gst_fast_scheduler_iterate (GstScheduler * sched) GstBin *bin = GST_BIN (sched->parent); GList *chains; GstSchedulerChain *chain; - GstElement *entry; - GList *elements; gint scheduled = 0; GstFastScheduler *bsched = GST_FAST_SCHEDULER (sched); GstSchedulerState state; @@ -1039,7 +1032,7 @@ exit: return state; } - +/* defined but not used static void gst_fast_scheduler_show (GstScheduler * sched) { @@ -1093,3 +1086,4 @@ gst_fast_scheduler_show (GstScheduler * sched) g_print ("\n"); } } +*/ diff --git a/libs/gst/bytestream/bstest.c b/libs/gst/bytestream/bstest.c index 7fe35b3..bdfb894 100644 --- a/libs/gst/bytestream/bstest.c +++ b/libs/gst/bytestream/bstest.c @@ -215,6 +215,8 @@ gst_identity_loop (GstElement *element) } exit(1); + /* implicit declaration of function `GST_ELEMENT_IS_COTHREAD_STOPPING' */ + #define GST_ELEMENT_IS_COTHREAD_STOPPING(element) GST_FLAG_IS_SET((element), GST_ELEMENT_SCHEDULER_PRIVATE1) } while (!GST_ELEMENT_IS_COTHREAD_STOPPING(element)); /**/ } diff --git a/tests/bufspeed/gstmempool.c b/tests/bufspeed/gstmempool.c index ffd5862..2e967c4 100644 --- a/tests/bufspeed/gstmempool.c +++ b/tests/bufspeed/gstmempool.c @@ -1,4 +1,5 @@ #include "gstmempool.h" +#include /* memset */ #ifdef __SMP__ #define POOL_LOCK "lock ; " diff --git a/tests/bufspeed/test1.c b/tests/bufspeed/test1.c index 7bedae6..aef6686 100644 --- a/tests/bufspeed/test1.c +++ b/tests/bufspeed/test1.c @@ -1,4 +1,5 @@ #include "gstbuffer.h" +#include int main (int argc, char *argv[]) diff --git a/tests/lat.c b/tests/lat.c index 8b8a995..eb08877 100644 --- a/tests/lat.c +++ b/tests/lat.c @@ -1,5 +1,6 @@ #include #include +#include /* FIXME: WTF does this do? */ diff --git a/tests/memchunk/gmemchunktest.c b/tests/memchunk/gmemchunktest.c index b3301f1..fe36e1a 100644 --- a/tests/memchunk/gmemchunktest.c +++ b/tests/memchunk/gmemchunktest.c @@ -1,4 +1,5 @@ #include +#include /* strerror */ #define MAX_THREADS 100 diff --git a/tests/memchunk/gstmemchunk.c b/tests/memchunk/gstmemchunk.c index f51e7d6..26b4664 100644 --- a/tests/memchunk/gstmemchunk.c +++ b/tests/memchunk/gstmemchunk.c @@ -1,4 +1,5 @@ #include "gstmemchunk.h" +#include /* memset */ #ifdef __SMP__ #define CHUNK_LOCK "lock ; " diff --git a/tests/memchunk/gstmemchunktest.c b/tests/memchunk/gstmemchunktest.c index 05acccb..267503e 100644 --- a/tests/memchunk/gstmemchunktest.c +++ b/tests/memchunk/gstmemchunktest.c @@ -1,5 +1,6 @@ #include #include "gstmemchunk.h" +#include /* strerror */ #define MAX_THREADS 100 diff --git a/tools/gst-launch.c b/tools/gst-launch.c index c8d7694..3890b01 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -165,9 +165,9 @@ main(int argc, char *argv[]) argvn = g_new0 (char *,argc); memcpy (argvn, argv+1, sizeof (char*) * (argc-1)); if (strstr (argv[0], "gst-xmllaunch")) { - pipeline = xmllaunch_parse_cmdline (argvn); + pipeline = xmllaunch_parse_cmdline ((const gchar **) argvn); } else { - pipeline = (GstElement*) gst_parse_launchv (argvn); + pipeline = (GstElement*) gst_parse_launchv ((const gchar **) argvn); } if (!pipeline) { -- 2.7.4