brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Don't use g_memmove()

Browse Source 
Glib stopped providing any fallback implementations on systems without
memmove() all the way back in 2013. Since then, the symbol is a simple
macro around memmove(); use that function directly now that glib added
a deprecation warning.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/632
This commit is contained in:
Florian Müllner 2019-07-17 17:20:08 +02:00 committed by Georges Basile Stavracas Neto
parent 305e63750e
commit 208c5e9562
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell-secure-text-buffer.c
View File

@ -108,7 +108,7 @@ shell_secure_text_buffer_real_insert_text (ClutterTextBuffer *buffer,
/* Actual text insertion */ /* Actual text insertion */
at = g_utf8_offset_to_pointer (self->text, position) - self->text; at = g_utf8_offset_to_pointer (self->text, position) - self->text;
g_memmove (self->text + at + n_bytes, self->text + at, self->text_bytes - at); memmove (self->text + at + n_bytes, self->text + at, self->text_bytes - at);
memcpy (self->text + at, chars, n_bytes); memcpy (self->text + at, chars, n_bytes);
/* Book keeping */ /* Book keeping */
@ -138,7 +138,7 @@ shell_secure_text_buffer_real_delete_text (ClutterTextBuffer *buffer,
start = g_utf8_offset_to_pointer (self->text, position) - self->text; start = g_utf8_offset_to_pointer (self->text, position) - self->text;
end = g_utf8_offset_to_pointer (self->text, position + n_chars) - self->text; end = g_utf8_offset_to_pointer (self->text, position + n_chars) - self->text;
g_memmove (self->text + start, self->text + end, self->text_bytes + 1 - end); memmove (self->text + start, self->text + end, self->text_bytes + 1 - end);
self->text_chars -= n_chars; self->text_chars -= n_chars;
self->text_bytes -= (end - start); self->text_bytes -= (end - start);