luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-05 04:10:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_date_time_format: small fixups

Browse Source 
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.
This commit is contained in:
Ryan Lortie 2011-09-02 19:34:33 -04:00
parent 65fe8b73c5
commit 4b35f12552
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gdatetime.c
View File

@ -2441,6 +2441,7 @@ g_date_time_format (GDateTime *datetime,
case 'C': case 'C':
get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); 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); g_string_append_printf (outstr, fmt, g_date_time_get_year (datetime) / 100);
break;
case 'd': case 'd':
get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); 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)); 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); 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)); g_string_append_printf (outstr, fmt, g_date_time_get_day_of_month (datetime));
break; 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': case 'F':
g_string_append_printf (outstr, "%d-%02d-%02d", g_string_append_printf (outstr, "%d-%02d-%02d",
g_date_time_get_year (datetime), g_date_time_get_year (datetime),
g_date_time_get_month (datetime), g_date_time_get_month (datetime),
g_date_time_get_day_of_month (datetime)); g_date_time_get_day_of_month (datetime));
break; 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': case 'h':
g_string_append (outstr, MONTH_ABBR (datetime)); g_string_append (outstr, MONTH_ABBR (datetime));
break; break;
@ -2494,6 +2495,9 @@ g_date_time_format (GDateTime *datetime,
g_string_append_printf (outstr, fmt, hour); g_string_append_printf (outstr, fmt, hour);
} }
break; break;
case 'n':
g_string_append_c (outstr, '\n');
break;
case 'm': case 'm':
get_numeric_format (fmt, sizeof(fmt), alt_digits, pad_set ? pad : '0', 2); 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)); g_string_append_printf (outstr, fmt, g_date_time_get_month (datetime));
@ -2612,9 +2616,6 @@ g_date_time_format (GDateTime *datetime,
case '%': case '%':
g_string_append_c (outstr, '%'); g_string_append_c (outstr, '%');
break; break;
case 'n':
g_string_append_c (outstr, '\n');
break;
case '-': case '-':
pad_set = TRUE; pad_set = TRUE;
pad = 0; pad = 0;