CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-17 04:41:59 +02:00
Code Issues Projects Releases Wiki Activity

(my_strftime): Rewrite the previous change slightly,

Browse Source 
to make it a bit faster and (I hope) clearer.
This commit is contained in:
Paul Eggert
2005-09-15 18:47:56 +00:00
parent 5185512286
commit a08b44ea30
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/strftime.c
View File

@@ -492,7 +492,7 @@ my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
int width = -1;
bool to_lowcase = false;
bool to_uppcase = false;
size_t colons = 0;
size_t colons;
bool change_case = false;
int format_char;
@@ -643,19 +643,6 @@ my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
break;
}
/* Parse the colons of %:::z *after* the optional field width,
not before, so we accept %9:z, not %:9z. */
{
const CHAR_T *q;
for (q = f; *q == L_(':') && q - f < 3; q++)
; /* empty */
if (*q == L_('z'))
{
colons = q - f;
f = q;
}
}
/* Now do the specified format. */
format_char = *f;
switch (format_char)
@@ -1320,7 +1307,20 @@ my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
#endif
break;
case L_(':'):
/* :, ::, and ::: are valid only just before 'z'.
:::: etc. are rejected later. */
for (colons = 1; f[colons] == L_(':'); colons++)
continue;
if (f[colons] != L_('z'))
goto bad_format;
f += colons;
goto do_z_conversion;
case L_('z'):
colons = 0;
do_z_conversion:
if (tp->tm_isdst < 0)
break;