diff options
Diffstat (limited to 'usr.sbin/tcpdump/util.c')
| -rw-r--r-- | usr.sbin/tcpdump/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c index 105b6e4029f..9ae7f4bcf10 100644 --- a/usr.sbin/tcpdump/util.c +++ b/usr.sbin/tcpdump/util.c @@ -1,5 +1,5 @@ -/* $OpenBSD: util.c,v 1.2 1996/03/04 15:59:47 mickey Exp $ */ -/* $NetBSD: util.c,v 1.3 1995/03/06 19:11:53 mycroft Exp $ */ +/**//* $OpenBSD: util.c,v 1.3 1996/06/10 07:47:59 deraadt Exp $ */ +/* $NetBSD: util.c,v 1.5 1996/05/20 00:41:19 fvdl Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994 @@ -24,7 +24,7 @@ #ifndef lint static char rcsid[] = - "@(#) Header: util.c,v 1.28 94/06/12 14:30:31 leres Exp (LBL)"; + "@(#) Header: util.c,v 1.28+ 94/06/12 14:30:31 leres Exp (LBL)"; #endif #include <stdlib.h> @@ -34,7 +34,7 @@ static char rcsid[] = #include <sys/stat.h> #include <ctype.h> -#ifdef SOLARIS +#ifdef SVR4 #include <fcntl.h> #endif #ifdef __STDC__ @@ -174,7 +174,7 @@ savestr(register const char *str) strsize = 1024; if (strsize < size) strsize = size; - strptr = malloc(strsize); + strptr = (char *)malloc(strsize); if (strptr == NULL) error("savestr: malloc"); } @@ -282,7 +282,7 @@ copy_argv(register char **argv) while (*p) len += strlen(*p++) + 1; - buf = malloc(len); + buf = (char *)malloc(len); p = argv; dst = buf; @@ -310,7 +310,7 @@ read_infile(char *fname) if (fstat(fd, &buf) < 0) error("can't state '%s'", fname); - p = malloc((u_int)buf.st_size); + p = (char *)malloc((u_int)buf.st_size); if (read(fd, p, (int)buf.st_size) != buf.st_size) error("problem reading '%s'", fname); @@ -334,7 +334,7 @@ gmt2local() #else t = tz.tz_minuteswest * -60; if (tm->tm_isdst) - t += 60 * 60; + t += 3600; #endif return (t); #else |