diff --git a/ChangeLog b/ChangeLog index 1ae80b5dd..8c2442154 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2006-04-04 Matthias Clasen + * 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 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1ae80b5dd..8c2442154 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,21 @@ 2006-04-04 Matthias Clasen + * 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 diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 1423fff68..6ea364dad 100644 --- 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 5b0bb14fe..380dad8db 100644 --- 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 1055729b6..0b3e86e28 100644 --- 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 382564d68..0c0c077d6 100644 --- 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 68956864d..8667ae2ec 100644 --- 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 7a8a7832b..08c171553 100644 --- 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 9b57cf152..fad05d2c4 100644 --- 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 42eef854b..f85c8f5a1 100644 --- 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 5dfc4b655..01ea43acf 100644 --- 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 0d227990b..752cb820c 100644 --- 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 6d77b25b7..9550adaf7 100644 --- 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 0dbfbc88d..684a28478 100644 --- 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! */