Add G_UNLIKELY() to type registration block in _get_type() functions.

2007-06-20  Behdad Esfahbod  <behdad@gnome.org>

        * pango/fonts.c (pango_font_description_get_type),
        (pango_font_metrics_get_type):
        * pango/glyphstring.c (pango_glyph_string_get_type):
        * pango/pango-attributes.c (pango_attr_list_get_type):
        * pango/pango-color.c (pango_color_get_type):
        * pango/pango-item.c (pango_item_get_type):
        * pango/pango-language.c (pango_language_get_type):
        * pango/pango-layout.c (pango_layout_line_get_type),
        (pango_layout_iter_get_type):
        * pango/pango-matrix.c (pango_matrix_get_type):
        * pango/pango-ot-info.c (pango_ot_info_get_type):
        * pango/pango-ot-ruleset.c (pango_ot_ruleset_get_type):
        * pango/pango-tabs.c (pango_tab_array_get_type):
        * pango/pangoatsui-fontmap.c (pango_atsui_family_get_type),
        (pango_atsui_face_get_type):
        * pango/pangofc-fontmap.c (pango_fc_face_get_type),
        (pango_fc_family_get_type):
        * pango/pangowin32-fontmap.c (pango_win32_family_get_type),
        (pango_win32_face_get_type):
        * pango/pangox-fontmap.c (pango_x_font_map_get_type),
        (pango_x_face_get_type), (pango_x_family_get_type):
        * pango/pangox.c (pango_x_font_get_type):
        Add G_UNLIKELY() to type registration block in _get_type() functions.


svn path=/trunk/; revision=2364

17 files changed, 49 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index a1009a48..8a471030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-06-20  Behdad Esfahbod  <behdad@gnome.org>
+
+	* pango/fonts.c (pango_font_description_get_type),
+	(pango_font_metrics_get_type):
+	* pango/glyphstring.c (pango_glyph_string_get_type):
+	* pango/pango-attributes.c (pango_attr_list_get_type):
+	* pango/pango-color.c (pango_color_get_type):
+	* pango/pango-item.c (pango_item_get_type):
+	* pango/pango-language.c (pango_language_get_type):
+	* pango/pango-layout.c (pango_layout_line_get_type),
+	(pango_layout_iter_get_type):
+	* pango/pango-matrix.c (pango_matrix_get_type):
+	* pango/pango-ot-info.c (pango_ot_info_get_type):
+	* pango/pango-ot-ruleset.c (pango_ot_ruleset_get_type):
+	* pango/pango-tabs.c (pango_tab_array_get_type):
+	* pango/pangoatsui-fontmap.c (pango_atsui_family_get_type),
+	(pango_atsui_face_get_type):
+	* pango/pangofc-fontmap.c (pango_fc_face_get_type),
+	(pango_fc_family_get_type):
+	* pango/pangowin32-fontmap.c (pango_win32_family_get_type),
+	(pango_win32_face_get_type):
+	* pango/pangox-fontmap.c (pango_x_font_map_get_type),
+	(pango_x_face_get_type), (pango_x_family_get_type):
+	* pango/pangox.c (pango_x_font_get_type):
+	Add G_UNLIKELY() to type registration block in _get_type() functions.
+
 2007-06-18  Behdad Esfahbod  <behdad@gnome.org>
 
 	* === Released 1.17.3 ===
diff --git a/pango/fonts.c b/pango/fonts.c
index 48e26de1..0979ba1a 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -53,7 +53,7 @@ pango_font_description_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoFontDescription"),
 					     (GBoxedCopyFunc)pango_font_description_copy,
 					     (GBoxedFreeFunc)pango_font_description_free);
@@ -1425,7 +1425,7 @@ pango_font_metrics_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoFontMetrics"),
 					     (GBoxedCopyFunc)pango_font_metrics_ref,
 					     (GBoxedFreeFunc)pango_font_metrics_unref);
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index caff9d77..0fcbb229 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -82,7 +82,7 @@ pango_glyph_string_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoGlyphString"),
 					     (GBoxedCopyFunc)pango_glyph_string_copy,
 					     (GBoxedFreeFunc)pango_glyph_string_free);
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index ba3973dd..e054b14d 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1030,7 +1030,7 @@ pango_attr_list_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoAttrList"),
 					     (GBoxedCopyFunc) pango_attr_list_copy,
 					     (GBoxedFreeFunc) pango_attr_list_unref);
