svn commit: r257466 - in head/contrib/libpcap: . bpf/net pcap

[Sean Bruno]

Author: sbruno
Date: Thu Oct 31 20:03:59 2013
New Revision: 257466
URL: http://svnweb.freebsd.org/changeset/base/257466

Log:
  Integrate github revision 0446821e49224c6a29be28760cc9c4cc14f56d8a as
  suggested by upstream
  
  https://github.com/the-tcpdump-group/libpcap/issues/327
  
  Quiesce assignment warnings by use of const

Modified:
  head/contrib/libpcap/bpf/net/bpf_filter.c
  head/contrib/libpcap/bpf_dump.c
  head/contrib/libpcap/bpf_image.c
  head/contrib/libpcap/pcap/bpf.h
  head/contrib/libpcap/pcap/pcap.h

Modified: head/contrib/libpcap/bpf/net/bpf_filter.c
==============================================================================
--- head/contrib/libpcap/bpf/net/bpf_filter.c	Thu Oct 31 19:55:36 2013	(r257465)
+++ head/contrib/libpcap/bpf/net/bpf_filter.c	Thu Oct 31 20:03:59 2013	(r257466)
@@ -209,8 +209,8 @@ m_xhalf(m, k, err)
  */
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	register struct bpf_insn *pc;
-	register u_char *p;
+	register const struct bpf_insn *pc;
+	register const u_char *p;
 	u_int wirelen;
 	register u_int buflen;
 {

Modified: head/contrib/libpcap/bpf_dump.c
==============================================================================
--- head/contrib/libpcap/bpf_dump.c	Thu Oct 31 19:55:36 2013	(r257465)
+++ head/contrib/libpcap/bpf_dump.c	Thu Oct 31 20:03:59 2013	(r257466)
@@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 
 void
-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)
 {
 	const struct bpf_insn *insn;
 	int i;

Modified: head/contrib/libpcap/bpf_image.c
==============================================================================
--- head/contrib/libpcap/bpf_image.c	Thu Oct 31 19:55:36 2013	(r257465)
+++ head/contrib/libpcap/bpf_image.c	Thu Oct 31 20:03:59 2013	(r257466)
@@ -53,7 +53,7 @@ static const char rcsid[] _U_ =
 
 char *
 bpf_image(p, n)
-	struct bpf_insn *p;
+	const struct bpf_insn *p;
 	int n;
 {
 	int v;

Modified: head/contrib/libpcap/pcap/bpf.h
==============================================================================
--- head/contrib/libpcap/pcap/bpf.h	Thu Oct 31 19:55:36 2013	(r257465)
+++ head/contrib/libpcap/pcap/bpf.h	Thu Oct 31 20:03:59 2013	(r257466)
@@ -1285,7 +1285,7 @@ struct bpf_insn {
 
 #if __STDC__ || defined(__cplusplus)
 extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
+extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 #else
 extern int bpf_validate();
 extern u_int bpf_filter();

Modified: head/contrib/libpcap/pcap/pcap.h
==============================================================================
--- head/contrib/libpcap/pcap/pcap.h	Thu Oct 31 19:55:36 2013	(r257465)
+++ head/contrib/libpcap/pcap/pcap.h	Thu Oct 31 20:03:59 2013	(r257466)
@@ -409,11 +409,11 @@ const char *pcap_lib_version(void);
  * declared when we build pcap-bpf.c.
  */
 #ifndef __NetBSD__
-u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); 
+u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); 
 #endif
 int	bpf_validate(const struct bpf_insn *f, int len);
-char	*bpf_image(struct bpf_insn *, int);
-void	bpf_dump(struct bpf_program *, int);
+char	*bpf_image(const struct bpf_insn *, int);
+void	bpf_dump(const struct bpf_program *, int);
 
 #if defined(WIN32)