diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-05 13:21:35 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-05 15:03:23 +0000 |
| commit | b1aa1be33c50b9da7de4e8d1414f872cf3546900 (patch) | |
| tree | be62578d2f532a3ea33a448f09a9ae0e83c23ec7 | |
| parent | 62a7fb7b86144ba887501a2e035184e3f640cd53 (diff) | |
| download | wireshark-b1aa1be33c50b9da7de4e8d1414f872cf3546900.tar.gz | |
couchbase: Use some unused hf (and remove unused hf...)
Change-Id: I767a334c82c27b06be7e72461b7f3e3d961784b4
Reviewed-on: https://code.wireshark.org/review/13725
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-couchbase.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index c28a41cfa1..99cb9bfb29 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -351,7 +351,6 @@ static int hf_vbucket_states_size = -1; static int hf_vbucket_states_id = -1; static int hf_vbucket_states_seqno = -1; -static int hf_multipath = -1; static int hf_multipath_opcode = -1; static int hf_multipath_index = -1; static int hf_multipath_pathlen = -1; @@ -1296,12 +1295,12 @@ dissect_multipath_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; } - proto_tree_add_item(multipath_tree, hf_path, tvb, offset, path_len, + proto_tree_add_item(multipath_tree, hf_multipath_path, tvb, offset, path_len, ENC_ASCII | ENC_NA); offset += path_len; if (spec_value_len > 0) { - proto_tree_add_item(multipath_tree, hf_value, tvb, offset, + proto_tree_add_item(multipath_tree, hf_multipath_value, tvb, offset, spec_value_len, ENC_ASCII | ENC_NA); offset += spec_value_len; } @@ -1749,7 +1748,6 @@ proto_register_couchbase(void) { &hf_observe_status, { "Status", "couchbase.observe.status", FT_UINT8, BASE_HEX, NULL, 0x0, "Status of the observable key", HFILL } }, { &hf_observe_cas, { "CAS", "couchbase.observe.cas", FT_UINT64, BASE_HEX, NULL, 0x0, "CAS value of the observable key", HFILL } }, - { &hf_multipath, { "Multipath", "couchbase.multipath", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_multipath_opcode, { "Opcode", "couchbase.multipath.opcode", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &opcode_vals_ext, 0x0, "Command code", HFILL } }, { &hf_multipath_index, { "Index", "couchbase.multipath.index", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_multipath_pathlen, { "Path Length", "couchbase.multipath.path.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, |