From d9c2914c90c1d7a566154a2a922105cbd8a00a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 21 Nov 2013 15:30:34 +0000 Subject: [PATCH] g_memmove() is deprecated Just use plain memmove(), g_memmove() is deprecated in recent GLib versions. https://bugzilla.gnome.org/show_bug.cgi?id=712811 --- ext/wavpack/gstwavpackcommon.c | 2 +- ext/wavpack/gstwavpackstreamreader.c | 2 +- gst/apetag/gstapedemux.c | 2 +- gst/autodetect/gstautoaudiosink.c | 2 +- gst/autodetect/gstautoaudiosrc.c | 2 +- gst/autodetect/gstautovideosink.c | 2 +- gst/autodetect/gstautovideosrc.c | 2 +- gst/dtmf/gstrtpdtmfsrc.c | 2 +- gst/isomp4/atoms.c | 2 +- gst/matroska/matroska-demux.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c index 40ffb3af70..7e3e492dfa 100644 --- a/ext/wavpack/gstwavpackcommon.c +++ b/ext/wavpack/gstwavpackcommon.c @@ -36,7 +36,7 @@ GST_DEBUG_CATEGORY_EXTERN (wavpack_debug); gboolean gst_wavpack_read_header (WavpackHeader * header, guint8 * buf) { - g_memmove (header, buf, sizeof (WavpackHeader)); + memmove (header, buf, sizeof (WavpackHeader)); #ifndef WAVPACK_OLD_API WavpackLittleEndianToNative (header, (char *) WavpackHeaderFormat); diff --git a/ext/wavpack/gstwavpackstreamreader.c b/ext/wavpack/gstwavpackstreamreader.c index f10cf5840b..dd29a37280 100644 --- a/ext/wavpack/gstwavpackstreamreader.c +++ b/ext/wavpack/gstwavpackstreamreader.c @@ -39,7 +39,7 @@ gst_wavpack_stream_reader_read_bytes (void *id, void *data, int32_t bcount) rid->length, rid->position); if (to_read > 0) { - g_memmove (data, rid->buffer + rid->position, to_read); + memmove (data, rid->buffer + rid->position, to_read); rid->position += to_read; return to_read; } else { diff --git a/gst/apetag/gstapedemux.c b/gst/apetag/gstapedemux.c index 840765441c..be0b0e5bbb 100644 --- a/gst/apetag/gstapedemux.c +++ b/gst/apetag/gstapedemux.c @@ -214,7 +214,7 @@ ape_demux_parse_tags (const guint8 * data, gint size) while (sp != NULL && (sp2 = strchr (sp + 1, ' ')) != NULL) sp = sp2; if (sp) { - g_memmove (val, sp + 1, strlen (sp + 1) + 1); + memmove (val, sp + 1, strlen (sp + 1) + 1); } } diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 4bb9c1c6cc..7c1e2c5350 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -221,7 +221,7 @@ gst_auto_audio_sink_create_element_with_pretty_name (GstAutoAudioSink * sink, if (g_str_has_suffix (marker, "sink")) marker[strlen (marker) - 4] = '\0'; if (g_str_has_prefix (marker, "gst")) - g_memmove (marker, marker + 3, strlen (marker + 3) + 1); + memmove (marker, marker + 3, strlen (marker + 3) + 1); name = g_strdup_printf ("%s-actual-sink-%s", GST_OBJECT_NAME (sink), marker); g_free (marker); diff --git a/gst/autodetect/gstautoaudiosrc.c b/gst/autodetect/gstautoaudiosrc.c index 032196a807..49fa387a1c 100644 --- a/gst/autodetect/gstautoaudiosrc.c +++ b/gst/autodetect/gstautoaudiosrc.c @@ -207,7 +207,7 @@ gst_auto_audio_src_create_element_with_pretty_name (GstAutoAudioSrc * src, if (g_str_has_suffix (marker, "src")) marker[strlen (marker) - 4] = '\0'; if (g_str_has_prefix (marker, "gst")) - g_memmove (marker, marker + 3, strlen (marker + 3) + 1); + memmove (marker, marker + 3, strlen (marker + 3) + 1); name = g_strdup_printf ("%s-actual-src-%s", GST_OBJECT_NAME (src), marker); g_free (marker); diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index ffecd6d257..282bca4651 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -220,7 +220,7 @@ gst_auto_video_sink_create_element_with_pretty_name (GstAutoVideoSink * sink, if (g_str_has_suffix (marker, "sink")) marker[strlen (marker) - 4] = '\0'; if (g_str_has_prefix (marker, "gst")) - g_memmove (marker, marker + 3, strlen (marker + 3) + 1); + memmove (marker, marker + 3, strlen (marker + 3) + 1); name = g_strdup_printf ("%s-actual-sink-%s", GST_OBJECT_NAME (sink), marker); g_free (marker); diff --git a/gst/autodetect/gstautovideosrc.c b/gst/autodetect/gstautovideosrc.c index e79ef18a51..a7a9a088e4 100644 --- a/gst/autodetect/gstautovideosrc.c +++ b/gst/autodetect/gstautovideosrc.c @@ -206,7 +206,7 @@ gst_auto_video_src_create_element_with_pretty_name (GstAutoVideoSrc * src, if (g_str_has_suffix (marker, "src")) marker[strlen (marker) - 4] = '\0'; if (g_str_has_prefix (marker, "gst")) - g_memmove (marker, marker + 3, strlen (marker + 3) + 1); + memmove (marker, marker + 3, strlen (marker + 3) + 1); name = g_strdup_printf ("%s-actual-src-%s", GST_OBJECT_NAME (src), marker); g_free (marker); diff --git a/gst/dtmf/gstrtpdtmfsrc.c b/gst/dtmf/gstrtpdtmfsrc.c index 2a0b4a3bb4..ca986e788e 100644 --- a/gst/dtmf/gstrtpdtmfsrc.c +++ b/gst/dtmf/gstrtpdtmfsrc.c @@ -609,7 +609,7 @@ gst_rtp_dtmf_src_create_next_rtp_packet (GstRTPDTMFSrc * dtmfsrc) payload = (GstRTPDTMFPayload *) gst_rtp_buffer_get_payload (&rtpbuffer); /* copy payload and convert to network-byte order */ - g_memmove (payload, dtmfsrc->payload, sizeof (GstRTPDTMFPayload)); + memmove (payload, dtmfsrc->payload, sizeof (GstRTPDTMFPayload)); payload->duration = g_htons (payload->duration); diff --git a/gst/isomp4/atoms.c b/gst/isomp4/atoms.c index f6df24af1a..418e65d7e9 100644 --- a/gst/isomp4/atoms.c +++ b/gst/isomp4/atoms.c @@ -2870,7 +2870,7 @@ atom_moov_add_tag (AtomMOOV * moov, guint32 fourcc, guint32 flags, tag = atom_tag_new (fourcc, flags); tdata = &tag->data; atom_tag_data_alloc_data (tdata, size); - g_memmove (tdata->data, data, size); + memmove (tdata->data, data, size); atom_moov_append_tag (moov, build_atom_info_wrapper ((Atom *) tag, atom_tag_copy_data, diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 6afe8b8732..afad4af8a7 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2942,7 +2942,7 @@ gst_matroska_demux_add_wvpk_header (GstElement * element, GST_WRITE_UINT32_LE (outdata + outpos + 24, crc); outpos += 28; - g_memmove (outdata + outpos, data, blocksize); + memmove (outdata + outpos, data, blocksize); outpos += blocksize; data += blocksize; size -= blocksize;