summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-03-22 13:16:33 +0100
committerBenjamin Otte <otte@redhat.com>2010-03-22 13:16:33 +0100
commit33c2f5fb01b1cb9145751a745cfa2514421fa7b3 (patch)
treef8c0318f6d50928ee96ed1e8663a0c0c5fce7d3e /gst
parent010789159d7bf274e11f0b4bec5c66543ad1220f (diff)
downloadgstreamer-plugins-bad-33c2f5fb01b1cb9145751a745cfa2514421fa7b3.tar.gz
Add -Wwrite-strings
and fix its warnings
Diffstat (limited to 'gst')
-rw-r--r--gst/adpcmenc/adpcmenc.c2
-rw-r--r--gst/dataurisrc/gstdataurisrc.c6
-rw-r--r--gst/dtmf/gstdtmfsrc.c2
-rw-r--r--gst/dtmf/gstrtpdtmfdepay.c2
-rw-r--r--gst/festival/gstfestival.h4
-rw-r--r--gst/id3tag/id3tag.c5
-rw-r--r--gst/mpegdemux/mpegtspacketizer.c16
-rw-r--r--gst/mxf/mxftypes.c4
-rw-r--r--gst/qtmux/atoms.c2
-rw-r--r--gst/qtmux/gstqtmuxmap.h6
-rw-r--r--gst/real/gstrealaudiodec.c6
-rw-r--r--gst/real/gstrealvideodec.c2
-rw-r--r--gst/sdp/gstsdpdemux.c7
13 files changed, 33 insertions, 31 deletions
diff --git a/gst/adpcmenc/adpcmenc.c b/gst/adpcmenc/adpcmenc.c
index 0a9d0e96f..bc45c3da4 100644
--- a/gst/adpcmenc/adpcmenc.c
+++ b/gst/adpcmenc/adpcmenc.c
@@ -152,8 +152,8 @@ adpcmenc_setup (ADPCMEnc * enc)
const int DVI_IMA_HEADER_SIZE = 4;
const int ADPCM_SAMPLES_PER_BYTE = 2;
guint64 sample_bytes;
+ const char *layout;
- char *layout;
switch (enc->layout) {
case LAYOUT_ADPCM_DVI:
layout = "dvi";
diff --git a/gst/dataurisrc/gstdataurisrc.c b/gst/dataurisrc/gstdataurisrc.c
index bb4b895fe..17ebf4b10 100644
--- a/gst/dataurisrc/gstdataurisrc.c
+++ b/gst/dataurisrc/gstdataurisrc.c
@@ -314,7 +314,7 @@ gst_data_uri_src_get_uri_type (void)
static gchar **
gst_data_uri_src_get_protocols (void)
{
- static gchar *protocols[] = { "data", 0 };
+ static gchar *protocols[] = { (char *) "data", 0 };
return protocols;
}
@@ -423,8 +423,8 @@ gst_data_uri_src_set_uri (GstURIHandler * handler, const gchar * uri)
gchar *data;
data =
- g_convert_with_fallback (old_data, -1, "UTF-8", charset, "*", &read,
- &written, NULL);
+ g_convert_with_fallback (old_data, -1, "UTF-8", charset, (char *) "*",
+ &read, &written, NULL);
g_free (old_data);
GST_BUFFER_DATA (src->buffer) = GST_BUFFER_MALLOCDATA (src->buffer) =
(guint8 *) data;
diff --git a/gst/dtmf/gstdtmfsrc.c b/gst/dtmf/gstdtmfsrc.c
index f1244b62b..8831b39cf 100644
--- a/gst/dtmf/gstdtmfsrc.c
+++ b/gst/dtmf/gstdtmfsrc.c
@@ -147,7 +147,7 @@
typedef struct st_dtmf_key
{
- char *event_name;
+ const char *event_name;
int event_encoding;
float low_frequency;
float high_frequency;
diff --git a/gst/dtmf/gstrtpdtmfdepay.c b/gst/dtmf/gstrtpdtmfdepay.c
index 9f5ae9278..00ea508e5 100644
--- a/gst/dtmf/gstrtpdtmfdepay.c
+++ b/gst/dtmf/gstrtpdtmfdepay.c
@@ -117,7 +117,7 @@
typedef struct st_dtmf_key
{
- char *event_name;
+ const char *event_name;
int event_encoding;
float low_frequency;
float high_frequency;
diff --git a/gst/festival/gstfestival.h b/gst/festival/gstfestival.h
index 66350f442..d099954e6 100644
--- a/gst/festival/gstfestival.h
+++ b/gst/festival/gstfestival.h
@@ -75,9 +75,9 @@ extern "C" {
typedef struct FT_Info
{
int encoding;
- char *server_host;
+ const char *server_host;
int server_port;
- char *text_mode;
+ const char *text_mode;
int server_fd;
} FT_Info;
diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c
index 899bd4be2..301307e5d 100644
--- a/gst/id3tag/id3tag.c
+++ b/gst/id3tag/id3tag.c
@@ -926,7 +926,7 @@ add_relative_volume_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
gint16 gain_int;
guint8 peak_bits;
GstId3v2Frame frame;
- gchar *frame_id;
+ const gchar *frame_id;
/* figure out tag names and the identification string to use */
if (strcmp (tag, GST_TAG_TRACK_PEAK) == 0 ||
@@ -1154,7 +1154,8 @@ latin1_convert (const GstTagList * list, const gchar * tag,
/* Convert to Latin-1 (ISO-8859-1), replacing unrepresentable characters
with '?' */
- latin1 = g_convert_with_fallback (str, -1, "ISO-8859-1", "UTF-8", "?",
+ latin1 =
+ g_convert_with_fallback (str, -1, "ISO-8859-1", "UTF-8", (char *) "?",
NULL, &len, NULL);
if (latin1 != NULL && *latin1 != '\0') {
diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index ccc3262d7..875f9712e 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -799,10 +799,10 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
DESC_DVB_SATELLITE_DELIVERY_SYSTEM_west_east_flag (delivery);
guint8 polarization =
DESC_DVB_SATELLITE_DELIVERY_SYSTEM_polarization (delivery);
- gchar *polarization_str;
+ const gchar *polarization_str;
guint8 modulation =
DESC_DVB_SATELLITE_DELIVERY_SYSTEM_modulation (delivery);
- gchar *modulation_str;
+ const gchar *modulation_str;
guint8 *symbol_rate_bcd =
DESC_DVB_SATELLITE_DELIVERY_SYSTEM_symbol_rate (delivery);
guint32 symbol_rate =
@@ -814,7 +814,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
100000 * ((symbol_rate_bcd[0] & 0xF0) >> 4);
guint8 fec_inner =
DESC_DVB_SATELLITE_DELIVERY_SYSTEM_fec_inner (delivery);
- gchar *fec_inner_str;
+ const gchar *fec_inner_str;
switch (polarization) {
case 0:
@@ -914,7 +914,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_transmission_mode (delivery);
gboolean other_frequency =
DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_other_frequency (delivery);
- gchar *constellation_str, *code_rate_hp_str, *code_rate_lp_str,
+ const gchar *constellation_str, *code_rate_hp_str, *code_rate_lp_str,
*transmission_mode_str;
/* do the stuff */
/* bandwidth is 8 if 0, 7 if 1, 6 if 2, reserved otherwise */
@@ -1041,7 +1041,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
10000000 * ((frequency_bcd[0] & 0xF0) >> 4));
guint8 modulation =
DESC_DVB_CABLE_DELIVERY_SYSTEM_modulation (delivery);
- gchar *modulation_str;
+ const gchar *modulation_str;
guint8 *symbol_rate_bcd =
DESC_DVB_CABLE_DELIVERY_SYSTEM_symbol_rate (delivery);
guint32 symbol_rate =
@@ -1052,7 +1052,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
10000 * (symbol_rate_bcd[0] & 0x0F) +
100000 * ((symbol_rate_bcd[0] & 0xF0) >> 4);
guint8 fec_inner = DESC_DVB_CABLE_DELIVERY_SYSTEM_fec_inner (delivery);
- gchar *fec_inner_str;
+ const gchar *fec_inner_str;
switch (fec_inner) {
case 0:
@@ -1386,7 +1386,7 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
(gchar *) DESC_DVB_SERVICE_name_text (service_descriptor);
if (servicename_length + serviceprovider_name_length + 2 <=
DESC_LENGTH (service_descriptor)) {
- gchar *running_status_tmp;
+ const gchar *running_status_tmp;
switch (running_status) {
case 0:
running_status_tmp = "undefined";
@@ -1700,7 +1700,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
gint freq = 25; /* 25 or 30 measured in Hertz */
gboolean highdef = FALSE;
gboolean panvectors = FALSE;
- gchar *comptype = "";
+ const gchar *comptype = "";
comp_descriptor = g_array_index (component_descriptors, guint8 *, i);
switch (DESC_DVB_COMPONENT_stream_content (comp_descriptor)) {
diff --git a/gst/mxf/mxftypes.c b/gst/mxf/mxftypes.c
index e678da63c..6fcfdeb1e 100644
--- a/gst/mxf/mxftypes.c
+++ b/gst/mxf/mxftypes.c
@@ -645,8 +645,8 @@ mxf_utf8_to_utf16 (const gchar * str, guint16 * size)
}
ret = (guint8 *)
- g_convert_with_fallback (str, -1, "UTF-16BE", "UTF-8", "*", NULL, &s,
- &error);
+ g_convert_with_fallback (str, -1, "UTF-16BE", "UTF-8", (char *) "*", NULL,
+ &s, &error);
if (ret == NULL) {
GST_WARNING ("UTF-16-BE to UTF-8 conversion failed: %s", error->message);
diff --git a/gst/qtmux/atoms.c b/gst/qtmux/atoms.c
index 841900d55..d87174e72 100644
--- a/gst/qtmux/atoms.c
+++ b/gst/qtmux/atoms.c
@@ -2817,7 +2817,7 @@ atom_hdlr_set_type (AtomHDLR * hdlr, AtomsContext * context, guint32 comp_type,
}
static void
-atom_hdlr_set_name (AtomHDLR * hdlr, char *name)
+atom_hdlr_set_name (AtomHDLR * hdlr, const char *name)
{
if (hdlr->name)
g_free (hdlr->name);
diff --git a/gst/qtmux/gstqtmuxmap.h b/gst/qtmux/gstqtmuxmap.h
index 67c613902..8e89351dd 100644
--- a/gst/qtmux/gstqtmuxmap.h
+++ b/gst/qtmux/gstqtmuxmap.h
@@ -61,9 +61,9 @@ typedef enum _GstQTMuxFormat
typedef struct _GstQTMuxFormatProp
{
GstQTMuxFormat format;
- gchar *name;
- gchar *long_name;
- gchar *type_name;
+ const gchar *name;
+ const gchar *long_name;
+ const gchar *type_name;
GstStaticCaps src_caps;
GstStaticCaps video_sink_caps;
GstStaticCaps audio_sink_caps;
diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c
index b3f2ad52e..70103cee0 100644
--- a/gst/real/gstrealaudiodec.c
+++ b/gst/real/gstrealaudiodec.c
@@ -87,7 +87,7 @@ typedef struct
guint16 (*RAOpenCodec2) (gpointer, const gchar *);
guint16 (*RASetFlavor) (gpointer, guint16);
void (*SetDLLAccessPath) (gchar *);
- void (*RASetPwd) (gpointer, gchar *);
+ void (*RASetPwd) (gpointer, const gchar *);
} GstRADecLibrary;
typedef struct
@@ -211,7 +211,7 @@ close_library (GstRealAudioDec * dec, GstRADecLibrary * lib)
static gboolean
open_library (GstRealAudioDec * dec, gint version, GstRADecLibrary * lib)
{
- gchar *path, *names;
+ const gchar *path, *names;
gchar **split_names, **split_path;
gint i, j;
gpointer ra_close_codec, ra_decode, ra_free_decoder;
@@ -300,7 +300,7 @@ codec_search_done:
lib->RAOpenCodec2 = (guint16 (*)(gpointer, const gchar *)) ra_open_codec2;
lib->RAInitDecoder = (guint16 (*)(gpointer, gpointer)) ra_init_decoder;
lib->RASetFlavor = (guint16 (*)(gpointer, guint16)) ra_set_flavor;
- lib->RASetPwd = (void (*)(gpointer, gchar *)) ra_set_pwd;
+ lib->RASetPwd = (void (*)(gpointer, const gchar *)) ra_set_pwd;
lib->SetDLLAccessPath = (void (*)(gchar *)) set_dll_access_path;
if (lib->SetDLLAccessPath)
diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c
index 4485a312f..0c4fb1542 100644
--- a/gst/real/gstrealvideodec.c
+++ b/gst/real/gstrealvideodec.c
@@ -443,7 +443,7 @@ open_library (GstRealVideoDec * dec, GstRealVideoDecVersion version,
{
gpointer rv_custom_msg, rv_free, rv_init, rv_transform;
GModule *module = NULL;
- gchar *path, *names;
+ const gchar *path, *names;
gchar **split_names, **split_path;
int i, j;
diff --git a/gst/sdp/gstsdpdemux.c b/gst/sdp/gstsdpdemux.c
index 3f9306e27..47c6e4a60 100644
--- a/gst/sdp/gstsdpdemux.c
+++ b/gst/sdp/gstsdpdemux.c
@@ -682,8 +682,8 @@ gst_sdp_demux_media_to_caps (gint pt, const GstSDPMedia * media)
/* <param>[=<value>] are separated with ';' */
pairs = g_strsplit (p, ";", 0);
for (i = 0; pairs[i]; i++) {
- gchar *valpos;
- gchar *val, *key;
+ gchar *valpos, *key;
+ const gchar *val;
/* the key may not have a '=', the value can have other '='s */
valpos = strstr (pairs[i], "=");
@@ -933,7 +933,8 @@ start_session_failure:
static gboolean
gst_sdp_demux_stream_configure_udp (GstSDPDemux * demux, GstSDPStream * stream)
{
- gchar *uri, *name, *destination;
+ gchar *uri, *name;
+ const gchar *destination;
GstPad *pad;
GST_DEBUG_OBJECT (demux, "creating UDP sources for multicast");