CVS commit: src/sys/net

[Alexander Nasonov]

Module Name:    src
Committed By:   alnsn
Date:           Sat Nov 10 22:12:31 UTC 2012

Modified Files:
        src/sys/net: bpfjit.c

Log Message:
Add RCSID and fix -Wsign-compare warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/net/bpfjit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.1 src/sys/net/bpfjit.c:1.2
--- src/sys/net/bpfjit.c:1.1	Sat Oct 27 22:36:14 2012
+++ src/sys/net/bpfjit.c	Sat Nov 10 22:12:31 2012
@@ -27,6 +27,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+#ifdef _KERNEL
+__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.2 2012/11/10 22:12:31 alnsn Exp $");
+#else
+__RCSID("$NetBSD: bpfjit.c,v 1.2 2012/11/10 22:12:31 alnsn Exp $");
+#endif
+
 #include <net/bpfjit.h>
 
 #ifndef _KERNEL
@@ -187,10 +194,10 @@ read_width(struct bpf_insn *pc)
 /*
  * Get offset of M[k] on the stack.
  */
-static int
-mem_local_offset(uint32_t k, int minm)
+static size_t
+mem_local_offset(uint32_t k, unsigned int minm)
 {
-	int moff = (k - minm) * sizeof(uint32_t);
+	size_t moff = (k - minm) * sizeof(uint32_t);
 
 #ifdef _KERNEL
 	/*
@@ -1093,7 +1100,7 @@ bpfjit_optimization_hints(struct bpf_ins
 {
 	unsigned int rv = BPFJIT_INIT_A;
 	struct bpf_insn *pc;
-	int minm, maxm;
+	unsigned int minm, maxm;
 
 	BPFJIT_ASSERT(BPF_MEMWORDS - 1 <= 0xff);
 
@@ -1203,9 +1210,9 @@ bpfjit_generate_code(struct bpf_insn *in
 	int branching, negate;
 	unsigned int rval, mode, src;
 	int ntmp;
-	int locals_size;
-	int minm, maxm; /* min/max k for M[k] */
-	int mem_locals_start; /* start of M[] array */
+	unsigned int locals_size;
+	unsigned int minm, maxm; /* min/max k for M[k] */
+	size_t mem_locals_start; /* start of M[] array */
 	unsigned int opts;
 	struct bpf_insn *pc;
 	struct sljit_compiler* compiler;