diff options
Diffstat (limited to 'epan/dissectors/packet-cql.c')
-rw-r--r-- | epan/dissectors/packet-cql.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index 1b70edc1f1..fa1d873db5 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -697,7 +697,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t offset += 4; item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_result_rows_data_type, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &data_type); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; if (bytes_length == -1) { @@ -840,32 +840,32 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t case CQL_RESULT_ROW_TYPE_UDT: /* keyspace */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_keyspace_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_udt_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT size */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_result_rows_udt_size, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &udt_size); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; for (i = 0; i < udt_size; i++) { /* UDT field name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_udt_field_name, tvb, *offset_metadata, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += string_length; /* UDT field option */ @@ -874,7 +874,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t break; case CQL_RESULT_ROW_TYPE_TUPLE: item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_result_rows_tuple_size, tvb, *offset_metadata, 2, ENC_BIG_ENDIAN, &tuple_size); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); *offset_metadata += 2; for (i = 0; i < tuple_size; i++) { offset = parse_value(columns_subtree, pinfo, tvb, offset_metadata, offset); @@ -901,25 +901,25 @@ static int parse_row(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t* if (!(result_rows_flags & CQL_RESULT_ROWS_FLAG_GLOBAL_TABLES_SPEC)) { /* ksname and tablename */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_keyspace_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_table_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; } /* column name */ item = proto_tree_add_item_ret_uint(columns_subtree, hf_cql_string_length, tvb, shadow_offset, 2, ENC_BIG_ENDIAN, &string_length); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += 2; item = proto_tree_add_item(columns_subtree, hf_cql_string_result_rows_column_name, tvb, shadow_offset, string_length, ENC_UTF_8 | ENC_NA); - PROTO_ITEM_SET_HIDDEN(item); + proto_item_set_hidden(item); shadow_offset += string_length; offset = parse_value(columns_subtree, pinfo, tvb, &shadow_offset, offset); @@ -1063,17 +1063,17 @@ dissect_cql_tcp_pdu(tvbuff_t* raw_tvb, packet_info* pinfo, proto_tree* tree, voi if (server_to_client == 0 && cql_trans->rep_frame) { /* request */ ti = proto_tree_add_uint(cql_tree, hf_cql_response_in, raw_tvb, 0, 0, cql_trans->rep_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } if (server_to_client && cql_trans->req_frame) { /* reply */ nstime_t ns; ti = proto_tree_add_uint(cql_tree, hf_cql_response_to, raw_tvb, 0, 0, cql_trans->req_frame); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); nstime_delta(&ns, &pinfo->abs_ts, &cql_trans->req_time); ti = proto_tree_add_time(cql_tree, hf_cql_response_time, raw_tvb, 0, 0, &ns); - PROTO_ITEM_SET_GENERATED(ti); + proto_item_set_generated(ti); } /* We cannot rely on compression negociation in the STARTUP message because the |