luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

datetime: Fix coding style

Browse Source
This commit is contained in:
Emmanuele Bassi 2010-08-25 12:24:54 +01:00
parent 0a59ab6e85
commit 2952e908e4
1 changed files with 148 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
glib/gdatetime.c
View File

@ -1843,7 +1843,8 @@ g_date_time_printf (const GDateTime *datetime,
tmp = g_utf8_offset_to_pointer (format, i); tmp = g_utf8_offset_to_pointer (format, i);
c = g_utf8_get_char (tmp); c = g_utf8_get_char (tmp);
switch (c) { switch (c)
{
case '%': case '%':
if (!in_mod) if (!in_mod)
{ {
@ -1854,7 +1855,8 @@ g_date_time_printf (const GDateTime *datetime,
default: default:
if (in_mod) if (in_mod)
{ {
switch (c) { switch (c)
{
case 'a': case 'a':
g_string_append (outstr, WEEKDAY_ABBR (datetime)); g_string_append (outstr, WEEKDAY_ABBR (datetime));
break; break;
@ -1868,12 +1870,10 @@ g_date_time_printf (const GDateTime *datetime,
g_string_append (outstr, MONTH_FULL (datetime)); g_string_append (outstr, MONTH_FULL (datetime));
break; break;
case 'd': case 'd':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_day_of_month (datetime));
g_date_time_get_day_of_month (datetime));
break; break;
case 'e': case 'e':
g_string_append_printf (outstr, "%2d", g_string_append_printf (outstr, "%2d", g_date_time_get_day_of_month (datetime));
g_date_time_get_day_of_month (datetime));
break; break;
case 'F': case 'F':
g_string_append_printf (outstr, "%d-%02d-%02d", g_string_append_printf (outstr, "%d-%02d-%02d",
@ -1885,42 +1885,34 @@ g_date_time_printf (const GDateTime *datetime,
g_string_append (outstr, MONTH_ABBR (datetime)); g_string_append (outstr, MONTH_ABBR (datetime));
break; break;
case 'H': case 'H':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_hour (datetime));
g_date_time_get_hour (datetime));
break; break;
case 'I': case 'I':
if (g_date_time_get_hour (datetime) == 0) if (g_date_time_get_hour (datetime) == 0)
g_string_append (outstr, "12"); g_string_append (outstr, "12");
else else
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_hour (datetime) % 12);
g_date_time_get_hour (datetime) % 12);
break; break;
case 'j': case 'j':
g_string_append_printf (outstr, "%03d", g_string_append_printf (outstr, "%03d", g_date_time_get_day_of_year (datetime));
g_date_time_get_day_of_year (datetime));
break; break;
case 'k': case 'k':
g_string_append_printf (outstr, "%2d", g_string_append_printf (outstr, "%2d", g_date_time_get_hour (datetime));
g_date_time_get_hour (datetime));
break; break;
case 'l': case 'l':
if (g_date_time_get_hour (datetime) == 0) if (g_date_time_get_hour (datetime) == 0)
g_string_append (outstr, "12"); g_string_append (outstr, "12");
else else
g_string_append_printf (outstr, "%2d", g_string_append_printf (outstr, "%2d", g_date_time_get_hour (datetime) % 12);
g_date_time_get_hour (datetime) % 12);
break; break;
case 'm': case 'm':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_month (datetime));
g_date_time_get_month (datetime));
break; break;
case 'M': case 'M':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_minute (datetime));
g_date_time_get_minute (datetime));
break; break;
case 'N': case 'N':
g_string_append_printf (outstr, "%"G_GUINT64_FORMAT, g_string_append_printf (outstr, "%"G_GUINT64_FORMAT, datetime->usec % USEC_PER_SECOND);
datetime->usec % USEC_PER_SECOND);
break; break;
case 'p': case 'p':
g_string_append (outstr, GET_AMPM (datetime, FALSE)); g_string_append (outstr, GET_AMPM (datetime, FALSE));
@ -1928,7 +1920,8 @@ g_date_time_printf (const GDateTime *datetime,
case 'P': case 'P':
g_string_append (outstr, GET_AMPM (datetime, TRUE)); g_string_append (outstr, GET_AMPM (datetime, TRUE));
break; break;
case 'r': { case 'r':
{
gint hour = g_date_time_get_hour (datetime) % 12; gint hour = g_date_time_get_hour (datetime) % 12;
if (hour == 0) if (hour == 0)
hour = 12; hour = 12;
@ -1937,54 +1930,50 @@ g_date_time_printf (const GDateTime *datetime,
g_date_time_get_minute (datetime), g_date_time_get_minute (datetime),
g_date_time_get_second (datetime), g_date_time_get_second (datetime),
GET_AMPM (datetime, FALSE)); GET_AMPM (datetime, FALSE));
break;
} }
break;
case 'R': case 'R':
g_string_append_printf (outstr, "%02d:%02d", g_string_append_printf (outstr, "%02d:%02d",
g_date_time_get_hour (datetime), g_date_time_get_hour (datetime),
g_date_time_get_minute (datetime)); g_date_time_get_minute (datetime));
break; break;
case 's': case 's':
g_string_append_printf (outstr, "%" G_GINT64_FORMAT, g_string_append_printf (outstr, "%" G_GINT64_FORMAT, g_date_time_to_epoch (datetime));
g_date_time_to_epoch (datetime));
break; break;
case 'S': case 'S':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_second (datetime));
g_date_time_get_second (datetime));
break; break;
case 't': case 't':
g_string_append_c (outstr, '\t'); g_string_append_c (outstr, '\t');
break; break;
case 'u': case 'u':
g_string_append_printf (outstr, "%d", g_string_append_printf (outstr, "%d", g_date_time_get_day_of_week (datetime));
g_date_time_get_day_of_week (datetime));
break; break;
case 'W': case 'W':
g_string_append_printf (outstr, "%d", g_string_append_printf (outstr, "%d", g_date_time_get_day_of_year (datetime) / 7);
g_date_time_get_day_of_year (datetime) / 7);
break; break;
case 'x': { case 'x':
{
tmp2 = GET_PREFERRED_DATE (datetime); tmp2 = GET_PREFERRED_DATE (datetime);
g_string_append (outstr, tmp2); g_string_append (outstr, tmp2);
g_free (tmp2); g_free (tmp2);
break;
} }
case 'X': { break;
case 'X':
{
tmp2 = GET_PREFERRED_TIME (datetime); tmp2 = GET_PREFERRED_TIME (datetime);
g_string_append (outstr, tmp2); g_string_append (outstr, tmp2);
g_free (tmp2); g_free (tmp2);
break;
} }
break;
case 'y': case 'y':
g_string_append_printf (outstr, "%02d", g_string_append_printf (outstr, "%02d", g_date_time_get_year (datetime) % 100);
g_date_time_get_year (datetime) % 100);
break; break;
case 'Y': case 'Y':
g_string_append_printf (outstr, "%d", g_string_append_printf (outstr, "%d", g_date_time_get_year (datetime));
g_date_time_get_year (datetime));
break; break;
case 'Z': case 'Z':
if (datetime->tz) if (datetime->tz != NULL)
g_string_append_printf (outstr, "%s", datetime->tz->name); g_string_append_printf (outstr, "%s", datetime->tz->name);
else else
g_string_append_printf (outstr, "UTC"); g_string_append_printf (outstr, "UTC");
@ -2005,10 +1994,7 @@ g_date_time_printf (const GDateTime *datetime,
} }
} }
tmp = outstr->str; return g_string_free (outstr, FALSE);
g_string_free (outstr, FALSE);
return (gchar*)tmp;
bad_format: bad_format:
g_string_free (outstr, TRUE); g_string_free (outstr, TRUE);