Move short_month_names and long_month_names to bss.

2006-04-04  Matthias Clasen  <mclasen@redhat.com>

        * glib/gdate.c: Move short_month_names and long_month_names
        to bss.

        * glib/gspawn-win32.c (g_spawn_error_quark):
        * glib/gspawn.c (g_spawn_error_quark):
        * glib/gshell.c (g_shell_error_quark):
        * glib/gmarkup.c (g_markup_error_quark):
        * glib/goption.c (g_option_error_quark):
        * glib/gkeyfile.c (g_key_file_error_quark):
        * glib/giochannel.c (g_io_channel_error_quark):
        * glib/gfileutils.c (g_file_error_quark):
        * glib/gconvert.c (g_convert_error_quark):
        * glib/gbookmarkfile.c (g_bookmark_file_error_quark):
        * glib/gthread.c (g_thread_error_quark): No point in making
        the error path fast by caching quarks.

        * glib/gbookmarkfile.c: Make the parser struct const.

diff --git a/ChangeLog b/ChangeLog
index 1ae80b5ddbcf25f96d0f3446fe499576063c2b45..8c2442154003bcd3b79c259875e935791fc8462b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2006-04-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gdate.c: Move short_month_names and long_month_names
+       to bss.
+
+       * glib/gspawn-win32.c (g_spawn_error_quark):
+       * glib/gspawn.c (g_spawn_error_quark):
+       * glib/gshell.c (g_shell_error_quark):
+       * glib/gmarkup.c (g_markup_error_quark):
+       * glib/goption.c (g_option_error_quark):
+       * glib/gkeyfile.c (g_key_file_error_quark):
+       * glib/giochannel.c (g_io_channel_error_quark):
+       * glib/gfileutils.c (g_file_error_quark):
+       * glib/gconvert.c (g_convert_error_quark):
+       * glib/gbookmarkfile.c (g_bookmark_file_error_quark):
+       * glib/gthread.c (g_thread_error_quark): No point in making
+       the error path fast by caching quarks.
+
        * glib/gbookmarkfile.c: Make the parser struct const.
 
 2006-04-04  Behdad Esfahbod  <behdad@gnome.org>

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1ae80b5ddbcf25f96d0f3446fe499576063c2b45..8c2442154003bcd3b79c259875e935791fc8462b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,21 @@
 2006-04-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gdate.c: Move short_month_names and long_month_names
+       to bss.
+
+       * glib/gspawn-win32.c (g_spawn_error_quark):
+       * glib/gspawn.c (g_spawn_error_quark):
+       * glib/gshell.c (g_shell_error_quark):
+       * glib/gmarkup.c (g_markup_error_quark):
+       * glib/goption.c (g_option_error_quark):
+       * glib/gkeyfile.c (g_key_file_error_quark):
+       * glib/giochannel.c (g_io_channel_error_quark):
+       * glib/gfileutils.c (g_file_error_quark):
+       * glib/gconvert.c (g_convert_error_quark):
+       * glib/gbookmarkfile.c (g_bookmark_file_error_quark):
+       * glib/gthread.c (g_thread_error_quark): No point in making
+       the error path fast by caching quarks.
+
        * glib/gbookmarkfile.c: Make the parser struct const.
 
 2006-04-04  Behdad Esfahbod  <behdad@gnome.org>

diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 1423fff68a945146392994cd3c2b8a47534a0925..6ea364dad48eed81eb460a5be6fd3ecc83a839a8 100644 (file)
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -1562,12 +1562,7 @@ timestamp_from_iso8601 (const gchar *iso_date)
 GQuark
 g_bookmark_file_error_quark (void)
 {
-  static GQuark error_quark = 0;
-
-  if (G_UNLIKELY (error_quark == 0))
-    error_quark = g_quark_from_static_string ("egg-bookmark-file-error-quark");
-
-  return error_quark;
+  return g_quark_from_static_string ("egg-bookmark-file-error-quark");
 }
 
 

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 5b0bb14fe501c4147b0a8c8ef607cb6b0e87777c..380dad8db07972e362c60aa211c79776581fd7e1 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -52,11 +52,7 @@
 GQuark 
 g_convert_error_quark (void)
 {
-  static GQuark quark;
-  if (!quark)
-    quark = g_quark_from_static_string ("g_convert_error");
-
-  return quark;
+  return g_quark_from_static_string ("g_convert_error");
 }
 
 static gboolean

diff --git a/glib/gdate.c b/glib/gdate.c
index 1055729b6e1979b963c91ebf19d55a34964a97bc..0b3e86e28f5c64831328bb4408109006dcdaef94 100644 (file)
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -451,12 +451,12 @@ G_LOCK_DEFINE_STATIC (g_date_global);
 
 static gchar *long_month_names[13] = 
 { 
-  "Error", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 
+  NULL,
 };
 
 static gchar *short_month_names[13] = 
 {
-  "Error", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 
+  NULL, 
 };
 
 /* This tells us if we need to update the parse info */
