From 3f511ec3612102d8a39291ea3946b832b81b7bd0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 20 Mar 2010 00:54:14 +0100 Subject: [PATCH] Add -Wwrite-strings to the configure flags ... and fix all warnings --- configure.ac | 4 ++-- ext/hal/hal.c | 6 ++++-- ext/raw1394/gstdv1394src.c | 2 +- ext/raw1394/gsthdv1394src.c | 2 +- ext/soup/gstsouphttpsrc.c | 4 ++-- ext/wavpack/gstwavpackcommon.c | 2 +- gst/avi/gstavimux.c | 2 +- gst/debugutils/gstpushfilesrc.c | 2 +- gst/flv/gstflvparse.c | 4 ++-- gst/goom/config_param.c | 14 +++++++------- gst/goom/goom_config_param.h | 20 ++++++++++---------- gst/id3demux/id3tags.c | 4 ++-- gst/law/alaw-decode.c | 2 +- gst/law/alaw-encode.c | 2 +- gst/law/mulaw-decode.c | 2 +- gst/law/mulaw-encode.c | 2 +- gst/matroska/ebml-write.c | 3 ++- gst/matroska/ebml-write.h | 2 +- gst/matroska/matroska-demux.c | 10 +++++----- gst/matroska/matroska-mux.c | 8 ++++---- gst/qtdemux/qtdemux.c | 5 +++-- gst/rtp/gstrtpdvpay.c | 2 +- gst/rtp/gstrtpmp4gpay.c | 2 +- gst/rtsp/gstrtspsrc.c | 6 +++--- gst/udp/gstudpsink.c | 2 +- gst/udp/gstudpsrc.c | 2 +- gst/videofilter/gstvideobalance.c | 2 +- sys/oss/gstossmixertrack.c | 2 +- sys/v4l2/gstv4l2object.c | 2 +- sys/v4l2/gstv4l2object.h | 4 ++-- sys/v4l2/gstv4l2src.c | 2 +- tests/check/elements/avimux.c | 13 +++++++------ tests/check/elements/level.c | 4 ++-- tests/check/elements/rtpbin_buffer_list.c | 2 +- tests/check/pipelines/simple-launch-lines.c | 4 ++-- 35 files changed, 78 insertions(+), 73 deletions(-) diff --git a/configure.ac b/configure.ac index c45dd16..d601559 100644 --- a/configure.ac +++ b/configure.ac @@ -272,10 +272,10 @@ dnl set location of plugin directory AG_GST_SET_PLUGINDIR dnl define an ERROR_CFLAGS Makefile variable -AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef]) +AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef -Wwrite-strings]) dnl define an ERROR_CXXFLAGS Makefile variable -AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wredundant-decls -Wundef]) +AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings]) dnl define correct level for debugging messages AG_GST_SET_LEVEL_DEFAULT($GST_GIT) diff --git a/ext/hal/hal.c b/ext/hal/hal.c index b0e1d82..6957f56 100644 --- a/ext/hal/hal.c +++ b/ext/hal/hal.c @@ -55,7 +55,8 @@ static gchar * gst_hal_get_alsa_element (LibHalContext * ctx, const gchar * udi, GstHalDeviceType device_type) { - char *type, *element = NULL, *string = NULL; + char *type, *string = NULL; + const char *element = NULL; DBusError error; dbus_error_init (&error); @@ -145,7 +146,8 @@ static gchar * gst_hal_get_oss_element (LibHalContext * ctx, const gchar * udi, GstHalDeviceType device_type) { - char *type, *element = NULL, *string = NULL; + char *type, *string = NULL; + const char *element = NULL; DBusError error; dbus_error_init (&error); diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 34a3c82..9a05798 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -1046,7 +1046,7 @@ gst_dv1394src_uri_get_type (void) static gchar ** gst_dv1394src_uri_get_protocols (void) { - static gchar *protocols[] = { "dv", NULL }; + static gchar *protocols[] = { (char *) "dv", NULL }; return protocols; } diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c index 4957346..1d39659 100644 --- a/ext/raw1394/gsthdv1394src.c +++ b/ext/raw1394/gsthdv1394src.c @@ -793,7 +793,7 @@ gst_hdv1394src_uri_get_type (void) static gchar ** gst_hdv1394src_uri_get_protocols (void) { - static gchar *protocols[] = { "hdv", NULL }; + static gchar *protocols[] = { (char *) "hdv", NULL }; return protocols; } diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index 1824852..902b353 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -1395,8 +1395,8 @@ gst_soup_http_src_uri_get_type (void) static gchar ** gst_soup_http_src_uri_get_protocols (void) { - static gchar *protocols[] = { "http", "https", NULL }; - return protocols; + static const gchar *protocols[] = { "http", "https", NULL }; + return (gchar **) protocols; } static const gchar * diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c index 9fb97a7..252b64c 100644 --- a/ext/wavpack/gstwavpackcommon.c +++ b/ext/wavpack/gstwavpackcommon.c @@ -40,7 +40,7 @@ gst_wavpack_read_header (WavpackHeader * header, guint8 * buf) g_memmove (header, buf, sizeof (WavpackHeader)); #ifndef WAVPACK_OLD_API - WavpackLittleEndianToNative (header, WavpackHeaderFormat); + WavpackLittleEndianToNative (header, (char *) WavpackHeaderFormat); #else little_endian_to_native (header, WavpackHeaderFormat); #endif diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index c69fac1..23ea480 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -1093,7 +1093,7 @@ gst_avi_mux_write_tag (const GstTagList * list, const gchar * tag, const struct { guint32 fcc; - gchar *tag; + const gchar *tag; } rifftags[] = { { GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, { diff --git a/gst/debugutils/gstpushfilesrc.c b/gst/debugutils/gstpushfilesrc.c index 185fffc..ac4f4ba 100644 --- a/gst/debugutils/gstpushfilesrc.c +++ b/gst/debugutils/gstpushfilesrc.c @@ -152,7 +152,7 @@ gst_push_file_src_uri_get_type (void) static gchar ** gst_push_file_src_uri_get_protocols (void) { - static gchar *protocols[] = { "pushfile", NULL }; + static gchar *protocols[] = { (char *) "pushfile", NULL }; return protocols; } diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c index e41fb2d..66e52c4 100644 --- a/gst/flv/gstflvparse.c +++ b/gst/flv/gstflvparse.c @@ -507,7 +507,7 @@ gst_flv_parse_audio_negotiate (GstFLVDemux * demux, guint32 codec_tag, guint32 rate, guint32 channels, guint32 width) { GstCaps *caps = NULL; - gchar *codec_name = NULL; + const gchar *codec_name = NULL; gboolean ret = FALSE; switch (codec_tag) { @@ -890,7 +890,7 @@ gst_flv_parse_video_negotiate (GstFLVDemux * demux, guint32 codec_tag) { gboolean ret = FALSE; GstCaps *caps = NULL; - gchar *codec_name = NULL; + const gchar *codec_name = NULL; /* Generate caps for that pad */ switch (codec_tag) { diff --git a/gst/goom/config_param.c b/gst/goom/config_param.c index ba04b46..5b52d07 100644 --- a/gst/goom/config_param.c +++ b/gst/goom/config_param.c @@ -28,7 +28,7 @@ empty_fct (PluginParam * dummy) } PluginParam -goom_secure_param () +goom_secure_param (void) { PluginParam p; @@ -41,7 +41,7 @@ goom_secure_param () } PluginParam -goom_secure_f_param (char *name) +goom_secure_f_param (const char *name) { PluginParam p = secure_param (); @@ -55,7 +55,7 @@ goom_secure_f_param (char *name) } PluginParam -goom_secure_f_feedback (char *name) +goom_secure_f_feedback (const char *name) { PluginParam p = secure_f_param (name); @@ -64,7 +64,7 @@ goom_secure_f_feedback (char *name) } PluginParam -goom_secure_s_param (char *name) +goom_secure_s_param (const char *name) { PluginParam p = secure_param (); @@ -75,7 +75,7 @@ goom_secure_s_param (char *name) } PluginParam -goom_secure_b_param (char *name, int value) +goom_secure_b_param (const char *name, int value) { PluginParam p = secure_param (); @@ -86,7 +86,7 @@ goom_secure_b_param (char *name, int value) } PluginParam -goom_secure_i_param (char *name) +goom_secure_i_param (const char *name) { PluginParam p = secure_param (); @@ -100,7 +100,7 @@ goom_secure_i_param (char *name) } PluginParam -goom_secure_i_feedback (char *name) +goom_secure_i_feedback (const char *name) { PluginParam p = secure_i_param (name); diff --git a/gst/goom/goom_config_param.h b/gst/goom/goom_config_param.h index c05f8f5..c7f8db6 100644 --- a/gst/goom/goom_config_param.h +++ b/gst/goom/goom_config_param.h @@ -62,8 +62,8 @@ struct BoolVal { typedef struct _PARAM { - char *name; - char *desc; + const char *name; + const char *desc; char rw; ParamType type; union { @@ -99,20 +99,20 @@ typedef struct _PARAM { PluginParam goom_secure_param(void); -PluginParam goom_secure_f_param(char *name); -PluginParam goom_secure_i_param(char *name); -PluginParam goom_secure_b_param(char *name, int value); -PluginParam goom_secure_s_param(char *name); +PluginParam goom_secure_f_param(const char *name); +PluginParam goom_secure_i_param(const char *name); +PluginParam goom_secure_b_param(const char *name, int value); +PluginParam goom_secure_s_param(const char *name); -PluginParam goom_secure_f_feedback(char *name); -PluginParam goom_secure_i_feedback(char *name); +PluginParam goom_secure_f_feedback(const char *name); +PluginParam goom_secure_i_feedback(const char *name); void goom_set_str_param_value(PluginParam *p, const char *str); void goom_set_list_param_value(PluginParam *p, const char *str); typedef struct _PARAMETERS { - char *name; - char *desc; + const char *name; + const char *desc; int nbParams; PluginParam **params; } PluginParameters; diff --git a/gst/id3demux/id3tags.c b/gst/id3demux/id3tags.c index fb0e42d..68a88f8 100644 --- a/gst/id3demux/id3tags.c +++ b/gst/id3demux/id3tags.c @@ -239,8 +239,8 @@ static const gchar *obsolete_frame_ids[] = { const struct ID3v2FrameIDConvert { - gchar *orig; - gchar *new; + const gchar *orig; + const gchar *new; } frame_id_conversions[] = { /* 2.3.x frames */ { diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index d7b6f2f..ee5367a 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -152,7 +152,7 @@ gst_alaw_dec_getcaps (GstPad * pad) GstPad *otherpad; GstCaps *othercaps, *result; const GstCaps *templ; - gchar *name; + const gchar *name; gint i; alawdec = GST_ALAW_DEC (GST_PAD_PARENT (pad)); diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c index 2b1b058..f5514ce 100644 --- a/gst/law/alaw-encode.c +++ b/gst/law/alaw-encode.c @@ -303,7 +303,7 @@ gst_alaw_enc_getcaps (GstPad * pad) GstPad *otherpad; GstCaps *othercaps, *result; const GstCaps *templ; - gchar *name; + const gchar *name; gint i; alawenc = GST_ALAW_ENC (GST_PAD_PARENT (pad)); diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index 79c385b..40347ab 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -95,7 +95,7 @@ mulawdec_getcaps (GstPad * pad) GstPad *otherpad; GstCaps *othercaps, *result; const GstCaps *templ; - gchar *name; + const gchar *name; gint i; mulawdec = GST_MULAWDEC (GST_PAD_PARENT (pad)); diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c index 9ee320b..0ab1a1e 100644 --- a/gst/law/mulaw-encode.c +++ b/gst/law/mulaw-encode.c @@ -61,7 +61,7 @@ mulawenc_getcaps (GstPad * pad) GstPad *otherpad; GstCaps *othercaps, *result; const GstCaps *templ; - gchar *name; + const gchar *name; gint i; mulawenc = GST_MULAWENC (GST_PAD_PARENT (pad)); diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c index 69aa1ff..dd01791 100644 --- a/gst/matroska/ebml-write.c +++ b/gst/matroska/ebml-write.c @@ -749,7 +749,8 @@ gst_ebml_replace_uint (GstEbmlWrite * ebml, guint64 pos, guint64 num) * Write EBML header. */ void -gst_ebml_write_header (GstEbmlWrite * ebml, gchar * doctype, guint version) +gst_ebml_write_header (GstEbmlWrite * ebml, const gchar * doctype, + guint version) { guint64 pos; diff --git a/gst/matroska/ebml-write.h b/gst/matroska/ebml-write.h index 6fceb5d..17c0ae6 100644 --- a/gst/matroska/ebml-write.h +++ b/gst/matroska/ebml-write.h @@ -112,7 +112,7 @@ void gst_ebml_write_binary (GstEbmlWrite *ebml, guchar *binary, guint64 length); void gst_ebml_write_header (GstEbmlWrite *ebml, - gchar *doctype, + const gchar *doctype, guint version); /* diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 2c30bb9..11ebd09 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2934,8 +2934,8 @@ gst_matroska_demux_parse_metadata_id_simple_tag (GstMatroskaDemux * demux, /* FIXME: check if there are more useful mappings */ struct { - gchar *matroska_tagname; - gchar *gstreamer_tagname; + const gchar *matroska_tagname; + const gchar *gstreamer_tagname; } tag_conv[] = { { @@ -4025,7 +4025,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, } } - utf8 = g_convert_with_fallback (data, size, "UTF-8", encoding, "*", + utf8 = g_convert_with_fallback (data, size, "UTF-8", encoding, (char *) "*", NULL, NULL, &err); if (err) { @@ -4036,7 +4036,7 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, /* invalid input encoding, fall back to ISO-8859-15 (always succeeds) */ encoding = "ISO-8859-15"; - utf8 = g_convert_with_fallback (data, size, "UTF-8", encoding, "*", + utf8 = g_convert_with_fallback (data, size, "UTF-8", encoding, (char *) "*", NULL, NULL, NULL); } @@ -5387,7 +5387,7 @@ gst_matroska_demux_chain (GstPad * pad, GstBuffer * buffer) guint needed = 0; guint32 id; guint64 length; - gchar *name; + const gchar *name; gst_adapter_push (demux->adapter, buffer); buffer = NULL; diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 360794b..9040a64 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -1278,10 +1278,10 @@ speex_streamheader_to_codecdata (const GValue * streamheader, return TRUE; } -static gchar * +static const gchar * aac_codec_data_to_codec_id (const GstBuffer * buf) { - gchar *result; + const gchar *result; gint profile; /* default to MAIN */ @@ -2080,8 +2080,8 @@ gst_matroska_mux_write_simple_tag (const GstTagList * list, const gchar * tag, /* TODO: more sensible tag mappings */ struct { - gchar *matroska_tagname; - gchar *gstreamer_tagname; + const gchar *matroska_tagname; + const gchar *gstreamer_tagname; } tag_conv[] = { { diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 65fa278..90b82a1 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -6582,7 +6582,8 @@ qtdemux_tag_add_blob (GNode * node, GstQTDemux * demux) gint len; guint8 *data; GstBuffer *buf; - gchar *media_type, *style; + gchar *media_type; + const gchar *style; GstCaps *caps; guint i; guint8 ndata[4]; @@ -6998,7 +6999,7 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream, guint8 *data_ptr = NULL; int data_len = 0; guint8 object_type_id = 0; - char *codec_name = NULL; + const char *codec_name = NULL; GstCaps *caps = NULL; GST_MEMDUMP_OBJECT (qtdemux, "esds", ptr, len); diff --git a/gst/rtp/gstrtpdvpay.c b/gst/rtp/gstrtpdvpay.c index 08f78eb..7d0c48d 100644 --- a/gst/rtp/gstrtpdvpay.c +++ b/gst/rtp/gstrtpdvpay.c @@ -185,7 +185,7 @@ gst_rtp_dv_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) static gboolean gst_dv_pay_negotiate (GstRTPDVPay * rtpdvpay, guint8 * data, guint size) { - gchar *encode, *media; + const gchar *encode, *media; gboolean audio_bundled, res; if ((data[3] & 0x80) == 0) { /* DSF flag */ diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c index 437c0dc..75fc92e 100644 --- a/gst/rtp/gstrtpmp4gpay.c +++ b/gst/rtp/gstrtpmp4gpay.c @@ -331,7 +331,7 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) GstRtpMP4GPay *rtpmp4gpay; GstStructure *structure; const GValue *codec_data; - gchar *media_type = NULL; + const gchar *media_type = NULL; gboolean res; rtpmp4gpay = GST_RTP_MP4G_PAY (payload); diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 4d65e65..40f4eeb 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -1245,7 +1245,7 @@ gst_rtspsrc_media_to_caps (gint pt, const GstSDPMedia * media) pairs = g_strsplit (p, ";", 0); for (i = 0; pairs[i]; i++) { gchar *valpos; - gchar *val, *key; + const gchar *val, *key; /* the key may not have a '=', the value can have other '='s */ valpos = strstr (pairs[i], "="); @@ -5564,9 +5564,9 @@ gst_rtspsrc_uri_get_type (void) static gchar ** gst_rtspsrc_uri_get_protocols (void) { - static gchar *protocols[] = { "rtsp", "rtspu", "rtspt", "rtsph", NULL }; + static const gchar *protocols[] = { "rtsp", "rtspu", "rtspt", "rtsph", NULL }; - return protocols; + return (gchar **) protocols; } static const gchar * diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c index 1f55f7d..eba1f06 100644 --- a/gst/udp/gstudpsink.c +++ b/gst/udp/gstudpsink.c @@ -258,7 +258,7 @@ gst_udpsink_uri_get_type (void) static gchar ** gst_udpsink_uri_get_protocols (void) { - static gchar *protocols[] = { "udp", NULL }; + static gchar *protocols[] = { (char *) "udp", NULL }; return protocols; } diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index 0cbaee8..9d567b0 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -995,7 +995,7 @@ gst_udpsrc_uri_get_type (void) static gchar ** gst_udpsrc_uri_get_protocols (void) { - static gchar *protocols[] = { "udp", NULL }; + static gchar *protocols[] = { (char *) "udp", NULL }; return protocols; } diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c index 77a5fbe..9ad0a6d 100644 --- a/gst/videofilter/gstvideobalance.c +++ b/gst/videofilter/gstvideobalance.c @@ -394,7 +394,7 @@ static void gst_video_balance_init (GTypeInstance * instance, gpointer g_class) { GstVideoBalance *videobalance = GST_VIDEO_BALANCE (instance); - char *channels[4] = { "HUE", "SATURATION", + const char *channels[4] = { "HUE", "SATURATION", "BRIGHTNESS", "CONTRAST" }; gint i; diff --git a/sys/oss/gstossmixertrack.c b/sys/oss/gstossmixertrack.c index 4b1d962..3bc8cde 100644 --- a/sys/oss/gstossmixertrack.c +++ b/sys/oss/gstossmixertrack.c @@ -83,7 +83,7 @@ static void fill_labels (void) { gint i, pos; - gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; + const gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; const struct { const gchar *given; diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 7d9409e..a363d4a 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -331,7 +331,7 @@ gst_v4l2_object_install_properties_helper (GObjectClass * gobject_class, GstV4l2Object * gst_v4l2_object_new (GstElement * element, enum v4l2_buf_type type, - char *default_device, + const char *default_device, GstV4l2GetInOutFunction get_in_out_func, GstV4l2SetInOutFunction set_in_out_func, GstV4l2UpdateFpsFunction update_fps_func) diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h index ba0799f..8660924 100644 --- a/sys/v4l2/gstv4l2object.h +++ b/sys/v4l2/gstv4l2object.h @@ -136,8 +136,8 @@ GType gst_v4l2_object_get_type (void); /* create/destroy */ GstV4l2Object * gst_v4l2_object_new (GstElement * element, - enum v4l2_buf_type type, - char *default_device, + enum v4l2_buf_type type, + const char *default_device, GstV4l2GetInOutFunction get_in_out_func, GstV4l2SetInOutFunction set_in_out_func, GstV4l2UpdateFpsFunction update_fps_func); diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 331fa75..5a70de6 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -969,7 +969,7 @@ gst_v4l2src_uri_get_type (void) static gchar ** gst_v4l2src_uri_get_protocols (void) { - static gchar *protocols[] = { "v4l2", NULL }; + static gchar *protocols[] = { (char *) "v4l2", NULL }; return protocols; } diff --git a/tests/check/elements/avimux.c b/tests/check/elements/avimux.c index 922221d..be06a6b 100644 --- a/tests/check/elements/avimux.c +++ b/tests/check/elements/avimux.c @@ -55,7 +55,7 @@ static GstStaticPadTemplate srcaudiotemplate = GST_STATIC_PAD_TEMPLATE ("src", /* setup and teardown needs some special handling for muxer */ static GstPad * setup_src_pad (GstElement * element, - GstStaticPadTemplate * template, GstCaps * caps, gchar * sinkname) + GstStaticPadTemplate * template, GstCaps * caps, const gchar * sinkname) { GstPad *srcpad, *sinkpad; @@ -84,7 +84,7 @@ setup_src_pad (GstElement * element, } static void -teardown_src_pad (GstElement * element, gchar * sinkname) +teardown_src_pad (GstElement * element, const gchar * sinkname) { GstPad *srcpad, *sinkpad; gchar *padname; @@ -116,7 +116,7 @@ teardown_src_pad (GstElement * element, gchar * sinkname) } static GstElement * -setup_avimux (GstStaticPadTemplate * srctemplate, gchar * sinkname) +setup_avimux (GstStaticPadTemplate * srctemplate, const gchar * sinkname) { GstElement *avimux; @@ -131,7 +131,7 @@ setup_avimux (GstStaticPadTemplate * srctemplate, gchar * sinkname) } static void -cleanup_avimux (GstElement * avimux, gchar * sinkname) +cleanup_avimux (GstElement * avimux, const gchar * sinkname) { GST_DEBUG ("cleanup_avimux"); gst_element_set_state (avimux, GST_STATE_NULL); @@ -144,8 +144,9 @@ cleanup_avimux (GstElement * avimux, gchar * sinkname) } static void -check_avimux_pad (GstStaticPadTemplate * srctemplate, gchar * src_caps_string, - gchar * chunk_id, gchar * sinkname) +check_avimux_pad (GstStaticPadTemplate * srctemplate, + const gchar * src_caps_string, const gchar * chunk_id, + const gchar * sinkname) { GstElement *avimux; GstBuffer *inbuffer, *outbuffer; diff --git a/tests/check/elements/level.c b/tests/check/elements/level.c index 0cd8fb6..d1f744c 100644 --- a/tests/check/elements/level.c +++ b/tests/check/elements/level.c @@ -153,7 +153,7 @@ GST_START_TEST (test_int16) /* block wave of half amplitude has -5.94 dB for rms, peak and decay */ for (i = 0; i < 2; ++i) { - gchar *fields[3] = { "rms", "peak", "decay" }; + const gchar *fields[3] = { "rms", "peak", "decay" }; for (j = 0; j < 3; ++j) { list = gst_structure_get_value (structure, fields[j]); value = gst_value_list_get_value (list, i); @@ -201,7 +201,7 @@ GST_START_TEST (test_int16_panned) const GValue *list, *value; GstClockTime endtime; gdouble dB; - gchar *fields[3] = { "rms", "peak", "decay" }; + const gchar *fields[3] = { "rms", "peak", "decay" }; level = setup_level (); g_object_set (level, "message", TRUE, "interval", GST_SECOND / 10, NULL); diff --git a/tests/check/elements/rtpbin_buffer_list.c b/tests/check/elements/rtpbin_buffer_list.c index af4003d..f459b92 100644 --- a/tests/check/elements/rtpbin_buffer_list.c +++ b/tests/check/elements/rtpbin_buffer_list.c @@ -61,7 +61,7 @@ static GstBuffer *header_buffer[2] = { NULL, NULL }; /* Some payload. */ -static char *payload = +static const char *payload = "0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF" "0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF" "0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF0123456789ABSDEF" diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index d4eaee9..c1c12ed 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -105,7 +105,7 @@ done: GST_START_TEST (test_rtp_payloaders) { - gchar *s; + const gchar *s; /* FIXME: going to playing would be nice, but thet leads to lot of failure */ GstState target_state = GST_STATE_PAUSED; @@ -223,7 +223,7 @@ GST_START_TEST (test_rtp_payloaders) GST_END_TEST GST_START_TEST (test_video_encoders_decoders) { - gchar *s; + const gchar *s; GstState target_state = GST_STATE_PLAYING; /* no is-live on the source because we actually want to preroll since -- 2.7.4