summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/tcpdump/print-bootp.c4
-rw-r--r--usr.sbin/tcpdump/print-gtp.c4
-rw-r--r--usr.sbin/tcpdump/print-udp.c4
-rw-r--r--usr.sbin/tcpdump/tcpdump.c4
-rw-r--r--usr.sbin/tokeninit/tokeninit.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/tcpdump/print-bootp.c b/usr.sbin/tcpdump/print-bootp.c
index 426bdb54cb0..b9083597cb5 100644
--- a/usr.sbin/tcpdump/print-bootp.c
+++ b/usr.sbin/tcpdump/print-bootp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-bootp.c,v 1.21 2015/11/18 15:36:20 mmcc Exp $ */
+/* $OpenBSD: print-bootp.c,v 1.22 2015/12/22 21:01:07 mmcc Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -128,7 +128,7 @@ bootp_print(const u_char *cp, u_int length,
else if (bp->bp_op == BOOTREPLY)
e = (const char *)EDST(eh);
else
- e = 0;
+ e = NULL;
if (e == 0 || memcmp((char *)bp->bp_chaddr, e, 6) != 0)
printf(" ether %s", etheraddr_string(bp->bp_chaddr));
}
diff --git a/usr.sbin/tcpdump/print-gtp.c b/usr.sbin/tcpdump/print-gtp.c
index 444266bb52f..a18f679608e 100644
--- a/usr.sbin/tcpdump/print-gtp.c
+++ b/usr.sbin/tcpdump/print-gtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-gtp.c,v 1.8 2015/11/16 00:16:39 mmcc Exp $ */
+/* $OpenBSD: print-gtp.c,v 1.9 2015/12/22 21:01:07 mmcc Exp $ */
/*
* Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
*
@@ -882,7 +882,7 @@ void
gtp_v1_print(const u_char *cp, u_int length, u_short sport, u_short dport)
{
struct gtp_v1_hdr *gh = (struct gtp_v1_hdr *)cp;
- struct gtp_v1_hdr_ext *ghe = 0;
+ struct gtp_v1_hdr_ext *ghe = NULL;
int nexthdr, hlen;
u_char *p = (u_char *)cp;
diff --git a/usr.sbin/tcpdump/print-udp.c b/usr.sbin/tcpdump/print-udp.c
index 0b18905defb..89f97889537 100644
--- a/usr.sbin/tcpdump/print-udp.c
+++ b/usr.sbin/tcpdump/print-udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-udp.c,v 1.39 2015/11/16 00:16:39 mmcc Exp $ */
+/* $OpenBSD: print-udp.c,v 1.40 2015/12/22 21:01:07 mmcc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -211,7 +211,7 @@ static const u_char *
rtcp_print(const u_char *hdr, const u_char *ep)
{
/* rtp v2 control (rtcp) */
- struct rtcp_rr *rr = 0;
+ struct rtcp_rr *rr = NULL;
struct rtcp_sr *sr;
struct rtcphdr *rh = (struct rtcphdr *)hdr;
u_int len;
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c
index 8b9d5c18412..b7b4d14e364 100644
--- a/usr.sbin/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdump.c,v 1.77 2015/11/16 00:16:39 mmcc Exp $ */
+/* $OpenBSD: tcpdump.c,v 1.78 2015/12/22 21:01:07 mmcc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -474,7 +474,7 @@ main(int argc, char **argv)
pcap_userdata = (u_char *)p;
} else {
printer = lookup_printer(pcap_datalink(pd));
- pcap_userdata = 0;
+ pcap_userdata = NULL;
priv_init_done();
/* state: STATE_RUN */
}
diff --git a/usr.sbin/tokeninit/tokeninit.c b/usr.sbin/tokeninit/tokeninit.c
index 91c42b0a938..512c3c438f3 100644
--- a/usr.sbin/tokeninit/tokeninit.c
+++ b/usr.sbin/tokeninit/tokeninit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tokeninit.c,v 1.9 2015/02/09 23:00:14 deraadt Exp $ */
+/* $OpenBSD: tokeninit.c,v 1.10 2015/12/22 21:01:07 mmcc Exp $ */
/*-
* Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -65,7 +65,7 @@ main(int argc, char **argv)
char seed[80];
unsigned char secret[9];
char *optstr;
- char *p = 0;
+ char *p = NULL;
struct rlimit cds;