diff --git a/pango/pango-color.c b/pango/pango-color.c
index b469e83c..beae87fa 100644
--- a/pango/pango-color.c
+++ b/pango/pango-color.c
@@ -32,7 +32,7 @@ pango_color_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoColor"),
 					     (GBoxedCopyFunc) pango_color_copy,
 					     (GBoxedFreeFunc) pango_color_free);
diff --git a/pango/pango-item.c b/pango/pango-item.c
index 4ad76eee..d5650827 100644
--- a/pango/pango-item.c
+++ b/pango/pango-item.c
@@ -102,7 +102,7 @@ pango_item_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoItem"),
 					     (GBoxedCopyFunc) pango_item_copy,
 					     (GBoxedFreeFunc) pango_item_free);
diff --git a/pango/pango-language.c b/pango/pango-language.c
index 61124bd0..e6567924 100644
--- a/pango/pango-language.c
+++ b/pango/pango-language.c
@@ -88,7 +88,7 @@ pango_language_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoLanguage"),
 					     (GBoxedCopyFunc)pango_language_copy,
 					     (GBoxedFreeFunc)pango_language_free);
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 10cf6d4e..8066c646 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3799,7 +3799,7 @@ pango_layout_line_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoLayoutLine"),
 					     (GBoxedCopyFunc) pango_layout_line_ref,
 					     (GBoxedFreeFunc) pango_layout_line_unref);
@@ -5314,7 +5314,7 @@ pango_layout_iter_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoLayoutIter"),
 					     (GBoxedCopyFunc) pango_layout_iter_copy,
 					     (GBoxedFreeFunc) pango_layout_iter_free);
diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c
index 971e6a61..828d4f90 100644
--- a/pango/pango-matrix.c
+++ b/pango/pango-matrix.c
@@ -31,7 +31,7 @@ pango_matrix_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoMatrix"),
 					     (GBoxedCopyFunc) pango_matrix_copy,
 					     (GBoxedFreeFunc) pango_matrix_free);
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c
index 1963414c..73779370 100644
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -42,7 +42,7 @@ pango_ot_info_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
index 8223f703..141ce262 100644
--- a/pango/pango-ot-ruleset.c
+++ b/pango/pango-ot-ruleset.c
@@ -44,7 +44,7 @@ pango_ot_ruleset_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index 705ad0a0..df283a21 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -161,7 +161,7 @@ pango_tab_array_get_type (void)
 {
   static GType our_type = 0;
 
-  if (our_type == 0)
+  if (G_UNLIKELY (our_type == 0))
     our_type = g_boxed_type_register_static (I_("PangoTabArray"),
 					     (GBoxedCopyFunc)pango_tab_array_copy,
 					     (GBoxedFreeFunc)pango_tab_array_free);
diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c
index 85108641..2fac21b9 100644
--- a/pango/pangoatsui-fontmap.c
+++ b/pango/pangoatsui-fontmap.c
@@ -247,7 +247,7 @@ pango_atsui_family_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
@@ -379,7 +379,7 @@ pango_atsui_face_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index e64d23eb..267dc483 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1827,7 +1827,7 @@ pango_fc_face_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
@@ -2030,7 +2030,7 @@ pango_fc_family_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index ad5b143d..0f79dd7f 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -404,7 +404,7 @@ pango_win32_family_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
@@ -1271,7 +1271,7 @@ pango_win32_face_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       static const GTypeInfo object_info =
       {
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index e4efb05a..3681b939 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -178,7 +178,7 @@ pango_x_font_map_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
@@ -1490,7 +1490,7 @@ pango_x_face_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
@@ -1649,7 +1649,7 @@ pango_x_family_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {
diff --git a/pango/pangox.c b/pango/pangox.c
index 59c0649e..6ca0e578 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -227,7 +227,7 @@ pango_x_font_get_type (void)
 {
   static GType object_type = 0;
 
-  if (!object_type)
+  if (G_UNLIKELY (!object_type))
     {
       const GTypeInfo object_info =
       {