Integrate github revision 0446821e49224c6a29be28760cc9c4cc14f56d8a as

suggested by upstream

https://github.com/the-tcpdump-group/libpcap/issues/327

Quiesce assignment warnings by use of const
This commit is contained in:
Sean Bruno 2013-10-31 20:03:59 +00:00
parent b24e24eb7d
commit 3055dc3e48
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=257466
5 changed files with 8 additions and 8 deletions

View File

@ -209,8 +209,8 @@ m_xhalf(m, k, err)
*/ */
u_int u_int
bpf_filter(pc, p, wirelen, buflen) bpf_filter(pc, p, wirelen, buflen)
register struct bpf_insn *pc; register const struct bpf_insn *pc;
register u_char *p; register const u_char *p;
u_int wirelen; u_int wirelen;
register u_int buflen; register u_int buflen;
{ {

View File

@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
#include <stdio.h> #include <stdio.h>
void void
bpf_dump(struct bpf_program *p, int option) bpf_dump(const struct bpf_program *p, int option)
{ {
const struct bpf_insn *insn; const struct bpf_insn *insn;
int i; int i;

View File

@ -53,7 +53,7 @@ static const char rcsid[] _U_ =
char * char *
bpf_image(p, n) bpf_image(p, n)
struct bpf_insn *p; const struct bpf_insn *p;
int n; int n;
{ {
int v; int v;

View File

@ -1285,7 +1285,7 @@ struct bpf_insn {
#if __STDC__ || defined(__cplusplus) #if __STDC__ || defined(__cplusplus)
extern int bpf_validate(const struct bpf_insn *, int); 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 #else
extern int bpf_validate(); extern int bpf_validate();
extern u_int bpf_filter(); extern u_int bpf_filter();

View File

@ -409,11 +409,11 @@ const char *pcap_lib_version(void);
* declared when we build pcap-bpf.c. * declared when we build pcap-bpf.c.
*/ */
#ifndef __NetBSD__ #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 #endif
int bpf_validate(const struct bpf_insn *f, int len); int bpf_validate(const struct bpf_insn *f, int len);
char *bpf_image(struct bpf_insn *, int); char *bpf_image(const struct bpf_insn *, int);
void bpf_dump(struct bpf_program *, int); void bpf_dump(const struct bpf_program *, int);
#if defined(WIN32) #if defined(WIN32)