lint fixes from rick adams

SCCS-vsn: usr.bin/uucp/assert.c 5.5

diff --git a/usr/src/usr.bin/uucp/assert.c b/usr/src/usr.bin/uucp/assert.c
index a932d24..937e8d7 100644 (file)
--- a/usr/src/usr.bin/uucp/assert.c
+++ b/usr/src/usr.bin/uucp/assert.c
@@ -1,15 +1,15 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)assert.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)assert.c   5.5 (Berkeley) %G%";

 #endif
 
 #include "uucp.h"
 #include <sys/time.h>
 #include <errno.h>
 
 #endif
 
 #include "uucp.h"
 #include <sys/time.h>
 #include <errno.h>
 

-/*******
- *     assert - print out assetion error
- *
- *     return code - none
+/*LINTLIBRARY*/
+
+/*
+ *     print out assetion error

  */
 
 assert(s1, s2, i1)
  */
 
 assert(s1, s2, i1)


@@ -18,7 +18,6 @@ char *s1, *s2;
        register FILE *errlog;
        register struct tm *tp;
        extern struct tm *localtime();
        register FILE *errlog;
        register struct tm *tp;
        extern struct tm *localtime();

-       extern time_t time();

        time_t clock;
        int pid;
 
        time_t clock;
        int pid;
 


@@ -35,17 +34,18 @@ char *s1, *s2;
        pid = getpid();
        fprintf(errlog, "ASSERT ERROR (%.9s)  ", Progname);
        fprintf(errlog, "pid: %d  ", pid);
        pid = getpid();
        fprintf(errlog, "ASSERT ERROR (%.9s)  ", Progname);
        fprintf(errlog, "pid: %d  ", pid);

-       time(&clock);
+       (void) time(&clock);

        tp = localtime(&clock);
 #ifdef USG
        fprintf(errlog, "(%d/%d-%2.2d:%2.2d) ", tp->tm_mon + 1,
                tp->tm_mday, tp->tm_hour, tp->tm_min);
        tp = localtime(&clock);
 #ifdef USG
        fprintf(errlog, "(%d/%d-%2.2d:%2.2d) ", tp->tm_mon + 1,
                tp->tm_mday, tp->tm_hour, tp->tm_min);

-#else
+#endif
+#ifndef USG

        fprintf(errlog, "(%d/%d-%02d:%02d) ", tp->tm_mon + 1,
                tp->tm_mday, tp->tm_hour, tp->tm_min);
 #endif
        fprintf(errlog, "%s %s (%d)\n", s1 ? s1 : "", s2 ? s2 : "", i1);
        if (errlog != stderr)
        fprintf(errlog, "(%d/%d-%02d:%02d) ", tp->tm_mon + 1,
                tp->tm_mday, tp->tm_hour, tp->tm_min);
 #endif
        fprintf(errlog, "%s %s (%d)\n", s1 ? s1 : "", s2 ? s2 : "", i1);
        if (errlog != stderr)

-               fclose(errlog);
+               (void) fclose(errlog);

        return;
 }
        return;
 }