summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/libpcap/bpf/net/bpf_filter.c4
-rw-r--r--contrib/libpcap/bpf_dump.c2
-rw-r--r--contrib/libpcap/bpf_image.c2
-rw-r--r--contrib/libpcap/pcap/bpf.h2
-rw-r--r--contrib/libpcap/pcap/pcap.h8
5 files changed, 9 insertions, 9 deletions
diff --git a/contrib/libpcap/bpf/net/bpf_filter.c b/contrib/libpcap/bpf/net/bpf_filter.c
index a2733d1..77002dc 100644
--- a/contrib/libpcap/bpf/net/bpf_filter.c
+++ b/contrib/libpcap/bpf/net/bpf_filter.c
@@ -200,8 +200,8 @@ m_xhalf(m, k, err)
*/
u_int
bpf_filter(pc, p, wirelen, buflen)
- register const struct bpf_insn *pc;
- register const u_char *p;
+ register struct bpf_insn *pc;
+ register u_char *p;
u_int wirelen;
register u_int buflen;
{
diff --git a/contrib/libpcap/bpf_dump.c b/contrib/libpcap/bpf_dump.c
index 5c0033d..630fa5c 100644
--- a/contrib/libpcap/bpf_dump.c
+++ b/contrib/libpcap/bpf_dump.c
@@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
#include <stdio.h>
void
-bpf_dump(const struct bpf_program *p, int option)
+bpf_dump(struct bpf_program *p, int option)
{
const struct bpf_insn *insn;
int i;
diff --git a/contrib/libpcap/bpf_image.c b/contrib/libpcap/bpf_image.c
index 91f7cef..265cb7d 100644
--- a/contrib/libpcap/bpf_image.c
+++ b/contrib/libpcap/bpf_image.c
@@ -39,7 +39,7 @@ static const char rcsid[] _U_ =
char *
bpf_image(p, n)
- const struct bpf_insn *p;
+ struct bpf_insn *p;
int n;
{
int v;
diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
index 9f4ca33..c9b30ed 100644
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -916,7 +916,7 @@ struct bpf_insn {
#if __STDC__ || defined(__cplusplus)
extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
+extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
#else
extern int bpf_validate();
extern u_int bpf_filter();
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
index 2687e1e..6997a9f 100644
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -334,10 +334,10 @@ void pcap_freealldevs(pcap_if_t *);
const char *pcap_lib_version(void);
/* XXX this guy lives in the bpf tree */
-/* u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
-int bpf_validate(const struct bpf_insn *f, int len); */
-char *bpf_image(const struct bpf_insn *, int);
-void bpf_dump(const struct bpf_program *, int);
+u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
+int bpf_validate(struct bpf_insn *f, int len);
+char *bpf_image(struct bpf_insn *, int);
+void bpf_dump(struct bpf_program *, int);
#if defined(WIN32)
OpenPOWER on IntegriCloud