AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 03:10:09 +00:00
Code Issues Projects Releases Wiki Activity

debug: remove open-coded debug checks in gtktextsegment

Browse Source 
These runtime checks were being performed whether or not we were in a
debug build. Using GTK_DEBUG_CHECK() will compile out of production
builds, as it will result in something like:

  if (G_UNLIKELY(0))

which the optimizer can prune.

https://bugzilla.gnome.org/show_bug.cgi?id=765284
This commit is contained in:
Christian Hergert 2016-04-19 19:35:52 -07:00 committed by Christian Hergert
parent f3e6d930a8
commit 3df2e0b26a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtktextsegment.c
View File

@ -103,7 +103,7 @@ gtk_text_line_segment_split (const GtkTextIter *iter)
count = gtk_text_iter_get_line_index (iter); count = gtk_text_iter_get_line_index (iter);
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
_gtk_text_iter_check (iter); _gtk_text_iter_check (iter);
prev = NULL; prev = NULL;
@ -203,7 +203,7 @@ _gtk_char_segment_new (const gchar *text, guint len)
seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count); seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
char_segment_self_check (seg); char_segment_self_check (seg);
return seg; return seg;
@ -232,7 +232,7 @@ _gtk_char_segment_new_from_two_strings (const gchar *text1,
seg->char_count = chars1 + chars2; seg->char_count = chars1 + chars2;
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
char_segment_self_check (seg); char_segment_self_check (seg);
return seg; return seg;
@ -274,7 +274,7 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
g_assert (index < seg->byte_count); g_assert (index < seg->byte_count);
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
{ {
char_segment_self_check (seg); char_segment_self_check (seg);
} }
@ -290,7 +290,7 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
new1->next = new2; new1->next = new2;
new2->next = seg->next; new2->next = seg->next;
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
{ {
char_segment_self_check (new1); char_segment_self_check (new1);
char_segment_self_check (new2); char_segment_self_check (new2);
@ -329,7 +329,7 @@ char_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
{ {
GtkTextLineSegment *segPtr2, *newPtr; GtkTextLineSegment *segPtr2, *newPtr;
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
char_segment_self_check (segPtr); char_segment_self_check (segPtr);
segPtr2 = segPtr->next; segPtr2 = segPtr->next;
@ -348,7 +348,7 @@ char_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
newPtr->next = segPtr2->next; newPtr->next = segPtr2->next;
if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) if (GTK_DEBUG_CHECK (TEXT))
char_segment_self_check (newPtr); char_segment_self_check (newPtr);
_gtk_char_segment_free (segPtr); _gtk_char_segment_free (segPtr);