Sat Apr 20 17:07:17 1996 Ulrich Drepper <drepper@cygnus.com>

[kopensolaris-gnu/glibc.git] / time / scheck.c

diff --git a/time/scheck.c b/time/scheck.c
index c181cec..64f2507 100644 (file)
--- a/time/scheck.c
+++ b/time/scheck.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char    elsieid[] = "@(#)scheck.c       8.10";
+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,11 +22,12 @@ const char * const  format;
        register int            c;
        register char *         result;
        char                    dummy;
+       static char             nada;
 
-       result = "";
+       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;
@@ -41,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++;