[beast/devel: 9/26] BEAST-GTK: use memmove(), since g_memmove() was removed from GLib
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/devel: 9/26] BEAST-GTK: use memmove(), since g_memmove() was removed from GLib
- Date: Mon, 13 Oct 2014 02:26:52 +0000 (UTC)
commit 884687355c074aef3f32d7296d8e354d8e1a503c
Author: Tim Janik <timj gnu org>
Date: Sun Oct 12 01:26:20 2014 +0200
BEAST-GTK: use memmove(), since g_memmove() was removed from GLib
beast-gtk/bstkeybindings.cc | 4 ++--
beast-gtk/bstqsampler.cc | 4 ++--
beast-gtk/bstsnifferscope.cc | 4 ++--
beast-gtk/gxk/gxkscrollcanvas.cc | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/beast-gtk/bstkeybindings.cc b/beast-gtk/bstkeybindings.cc
index 9e6f613..5a1b5f9 100644
--- a/beast-gtk/bstkeybindings.cc
+++ b/beast-gtk/bstkeybindings.cc
@@ -117,7 +117,7 @@ key_bindings_exec_action (gpointer data,
if (valid)
{
kbinding->keys = (BstKeyBindingKey*) g_realloc (kbinding->keys, sizeof (kbinding->keys[0]) *
(kbinding->n_keys + 1));
- g_memmove (kbinding->keys + nb + 1,
+ memmove (kbinding->keys + nb + 1,
kbinding->keys + nb,
sizeof (kbinding->keys[0]) * (kbinding->n_keys - nb));
kbinding->n_keys++;
@@ -205,7 +205,7 @@ key_bindings_exec_action (gpointer data,
if (nth < kbinding->n_keys)
{
kbinding->n_keys--;
- g_memmove (kbinding->keys + nth,
+ memmove (kbinding->keys + nth,
kbinding->keys + nth + 1,
sizeof (kbinding->keys[0]) * (kbinding->n_keys - nth));
gxk_list_wrapper_notify_delete (GXK_LIST_WRAPPER (model), nth);
diff --git a/beast-gtk/bstqsampler.cc b/beast-gtk/bstqsampler.cc
index 6067c83..4c6c3b4 100644
--- a/beast-gtk/bstqsampler.cc
+++ b/beast-gtk/bstqsampler.cc
@@ -699,7 +699,7 @@ bst_qsampler_move_to (BstQSampler *qsampler,
{
guint diff = peak_offset - qsampler->peak_offset;
- g_memmove (qsampler->peaks, qsampler->peaks + diff, (qsampler->n_peaks - diff) * sizeof
(qsampler->peaks[0]));
+ memmove (qsampler->peaks, qsampler->peaks + diff, (qsampler->n_peaks - diff) * sizeof
(qsampler->peaks[0]));
qsampler->peak_offset = peak_offset;
bst_qsampler_invalidate (qsampler, (qsampler->n_peaks - diff), qsampler->n_peaks, TRUE);
bst_qsampler_update_types (qsampler,
@@ -711,7 +711,7 @@ bst_qsampler_move_to (BstQSampler *qsampler,
{
guint diff = qsampler->peak_offset - peak_offset;
- g_memmove (qsampler->peaks + diff, qsampler->peaks, (qsampler->n_peaks - diff) * sizeof
(qsampler->peaks[0]));
+ memmove (qsampler->peaks + diff, qsampler->peaks, (qsampler->n_peaks - diff) * sizeof
(qsampler->peaks[0]));
qsampler->peak_offset = peak_offset;
bst_qsampler_invalidate (qsampler, 0, diff, TRUE);
bst_qsampler_update_types (qsampler, 0, (qsampler->peak_offset + diff + 1) * qsampler->zoom_factor);
diff --git a/beast-gtk/bstsnifferscope.cc b/beast-gtk/bstsnifferscope.cc
index 8cb7dac..8d9a2e6 100644
--- a/beast-gtk/bstsnifferscope.cc
+++ b/beast-gtk/bstsnifferscope.cc
@@ -182,8 +182,8 @@ sniffer_scope_shift (BstSnifferScope *self)
{
if (self->n_values)
{
- g_memmove (self->lvalues + 1, self->lvalues, (self->n_values - 1) * sizeof (self->lvalues[0]));
- g_memmove (self->rvalues + 1, self->rvalues, (self->n_values - 1) * sizeof (self->rvalues[0]));
+ memmove (self->lvalues + 1, self->lvalues, (self->n_values - 1) * sizeof (self->lvalues[0]));
+ memmove (self->rvalues + 1, self->rvalues, (self->n_values - 1) * sizeof (self->rvalues[0]));
if (GTK_WIDGET_DRAWABLE (self))
{
GtkWidget *widget = GTK_WIDGET (self);
diff --git a/beast-gtk/gxk/gxkscrollcanvas.cc b/beast-gtk/gxk/gxkscrollcanvas.cc
index 3a0191f..2ad499b 100644
--- a/beast-gtk/gxk/gxkscrollcanvas.cc
+++ b/beast-gtk/gxk/gxkscrollcanvas.cc
@@ -1658,7 +1658,7 @@ gxk_scroll_canvas_add_marker (GxkScrollCanvas *self,
if (index < self->markers[i].index)
break;
self->markers = g_renew (GxkScrollMarker, self->markers, self->n_markers + 1);
- g_memmove (self->markers + i + 1, self->markers + i, sizeof (marker[0]) * (self->n_markers - i));
+ memmove (self->markers + i + 1, self->markers + i, sizeof (marker[0]) * (self->n_markers - i));
self->n_markers += 1;
marker = self->markers + i;
memset (marker, 0, sizeof (marker[0]));
@@ -1677,7 +1677,7 @@ gxk_scroll_canvas_remove_marker (GxkScrollCanvas *self,
i = marker - self->markers;
gxk_scroll_canvas_setup_marker (self, marker, NULL, 0, 0, 0, 0);
self->n_markers -= 1;
- g_memmove (self->markers + i, self->markers + i + 1, sizeof (marker[0]) * (self->n_markers - i));
+ memmove (self->markers + i, self->markers + i + 1, sizeof (marker[0]) * (self->n_markers - i));
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]