diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:50:14 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:50:14 +0000 |
| commit | c27e56d74f3fb58f18e5381e49d30e1134b2005e (patch) | |
| tree | 961e5061add44ed5f4bdded12ae6f2bb7d4c930a /libc/timezone/zic.c | |
| parent | 976bc9d4ac64f30edc1e8fa8ec7552703f04a6de (diff) | |
| download | eglibc2-c27e56d74f3fb58f18e5381e49d30e1134b2005e.tar.gz | |
Merge changes between r21628 and r21775 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21776 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/timezone/zic.c')
| -rw-r--r-- | libc/timezone/zic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/timezone/zic.c b/libc/timezone/zic.c index eab1d592c..a5202a1ac 100644 --- a/libc/timezone/zic.c +++ b/libc/timezone/zic.c @@ -3,7 +3,6 @@ ** 2006-07-17 by Arthur David Olson. */ -#include "config.h" #include "version.h" #include "private.h" #include "locale.h" @@ -427,8 +426,7 @@ usage(FILE *stream, int status) [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\ \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\ \n\ -For bug reporting instructions, please see:\n\ -%s.\n"), +Report bugs to %s.\n"), progname, progname, REPORT_BUGS_TO); exit(status); } @@ -2536,8 +2534,8 @@ newabbr(const char *const string) ++cp; if (cp - string == 0) mp = _("time zone abbreviation lacks alphabetic at start"); - if (noise && cp - string > 3) -mp = _("time zone abbreviation has more than 3 alphabetics"); + if (noise && cp - string < 3) +mp = _("time zone abbreviation has fewer than 3 alphabetics"); if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) mp = _("time zone abbreviation has too many alphabetics"); if (mp == NULL && (*cp == '+' || *cp == '-')) { |