diff options
Diffstat (limited to 'epan/dissectors/packet-kt.c')
-rw-r--r-- | epan/dissectors/packet-kt.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c index 94c77493fa..56892c225f 100644 --- a/epan/dissectors/packet-kt.c +++ b/epan/dissectors/packet-kt.c @@ -24,7 +24,7 @@ void proto_register_kt(void); void proto_reg_handoff_kt(void); -static int proto_kt = -1; +static int proto_kt; /* * A few notes before we get into the thick of things... @@ -35,7 +35,7 @@ static int proto_kt = -1; * for which it has been written, the way it has been written makes * dissection a bit tricky. Requests and responses have the same * "magic" identifier, but there is no clear cut way to distinguish - * between them. This means that a few dirty tricks have have to be + * between them. This means that a few dirty tricks have to be * employed for dissecting... and the dissector is based on sample * captures from two different clients working with the same version * of the server. @@ -68,31 +68,31 @@ static int proto_kt = -1; static dissector_handle_t kt_handle; /* Sub-trees */ -static gint ett_kt = -1; -static gint ett_kt_rec = -1; +static gint ett_kt; +static gint ett_kt_rec; /* Header fields */ -static gint hf_kt_magic = -1; -static gint hf_kt_type = -1; -static gint hf_kt_ts = -1; -static gint hf_kt_flags = -1; -static gint hf_kt_rnum = -1; -static gint hf_kt_dbidx = -1; -static gint hf_kt_sid= -1; -static gint hf_kt_xt = -1; -static gint hf_kt_xt_resp = -1; -static gint hf_kt_ksiz = -1; -static gint hf_kt_vsiz = -1; -static gint hf_kt_key = -1; -static gint hf_kt_val = -1; -static gint hf_kt_key_str = -1; -static gint hf_kt_val_str = -1; -static gint hf_kt_hits = -1; -static gint hf_kt_nsiz = -1; -static gint hf_kt_name = -1; -static gint hf_kt_size = -1; -static gint hf_kt_log = -1; -static gint hf_kt_rec = -1; +static gint hf_kt_magic; +static gint hf_kt_type; +static gint hf_kt_ts; +static gint hf_kt_flags; +static gint hf_kt_rnum; +static gint hf_kt_dbidx; +static gint hf_kt_sid; +static gint hf_kt_xt; +static gint hf_kt_xt_resp; +static gint hf_kt_ksiz; +static gint hf_kt_vsiz; +static gint hf_kt_key; +static gint hf_kt_val; +static gint hf_kt_key_str; +static gint hf_kt_val_str; +static gint hf_kt_hits; +static gint hf_kt_nsiz; +static gint hf_kt_name; +static gint hf_kt_size; +static gint hf_kt_log; +static gint hf_kt_rec; /* Magic Values */ #define KT_MAGIC_REPL_WAIT 0xB0 @@ -253,14 +253,14 @@ dissect_kt_set_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -314,7 +314,7 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_uint(tree, hf_kt_rnum, tvb, new_offset, 4, rnum); new_offset += 4; - proto_tree_add_item(tree, hf_kt_name, tvb, new_offset, nsiz, ENC_ASCII|ENC_NA); + proto_tree_add_item(tree, hf_kt_name, tvb, new_offset, nsiz, ENC_ASCII); new_offset += nsiz; while (rnum > 0) { @@ -333,14 +333,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -382,14 +382,14 @@ dissect_kt_play_script(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -447,7 +447,7 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; @@ -497,14 +497,14 @@ dissect_kt_get_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; proto_tree_add_item(rec_tree, hf_kt_val, tvb, new_offset, vsiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_val_str, tvb, new_offset, vsiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += vsiz; @@ -559,7 +559,7 @@ dissect_kt_remove_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint proto_tree_add_item(rec_tree, hf_kt_key, tvb, new_offset, ksiz, ENC_NA); if (kt_present_key_val_as_ascii) { - pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII|ENC_NA); + pi = proto_tree_add_item(rec_tree, hf_kt_key_str, tvb, new_offset, ksiz, ENC_ASCII); proto_item_set_generated(pi); } new_offset += ksiz; |