diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
| commit | 41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387 (patch) | |
| tree | 46737517f86dbb9ec37210737dd521c9c3920608 /epan/dfilter/dfvm.c | |
| parent | 9625720a39eddda6ef4c34725fe8017160cf05d9 (diff) | |
Merge the work in Novell_NCP_branch into the mainline code.
A little work still needs to be done on the new NCP dissector -- make
some of the COL_INFO texts more useful, handle a Unicode issue, and
modify some of the cases that use "request conditions".
But the NCP dissector as it stands is very usable now.
Note: I didn't merge in the PROTO_LENGTH_UNTIL_END macro... I wanted
to think about the various possible macros and review an email conversation
I had with Guy on the subject.
svn path=/trunk/; revision=5432
Diffstat (limited to 'epan/dfilter/dfvm.c')
| -rw-r--r-- | epan/dfilter/dfvm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c index 24621c8730..bab20e3564 100644 --- a/epan/dfilter/dfvm.c +++ b/epan/dfilter/dfvm.c @@ -1,5 +1,5 @@ /* - * $Id: dfvm.c,v 1.6 2002/04/08 20:11:31 gram Exp $ + * $Id: dfvm.c,v 1.7 2002/05/09 23:50:30 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -300,7 +300,7 @@ mk_range(dfilter_t *df, int from_reg, int to_reg, drange *drange) gboolean -dfvm_apply(dfilter_t *df, tvbuff_t *tvb, proto_tree *tree) +dfvm_apply(dfilter_t *df, proto_tree *tree) { int i, id, length; gboolean accum = TRUE; @@ -309,7 +309,6 @@ dfvm_apply(dfilter_t *df, tvbuff_t *tvb, proto_tree *tree) dfvm_value_t *arg2; dfvm_value_t *arg3; - g_assert(tvb); g_assert(tree); |