From 9867259b81996aedbc5270f0fb6f74f0217d1387 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 4 May 2005 21:29:44 +0000 Subject: [PATCH] gdp: GCC 4 fixen. Original commit message from CVS: 2005-05-04 Andy Wingo * check/Makefile.am: * docs/gst/tmpl/gstatomic.sgml: * docs/gst/tmpl/gstplugin.sgml: * gst/base/gstbasesink.c: (gst_basesink_activate): * gst/base/gstbasesrc.c: (gst_basesrc_class_init), (gst_basesrc_init), (gst_basesrc_set_dataflow_funcs), (gst_basesrc_query), (gst_basesrc_set_property), (gst_basesrc_get_property), (gst_basesrc_check_get_range), (gst_basesrc_activate): * gst/base/gstbasesrc.h: * gst/base/gstbasetransform.c: (gst_base_transform_sink_activate), (gst_base_transform_src_activate): * gst/elements/gstelements.c: * gst/elements/gstfakesrc.c: (gst_fakesrc_class_init), (gst_fakesrc_set_property), (gst_fakesrc_get_property): * gst/elements/gsttee.c: (gst_tee_sink_activate): * gst/elements/gsttypefindelement.c: (find_element_get_length), (gst_type_find_element_checkgetrange), (gst_type_find_element_activate): * gst/gstbin.c: (gst_bin_save_thyself), (gst_bin_restore_thyself): * gst/gstcaps.c: (gst_caps_do_simplify), (gst_caps_save_thyself), (gst_caps_load_thyself): * gst/gstelement.c: (gst_element_pads_activate), (gst_element_save_thyself), (gst_element_restore_thyself): * gst/gstpad.c: (gst_pad_load_and_link), (gst_pad_save_thyself), (gst_ghost_pad_save_thyself), (gst_pad_check_pull_range): * gst/gstpad.h: * gst/gstxml.c: (gst_xml_write), (gst_xml_parse_doc), (gst_xml_parse_file), (gst_xml_parse_memory), (gst_xml_get_element), (gst_xml_make_element): * gst/indexers/gstfileindex.c: (gst_file_index_load), (_file_index_id_save_xml), (gst_file_index_commit): * gst/registries/gstlibxmlregistry.c: (read_string), (read_uint), (read_enum), (load_pad_template), (load_feature), (load_plugin), (load_paths): * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_caps), (gst_dp_packet_from_event), (gst_dp_caps_from_packet): * tools/gst-complete.c: (main): * tools/gst-compprep.c: (main): * tools/gst-inspect.c: (print_element_properties_info): * tools/gst-launch.c: (xmllaunch_parse_cmdline): * tools/gst-xmlinspect.c: (print_element_properties): GCC 4 fixen. --- gst/gdp/dataprotocol.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c index 0ae75af..9210f29 100644 --- a/gst/gdp/dataprotocol.c +++ b/gst/gdp/dataprotocol.c @@ -237,7 +237,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, { guint8 *h; guint16 crc; - gchar *string; + guchar *string; /* FIXME: GST_IS_CAPS doesn't work g_return_val_if_fail (GST_IS_CAPS (caps), FALSE); */ @@ -248,7 +248,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, *length = GST_DP_HEADER_LENGTH; h = g_malloc (GST_DP_HEADER_LENGTH); - string = gst_caps_to_string (caps); + string = (guchar *) gst_caps_to_string (caps); /* version, flags, type */ h[0] = (guint8) GST_DP_VERSION_MAJOR; @@ -257,7 +257,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, h[3] = GST_DP_PAYLOAD_CAPS; /* buffer properties */ - GST_WRITE_UINT32_BE (h + 4, strlen (string) + 1); /* include trailing 0 */ + GST_WRITE_UINT32_BE (h + 4, strlen ((gchar *) string) + 1); /* include trailing 0 */ GST_WRITE_UINT64_BE (h + 8, (guint64) 0); GST_WRITE_UINT64_BE (h + 16, (guint64) 0); GST_WRITE_UINT64_BE (h + 24, (guint64) 0); @@ -276,7 +276,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, crc = 0; if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) { - crc = gst_dp_crc (string, strlen (string) + 1); + crc = gst_dp_crc (string, strlen ((gchar *) string) + 1); } GST_WRITE_UINT16_BE (h + 58, crc); @@ -379,7 +379,7 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, crc = 0; /* events can have a NULL payload */ if (*payload && flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) { - crc = gst_dp_crc (*payload, strlen (*payload) + 1); + crc = gst_dp_crc (*payload, strlen ((gchar *) * payload) + 1); } GST_WRITE_UINT16_BE (h + 58, crc); @@ -443,7 +443,7 @@ gst_dp_caps_from_packet (guint header_length, const guint8 * header, g_return_val_if_fail (GST_DP_HEADER_PAYLOAD_TYPE (header) == GST_DP_PAYLOAD_CAPS, FALSE); - string = payload; + string = (gchar *) payload; caps = gst_caps_from_string (string); return caps; } -- 2.7.4