diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:53:47 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:53:47 +0000 |
commit | 9cfac1227d8fd1f6de1d9e47489ea49616a2bee2 (patch) | |
tree | f48731d0b0c293e6af6f3476eae8fef06908059f /epan/dfilter | |
parent | 72ea2f9c9c63c7e5c6270383888ad32683d96edf (diff) | |
download | wireshark-9cfac1227d8fd1f6de1d9e47489ea49616a2bee2.tar.gz |
Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
Diffstat (limited to 'epan/dfilter')
-rw-r--r-- | epan/dfilter/gencode.c | 8 | ||||
-rw-r--r-- | epan/dfilter/semcheck.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c index 8571d47a2b..f977c77ede 100644 --- a/epan/dfilter/gencode.c +++ b/epan/dfilter/gencode.c @@ -63,8 +63,8 @@ dfw_append_read_tree(dfwork_t *dfw, header_field_info *hfinfo) gboolean added_new_hfinfo = FALSE; /* Rewind to find the first field of this name. */ - while (hfinfo->same_name_prev) { - hfinfo = hfinfo->same_name_prev; + while (hfinfo->same_name_prev_id != -1) { + hfinfo = proto_registrar_get_nth(hfinfo->same_name_prev_id); } /* Keep track of which registers @@ -341,8 +341,8 @@ gen_test(dfwork_t *dfw, stnode_t *st_node) hfinfo = (header_field_info*)stnode_data(st_arg1); /* Rewind to find the first field of this name. */ - while (hfinfo->same_name_prev) { - hfinfo = hfinfo->same_name_prev; + while (hfinfo->same_name_prev_id != -1) { + hfinfo = proto_registrar_get_nth(hfinfo->same_name_prev_id); } val1->value.hfinfo = hfinfo; insn = dfvm_insn_new(CHECK_EXISTS); diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index ea5cb99e17..47dd748da3 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -618,8 +618,8 @@ check_relation_LHS_FIELD(const char *relation_string, FtypeCanFunc can_func, } if (!fvalue) { /* Try another field with the same name */ - if (hfinfo1->same_name_prev) { - hfinfo1 = hfinfo1->same_name_prev; + if (hfinfo1->same_name_prev_id != -1) { + hfinfo1 = proto_registrar_get_nth(hfinfo1->same_name_prev_id); ftype1 = hfinfo1->type; } else { break; |