BSD 4_3_Net_2 release

[unix-history] / usr / src / share / zoneinfo / scheck.c

diff --git a/usr/src/share/zoneinfo/scheck.c b/usr/src/share/zoneinfo/scheck.c
index 64df712..4d5c43b 100644 (file)
--- a/usr/src/share/zoneinfo/scheck.c
+++ b/usr/src/share/zoneinfo/scheck.c
@@ -1,19 +1,53 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Arthur David Olson of the National Cancer Institute.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-#ifndef NOID
+static char sccsid[] = "@(#)scheck.c   5.3 (Berkeley) 4/20/91";
+#endif /* not lint */
+
+#ifdef notdef

 static char    elsieid[] = "@(#)scheck.c       8.9";
 static char    elsieid[] = "@(#)scheck.c       8.9";

-#endif /* !defined lint */
-#endif /* !defined NOID */
+#endif

 
 /*LINTLIBRARY*/
 
 
 /*LINTLIBRARY*/
 

-#include "stdio.h"
-#include "ctype.h"
-#include "string.h"
-#include "stdlib.h"
-#include "nonstd.h"
-
-extern char *  imalloc P((int n));
-extern void    ifree P((char * p));
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>

 
 char *
 scheck(string, format)
 
 char *
 scheck(string, format)


@@ -30,7 +64,7 @@ const char * const    format;
        result = "";
        if (string == NULL || format == NULL)
                return result;
        result = "";
        if (string == NULL || format == NULL)
                return result;

-       fbuf = imalloc(2 * strlen(format) + 4);
+       fbuf = malloc(2 * strlen(format) + 4);

        if (fbuf == NULL)
                return result;
        fp = format;
        if (fbuf == NULL)
                return result;
        fp = format;


@@ -58,7 +92,7 @@ const char * const    format;
        *(tp - 1) = '%';
        *tp++ = 'c';
        *tp = '\0';
        *(tp - 1) = '%';
        *tp++ = 'c';
        *tp = '\0';

-       if (sscanf(string, fbuf, &dummy) != 1)
+       if (sscanf((char *)string, fbuf, &dummy) != 1)

                result = (char *) format;
        ifree(fbuf);
        return result;
                result = (char *) format;
        ifree(fbuf);
        return result;