From 4b35f12552ebd9d064c7e6dc97e0e1e9c57b6215 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 2 Sep 2011 19:34:33 -0400 Subject: [PATCH] g_date_time_format: small fixups Add missing 'break;' from the case: block for %c. Reorder the cases so that %F comes before %g/%G and %n comes in its correct alphabetical order. --- glib/gdatetime.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/glib/gdatetime.c b/glib/gdatetime.c index fa5cb08..0b7665b 100644 --- a/glib/gdatetime.c +++ b/glib/gdatetime.c @@ -2441,6 +2441,7 @@ g_date_time_format (GDateTime *datetime, case 'C': get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); g_string_append_printf (outstr, fmt, g_date_time_get_year (datetime) / 100); + break; case 'd': get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); g_string_append_printf (outstr, fmt, g_date_time_get_day_of_month (datetime)); @@ -2449,18 +2450,18 @@ g_date_time_format (GDateTime *datetime, get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : ' ', 2); g_string_append_printf (outstr, fmt, g_date_time_get_day_of_month (datetime)); break; - case 'g': - g_string_append_printf (outstr, "%02d", g_date_time_get_week_numbering_year (datetime) % 100); - break; - case 'G': - g_string_append_printf (outstr, "%d", g_date_time_get_week_numbering_year (datetime)); - break; case 'F': g_string_append_printf (outstr, "%d-%02d-%02d", g_date_time_get_year (datetime), g_date_time_get_month (datetime), g_date_time_get_day_of_month (datetime)); break; + case 'g': + g_string_append_printf (outstr, "%02d", g_date_time_get_week_numbering_year (datetime) % 100); + break; + case 'G': + g_string_append_printf (outstr, "%d", g_date_time_get_week_numbering_year (datetime)); + break; case 'h': g_string_append (outstr, MONTH_ABBR (datetime)); break; @@ -2494,6 +2495,9 @@ g_date_time_format (GDateTime *datetime, g_string_append_printf (outstr, fmt, hour); } break; + case 'n': + g_string_append_c (outstr, '\n'); + break; case 'm': get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); g_string_append_printf (outstr, fmt, g_date_time_get_month (datetime)); @@ -2612,9 +2616,6 @@ g_date_time_format (GDateTime *datetime, case '%': g_string_append_c (outstr, '%'); break; - case 'n': - g_string_append_c (outstr, '\n'); - break; case '-': pad_set = TRUE; pad = 0; -- 2.7.4