@@ -605,6 +605,9 @@ g_date_prepare_to_parse (const gchar *str, GDateParseTokens *pt)
       
       current_locale = g_strdup (locale);
       
+      short_month_names[0] = "Error";
+      long_month_names[0] = "Error";
+
       while (i < 13) 
         {
          gchar *casefold;

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 382564d68fb9434ba7317a2041da4ae7628d5068..0c0c077d6be7324b253843e50f8e0317856da9c9 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -359,11 +359,7 @@ g_file_test (const gchar *filename,
 GQuark
 g_file_error_quark (void)
 {
-  static GQuark q = 0;
-  if (q == 0)
-    q = g_quark_from_static_string ("g-file-error-quark");
-
-  return q;
+  return g_quark_from_static_string ("g-file-error-quark");
 }
 
 /**

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 68956864d8f7c21f0458a4c82e63106d648b2290..8667ae2ec042e6711d6782705d82cf50e03efa09 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -2299,11 +2299,7 @@ g_io_channel_write_unichar    (GIOChannel   *channel,
 GQuark
 g_io_channel_error_quark (void)
 {
-  static GQuark q = 0;
-  if (q == 0)
-    q = g_quark_from_static_string ("g-io-channel-error-quark");
-
-  return q;
+  return g_quark_from_static_string ("g-io-channel-error-quark");
 }
 
 #define __G_IOCHANNEL_C__

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 7a8a7832b814eff073c2da4b7994b3a9a3356e0a..08c171553906540504829beb918aff2af978e3da 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -185,12 +185,7 @@ static void                  g_key_file_flush_parse_buffer     (GKeyFile
 GQuark
 g_key_file_error_quark (void)
 {
-  static GQuark error_quark = 0;
-
-  if (error_quark == 0)
-    error_quark = g_quark_from_static_string ("g-key-file-error-quark");
-
-  return error_quark;
+  return g_quark_from_static_string ("g-key-file-error-quark");
 }
 
 static void

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 9b57cf152dae5ee5dac9ade4fb2c3f015d478b9d..fad05d2c4b65b18ba481fac104d98084048a6a5a 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -34,12 +34,7 @@
 GQuark
 g_markup_error_quark (void)
 {
-  static GQuark error_quark = 0;
-
-  if (error_quark == 0)
-    error_quark = g_quark_from_static_string ("g-markup-error-quark");
-
-  return error_quark;
+  return g_quark_from_static_string ("g-markup-error-quark");
 }
 
 typedef enum

diff --git a/glib/goption.c b/glib/goption.c
index 42eef854bdeb711541432e19a31030698e353563..f85c8f5a10dac95104a1e673a05a905f5793fff7 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -118,12 +118,7 @@ static void free_pending_nulls (GOptionContext *context,
 GQuark
 g_option_error_quark (void)
 {
-  static GQuark q = 0;
-  
-  if (q == 0)
-    q = g_quark_from_static_string ("g-option-context-error-quark");
-
-  return q;
+  return g_quark_from_static_string ("g-option-context-error-quark");
 }
 
 /**

diff --git a/glib/gshell.c b/glib/gshell.c
index 5dfc4b65532524652a5c42561a9a204a71ab891e..01ea43acff7b1068ff5c1bc425accb67d16a465e 100644 (file)
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -36,10 +36,7 @@
 GQuark
 g_shell_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("g-shell-error-quark");
-  return quark;
+  return g_quark_from_static_string ("g-shell-error-quark");
 }
 
 /* Single quotes preserve the literal string exactly. escape

diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 0d227990b8bb9a9c1bca989061ceb674ef9435c9..752cb820ca01c63f26347f63e8a4b3acb8a3f98b 100644 (file)
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -199,10 +199,7 @@ protect_argv (gchar  **argv,
 GQuark
 g_spawn_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("g-exec-error-quark");
-  return quark;
+  return g_quark_from_static_string ("g-exec-error-quark");
 }
 
 gboolean

diff --git a/glib/gspawn.c b/glib/gspawn.c
index 6d77b25b747924687f3ac88281a5f19af7286001..9550adaf727e89b82e1223e24a11fd1c31ba7903 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -68,10 +68,7 @@ static gboolean fork_exec_with_pipes (gboolean              intermediate_child,
 GQuark
 g_spawn_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("g-exec-error-quark");
-  return quark;
+  return g_quark_from_static_string ("g-exec-error-quark");
 }
 
 /**

diff --git a/glib/gthread.c b/glib/gthread.c
index 0dbfbc88dcc6a4d21db979e743be3ea5cf55bdbf..684a284782c2e01316a0d8189922e2353904e279 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -64,10 +64,7 @@
 GQuark 
 g_thread_error_quark (void)
 {
-  static GQuark quark;
-  if (!quark)
-    quark = g_quark_from_static_string ("g_thread_error");
-  return quark;
+  return g_quark_from_static_string ("g_thread_error");
 }
 
 /* Keep this in sync with GRealThread in gmain.c! */