diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libshouldbeinlibc/timefmt.c | |
parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
download | hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.gz hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.bz2 hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.zip |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libshouldbeinlibc/timefmt.c')
-rw-r--r-- | libshouldbeinlibc/timefmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libshouldbeinlibc/timefmt.c b/libshouldbeinlibc/timefmt.c index aa8965b7..7ce973bc 100644 --- a/libshouldbeinlibc/timefmt.c +++ b/libshouldbeinlibc/timefmt.c @@ -226,7 +226,7 @@ fmt_seconds (struct timeval *tv, int leading_zeros, int frac_places, p += add_field (&secs, MINUTE, &leading_zeros, 4, ":", width, p); p += add_field (&secs, SECOND, &leading_zeros, 1, "", width, p); - if (frac_places < 0 && (p - buf) < width - 2) + if (frac_places < 0 && (p - buf) < (int) width - 2) /* If FRAC_PLACES is < 0, then use any space remaining before WIDTH. */ frac_places = width - (p - buf) - 1; |