summaryrefslogtreecommitdiffstats
path: root/usr.sbin/zic/scheck.c
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1996-07-18 19:40:52 +0000
committerwollman <wollman@FreeBSD.org>1996-07-18 19:40:52 +0000
commitaff84ecc8f819a5f1134a83c067f8d7abf813138 (patch)
tree5bb40c2780914cac6b47ab1a23782ab90b18fc60 /usr.sbin/zic/scheck.c
parent432bfd150d5fcef2195e57491d1659bc73708bf9 (diff)
downloadFreeBSD-src-aff84ecc8f819a5f1134a83c067f8d7abf813138.zip
FreeBSD-src-aff84ecc8f819a5f1134a83c067f8d7abf813138.tar.gz
Second part of the timezone code import for version 96h. This includes
a number of bug fixes to the compiler (which bugs would previously have caused undesirable behavior during transition times).
Diffstat (limited to 'usr.sbin/zic/scheck.c')
-rw-r--r--usr.sbin/zic/scheck.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index 4d9616d..64f2507 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -1,6 +1,6 @@
#ifndef lint
#ifndef NOID
-static char elsieid[] = "@(#)scheck.c 8.11";
+static char elsieid[] = "@(#)scheck.c 8.13";
#endif /* !defined lint */
#endif /* !defined NOID */
@@ -14,7 +14,7 @@ extern void ifree P((char * p));
char *
scheck(string, format)
const char * const string;
-const char * const format;
+char * const format;
{
register char * fbuf;
register const char * fp;
@@ -22,12 +22,12 @@ const char * const format;
register int c;
register char * result;
char dummy;
- static char nada[1];
+ static char nada;
- result = nada;
+ result = &nada;
if (string == NULL || format == NULL)
return result;
- fbuf = imalloc(2 * strlen(format) + 4);
+ fbuf = imalloc((int) (2 * strlen(format) + 4));
if (fbuf == NULL)
return result;
fp = format;
@@ -42,7 +42,7 @@ const char * const format;
*tp++ = '*';
if (*fp == '*')
++fp;
- while (isascii(*fp) && isdigit(*fp))
+ while (is_digit(*fp))
*tp++ = *fp++;
if (*fp == 'l' || *fp == 'h')
*tp++ = *fp++;
OpenPOWER on IntegriCloud